|
d3423c34e2
|
Merge remote-tracking branch 'remotes/origin/master' into eeprom
# Conflicts:
# UAV-ControlSystem/src/main.c
|
2016-10-04 13:36:58 +02:00 |
|
|
7271ac3138
|
EEPROM works and is upgraded and simplified
|
2016-09-29 13:07:43 +02:00 |
|
|
a11e12b943
|
LinkerScript.ld addition for EEPROM memory address
|
2016-09-29 08:57:49 +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 |
|
|
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 |
|
|
5716445448
|
Working ADC with DMA. Needs some cleaning
|
2016-09-20 11:43:32 +02:00 |
|
Jonas Holmberg
|
1437f6e867
|
Merge remote-tracking branch 'refs/remotes/origin/master' into Scheduler
|
2016-09-16 16:24:02 +02:00 |
|
Lennart Eriksson
|
2e5d1a6dac
|
fixed bug with bool
|
2016-09-16 16:23:22 +02:00 |
|
Jonas Holmberg
|
14b7a7350c
|
Merge remote-tracking branch 'refs/remotes/origin/master' into Scheduler
|
2016-09-16 16:08:36 +02:00 |
|
Lennart Eriksson
|
fc5fcf6c57
|
new define in csproj again
|
2016-09-16 16:07:22 +02:00 |
|
Lennart Eriksson
|
e7bf5a81e4
|
updated cproj processor define
|
2016-09-16 16:06:32 +02:00 |
|
Jonas Holmberg
|
161869c53a
|
Commit conflict
|
2016-09-16 16:01:19 +02:00 |
|
Lennart Eriksson
|
8008a6267e
|
Fixed processor and gitignore
|
2016-09-16 15:47:22 +02:00 |
|
|
8a78a17aa3
|
We fix!
|
2016-09-15 14:18:24 +02:00 |
|
Jonas Holmberg
|
0d3b585625
|
Adding scheduler files
|
2016-09-12 14:02:24 +02:00 |
|
Lennart Eriksson
|
7b2ead9c30
|
First blinking led working solution
|
2016-09-09 16:12:41 +02:00 |
|