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
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
zedamota
9481be90af
GCS - Changes reload button behavior, now loads data from persistence memory.
2012-05-07 14:02:58 +01:00
Brian Webb
454144f46c
Pairing and saving settings working.
2012-05-06 20:47:21 -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
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
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
513c36f19a
Update the F4 ADC to compile again. Still not fully compliant with API but
...
then again API is not great and unused currently so no rush.
2012-05-04 21:37:46 -05: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
James Cotton
65829a6513
Update the revo configuration to be consistent with the new meta data format.
2012-05-03 21:09:25 -05:00
Brian Webb
44d95003f3
Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2
2012-05-03 17:56:08 -07:00
James Cotton
297ed01aee
Update the logging modes for these objects to match the new meta information
2012-05-03 17:00:41 -05:00
James Cotton
3155324384
Merge branch 'next' into cc3d
...
Conflicts:
Makefile
ground/openpilotgcs/src/plugins/config/configahrswidget.cpp
shared/uavobjectdefinition/ahrscalibration.xml
shared/uavobjectdefinition/ahrssettings.xml
shared/uavobjectdefinition/attituderaw.xml
2012-05-03 16:31:49 -05:00
James Cotton
07a5d98020
Merge remote-tracking branch 'origin/Brian-Metadata-Mods' into next
2012-05-03 08:50:24 -05:00
Brian Webb
249ededcfd
Added responding to OBJ_REQ and sending ACK/NACK on PipX.
2012-05-02 20:51:29 -07:00
Brian Webb
22f48ce8b0
Exposed the Send ACK/NACK function in UAVTalk.
2012-05-02 20:42:37 -07:00
Brian Webb
30d63b5b12
Merged USB CDC updates.
2012-05-02 06:45:24 -07:00
Brian Webb
8da4b9c745
Merge remote-tracking branch 'origin/stac/pt-win-vcp-fix' into Brian-PipXtreme-V2
2012-05-02 06:42:30 -07:00
Brian Webb
290acf0398
Fixed watchdog timeouts.
2012-05-01 20:48:35 -07:00
Brian Webb
217aad8c37
Now using read and write threads for both radio and com ports on PipX. Also cleaned up UAVTalk message handling.
2012-05-01 19:14:58 -07:00
James Cotton
3f63051df8
PiOS ADC: This could still use a lot of cleanup and needs to be implemented in
...
the non-FreeRTOS case but now the ADC device is allocated dynamically which
means CC3D won't waste heap on it.
2012-05-01 11:11:31 -05:00
James Cotton
311cbe37d2
Reenable PIOS_ADC for coptercontrol
2012-05-01 00:30:41 -05:00
Brian Webb
84a19ebeab
Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2
2012-04-28 19:30:35 -07:00
Brian Webb
25ffb99cee
Added initialization of flash eeprom for saving settings to PipX.
2012-04-28 19:29:56 -07:00
Brian Webb
1048eb7e2c
Added pios_eeprom for saving settings.
2012-04-28 19:29:25 -07:00
Laura Sebesta
c6526a07a4
Modified svg text field sizes to be a bit more aesthetic.
2012-04-28 11:11:57 -04:00
zedamota
c8655acd2d
Merge remote-tracking branch 'remotes/origin/kenzPT' into PT_ui_fixes
2012-04-27 18:49:17 +01:00
Kenn Sebesta
38f9c99596
Changed Basic stabilization UI to remove scaling from full stick movement, etc...
...
in order that the Basic and Advanced tabs correspond.
2012-04-27 09:30:30 -04:00
jb
8fc3958f80
Made the scroll event filter a member of the parent class.
2012-04-26 12:29:00 +01:00
Stacey Sheldon
91e02cabe3
Merge remote-tracking branch 'origin/stac/summit-fixes' into next
2012-04-25 10:20:12 -04:00
Laura Sebesta
4fedbd7df4
Changed the number of significant digits in many fields.
2012-04-25 06:31:21 -04:00
Brian Webb
663b151f4a
A few more bug fixes on metadata mods.
2012-04-22 20:49:37 -07:00
Brian Webb
aab47d6ed4
Final updates to throttled mode and further memeory reduction in the object manager and event dispatcher to reflect smaller data sizes in metadata.
2012-04-22 14:56:26 -07:00
Brian Webb
a7cec7c823
Merge remote-tracking branch 'raid/Brian-PipXtreme-V2' into Brian-PipXtreme-V2
2012-04-22 08:45:33 -07:00
Brian Webb
ed1937958e
Changed PipX UAVTalkProcessInputStream calls to UAVTalkProcessInputStreamQuiet.
2012-04-22 08:45:01 -07:00
Brian Webb
fb6dedad2b
Added UAVTalkProcessInputStreamQuiet function, which is a version of UAVTalkProcessInputStream that only processes (does not sens or receive).
2012-04-22 08:43:51 -07:00
