philip/MDH-UAV-Control-System
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
188 Commits 1 Branch 0 Tags
Commit Graph

188 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lennart Eriksson
e2c8ffee5a Got compass to work again 2016-11-23 13:56:55 +01:00
Lennart Eriksson
3c10f7b4de Merge remote-tracking branch 'refs/remotes/origin/ArduinoCom' 2016-11-09 11:07:15 +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
Lennart Eriksson
23c9e65e60 Merge remote-tracking branch 'refs/remotes/origin/master' into ArduinoCom 2016-11-02 13:11:54 +01:00
philsson
0152b14006 Better standard value for arm state. Not valid anymore from 1500 as this is default. 2016-11-01 14:42:58 +01:00
philsson
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
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
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
philsson
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
philsson
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
johan9107
3d3d16cead PID added new lowpas filter and average calculations to Accelerometer values 2016-10-27 14:30:26 +02:00
Lennart Eriksson
fd743c755e Fix for starting sampling of data 2016-10-27 13:24:56 +02:00
johan9107
c3e969e982 PID Added new values to improve filter 2016-10-27 11:55:16 +02:00
philsson
6838df050b First test 2016-10-27 10:55:59 +02:00
philsson
33426ea90b Commit only to switch branch. Not ready! 2016-10-26 16:27:34 +02:00
johan9107
69c9f22dad Pid update angle caluclations 2016-10-26 16:22:33 +02:00
Jonas Holmberg
fe18550ca8 Some sort of comm possible using hardware I2C 
Can get response by hardware but its not very fast since the setting are
not optimized at all
 2016-10-26 15:25:36 +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
Jonas Holmberg
f35617c92d Working communication with the BARO 
Not a full implementation just a test that can get conntact with the
BARO and no other calculations are made. This is not using the HAL but
its a software implementation that simly sets pins high and low etc...
 2016-10-25 14:23:01 +02:00
johan9107
8b511b1098 Merge remote-tracking branch 'refs/remotes/origin/master' into PID-Improved 2016-10-25 10:19:56 +02:00
philsson
76fb5c8128 Motormixer fixed now! The mid mixer does not max out motors anymore (probably not) 2016-10-25 10:13:51 +02:00
johan9107
facfcb7023 PID accelerometer added low pass filter 2016-10-25 10:13:49 +02:00
philsson
6bdcb6e853 Some more fixes on mixer. Not working well! 2016-10-25 09:50:35 +02:00
johan9107
6994bcaf11 Merge remote-tracking branch 'refs/remotes/origin/master' into PID-Improved 2016-10-25 09:44:01 +02:00
johan9107
75dadc7484 Chnaged port from usart 3 to 6 on cli 2016-10-25 09:43:38 +02:00
philsson
4da4736257 Fix for motormix low. Not tested! 2016-10-25 09:17:58 +02:00
johan9107
18cdcc628b Merge remote-tracking branch 'refs/remotes/origin/master' into PID-Improved 2016-10-24 18:00:18 +02:00
johan9107
7186db1c6b Merge remote-tracking branch 'refs/remotes/origin/master' into PID-Improved 2016-10-24 17:36:21 +02:00
philsson
1ef8f56ed6 Changes to acc functionality. OBS! Not working correctly 2016-10-24 17:34:58 +02:00
Lennart Eriksson
8ae24669af Merge pull request #19 from MDHSweden/PID-Improved 
Pid improved, approved by Lennart
 2016-10-24 14:44:55 +02:00
johan9107
c0cb3ffe17 PID, added correct calculations to accelerometer data 
PID, added correct calculations to accelerometer data
 2016-10-24 14:37:01 +02:00