James Cotton
1e041e5788
Merge remote-tracking branch 'origin/next' into revo
2012-06-07 09:49:09 -05:00
Oleg Semyonov
95f66ddd76
AeroSimRC: add default simulatorId to prevent GCS crashes w/o config
...
GCS will crash when HITLv2 plugin is started if there is no
HITLv2 configuration in the OpenPilotGCS.xml. This is a workaround
to prevent this behavior. Better way might be to rework the GCS config
handling, but as a workaround this should work.
2012-06-07 12:52:08 +03:00
James Cotton
aa5832b1e8
Remove some style sheets that got dragged back in from conflict
2012-06-06 13:01:15 -05:00
James Cotton
5e01617cbd
Merge branch 'next' into MikeL
...
Conflicts:
ground/openpilotgcs/src/plugins/config/airframe.ui
ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
ground/openpilotgcs/src/plugins/config/configoutputwidget.h
ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp
ground/openpilotgcs/src/plugins/config/configvehicletypewidget.h
2012-06-06 11:58:06 -05:00
Mike LaBranche
01820904a2
Merge conflict resolution: alter configvehicle,configoutput refreshWidgetsValues
...
signatures to conform to virtual in ConfigTaskWidget;
add multirotor mixer sliders to apply/save dirty monitor, fix slider signals;
2012-06-06 08:58:18 -07:00
Brian Webb
6f9c6ae86d
Only show PipX config gadget when the PipX is connected.
2012-06-05 19:34:42 -07:00
James Cotton
983153d87b
Waypoint importing now works
2012-06-05 18:06:43 -05:00
James Cotton
4550eafa02
Add the ability to export waypoints to an xml file
2012-06-05 17:38:01 -05:00
James Cotton
b4d59d3e3e
Dragging and dropping waypoints now works and updates the FC immediately.
2012-06-05 10:01:12 -05:00
James Cotton
302575714f
Filter updates from the UAVOs if the waypoints haven't changed since they are
...
set to periodic (and need to be right now until FC telemetry is fixed and sends
new instances).
2012-06-05 08:30:42 -05:00
James Cotton
ff36e880e9
Fix for pathcompiler and waypoint table regarding signals and new instances
2012-06-05 08:10:20 -05:00
Brian Webb
4e68f6543e
Added tracking of dropped packets to PipX and turned off visible text on signal strength meters.
2012-06-04 21:18:13 -07:00
Brian Webb
7abf32e4c2
Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2-gui-upgrades
2012-06-04 18:24:20 -07:00
Mike LaBranche
682ab20f94
add accels.h, gyros.h zapped during conflict resolution
2012-06-04 17:13:55 -07:00
Mike LaBranche
0ba8345c51
Merge branch 'next' into MikeL
...
Conflicts:
flight/Bootloaders/Revolution/inc/pios_config.h
flight/Modules/OveroSync/inc/overosync.h
flight/Modules/Sensors/inc/sensors.h
flight/PiOS/Boards/STM32F4xx_Revolution.h
flight/PiOS/STM32F4xx/pios_iap.c
flight/Revolution/System/inc/pios_config.h
ground/openpilotgcs/src/plugins/config/config.pro
ground/openpilotgcs/src/plugins/config/configccattitudewidget.cpp
ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp
2012-06-04 16:59:31 -07:00
Mike LaBranche
bf591ebe45
Merge branch 'next' into MikeL
...
Conflicts:
flight/Bootloaders/Revolution/inc/pios_config.h
flight/Modules/OveroSync/inc/overosync.h
flight/Modules/Sensors/inc/sensors.h
flight/PiOS/Boards/STM32F4xx_Revolution.h
flight/PiOS/STM32F4xx/pios_iap.c
flight/Revolution/System/inc/pios_config.h
ground/openpilotgcs/src/plugins/config/config.pro
ground/openpilotgcs/src/plugins/config/configccattitudewidget.cpp
ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp
2012-06-04 15:38:57 -07:00
James Cotton
0b828fbdd0
Merge branch 'next' into revo
...
Conflicts:
Makefile
2012-06-04 14:12:19 -05:00
James Cotton
ff0a3a156e
Merge remote-tracking branch 'origin/os/AeroSimRC' into next
2012-06-04 12:25:59 -05:00
James Cotton
71e14a691e
Merge branch 'next' into revo
2012-06-03 19:00:51 -05:00
Sambas
eb4f90f188
Check if Homelocation is set before calibration
2012-06-03 18:25:22 -05:00
Sambas
2ec8423334
Mag calibration, does this make any sense?
2012-06-03 18:25:22 -05:00
James Cotton
4d75718347
While change the util manager make a few other methods use static accessors.
2012-06-03 18:16:21 -05:00
James Cotton
2d80d59e93
Make the uavobjectutilmanager handle the error condition on saving and not
...
segfault when a save fails.
2012-06-03 17:41:51 -05:00
Laura Sebesta
054f15c529
Added digital RSSI output to GUI.
2012-06-03 12:06:07 +03:00
James Cotton
e82621cbeb
Fix waypoint deletion
2012-06-02 18:40:55 -05:00
James Cotton
8aab4755e4
Try and cover a case that was making the waypointitem crash
2012-06-02 18:40:55 -05:00
James Cotton
0a842ac639
After deleting a waypoint (which really sets the last one to stop and shifts
...
the rest) any added waypoints were invisible. This puts the new one after the
first stop and removes the stop.
2012-06-02 18:40:54 -05:00
James Cotton
39657af8db
More work on deleting waypoints
2012-06-02 18:40:54 -05:00
James Cotton
e686ac0b1d
Start adding the ability to delete a waypoint
2012-06-02 18:40:53 -05:00
James Cotton
64ba15cf07
Add the ability to add waypoints via OPMap
2012-06-02 18:40:53 -05:00
James Cotton
4e1044589f
Add a coordinate conversion method to go from LLA to NED
2012-06-02 18:40:52 -05:00
James Cotton
f7e0fc1065
Add a long comment describing pathcompiler and store the index for each
...
waypoint in their description.
2012-06-02 18:40:52 -05:00
James Cotton
7492c8fec8
UI Fix: Remove unnecessary spacer (that triggered a warning) from input page
2012-06-02 18:40:52 -05:00
James Cotton
6b662f9b9e
Connect OPMapGadget to the PathCompiler so any changes in UAVOs are reflected
...
on the map
2012-06-02 18:40:52 -05:00
James Cotton
e348a1a582
Get the waypoints from UAVO, format them into LLA and emit the signal
2012-06-02 18:40:49 -05:00
James Cotton
6f6fdbe3e4
Finish stubbing out the path compiler class.
2012-06-02 18:40:41 -05:00
James Cotton
0f526fe67e
Initial commit of pathcompiler stub
2012-06-02 18:40:19 -05:00
James Cotton
f3e3a2f16b
Enable waypoints on the map again
2012-06-02 18:40:01 -05:00
PT_Dreamer
ed92edc421
GCS - Should fix crashes when opening and closing settings page
2012-06-02 01:12:55 +01: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
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
PT_Dreamer
74d96d0073
Minor cleaning
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
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
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
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
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
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
James Cotton
8682937f8a
Remove custom style sheets from camerastab. At least that was applied widget
...
wide, but still should be done to look nice cross platform (or from a window
specific runtime command).
2012-05-26 03:11:38 -05:00
James Cotton
60af442f27
Remove the custom stylesheet from the txpid .ui group boxes
2012-05-26 03:11:38 -05:00
James Cotton
a6e1837161
Remove stylesheets for stabilization ui group boxes as they don't work properly
...
on all platforms. Also removed custom fonts as these don't work consistently
across platforms.
Basically don't customize shit in the .ui file. Generate a stylesheet and
let's properly validate them and/or have one per platform. Even things like
changing font sizes behave inconsistently.
Don't specify the size of buttons, at least to any precision. It will not work
across platforms.
2012-05-26 03:11:38 -05:00
Laura Sebesta
0e505a396e
Fixed scrolling issues in plugin by adding all elements to a parent QFrame widget,
...
and then activating scrolling in configpipxtremewidget.cpp constructor.
2012-05-26 03:11:38 -05:00
James Cotton
4683a1dcc3
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
2012-05-26 03:09:16 -05:00
James Cotton
a24375ca71
Fix bug introduced with PiPX merge where the refreshWidgetsValues(UAVObject *)
...
gained the parameter. However, objects that had overriden that method were now
creating a new method and not getting called at the right time. This fixes the
Output and Aircraft type panels
2012-05-26 03:07:36 -05:00
James Cotton
7698913d38
Merge remote-tracking branch 'origin/Brian-PipXtreme-V2-scroll' into next
2012-05-25 23:51:30 -05:00
Mike LaBranche
94df1847fc
Bugfix: update ccpm swash mix slider visibility via ui instead of stored config;
...
sliders now appear/disappear as user selects link checkboxes
2012-05-25 19:36:39 -07:00
James Cotton
5a6e02a688
Merge remote-tracking branch 'origin/Brian-PipXtreme-V2' into next
2012-05-25 20:37:23 -05:00
Mike LaBranche
b5ac4306d3
Delete commented code using direct vector object referencing
2012-05-25 11:47:38 -07:00
Mike LaBranche
e9e6aece21
Bugfix: ccpm_ui - change sliders signal sliderMoved to valueChanged;
...
resolves related spinboxes not always staying in synch
2012-05-25 11:29:38 -07:00
Laura Sebesta
5061f86e00
Fixed scrolling issues in plugin by adding all elements to a parent QFrame widget,
...
and then activating scrolling in configpipxtremewidget.cpp constructor.
2012-05-25 11:45:28 +03:00
Mike LaBranche
7fb96f1acd
Bugfixes in configwidgets;
...
Refactor mixer type and vector set/get, named vector elements;
2012-05-24 09:38:34 -07:00
Mike LaBranche
2db4f6b2b6
Resolves mixer/advanced tab switching issue;
...
semi-centralized channelNames;
renames ConfigCcpmWidget
2012-05-22 09:55:50 -07:00
Laura Sebesta
5f7944bff1
Fixed display problem for in scope for math function type. Updated
...
OpenPilotGCS.xml to include default of "None" for scope math type.
2012-05-22 18:14:21 +03:00
Laura Sebesta
6003d2d574
Changed order of scope math functions to be more logical.
...
Added "Average" as scope math function.
Changed averaging window size text edit box to be active only when math functions are selected.
Fixed bug introduced immediately prior by removing child redefinition of saveConfig.
Tried installing scroll wheel event filter for scope config plugin, but is not currently working.
2012-05-22 12:34:01 +03:00
Laura Sebesta
a210b790b4
Added combo boxes to the mouse wheel filter.
2012-05-22 12:19:20 +03:00
Brian Webb
6e359c5933
Added PipX to Windows .inf file and updated ppm port definitions.
2012-05-21 19:22:46 -07:00
Laura Sebesta
aeca5c6741
Added Math Functions to the scope. Currently only support standard deviation.
2012-05-22 05:21:11 +03:00
Laura Sebesta
ce139a12cc
Missed a final typo.
2012-05-22 01:22:47 +03:00
Laura Sebesta
f4376b3445
Corrected small typo: disbleMouseWheelEvents vs. disableMouseWheelEvents
2012-05-22 01:20:23 +03:00
Laura Sebesta
3a1b15a65b
Reworked scale plot entry to have a more descriptive name and function.
2012-05-22 00:40:01 +03:00
Laura Sebesta
cae53915d3
Fixed small typo: "sequencial" vs. "sequential"
2012-05-22 00:34:29 +03:00
Mike LaBranche
64688be0a1
Refactor configwidgets for multirotor,fixedwing,heli,ground;
...
VehicleConfig subclasses ConfigTaskWidget and adds guiconfigdata bit storage;
Align channelbox items so 'None' is first;
2012-05-21 11:28:29 -07:00
Brian Webb
bc9dcd415f
Reverted unnecessary changes to configtaskwidget.cpp
2012-05-19 15:05:17 -07:00
Brian Webb
723f68f763
Reverted unnecessary changes to configtaskwidget.cpp
2012-05-19 14:18:29 -07:00
Brian Webb
c25884bcaf
Cleanup on the PipX branch.
2012-05-18 17:42:25 -07:00
Brian Webb
68d66d4181
Fixed firmware description in PipX status.
2012-05-17 20:35:17 -07:00
Brian Webb
44a1663eb9
Fixed transparent comm on PipX.
2012-05-16 19:02:53 -07:00
Mike LaBranche
ed54716436
add gui config data bit storage to fixedwing,multirotor,ground vehicles
2012-05-14 10:05:40 -07:00
