Jonas Holmberg
c82e0e5bf8
Merge remote-tracking branch 'refs/remotes/origin/master' into baro2
2016-11-29 12:23:41 +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
fb826ac607
got the main file back
2016-11-09 11:06:33 +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
27362fcbb6
Merge branch 'PID-Improved'
...
# Conflicts:
# UAV-ControlSystem/src/main.c
2016-11-01 14:41:29 +01:00
Jonas Holmberg
fbae0cf452
Fixed abs function for float values
...
This could cause the anti windup to work. Needs testing.
2016-11-01 14:05:52 +01:00
Jonas Holmberg
4accab0660
Fixed the problem with windup
2016-11-01 12:18:50 +01:00
Lennart Eriksson
1b601f153d
Fixes for the master
2016-11-01 09:44:41 +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
johan9107
3039f3a394
pid SHIT FIX
2016-10-31 18:17:13 +01:00
e6ce36f9e9
Changes to scaling of the I-term. It is now 200 times smaller
2016-10-31 11:18:54 +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
c57ec51397
Temp fix for eeprom problem
2016-10-28 10:22:42 +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
6838df050b
First test
2016-10-27 10:55:59 +02:00
johan9107
75dadc7484
Chnaged port from usart 3 to 6 on cli
2016-10-25 09:43:38 +02:00
johan9107
ce9d016e81
PID eeprom settings changed to correct index of PID profile
...
PID eeprom settings changed to correct index of PID profile
2016-10-20 10:42:49 +02:00
Jonas Holmberg
db48b1235c
Ceated new branch for baro
2016-10-20 08:59:30 +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
Lennart Eriksson
d22c77fc06
Merge remote-tracking branch 'refs/remotes/origin/master' into PID
2016-10-18 12:11:15 +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
Lennart Eriksson
8c5d82e416
Fix
2016-10-17 09:08:36 +02:00
Lennart Eriksson
d5dcbf9c25
cli / eeprom implementation tested and verified
2016-10-17 09:05:34 +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
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
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
Jonas Holmberg
9b0d35a579
Small changes to the motermix to perform testing
2016-10-13 10:01:41 +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
7deb9041a6
Adde functionality
...
Added fucntionality to make failseafes and bool toggles.
2016-10-11 18:06:23 +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
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
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
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
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
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
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
c8440bd1a8
ADC finalized and working
2016-09-20 16:34:51 +02:00
5716445448
Working ADC with DMA. Needs some cleaning
2016-09-20 11:43:32 +02:00
Jonas Holmberg
161869c53a
Commit conflict
2016-09-16 16:01:19 +02:00
Jonas Holmberg
f2c39aecec
Just little
...
just to change branch.
2016-09-16 10:59:12 +02:00
c3ce11d0cc
new start on ADC fix
2016-09-15 16:34:19 +02:00
