113 Commits

Author SHA1 Message Date
Jonas Holmberg
c82e0e5bf8 Merge remote-tracking branch 'refs/remotes/origin/master' into baro2 2016-11-29 12:23:41 +01:00
Lennart Eriksson
dce78c05f5 Added ping sensor data to the system 2016-11-25 11:52:00 +01:00
johan9107
16b05ee206 Improved angle update to accelerometer 2016-11-21 11:17:00 +01:00
Jonas Holmberg
3407813f1e Added filter to the barometer data. Also some fixes in PID for barometer. Also added simple beeper code. 2016-11-17 10:18:39 +01:00
Jonas Holmberg
7333665fc6 Added small fixes, also added beeber. Beeber dont seem to work needs fixing. 2016-11-15 09:13:47 +01:00
Jonas Holmberg
aa93a954d8 Fixed throttlerate, added constrain so that we cant lower altitude to fast with barometer flight. 2016-11-10 13:30:24 +01:00
Jonas Holmberg
f49548d141 Merged with accelerometer. Started baro implementation, not working. 2016-11-09 12:06:32 +01:00
Lennart Eriksson
29c03e1f75 Sending sensor values are working, the only thing left is to update the values correctly 2016-11-09 11:06:09 +01:00
Jonas Holmberg
4fe18abcec Merge remote-tracking branch 'refs/remotes/origin/ACC-fix' into baro2 2016-11-09 10:36:30 +01:00
Jonas Holmberg
440640d8ef Added average function to get the altitude 2016-11-09 10:35:55 +01:00
johan9107
c791a9ea3b PID added barometer settings to CLI, eeprom and PID 2016-11-09 10:34:03 +01:00
Jonas Holmberg
9024a8d425 Added a full set of comments to the barometer code.
Fully commented the code for the barometer.
2016-11-08 12:26:07 +01:00
Jonas Holmberg
fcc0bd41ae Added some comments.
Added some comments to the barometer code. More will be added.
2016-11-08 09:25:52 +01:00
Jonas Holmberg
280240815d Possible fix to the accelerometer problem 2016-11-07 10:43:43 +01:00
88f09eef25 First commit to new acc implementation 2016-11-02 09:22:32 +01:00
27362fcbb6 Merge branch 'PID-Improved'
# Conflicts:
#	UAV-ControlSystem/src/main.c
2016-11-01 14:41:29 +01:00
Jonas Holmberg
fbae0cf452 Fixed abs function for float values
This could cause the anti windup to work. Needs testing.
2016-11-01 14:05:52 +01:00
Jonas Holmberg
4accab0660 Fixed the problem with windup 2016-11-01 12:18:50 +01:00
Lennart Eriksson
50bc7bac30 Arduino com working with parser and everything (hopefully) 2016-11-01 09:34:57 +01:00
Lennart Eriksson
1c0c7fb00f First drafto of new parser 2016-11-01 09:23:40 +01:00
Jonas Holmberg
0f37f6600d Added calibration for accelerometer 2016-10-28 14:34:49 +02:00
Jonas Holmberg
e1b7a5c2ff Merge remote-tracking branch 'refs/remotes/origin/PID-Improved' into baro2
# Conflicts:
#	UAV-ControlSystem/src/drivers/accel_gyro.c
2016-10-28 10:26:19 +02:00
c57ec51397 Temp fix for eeprom problem 2016-10-28 10:22:42 +02:00
Jonas Holmberg
738dca560f Added I2C soft implementation. Added barometer functionality.
In this commit the the barometer is commented out and is not used in the
system. This part also has athe beginnings of the calibration functions
for accel and gyro
2016-10-28 10:22:13 +02:00
Lennart Eriksson
fd743c755e Fix for starting sampling of data 2016-10-27 13:24:56 +02:00
6838df050b First test 2016-10-27 10:55:59 +02:00
33426ea90b Commit only to switch branch. Not ready! 2016-10-26 16:27:34 +02:00
Jonas Holmberg
ec395d11e0 Working software ic2 barometer
Can read from baro and get temp, preassure and alt. Will look into
optimizations.
2016-10-25 17:10:36 +02:00
76fb5c8128 Motormixer fixed now! The mid mixer does not max out motors anymore (probably not) 2016-10-25 10:13:51 +02:00
Jonas Holmberg
7ca3bbec8f Changed some min max values in CLI and changed direction of the GYRO 2016-10-20 18:22:40 +02:00
Jonas Holmberg
622a61f17f Merge remote-tracking branch 'refs/remotes/origin/master' into baro2 2016-10-20 09:03:02 +02:00
Jonas Holmberg
db48b1235c Ceated new branch for baro 2016-10-20 08:59:30 +02:00
johan9107
7763f73c2c Connected cli and eeprom, and motormix to PID settings
Connected cli and eeprom, and motormix to PID settings
2016-10-19 16:59:48 +02:00
johan9107
8bb27e91fa Improved and added new PID structure
Changed the PID strucutre and added new filters
2016-10-19 14:26:10 +02:00
johan9107
23a19c314b PID changed postion of code
PID changed postion of defines
2016-10-18 17:01:11 +02:00
Jonas Holmberg
7da69bb6c2 small comments 2016-10-18 15:07:29 +02:00
Lennart Eriksson
ea48b3560b Merge remote-tracking branch 'origin/PID' into PID
# Conflicts:
#	UAV-ControlSystem/src/config/cli.c
#	UAV-ControlSystem/src/config/eeprom.c
#	UAV-ControlSystem/src/drivers/sbus.c
2016-10-18 12:20:07 +02:00
Lennart Eriksson
d22c77fc06 Merge remote-tracking branch 'refs/remotes/origin/master' into PID 2016-10-18 12:11:15 +02:00
Jonas Holmberg
238b71b8bc Added some more comments to Failsafe and CLI
General comments added for the failsafe and toggles. Also added
description in CLI.h on the necessary steps to add a new command to the
CLI and how to also add the value it should operate on to the EEPROM.
2016-10-18 11:51:47 +02:00
Jonas Holmberg
dfac730893 Added improvement to AUX command processing
Improved the speed of the processing of aux commands from the rc that
handles various bolean flags in the system. Also added some more
commenting to the failsafe and toggles fiels. Also updated the motor 7
and 8s information in the REVO.h
2016-10-18 11:13:27 +02:00
johan9107
8031d48cb0 PID new rc input
added a new gloabal functions to get rc input from radio (rc_input)
2016-10-18 11:02:23 +02:00
d72e7e099b New mixer mode implemented with low scaling. Renaming of Airmode into Full scale
Implemented new modes in cli
Fixed bugg in motors.c cutting out max value
2016-10-17 14:34:09 +02:00
johan9107
4bb2d6fdaf Merge remote-tracking branch 'refs/remotes/origin/PID_from_eeprom' into PID 2016-10-17 11:59:41 +02:00
johan9107
2227ab997f PID changes
Added ID profile to PID init and new init func
2016-10-17 11:58:36 +02:00
Lennart Eriksson
efd9f23f55 temp changes 2016-10-14 15:53:40 +02:00
Jonas Holmberg
51ec5b4170 Fixed some errors with the sbus RC command and other small things
Fixed an issue in the SBUS RC command read. Also fixed some things in
the motormix, not yet fixed totally. Also added a command in CLI to
calibrate the motors of the aircraft.
2016-10-14 15:32:49 +02:00
Lennart Eriksson
a3fe614d3a temp change on eeprom 2016-10-14 14:33:15 +02:00
johan9107
a9bde4513a PID functions
Added new global variables and functions to the PID controller which is
supposed to sync with the main program
2016-10-14 10:27:46 +02:00
Jonas Holmberg
bce8d66ea0 May have fixed the problem
May have solved the issue with the throttle not wokring when maxing some
of the stick controlls. Could still not be correct but the issue seems
to have been located.
2016-10-13 17:10:13 +02:00
0df214b68a Fixing RC problems on header in message 2016-10-13 14:05:00 +02:00