James Cotton
5f7a9b513a
Merge branch 'sambas/dsmx_stuff' of ssh://git.openpilot.org/OpenPilot into next
...
Conflicts:
shared/uavobjectdefinition/hwsettings.xml
2011-08-24 11:37:30 -05:00
James Cotton
368323fd59
Merge remote-tracking branch 'origin/james/erase_settings' into next
2011-08-20 13:07:01 -05:00
James Cotton
f85ae84ec3
Merge branch 'camera_stabilization' into next
...
Conflicts:
flight/OpenPilot/System/pios_board_posix.c
2011-08-19 01:48:24 -05:00
James Cotton
25b54a4323
Change to default settings at request of Dave. AccelKp = 0.05. MaxAxisLock =
...
15 degrees.
2011-08-19 01:46:52 -05:00
James Cotton
35eef66bfe
OP-557: Add a UAVO access method to erase the entire flash chip. Normally not
...
needed by users because if too much changes I change the FS magic and trigger a
wipe.
Possibly the erase should require a particular "magic" object id value to
execute? This would make it harder to do manually through UAVOs though.
2011-08-15 10:33:27 -05:00
James Cotton
98346186e3
The camera desired object can now be a single instance. I think it will be a
...
while before we have multiple cameras :) although it's easy to extend when we
do.
2011-08-11 14:07:24 -05:00
James Cotton
bbe3c1533a
Merge branch 'next' into camera_stabilization
2011-08-10 21:57:45 -05:00
James Cotton
ab288e95ab
Stabilization: Small patch so that by default the integral is zeroed while
...
throttle is low (good for quads) but can be disabled (good for planes and also
testing helis).
2011-08-10 03:51:46 -05:00
James Cotton
f23eaa8273
Make the Actuator pull from the CameraDesired fields
2011-08-09 21:47:42 -05:00
James Cotton
f11aa80444
CameraStabilization: Make the CameraStabilization module put the desired
...
position into another object (will help with configuration).
2011-08-09 20:45:38 -05:00
sambas
1e67b5e3b5
DSMx_binder, hw setting 0 disabled, 1-10 bind pulses. Manual disable after successful bind. Only for flexiport.
2011-08-06 22:16:47 +03:00
James Cotton
387a22398e
Make it possible to optionally enable the CameraStab module
2011-07-30 12:08:47 +09:00
James Cotton
96c2d24253
Merge branch 'next' into camera_stabilization
...
Conflicts:
flight/CopterControl/Makefile
flight/CopterControl/System/coptercontrol.c
flight/Modules/Actuator/actuator.c
flight/Modules/GPS/GPS.c
flight/Modules/ManualControl/manualcontrol.c
flight/Modules/Stabilization/stabilization.c
flight/Modules/System/systemmod.c
shared/uavobjectdefinition/manualcontrolsettings.xml
shared/uavobjectdefinition/stabilizationdesired.xml
2011-07-30 10:06:10 +09:00
James Cotton
53ca934b2b
Merge branch 'heli_stabilization'
...
Conflicts:
flight/CopterControl/System/inc/pios_config.h
flight/Modules/Attitude/attitude.c
flight/Modules/ManualControl/manualcontrol.c
flight/Modules/Stabilization/stabilization.c
2011-07-12 13:28:20 -05:00
Mathieu Rondonneau
d38f6167e3
OP-423:
...
Also reduce heap has it does not fit in SRAM anymore (not with current compiler).
(that's ok since if there is more space available, it will be reclaimed).
Merge branch 'master' into OP-423_Mathieu_Change_Init_To_Reduce_Memory_Footprint
Conflicts:
flight/CopterControl/System/inc/pios_config.h
flight/Modules/ManualControl/manualcontrol.c
2011-07-08 06:29:34 -07:00
Stacey Sheldon
a8787ee015
bootcfg: Add support for selecting S.Bus receivers in inputtype
2011-07-06 22:38:23 -04:00
Stacey Sheldon
d9aac892a9
hwsettings: Cosmetic change of SBUS to S.Bus in UAVObject
2011-07-06 22:37:17 -04:00
Stacey Sheldon
cba0985f26
hwsettings: UAVObject to select hardware runtime hw config
2011-07-05 22:02:37 -04:00
James Cotton
ad8876c62a
OP-193: Weak leveling variant on rate mode. Slowly will return to level.
2011-07-04 20:44:55 -05:00
James Cotton
a7206361d2
Slightly different way to respond to sticks in axis lock that is much more
...
responsive and avoids overshoot.
2011-06-26 21:59:54 -05:00
James Cotton
e6ad21d881
Make gyro bias in deg/s * 100 to calibrate more precisely.
2011-06-24 10:51:07 -05:00
James Cotton
eb3f3d790f
Zero during arming on by default since we're changing these objects
2011-06-24 10:38:26 -05:00
James Cotton
038f955cb1
OP-410 OP-333: Axis lock (heading hold) implemented
2011-06-24 10:38:26 -05:00
James Cotton
c0eff41dc6
OP-410 OP-333: Created an Axis-lock setting for stabilization
2011-06-24 10:38:26 -05:00
James Cotton
0a4bbcc12e
Added a field for initial gyro bias to speed up initialization.
2011-06-24 10:38:26 -05:00
James Cotton
28501842c3
Expose the rate D term which in simulations seems to help damp oscillations for
...
high RateKp terms. However it might be sensitive to gyro noise (vibrations).
In addition it is mathematically similar to lead shapign so probably only use
one or the other.
2011-06-24 10:38:25 -05:00
James Cotton
373689207a
Add a 1-tap IIR filter into the gyros in the feedback path. This will make the
...
stabilization output a bit more resilient to the high frequency noise from
gyros. However this value shouldn't be too high as it will increase the phase
delay of the feedback loop and decrease stability. Default is 5 ms.
Note: this resests the stabilizationsettings object. Sorry guys.
2011-06-24 10:38:25 -05:00
Mathieu Rondonneau
3677521168
Merge branch 'master' into OP-423_Mathieu_Change_Init_To_Reduce_Memory_Footprint
2011-06-24 06:48:10 -07:00
Oleg Semyonov
dc651b6604
Merge remote branch 'origin/OP-532_Heli_GUI_Improvements'
...
WARNING: this will wipe out system settings. Don't forget to export
settings first with old GCS and import using new GCS after upgrade.
2011-06-24 10:05:54 +03:00
James Cotton
f6312c7798
OP-410 OP-333: Created an Axis-lock setting for stabilization
2011-06-23 14:51:18 -05:00
James Cotton
a684592546
Stopped hoarding all the UAVObject definition files.
...
MUAHAHA
2011-06-23 11:20:37 -05:00
Mathieu Rondonneau
74e5e2015e
Merge branch 'master' into OP-423_Mathieu_Change_Init_To_Reduce_Memory_Footprint
2011-06-20 20:28:12 -07:00
James Cotton
0f2e4730b4
Merge remote-tracking branch 'origin/OP-530-PT_Dreamer'
...
Note this requires redoing the mixer settings!
Conflicts:
shared/uavobjectdefinition/mixersettings.xml
2011-06-20 14:08:08 -05:00
Mathieu Rondonneau
b67a38661e
OP-423: merge master into that branch, resolve conflicts and test with CC and bl_CC
...
heap reamining is low (about 500) but stacks can be ajusted (specially the 200 bytes from system) to give the level close to 1Ko if needed.
Merge branch 'master' into OP-423_Mathieu_Change_Init_To_Reduce_Memory_Footprint
Conflicts:
flight/CopterControl/System/inc/FreeRTOSConfig.h
flight/CopterControl/System/inc/pios_config.h
2011-06-17 19:04:09 -07:00
Andrew Thoms
5c5a07b101
OP-532 Updated GUI config data definition, UI, and implemented three
...
sliders in mixer generation code
2011-06-16 00:09:27 -04:00
Andrew Thoms
31339e0414
OP-532 Modified system settings UAVObject to have GUI config data
2011-06-13 21:39:47 -04:00
Mathieu Rondonneau
7598e898fa
OP-423 Step-1: split system stack and implement water mark for IRQstack:
...
- use IRQStack for ISRs (at begening of SRAM) (let's call it the irq stack)
- use end of heap for stack needed during initialization (let's call it the init stack).
- the systemStats in GCS indicate the remaining bytes in the IRQ stack (this is realy usefull to monitor our (nested) IRQs.
This is the base ground to provide as much memory as possible available at task creation time.
Next step is to re-organize the initialization in order to move all the init out of the thread's stacks onto the init stack.
This will provide as much memory as possible available at task creation time.
Basically the stack during initialization will be destroyed once the scheduler starts and dynamic alloc are made (since the init stack is at the end of the heap). We will need to make sure we don't clobber the heap during initialization otherwise this will lead to stack corruption.
2011-06-12 20:23:00 -07:00
Oleg Semyonov
f766642f0d
Merge branch 'master' into heli_improvements
...
Conflicts:
shared/uavobjectdefinition/manualcontrolsettings.xml
2011-06-09 10:11:27 +03:00
zedamota
dcccae7270
Change throttle default max value to 0.95 on multis
2011-06-08 18:21:29 +01:00
James Cotton
5aa8224181
Merge branch 'bugfix-flight' of ssh://git.openpilot.org/OpenPilot into bugfix-ground
2011-06-08 12:02:52 -05:00
dankers
0b59c34afb
Change Accel kP default to 0.03
...
Lots of testing with this but would like more thoughts as well.
2011-06-09 00:47:09 +10:00
James Cotton
bdc9094975
OP-493 OP-505 OP-511: Make up to 6 accessory channels so some can go from
...
ManualCommand to a camera module and some could go from that camera module to
output (i.e. mixing of inputs to pan tilt with stabilization)
2011-06-06 10:56:31 -05:00
James Cotton
6c6906d61e
OP-493: Switch to using Accessory0:2 to match the InstId
2011-06-05 15:38:58 -05:00
James Cotton
99b3a629a8
OP-493: Force three AccessoryDesired objects to always exist. Routing to
...
Mixing channel now works. However Accessory desired instances do not show up
in GCS.
2011-06-05 15:38:58 -05:00
James Cotton
468b7b562d
OP-493: Small bug in default value for Curve2Source
2011-06-05 15:38:57 -05:00
James Cotton
a1336e4d03
OP-493: Make sure accessory desired is not a single instance object
2011-06-05 15:38:57 -05:00
James Cotton
8ebd6a83d6
OP-493: Add support to bypass the mixer and route accessory data straight to
...
outputs. Warning: This has no failsafes like arming. We should discuss if
this is appropriate.
In addition accessory objects can be routed throught the mixer for collective
or flaperon.
2011-06-05 15:38:57 -05:00
James Cotton
a1d60cb77d
OP-493: Use multiple instances when using multiple accessory channels
2011-06-05 15:38:57 -05:00
Corvus Corax
54d9977eb1
auxillaryControl
2011-06-05 15:38:30 -05:00
James Cotton
483deb2bfc
Changed the default values for manual control settings to none to avoid
...
problems with channel mappings being different by brand.
You will need to recalibrate your transmitter.
2011-06-05 11:01:00 -05:00