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

53 Commits

Author SHA1 Message Date
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
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
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
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
Lennart Eriksson
30cb13cf49 Intermediate storage point 2016-09-27 11:35:07 +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
philsson
a89e3dc4e9 Merge branch 'master' of https://github.com/MDHSweden/UAV-Control-System 2016-09-21 16:38:55 +02:00
philsson
1de3babe98 Inverter for UART1 implemented. Not tested 2016-09-21 16:27:37 +02:00
Jonas Holmberg
c2ff566c46 Merge remote-tracking branch 'refs/remotes/origin/master' into Scheduler 2016-09-21 10:59:14 +02:00
Jonas Holmberg
049575f54f Commit because update from master needed 
Added some functionallity to utilize debug tasks. Only to be used when
testing the scheduler and never when the real system should run.
 2016-09-21 10:59:09 +02:00
Lennart Eriksson
6f7a9c6495 Fixed bugs with system clock 2016-09-21 10:47:12 +02:00
Jonas Holmberg
ecdeeffb6e Merge remote-tracking branch 'refs/remotes/origin/master' into Scheduler 
# Conflicts:
#	UAV-ControlSystem/.cproject
#	UAV-ControlSystem/src/main.c
 2016-09-21 10:25:43 +02:00
Lennart Eriksson
eea60e95da System Clock 2016-09-21 10:01:14 +02:00
philsson
310d377f8e Merge remote-tracking branch 'refs/remotes/origin/master' into ADCfix 
# Conflicts:
#	UAV-ControlSystem/.cproject
#	UAV-ControlSystem/.settings/language.settings.xml
#	UAV-ControlSystem/Debug/UAV-ControlSystem.bin
#	UAV-ControlSystem/Debug/objects.list
#	UAV-ControlSystem/Debug/output.map
#	revolution_hal_lib/.cproject
#	revolution_hal_lib/.settings/language.settings.xml
#	revolution_hal_lib/Debug/objects.mk
#	revolution_hal_lib/Debug/sources.mk
 2016-09-20 16:51:26 +02:00
philsson
c8440bd1a8 ADC finalized and working 2016-09-20 16:34:51 +02:00
Jonas Holmberg
db9ec94330 Added additional things in the scheduler 
The tasks should now be able to be added to the ready queue when the
schedual init.
 2016-09-20 15:42:05 +02:00
philsson
5716445448 Working ADC with DMA. Needs some cleaning 2016-09-20 11:43:32 +02:00
Lennart Eriksson
4370f1b413 Merge pull request #5 from MDHSweden/pwmDriver 
Drivers Oneshot125 approved by Lennart
 2016-09-19 16:19:35 +02:00
johan9107
c0c9aa8572 Drivers Oneshot125 
Added the protocol oneshot 125 to pwm drivers
 2016-09-19 15:54:32 +02:00
Jonas Holmberg
7d00a65cd5 Save commit 
Small save commit for temporary branch change. Added some task
definitions.
 2016-09-19 13:24:48 +02:00
Jonas Holmberg
8181a13122 Small save commit 
Added more functionality to the scheduler, and also started to define
some tasks.
 2016-09-19 09:19:33 +02:00
Jonas Holmberg
161869c53a Commit conflict 2016-09-16 16:01:19 +02:00
Lennart Eriksson
b8ea6487c2 Merge pull request #2 from MDHSweden/pwmDriver 
Pwmdriver Accepted by Lennart
 2016-09-16 10:56:09 +02:00
johan9107
ca351f536b Drivers PWM and motors 
Added comment to drivers and a clk prescaler to the pwm signal
 2016-09-16 10:43:15 +02:00
johan9107
b589ff8f1b New drivers to PWM and Motors 
Created new drivers for the PWM signals and Motors
 2016-09-16 08:28:19 +02:00
Jonas Holmberg
8eda8ba66d Added some more code to the scheduler 
Added more functionality to the scheduler. It should be able to select
the task that should run and soon be able to create tasks. Not fully
finished but its not that much left to add
 2016-09-15 16:57:22 +02:00
mdhsweden
1b944200be created drivers folder and SPI files (empty) (reverted from commit 39c3be13d110cd39a88cd9352fac91c177e23a5c) 2016-09-14 09:28:27 +02:00
mdhsweden
082fbf6505 Merge branch 'ADC' of https://github.com/MDHSweden/UAV-Control-System 2016-09-14 09:06:43 +02:00
Jonas Holmberg
5c09d34c92 Merge remote-tracking branch 'refs/remotes/origin/master' into Scheduler 2016-09-13 13:58:33 +02:00
Jonas Holmberg
a70c874cca Added all the files for scheduler and some code 
Some code and structure for the scheduler.
 2016-09-13 13:57:33 +02:00
philsson
39c3be13d1 created drivers folder and SPI files (empty) 2016-09-13 13:45:18 +02:00
philsson
62a9a434c8 ADC implementation fairly working 2016-09-13 13:41:20 +02:00