James Cotton
684715930a
Merge branch 'next' into revolution
...
Conflicts:
flight/OpenPilot/Makefile
flight/Revolution/System/inc/openpilot.h
2011-11-14 10:11:53 -06:00
James Cotton
3e2558bec6
Patch from PH which orders fields by size - important for using the M4 FPU
2011-11-14 09:49:50 -06:00
James Cotton
3e4a33169c
Merge remote-tracking branch 'origin/dwillis/gcs_gui_fixes' into next
2011-11-12 21:49:56 -06:00
James Cotton
f0b22519be
Merge remote-tracking branch 'origin/corvuscorax/CC_GPS' into next
2011-11-12 21:30:53 -06:00
Oleg Semyonov
951b7c27c2
gcs: fix typo in the GUI
2011-11-12 23:09:52 +02:00
James Cotton
e108bcafed
Merge remote-tracking branch 'origin/naiiawah/uploader_detection' into next
2011-11-11 10:56:17 -06:00
James Cotton
40b2b654b7
Merge remote-tracking branch 'origin/pt/OP586' into next
...
Conflicts:
ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
ground/openpilotgcs/src/plugins/config/configoutputwidget.h
2011-11-11 10:51:04 -06:00
James Cotton
207e2b9e0e
Merge remote-tracking branch 'origin/pt/OP587' into next
...
Conflicts:
ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
2011-11-11 10:06:20 -06:00
Corvus Corax
aa69027cb2
Merge branch 'next' into CC_GPS
2011-11-11 11:44:11 +01:00
James Cotton
6fd2426a90
Patch from Kenn for the matlab processing function to fix issue with multiple
...
isntance objects
2011-11-09 12:49:50 -06:00
James Cotton
813ac65159
OP-592: Also fix so it reads the values for channels 9 and 10 correctly
2011-11-07 15:58:08 -06:00
James Cotton
af6eeca8ee
Allow camera stabilization to control outputs 9 and 10. Also add a friendly
...
message to indicate when the output is already assigned.
2011-11-07 15:53:57 -06:00
David Willis
3f8f2c4da1
Add ifdef to retain default behaviour on OSX
2011-11-06 21:13:10 +00:00
Brian Mahaffy
e1dbf3b75c
Changed the uploader gadget to not ask if you want to plug in another
...
board, but only when using CC.
2011-11-05 23:22:56 -06:00
David Willis
3dd708a564
Set drop down width using list box size hint as necessary
2011-11-05 02:04:34 +00:00
Oleg Semyonov
53bef754c3
Merge remote branch 'origin/next' into os/alternative_spektrum_driver
2011-11-04 21:43:12 +02:00
James Cotton
c6bf1845a3
Fix combination on multiple cores with the debuggadget
2011-11-02 17:00:10 -05:00
Oleg Semyonov
2ec0b7d767
Merge branch 'next' into os/alternative_spektrum_driver
2011-11-02 23:02:34 +02:00
Oleg Semyonov
481bff2578
spektrum: code style fixes accoring to OPReview-122
2011-11-01 18:48:07 +02:00
Oleg Semyonov
0aad612720
spektrum: the same type of DSM receivers is now allowed on both CC ports
2011-11-01 01:16:43 +02:00
Oleg Semyonov
0116e6a007
spektrum: rework DSM2/DSMJ/DSMX driver for explicit DSMX resolution support
...
- both CC serial ports are now disabled by default (no telemetry);
- serial ports now have DSM2, DSMX (10bit) and DSMX (11bit) options;
- ReceiverGroups now have DSM (MainPort) and DSM (FlexiPort) options.
For DSM2 protocol there is an explicit resolution bit in the stream, so
the DSM2 should be selected. For DSMX there is no such bit, and user
should choose the resolution from the list configuring the spektrum port.
ReceiverGroups have single DSM option which is handled by the same driver.
Downside: this implementation saves received frame first, unrolls by the
end of frame. This should be ok, but may be improved by unrolling channels
on the fly in the rx callback.
Another minor difference is that a ChannelGroup is now bound to port:
DSM (MainPort) or DSM (FlexiPort). This was considered as acceptable
solution in order to not have 6 DSM options for each ChannelGroup and
even more in case of new DSM protocol variations.
Known problem: it is not possible to choose same protocols like
DSM2/DSM2 for two ports. It can be enabled by adding an exception to
common rule, though.
The DSMX throttle channel misbehavior (zero value) is not treated
specially yet. It should trigger the failsafe being out of bounds.
More info and data dumps are required to handle this properly.
2011-10-30 19:29:03 +02:00
Oleg Semyonov
51ec7da0a2
uavobjgenerator: enable '(' and ')' characters in object field names
...
Useful for names like "DSM (FlexiPort)" or similar. Will be removed
from symbolic indentifiers.
2011-10-30 11:34:47 +02:00
James Cotton
eb5e053a3e
Input configuration: Make the sticks move during the limit setting. Makes the
...
UI more intuitive.
2011-10-27 08:35:20 -05:00
James Cotton
0f8ae1e076
Merge branch 'next' into ins
...
Conflicts:
flight/Project/OpenPilotOSX/OpenPilotOSX.xcodeproj/project.pbxproj
2011-10-26 13:18:44 -05:00
James Cotton
a8f0c5a622
Output widget: Add lines from Sambas to indicate which speeds alter channels
...
7-10. Currently it doesn't indicate appropriately if those are actually
available...
2011-10-25 11:49:26 -05:00
James Cotton
27bf2b383e
Merge remote-tracking branch 'origin/james/remap_outputs' into next
2011-10-23 18:35:25 -05:00
Oleg Semyonov
b8d9d300c8
uavobjgenerator: enable '+' character in object field names
...
Useful for names like "Pitch+Roll" or similar. Will be removed
from symbolic indentifiers.
2011-10-24 00:23:03 +03:00
James Cotton
2050ce3fe1
Merge branch 'fix_input' into next
2011-10-23 15:29:12 -05:00
Oleg Semyonov
f71361ca83
Merge branch 'next' into os/GPS-on-CopterControl_next_v2
...
Conflicts:
flight/Modules/System/systemmod.c
2011-10-22 23:00:47 +03:00
Corvus Corax
167010e8a0
UAVTalk: Fixed bug in parser failing to handle length of multi-instanceobjects
...
UAVTalk (on GCS): Fixed a null pointer dereference when receiving in a NACK
2011-10-21 02:04:29 +02:00
James Cotton
a1cd6d580c
During output testing disable the reverse checkbox
2011-10-20 08:39:30 -05:00
James Cotton
b6df727d1a
Disable the input wizard while running simple calibration
2011-10-20 08:31:58 -05:00
James Cotton
5c04268205
Input configuration: Make sure during the 500 ms between detecting a channel
...
and requesting next nothing else can trigger.
2011-10-20 08:26:46 -05:00
James Cotton
fd96616c32
Delete large section of unused code
2011-10-20 07:51:00 -05:00
James Cotton
14fa739748
Add dialog box to indicate when test outputs won't work.
2011-10-20 07:20:23 -05:00
James Cotton
46aa8916c6
Fix segfault when selected motors 9 or 10. Also make labels show up in output
...
panel.
2011-10-20 06:56:56 -05:00
zedamota
cfbfbe1209
Only one output configuration at a time is now able to receive user input while the test outputs is enabled.
2011-10-16 00:57:59 +01:00
James Cotton
0193187d0c
Make the UI support 10 output channels
2011-10-15 16:59:42 -05:00
zedamota
ca20187dcf
Made UAVObject import disable the outputs test - see OP-587
2011-10-15 21:16:34 +01:00
James Cotton
08e077e8cb
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
2011-10-13 23:16:56 -05:00
James Cotton
1d5364878a
Update CameraStab icon with Muralha's new one
2011-10-13 23:16:09 -05:00
zedamota
8d5b310f1f
Merge branch 'next' of ssh://git.openpilot.org:22/OpenPilot into next
2011-10-12 16:44:11 +01:00
zedamota
032fa759ac
Fixes the zero while arming checkbox and and OP-575
2011-10-12 16:43:14 +01:00
James Cotton
ef34f6b674
Merge remote-tracking branch 'origin/ed_mac_halt_bug' into next
2011-10-11 10:23:19 -05:00
Edouard Lafargue
6514ea5262
Finally, a fix for the Mac UAVTalk issues: it was all caused by a wrong RunLoop pointer reference
...
because of multithreading.
2011-10-11 00:10:27 +02:00
James Cotton
7da8cb2079
CC: After attitude calibration always reenable BiasCorrectGyro. Fixes odd bug
...
if people have it crash in the middle.
2011-10-08 14:15:48 -05:00
James Cotton
4b04a5d9ea
Merge remote-tracking branch 'origin/pt/mixer_bug' into next
2011-10-06 21:33:59 -05:00
Edouard Lafargue
de8478718c
Attempt to make USB faster on Mac. Breaks the Firmware upload system!!!
2011-10-05 00:38:56 +02:00
Edouard Lafargue
c06c08e831
Merge branch 'next' into ed_mac_halt_bug
2011-10-03 23:05:52 +02:00
Oleg Semyonov
a38c569cd0
HwSettings: move Telemetry and add GPS port speed to the HwSettings object
...
TelemetrySettings object removed (saved 200+ bytes of RAM). Telemetry
port speed moved to the HwSettings object. Added GPS port speed setting.
GCS code updated to reflect changes and support both fields.
2011-09-28 22:11:42 +03:00
