198 Commits

Author SHA1 Message Date
ff5eca5fd7 Implementation of inclination compensation on throttle 2016-11-29 17:12:23 +01:00
Jonas Holmberg
c82e0e5bf8 Merge remote-tracking branch 'refs/remotes/origin/master' into baro2 2016-11-29 12:23:41 +01:00
Jonas Holmberg
366bf09086 small changes to settings 2016-11-29 09:52:55 +01:00
Lennart Eriksson
dce78c05f5 Added ping sensor data to the system 2016-11-25 11:52:00 +01:00
Jonas Holmberg
0ce318d2e7 Last fix 2016-11-24 17:11:08 +01:00
johan9107
eb28c1bb75 Merge remote-tracking branch 'origin/baro2' into baro2
# Conflicts:
#	UAV-ControlSystem/src/drivers/accel_gyro.c
2016-11-21 11:19:19 +01:00
johan9107
16b05ee206 Improved angle update to accelerometer 2016-11-21 11:17:00 +01:00
f6f6f50cdf Successful tests from friday. This code is not correct though. Regards ACC!!! Even though in baro2 branch 2016-11-21 09:03:41 +01:00
Jonas Holmberg
4986238d1e fast 2016-11-18 14:05:18 +01:00
Jonas Holmberg
2a87aa499e Last flight settings 2016-11-18 09:29:10 +01:00
johan9107
03be1e6b40 Deleted oscilation when enableing acc 2016-11-17 10:59:23 +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
johan9107
497e00aa2f Added velocity compensation to baromter loop instead of controling height 2016-11-15 09:15:15 +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
johan9107
84b3a729e1 PID baro fix loosing heoight to fast 2016-11-11 17:49:01 +01:00
Jonas Holmberg
4a1ac00dc1 Changes made during testflight 2016-11-11 14:24:51 +01:00
Jonas Holmberg
a5a888f553 Small value changes before second barometer test flight 2016-11-11 11:01:43 +01:00
johan9107
5873b4326e PID added desired height value to define 2016-11-10 14:12:59 +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
abe3af0f46 Merge remote-tracking branch 'origin/baro2' into baro2
# Conflicts:
#	UAV-ControlSystem/src/Flight/pid.c
2016-11-10 10:33:01 +01:00
Jonas Holmberg
ce6ca20b43 PID test flight baro 2016-11-10 10:31:26 +01:00
johan9107
02e33f7d33 PID and Motormix, code optimization 2016-11-09 16:56:56 +01:00
Jonas Holmberg
38486e2bd3 Seems to be a working with the barometer in the lab.
It looks like it could hold the altitude. Testing outside is needed to
verify and tune.
2016-11-09 16:26:28 +01:00
Jonas Holmberg
f49548d141 Merged with accelerometer. Started baro implementation, not working. 2016-11-09 12:06:32 +01:00
Lennart Eriksson
fb826ac607 got the main file back 2016-11-09 11:06:33 +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
johan9107
9d1b71fabc PID update, deleted code overflow 2016-11-09 08:35:37 +01:00
Jonas Holmberg
d7406cc501 ops 2016-11-08 12:26:19 +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
70b70fc5b6 ops 2016-11-07 16:58:07 +01:00
Jonas Holmberg
e09c69fbaa small things 2016-11-07 16:57:59 +01:00
Jonas Holmberg
52241202b1 Merge remote-tracking branch 'origin/ACC-fix' into ACC-fix
# Conflicts:
#	UAV-ControlSystem/src/drivers/accel_gyro.c
2016-11-07 13:45:58 +01:00
Jonas Holmberg
e22ad43c39 Removed very very very small amount of stuff 2016-11-07 13:42:43 +01:00
Jonas Holmberg
280240815d Possible fix to the accelerometer problem 2016-11-07 10:43:43 +01:00
3eeb4d3741 Remove square root from magnitude calculation on accel_gyro.c
Motors start now at 990 instead of 1000 to prevent glitches
2016-11-03 12:02:34 +01:00
johan9107
8bd9dc986d PID deleted rows 2016-11-02 13:39:15 +01:00
johan9107
29e621b18e added new calcualtions to accel gyro 2016-11-02 11:17:59 +01:00
88f09eef25 First commit to new acc implementation 2016-11-02 09:22:32 +01:00
0152b14006 Better standard value for arm state. Not valid anymore from 1500 as this is default. 2016-11-01 14:42:58 +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
be8b35a336 fixed commenting 2016-11-01 10:06:56 +01:00
johan9107
c6d50810cb PID take away antiwindup protection 2016-11-01 10:03:35 +01:00
Jonas Holmberg
195b311b88 Merge remote-tracking branch 'refs/remotes/origin/PID-Improved' into baro2 2016-11-01 09:57:55 +01:00
Jonas Holmberg
606160e1cf test 2016-11-01 09:57:06 +01:00