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
Stacey Sheldon
cba0985f26
hwsettings: UAVObject to select hardware runtime hw config
2011-07-05 22:02:37 -04:00
James Cotton
46ae7eb17b
Merge remote-tracking branch 'origin/bugfix-ground' into heli_stabilization
2011-06-30 19:40:22 -05:00
elafargue
b729b67f33
Attempt at making the new uploader gadget a bit more compact for smaller screens, make warning icon consistent with the rest of the icons.
2011-06-26 12:18:00 +02:00
elafargue
c55602a466
OP-538 Included fixes into ground codebase, thanks.
2011-06-26 12:16:21 +02: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
0dc541cbaa
Reformat attitude configuration gadget to use static access methods for
...
AttitudeSettings. This helps compiler catch errors.
2011-06-24 10:38:26 -05:00
James Cotton
ab7ff56d96
Compute initial gyro bias while calibrating to speed up convergence
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
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
Andrew Thoms
caf3c08ea2
OP-532 Improved visibility abd contrast of servo numbers on the
...
swashplate image
2011-06-24 01:38:29 -04:00
James Cotton
751bcba266
Merge remote-tracking branch 'origin/OP-515-PT_Dreamer'
2011-06-23 18:07:43 -05:00
zedamota
b67b6221d1
OP-515 took CPU serial from the devices screen
2011-06-23 17:42:54 +01:00
Andrew Thoms
56050b0536
OP-532 Implemented scalling of swashplate image in GUI
2011-06-22 00:38:53 -04:00
zedamota
6910bbb4f1
OP-515 Changes according to Osnwt suggestions.
2011-06-21 18:09:37 +01:00
Andrew Thoms
97c22fb57c
OP-532 Better indication of unassigned servos in heli config UI
2011-06-20 22:40:22 -04:00
Andrew Thoms
438cb91709
OP-532 minor GUI improvements to highlight incorrect servo assignments
2011-06-20 22:20:19 -04:00
Andrew Thoms
cf342b4155
OP-532 make all swashplate lines draw even if servos not defined
2011-06-20 21:39:10 -04:00
Andrew Thoms
ca21863f91
OP-507 added more swashplate configurations
2011-06-20 21:33:11 -04:00
Andrew Thoms
177263c237
OP-532 minor UI changes to servo selection box visibilities
2011-06-20 21:04:51 -04:00
Oleg Semyonov
8bcdd62dbd
Merge branch 'bugfix-flight'
2011-06-21 00:49:32 +03:00
James Cotton
5e5f1bb3f1
Merge remote-tracking branch 'origin/OP-530-PT_Dreamer'
2011-06-20 14:09:24 -05: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
zedamota
880905efba
OP-530 Change multirotor max throttle default value to 90%
2011-06-20 14:39:01 +01:00
zedamota
4d634ad304
Merge remote-tracking branch 'remotes/origin/OP-515-PT_Dreamer' into bugfix-ground
2011-06-20 11:21:45 +01:00
Andrew Thoms
e74c3390f7
OP-532 Minor UI layout changes
2011-06-20 00:31:30 -04:00
Oleg Semyonov
52d22c59d3
Revert "OP-522: fixed throttle calibration if input channel is reversed"
...
This reverts commit 0ba605812e
.
The real problem was not with this, but due to unexpected reverse
checkbox behaviour.
Reverse checkboxes are completely ignored at the start of calibration,
they can be even set checked initially. But change of checkbox does not
reverse the GCS control gadget display. This should probably be fixed.
2011-06-19 19:37:22 +03:00
Mathieu Rondonneau
d5cd3e0d2a
OP-423: fix problem in GCS when the config files get deleted.
...
GCS aborts on a table overflow when trying to set the axes with wrong number of channels.
2011-06-18 19:30:28 -07:00
zedamota
c6350492eb
Cleaning and formating
2011-06-19 00:56:35 +01:00
zedamota
a0eca05595
Many changes to the uploader Gadget
2011-06-19 00:50:38 +01:00
Oleg Semyonov
21f988321e
Merge branch 'master' into bugfix-ground
2011-06-19 02:18:06 +03:00
Oleg Semyonov
0ba605812e
OP-522: fixed throttle calibration if input channel is reversed
2011-06-19 02:15:23 +03:00
Andrew Thoms
6578eba0a0
Op-532 prevented settings being retreived from hardware during an update
...
to hardware
2011-06-17 01:01:55 -04:00
Andrew Thoms
90f7062940
OP-532 Implementation of Collective pass-through mapping
2011-06-16 22:52:41 -04:00
Andrew Thoms
08822807b3
OP-532 Now saving channels to GUI config data structure
2011-06-16 00:33:07 -04: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
22269b658d
OP-532 improved UI layout for new controls
2011-06-15 00:39:13 -04:00
James Cotton
d7e08e5686
Merge branch 'heli_improvements'
2011-06-14 09:13:52 -05:00
Andrew Thoms
748d49817f
OP-532 Save and Load UI elements to new GUIConfigData UABObject Field
2011-06-14 00:53:42 -04:00
Andrew Thoms
1c1881663f
OP-532 Save and recall the new GUI config data to UAVObject
2011-06-14 00:10:28 -04:00
Andrew Thoms
23f9dc42cc
OP-532 Created union of struct to assist in type casting of GUI settings
...
to UAVObject
2011-06-13 21:40:39 -04:00
Andrew Thoms
651c65ad84
OP-532 Started with GUI configuration save to OP hardware
2011-06-13 20:46:53 -04:00
elafargue
b4d65102b1
Add "..." on import and export buttons
2011-06-13 18:59:53 +02:00
elafargue
54d57f1815
Merge branch 'bugfix-ground' of git.openpilot.org:OpenPilot into bugfix-ground
2011-06-13 18:56:30 +02:00
Pip
7b3241cca9
Fixed GCS export file selection problem - in windows.
2011-06-13 16:12:04 +01:00
elafargue
8807d6bf0f
OP-534 Disable arming completely when staring calibration procedure. Tells user to reconfigure arming manually afterwards.
2011-06-13 12:14:40 +02:00
Andrew Thoms
c8939e6e4f
Merge branch 'heli_improvements' into OP-532_Heli_GUI_Improvements
2011-06-12 23:21:00 -04:00
Andrew Thoms
2dab73a128
minor updates to UI code for visibility of controls
2011-06-12 00:31:22 -04:00
Andrew Thoms
6ad60a7971
Implemented UI code for new ccpm options checkboxes and sliders
2011-06-12 00:17:32 -04:00
Andrew Thoms
86f5d63045
Changed names of new ui components
2011-06-11 22:35:19 -04:00