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

108 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lennart Eriksson
efd9f23f55 temp changes 2016-10-14 15:53:40 +02:00
Lennart Eriksson
a3fe614d3a temp change on eeprom 2016-10-14 14:33:15 +02:00
Lennart Eriksson
aeda5b45e2 Merge remote-tracking branch 'refs/remotes/origin/PID' into PID_from_eeprom 2016-10-14 10:28:51 +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
Lennart Eriksson
67495c1ba9 Merge remote-tracking branch 'refs/remotes/origin/master' into PID_from_eeprom 2016-10-14 09:51:59 +02:00
johan9107
de4348c385 Merge remote-tracking branch 'refs/remotes/origin/master' into PID 2016-10-13 10:07:22 +02:00
Jonas Holmberg
9b0d35a579 Small changes to the motermix to perform testing 2016-10-13 10:01:41 +02:00
Lennart Eriksson
62d2701e9e Merge pull request #15 from MDHSweden/PID 
pid and low pass filter Accepted by Lennart Eriksson
 2016-10-12 17:40:30 +02:00
johan9107
f0c400552d pid and low pass filter 
Added pid controller functions and low pass filter functions
 2016-10-12 17:17:01 +02:00
Jonas Holmberg
d3112e7128 Merge remote-tracking branch 'refs/remotes/origin/Failsafe-and-toggles' 2016-10-12 15:00:50 +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
26ab9475d5 Merge branch 'master' of https://github.com/MDHSweden/UAV-Control-System 2016-10-11 18:04:16 +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
Lennart Eriksson
a81bb6f808 Merge pull request #13 from MDHSweden/eeprom 
Eeprom, Accepeted by Lennart Eriksson
 2016-10-10 09:21:05 +02:00
Jonas Holmberg
666250485b Merge remote-tracking branch 'refs/remotes/origin/master' into eeprom 2016-10-10 09:07:47 +02:00
Jonas Holmberg
c8599dcf61 Merge remote-tracking branch 'origin/eeprom' into eeprom 
# Conflicts:
#	UAV-ControlSystem/src/config/cli.c
#	UAV-ControlSystem/src/tasks_main.c
 2016-10-10 09:05:26 +02:00
Jonas Holmberg
33a148b4dd Finished CLI Implementation 
The finished CLI implementation. All actions should be in a working
condition. It should be able to read messages from any serial
writer/reader. To do later if time build an desktop application to
communicate with
 2016-10-10 08:59:49 +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
3dab83f6d7 Merge remote-tracking branch 'refs/remotes/origin/ClockDividerTeat' 2016-10-06 10:45:47 +02:00
Lennart Eriksson
dca3a03ab9 Small fixes 2016-10-06 10:45:16 +02:00
Lennart Eriksson
4c6adc9c89 Merge remote-tracking branch 'refs/remotes/origin/Lennart-Gyro' 2016-10-06 09:01:12 +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
Jonas Holmberg
05247d9039 Merge remote-tracking branch 'origin/eeprom' into eeprom 
# Conflicts:
#	UAV-ControlSystem/inc/config/eeprom.h
#	UAV-ControlSystem/src/config/eeprom.c
#	UAV-ControlSystem/src/main.c
 2016-10-04 14:03:36 +02:00
Jonas Holmberg
214617ed1f CLI things 
CLI full func and some extra eeprom
 2016-10-04 13:38:44 +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
philsson
fd354ccf2d Final Philip EEPROM version. Now it will be merged with Master 2016-10-04 13:30:15 +02:00
philsson
ad9232147c Code cleanups and optimization 2016-10-03 11:45:49 +02:00
Lennart Eriksson
4d3801239c Merge remote-tracking branch 'refs/remotes/origin/I2C' 2016-10-03 09:51:36 +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
3c89d4ae07 Merge remote-tracking branch 'refs/remotes/origin/UART_LENNART' 2016-09-30 12:21:02 +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
365d71e03e Fixing stares in comments 2016-09-29 14:38:49 +02:00
philsson
0c3ecd9c66 Comments added to eeprom files 2016-09-29 14:25:26 +02:00
philsson
7271ac3138 EEPROM works and is upgraded and simplified 2016-09-29 13:07:43 +02:00
philsson
a11e12b943 LinkerScript.ld addition for EEPROM memory address 2016-09-29 08:57:49 +02:00
Lennart Eriksson
30cb13cf49 Intermediate storage point 2016-09-27 11:35:07 +02:00
Lennart Eriksson
a00e369b67 Merge pull request #10 from MDHSweden/Scheduler 
Scheduler approved by Lennart
 2016-09-26 20:01:09 +02:00
Jonas Holmberg
e23f6c5edd Merge remote-tracking branch 'refs/remotes/origin/master' into Scheduler 2016-09-26 14:58:57 +02:00
Jonas Holmberg
fc5ca4330c Final adjustments 
Added the and adjusted the final part to the scheduler. Added ability to
add task functionality that will run. Updated main file to its intended
state. Further added led functinality along with led warnings.
 2016-09-26 08:53:50 +02:00
philsson
83b56b2404 Renaming for better explanation of rx inverter for uart1 2016-09-22 11:29:16 +02:00
Lennart Eriksson
7c37ef0b47 temp checkin 2016-09-22 08:31:51 +02:00