PT_Dreamer
d0e012cbdb
GCS/MapLib - Added path plan manager.
2012-06-02 22:32:56 +01:00
Corvus Corax
ab28686976
Merge branch 'corvuscorax/new_navigation' into revo-next
2012-06-02 22:30:44 +02:00
PT_Dreamer
ed92edc421
GCS - Should fix crashes when opening and closing settings page
2012-06-02 01:12:55 +01:00
PT_Dreamer
3b8ca57eef
GCS/MapLib - added pathplanmanager class
2012-06-01 22:13:29 +01:00
PT_Dreamer
40cfe0f4d9
GCS/MapLib - Cleaned unused functions, added new UAVOs to objects.pro
2012-06-01 19:46:04 +01:00
PT_Dreamer
78db6d9853
GCS/MapLib-Added lines and circles between WPs overlay.
2012-06-01 15:28:35 +01:00
Corvus Corax
2fcbb4ee8e
Disabled OpenSceneGraph plugin per default. It doesn't compile without loads of extra work.
2012-05-31 16:49:24 +02:00
Corvus Corax
a2d6cb8314
PathAction editor: make easy selection of actions per waypoint
2012-05-31 04:11:13 +02:00
Corvus Corax
df67a3e631
PathActionEditor: added more buttons, always highlight active waypoint and pathaction
2012-05-30 18:23:10 +02:00
PT_Dreamer
ab78e1aca3
GCS - Make the welcome plugin use the workspace names instead
...
of the mode names.
2012-05-30 16:46:45 +01:00
PT_Dreamer
f7f6ffcab1
GCS/MapLib - Work continues on the future pathplaner
2012-05-30 16:19:36 +01:00
Sambas
ed1a4dada6
Merge remote-tracking branch 'remotes/origin/sambas/osd_test_v1' into revo-next
...
Conflicts:
flight/PiOS/STM32F4xx/pios_adc.c
2012-05-30 16:30:09 +03:00
James Cotton
252f61bb8e
A bit of preliminary cleanup and removing unused code to map gadget
2012-05-29 18:31:12 -05:00
James Cotton
fa20b0de63
Fix indentation in the map gadget widget before starting work on waypoints
2012-05-29 18:31:11 -05:00
jb
c95eeb92bb
GCS some improvements to the ripping function of the map library.
2012-05-29 18:31:10 -05:00
jb
25456e3b80
GCS - Added support for map ripping
2012-05-29 18:31:09 -05:00
Corvus Corax
298b6233ed
Merge branch 'revo-next' into corvuscorax/new_navigation
...
Conflicts:
flight/Libraries/paths.c
flight/Modules/ManualControl/manualcontrol.c
flight/Revolution/Makefile
shared/uavobjectdefinition/taskinfo.xml
2012-05-30 00:51:52 +02:00
Corvus Corax
7586a55fd6
Added an editor gadget for pathactions and waypoints - based on James
...
waypointeditor - no storing or loading yet
2012-05-29 22:48:17 +02:00
James Cotton
1a9e0806c1
Merge branch 'next' into revo-next
2012-05-28 22:07:29 -05:00
James Cotton
1e8db9f7e7
Merge remote-tracking branch 'origin/Brian-PipXtreme-V2-wheel' into next
2012-05-28 17:51:55 -05:00
James Cotton
1934752d50
Merge branch 'revo-next' into revo
2012-05-28 15:23:14 -05:00
James Cotton
f64adcfa58
Merge branch 'next' into revo-next
2012-05-28 15:17:13 -05:00
James Cotton
a6e9235888
Make the connections in the config gadget unique and add a flag to make sure
...
the refreshWidgetValues is never caleld after disabling updates
2012-05-28 14:11:29 -05:00
James Cotton
52a3d0079e
Clean up the output widget a bit with whole it interfaces to the
...
configTaskWidget. Uses more of the parent functionality.
2012-05-28 14:11:25 -05:00
Oleg Semyonov
5739dfbfc8
Merge remote-tracking branch 'origin/next' into os/aerosimrc
...
Conflicts:
shared/uavobjectdefinition/gcsreceiver.xml
2012-05-28 21:46:43 +03:00
Oleg Semyonov
2ef1943c0c
AeroSimRC: change default ports to the same as in the AeroSimRC config
2012-05-28 19:44:36 +03:00
Oleg Semyonov
d463cd322a
AeroSimRC: fix metadata access functions
2012-05-28 19:44:36 +03:00
Oleg Semyonov
9f0edd803e
AeroSimRC: change HITLv2 code to reflect changed sensor data objects
2012-05-28 19:44:35 +03:00
James Cotton
4360d8adfd
Merge branch 'next' into revo-next
2012-05-28 11:25:40 -05:00
James Cotton
ea03f8f220
Remove the specific function for the setSpinningArmed flag. This is now done
...
differently with the configTaskWidget style.
2012-05-28 11:23:43 -05:00
James Cotton
1689424620
Merge branch 'ui_unbreak' into next
2012-05-28 11:23:35 -05:00
Sambas
147100bc2f
Merge remote-tracking branch 'remotes/origin/revo-next' into osd_test_v1
...
Conflicts:
Makefile
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
2012-05-28 19:06:25 +03:00
James Cotton
3fa7b30f22
Merge branch 'ui_unbreak' into revo
2012-05-28 09:42:10 -05:00
James Cotton
33e39713d1
Make GCS aware of revo board number again
2012-05-28 09:34:23 -05:00
James Cotton
8a6073fbaf
Merge remote-tracking branch 'revo/revo-next' into testing
...
Conflicts:
Makefile
flight/PiOS.osx/osx/Libraries/FreeRTOS/Source/portable/GCC/Posix/port.c
flight/PiOS.osx/osx/Libraries/FreeRTOS/Source/task.c
flight/PiOS.posix/posix/Libraries/FreeRTOS/Source/portable/GCC/Posix/port_posix.c
flight/PiOS.posix/posix/Libraries/FreeRTOS/Source/tasks.c
flight/Revolution/Makefile
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
ground/openpilotgcs/src/plugins/uploader/devicewidget.cpp
shared/uavobjectdefinition/taskinfo.xml
2012-05-28 09:13:26 -05:00
PT_Dreamer
9024a21af7
GCS-MapLib - Reenabled waypoint features on the plugin.
...
Added go_to_place feature to the plugin.
2012-05-28 14:12:06 +01:00
Corvus Corax
978ab5b96c
Merge remote branch 'origin/stac/etasv3' into revo-next
2012-05-28 12:56:27 +02:00
Mike LaBranche
e2d1f67d9e
Add virtual updateObjectsFromWidgets to configccattitude;
...
reset calibration progress bar to 0% upon successful apply/save.
2012-05-27 10:20:31 -07:00
Mike LaBranche
1b2ffde116
Keep up: spelling disableWheelEvents; add pushbutton setAttribute for osx.
2012-05-26 16:49:02 -07:00
Corvus Corax
922b3b7f1e
Merge branch 'basenext' into corvuscorax/new_navigation
...
Conflicts:
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
2012-05-27 01:41:51 +02:00
PT_Dreamer
7a1501eea3
GCS - Relative WPs are now working
2012-05-26 21:23:53 +01:00
James Cotton
5fb615c3e5
Remove stylesheet on subpanel of input.ui as it doesn't look consistent across
...
platforms.
2012-05-26 14:09:42 -05:00
Corvus Corax
8c94e931d2
Bugfix: Fixed and reenabled HITL (backport of working code from revo repo)
2012-05-26 17:38:32 +02:00
James Cotton
126671ae4c
Add line from Kenz that fixes button overlap on OSX
2012-05-26 10:33:27 -05:00
James Cotton
f1f01f2b4b
Fix uploader gadget to not throw warnings when uploading to CC3D. Also added a
...
different icon to it. The description is still "CC3D" for "CopterControl".
The whole names/board types/etc really needs centralizing into
devicedescriptorstructure which should become a general class for checking if
firmware is good etc.
2012-05-26 09:46:29 -05:00
Corvus Corax
45258a6561
Ported GCS to reflect recent pathfollower changes
2012-05-26 13:57:46 +02:00
Corvus Corax
c7857926f4
OpenSceneGraph deactivated by default, too tricky to get it compiled for most devs
2012-05-26 13:49:04 +02:00
Laura Sebesta
888b8fb0c9
Disabled wheel scrolling, improved tab order.
2012-05-26 12:00:16 +03:00
James Cotton
dd9e2de4b9
Match small spacing between TxPid and CameraStab
2012-05-26 03:11:39 -05:00
James Cotton
1a4e358f7c
Remove custom style from airframe
2012-05-26 03:11:38 -05:00
