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

73 Commits

Author SHA1 Message Date
Lennart Eriksson
dc2bc678e4 Merge remote-tracking branch 'refs/remotes/origin/baro2' into Compass 
# Conflicts:
#	UAV-ControlSystem/inc/system_variables.h
#	UAV-ControlSystem/src/Flight/pid.c
#	UAV-ControlSystem/src/main.c
#	UAV-ControlSystem/src/tasks_main.c
 2016-11-23 14:03:09 +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
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
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
philsson
88f09eef25 First commit to new acc implementation 2016-11-02 09:22:32 +01:00
philsson
27362fcbb6 Merge branch 'PID-Improved' 
# Conflicts:
#	UAV-ControlSystem/src/main.c
 2016-11-01 14:41:29 +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
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
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
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
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
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
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
philsson
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
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
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
philsson
0df214b68a Fixing RC problems on header in message 2016-10-13 14:05:00 +02:00
Jonas Holmberg
2b05c843a1 Fiexed small errors and added more commands for RC things in CLI 
Also added some statistical values that can be veiwed in CLI to see how
they sytem performs.
 2016-10-12 14:58:21 +02:00
Jonas Holmberg
09daa76d63 Merge remote-tracking branch 'refs/remotes/origin/master' into Failsafe-and-toggles 2016-10-12 09:49:51 +02:00
Jonas Holmberg
7deb9041a6 Adde functionality 
Added fucntionality to make failseafes and bool toggles.
 2016-10-11 18:06:23 +02:00
philsson
20f006a0ca Some changes to yaw inversion and changed some possible negative ints to int 2016-10-11 18:02:49 +02:00
philsson
33398e756c Implemented all but EEPROM and check for Airmode and Armed 2016-10-11 12:02:28 +02:00
philsson
ff9ebbd15e Created files for motormixer 2016-10-07 17:36:16 +02:00
philsson
bb866510f8 Merge branch 'master' of https://github.com/MDHSweden/UAV-Control-System 2016-10-07 17:30:53 +02:00
philsson
6aa6084e55 SBUS is done now! besides failsafe which needs more work. 2016-10-07 17:28:10 +02:00
Lennart Eriksson
dca3a03ab9 Small fixes 2016-10-06 10:45:16 +02:00
Lennart Eriksson
912f7d0d39 mpu6000 fix with both SPI changes and accel and gyro working + fifo not crashing ever 2016-10-06 09:00:00 +02:00
philsson
d3423c34e2 Merge remote-tracking branch 'remotes/origin/master' into eeprom 
# Conflicts:
#	UAV-ControlSystem/src/main.c
 2016-10-04 13:36:58 +02:00
Lennart Eriksson
6983d53f8e Finalizing the I2C 2016-10-03 09:51:09 +02:00
Lennart Eriksson
a4d7eccd2b Merge remote-tracking branch 'refs/remotes/origin/master' into I2C 
# Conflicts:
#	UAV-ControlSystem/src/main.c
 2016-10-03 09:45:21 +02:00
Lennart Eriksson
9e6ba36ac0 I2C working with compass only so far 2016-10-03 09:42:16 +02:00
Lennart Eriksson
94a00d607d Merge pull request #12 from MDHSweden/Gyro 
Working SPI gyroacc, Approved by Lennart Eriksson
 2016-10-03 08:50:23 +02:00
Robert Skoglund
cd6087f3d4 Working SPI gyroacc 2016-10-03 08:41:16 +02:00
Lennart Eriksson
d8a9adff6d USART implementation 
This is an implementation of the USART but the DMA transfer is not
supported, all other functionalities are working including i.e. polling,
regular processor transmit and dma double buffer
 2016-09-30 12:20:10 +02:00
philsson
7271ac3138 EEPROM works and is upgraded and simplified 2016-09-29 13:07:43 +02:00