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
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
Jonas Holmberg
3ff3219a6a
Very small only because of master update
2016-09-21 10:09:22 +02:00
Lennart Eriksson
eea60e95da
System Clock
2016-09-21 10:01:14 +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
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
5716445448
Working ADC with DMA. Needs some cleaning
2016-09-20 11:43:32 +02:00
Lennart Eriksson
7ac27abd99
Merge pull request #6 from MDHSweden/pwmDriver
...
Drivers Approved by Lennart
2016-09-19 20:00:01 +02:00
johan9107
57dbfee7a2
Drivers
...
Improved motor driver
2016-09-19 17:12:05 +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
Lennart Eriksson
c0e4f39d86
Merge pull request #4 from MDHSweden/pwmDriver
...
Drivers approved by Lennart
2016-09-19 09:08:55 +02:00
johan9107
ea3e59956a
Error fix
...
Deleted comments
2016-09-19 09:07:03 +02:00
johan9107
2198adce0c
Error in motor drivers
...
Bug fix
2016-09-19 09:05:02 +02:00
johan9107
3131147c7d
PWM and motor drivers
...
Added a pulse stop signal to the motor driver and changed the clk
prescaler value in the pwm driver
2016-09-19 08:51:15 +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
d00f49871b
new gitignore file working
2016-09-16 15:49:31 +02:00
Lennart Eriksson
8008a6267e
Fixed processor and gitignore
2016-09-16 15:47:22 +02:00
Jonas Holmberg
f2c39aecec
Just little
...
just to change branch.
2016-09-16 10:59:12 +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
c3ce11d0cc
new start on ADC fix
2016-09-15 16:34:19 +02:00
8a78a17aa3
We fix!
2016-09-15 14:18:24 +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
39c3be13d1
created drivers folder and SPI files (empty)
2016-09-13 13:45:18 +02:00
62a9a434c8
ADC implementation fairly working
2016-09-13 13:41:20 +02:00
40e7c07f20
Created ADC branch
2016-09-12 16:50:53 +02:00
Jonas Holmberg
0d3b585625
Adding scheduler files
2016-09-12 14:02:24 +02:00
Jonas Holmberg
bf20290dc4
Added c and h file used for mapping pins on the processor
...
Files are not complete and will be added to continuously
2016-09-12 09:41:13 +02:00
Lennart Eriksson
7b2ead9c30
First blinking led working solution
2016-09-09 16:12:41 +02:00
