209 Commits

Author SHA1 Message Date
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
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
9c9a721cfa Merge remote-tracking branch 'refs/remotes/origin/ArduinoCom' 2016-11-01 10:11:55 +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
Lennart Eriksson
1b601f153d Fixes for the master 2016-11-01 09:44:41 +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
mdhsweden
40454ae608 Casts added to several functions in PID section
Signed-off-by: mdhsweden <mdhsweden@gmail.com>
2016-10-31 19:07:45 +01:00
mdhsweden
4b7fd40967 Cast Ints to float in constrainf. What happens if we return an int on a function which returns a float? Just to be sure 2016-10-31 18:30:09 +01:00
Jonas Holmberg
83c11bd444 Added miss to the acc calibration 2016-10-31 18:19:44 +01:00
johan9107
3039f3a394 pid SHIT FIX 2016-10-31 18:17:13 +01:00
johan9107
dcf36fc542 PID changed buffer to filter 2016-10-31 14:44:34 +01:00
johan9107
f787b19572 PID, deleted overflow code 2016-10-31 11:20:30 +01:00
e6ce36f9e9 Changes to scaling of the I-term. It is now 200 times smaller 2016-10-31 11:18:54 +01:00
johan9107
dab5b5626d PID new test changes, cast I term to float 2016-10-31 09:58:04 +01:00
johan9107
df965c19b3 Merge remote-tracking branch 'refs/remotes/origin/baro2' into PID-Improved 2016-10-31 09:24:48 +01:00
Jonas Holmberg
e040e35cf6 ops 2016-10-28 14:34:59 +02: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
johan9107
428a6140b4 PID added new dweight values 2016-10-28 08:39:05 +02:00