Brian Webb
f71630a50a
Merge remote-tracking branch 'raid/Brian-PipXtreme-V2' into Brian-PipXtreme-V2
2012-05-15 20:16:01 -07:00
Brian Webb
7082eda175
Fixed returning status for currently paired modem.
2012-05-15 20:11:52 -07:00
Brian Webb
6d28308032
Merge remote-tracking branch 'raid/Brian-PipXtreme-V2' into Brian-PipXtreme-V2
2012-05-15 19:38:54 -07:00
Brian Webb
93ec7c11a6
Fixed race condition on getting packets.
2012-05-15 19:38:14 -07:00
Mike LaBranche
ed54716436
add gui config data bit storage to fixedwing,multirotor,ground vehicles
2012-05-14 10:05:40 -07:00
Brian Webb
1f2277a8fe
Merge remote-tracking branch 'raid/Brian-PipXtreme-V2' into Brian-PipXtreme-V2
2012-05-14 06:58:26 -07:00
Brian Webb
bb491b8a3f
Fixed bootloader on PipX.
2012-05-14 06:57:16 -07:00
Brian Webb
31069d8858
Small mod to flash saving.
2012-05-13 20:20:17 -07:00
Brian Webb
563b454693
Fixed compiling of PipX bootloader.
2012-05-13 20:19:04 -07:00
Brian Webb
13b649f6e0
Merge remote-tracking branch 'raid/Brian-PipXtreme-V2' into Brian-PipXtreme-V2
2012-05-13 14:25:40 -07:00
Brian Webb
a3269aaf2f
Reverted some file permission changes.
2012-05-13 14:24:57 -07:00
Brian Webb
68d12b1b2f
Fixed some bugs with setting PairIDs in GCS.
2012-05-13 14:24:00 -07:00
Brian Webb
202cbeb67a
Merge remote-tracking branch 'raid/Brian-PipXtreme-V2' into Brian-PipXtreme-V2
2012-05-13 09:35:12 -07:00
Brian Webb
dd03b0b159
Added reporting of stats from the remote modem.
2012-05-13 09:34:21 -07:00
Brian Webb
a38e6eda5d
Merge remote-tracking branch 'raid/Brian-PipXtreme-V2' into Brian-PipXtreme-V2
2012-05-12 20:36:43 -07:00
Brian Webb
ec67742ff6
Added configuration of COM ports on PipX.
2012-05-12 13:16:36 -07:00
zedamota
817ce9327f
flight - fix pipxtreme bootloader compile
2012-05-12 12:57:15 +01:00
Mike LaBranche
5e07e742ef
revised to use GUIConfigManager.GetChannelDescriptions
2012-05-11 21:53:02 -07:00
Mike LaBranche
3a3dc4b888
extend GUIConfigData to support all vehicle types; add GUIConfigDataManager class to get/set
2012-05-11 21:48:46 -07:00
Brian Webb
dd02873908
Reverted changed mode.
2012-05-11 17:53:53 -07:00
Brian Webb
1f5dbcf57c
Mostly complete PipX configuration GUI.
2012-05-11 17:51:18 -07:00
Brian Webb
513c014f5a
Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2
2012-05-11 17:44:23 -07:00
PT_Dreamer
f716f16b60
Fixes compile issues on Ubuntu with qt 4.8.0
2012-05-10 14:47:30 +01:00
Mike LaBranche
c066fdc5e6
add support for output channel assignment descriptions for helicp
2012-05-09 15:24:15 -07:00
zedamota
75b3547e89
Merge branch 'ui_fixes' into next
2012-05-07 15:14:55 +01:00
zedamota
f753105c0f
GCS - disable the boot and safeboot buttons during flash
2012-05-07 15:11:51 +01:00
Oleg Semyonov
a3906aa7ea
Merge remote-tracking branch 'origin/hhrhhr/AeroSimRC_plugin' into os/aerosimrc
2012-05-07 16:09:35 +03:00
zedamota
9481be90af
GCS - Changes reload button behavior, now loads data from persistence memory.
2012-05-07 14:02:58 +01:00
Brian Webb
f9c8687645
Merge remote-tracking branch 'raid/Brian-PipXtreme-V2' into Brian-PipXtreme-V2
2012-05-06 20:49:07 -07:00
Brian Webb
454144f46c
Pairing and saving settings working.
2012-05-06 20:47:21 -07:00
Brian Webb
61be7c48c5
Merge remote-tracking branch 'raid/Brian-PipXtreme-V2' into Brian-PipXtreme-V2
2012-05-06 15:08:15 -07:00
Brian Webb
352471857f
Reverted USB configuration and switched all non-blocking COM calls to blocking, which appears to help prevent lockups now that all sends are in a different thread.
2012-05-06 15:07:07 -07:00
Laura Sebesta
bcc1885785
Added tooltips to beginners stab. tab.
2012-05-06 17:53:43 -04:00
Brian Webb
ea24aee916
Merge remote-tracking branch 'raid/Brian-PipXtreme-V2' into Brian-PipXtreme-V2
2012-05-06 12:41:12 -07:00
Brian Webb
d3c6a8c0da
Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2
2012-05-06 12:39:50 -07:00
Brian Webb
ef4828032b
Fixed failed merge with next.
2012-05-06 12:38:13 -07:00
Kenn Sebesta
40e215ae27
Fixed bug in configvehicletypewidget.cpp that prevented Octo Coax X from being selected.
...
Fixed labelnames in airframes.ui that were causing compile warnings.
2012-05-06 12:22:43 -04:00
unknown
cdd9c32bff
Add Overo Carrier hardware
2012-05-06 15:46:15 +10:00
Brian Webb
34d7e8e63f
Merge remote-tracking branch 'raid/Brian-PipXtreme-V2' into Brian-PipXtreme-V2
2012-05-05 10:29:11 -07:00
Brian Webb
3cf4fe6512
Reverted some USB changes.
2012-05-05 10:10:40 -07:00
Brian Webb
480371a43e
Resolving merge with origin/next
2012-05-05 09:53:54 -07:00
Brian Webb
e83fec0463
Merged latest origin/next.
2012-05-05 09:40:44 -07:00
zedamota
3e32b8db70
GCS - Fixes wrong mixer value being displayed.
2012-05-05 12:30:37 +01:00
James Cotton
474c5c96d3
Change field name back to ILimit to correctly reflect how it works in the code
2012-05-04 15:26:58 -05:00
James Cotton
3ef01569b8
Merge remote-tracking branch 'origin/kenz/PT_UI_fixes' into next
...
Conflicts:
flight/OpenPilot/System/openpilot.c
shared/uavobjectdefinition/positionactual.xml
shared/uavobjectdefinition/positiondesired.xml
shared/uavobjectdefinition/velocityactual.xml
shared/uavobjectdefinition/velocitydesired.xml
2012-05-04 13:21:23 -05:00
James Cotton
e9966da666
Add the OPLogConvert.m script to the OSX packages
2012-05-04 12:25:01 -05:00
James Cotton
9a1ed8d494
Update the HISTORY.txt for new release
2012-05-04 11:21:56 -05:00
James Cotton
a9b8e74b0d
Disable LEDs on the bootloader update as without knowing the particular
...
hardware revision it cannot know which pios_led_cfg_ structure to use.
Possibly this should be abstracted further into board_hw_defs to create
functions like board_init_led.
Also the BU should probably compare the hw_revision of the original and new
bootloader to make sure the user doesn't break their board.
2012-05-04 08:53:14 -05:00
James Cotton
d93bf5d2a2
Clean up the XCode project
2012-05-03 22:20:00 -05:00
Brian Webb
6a8aadc2f0
Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2
2012-05-03 19:12:46 -07:00