rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-03 11:24:10 +01:00
Code Issues Releases Activity
6,574 Commits 5 Branches 8 Tags 266 MiB
4b5c88589c
Commit Graph

1877 Commits

Author SHA1 Message Date
James Cotton
7a214dc6cb AndroidGCS: Clean up some warnings in UAVO templates 2012-08-06 16:55:00 -05:00
James Cotton
a067c0b0de AndroidGCS: Make sure the rest of the UAVO IDs are working as positive long 
values instead of ints.
 2012-08-06 16:54:57 -05:00
James Cotton
fc7e9d2b2b AndroidGCS: Change the UAVO generation to suppress warnings 2012-08-06 16:54:57 -05:00
James Cotton
ae40f88600 AndroidGCS: Convert UAVObject IDs to longs from ints because they are meant to 
be unsigned uint32 which is unsupported by java.
 2012-08-06 16:54:57 -05:00
James Cotton
9960411ead Finish porting the meta data changes from GCS and update all the UAVOs 2012-08-06 16:54:55 -05:00
James Cotton
f338625092 Removed various debugging outputs and exceptions for now (will add back in a 
more principled manner later).  Also updated the auto generated code.
 2012-08-06 16:54:19 -05:00
James Cotton
9a4c158690 Java autogenerated code to be more compatible with gcs code 2012-08-06 16:54:18 -05:00
James Cotton
f0e4c10cfa Continuing to work on the java code to be more consistent with GCS code 2012-08-06 16:54:17 -05:00
James Cotton
1810fb61a0 Update the object template to be more consistent with ground code 2012-08-06 16:54:17 -05:00
PT_Dreamer
40415f606e Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 2012-08-06 19:01:48 +01:00
Chris Pember
89a8b05422 fixed tab order, a little spacing tweak onadvanced page 2012-08-06 10:32:01 -07:00
Chris Pember
c600014f2f merged the weak leveling and axis lock to same group 2012-08-05 14:04:42 -07:00
Chris Pember
bcb23bb779 pre-spinner value align shift 2012-08-05 12:44:36 -07:00
Chris Pember
56dfed2e8b pre-spinner value align shift 2012-08-05 12:41:19 -07:00
Chris Pember
17bcdb6113 resized the default buttons areas, moved the entire sensor tuning to expert, fixed apply layout spacing 2012-08-04 23:03:56 -07:00
Chris Pember
72749a1ce1 resized the default buttons areas, moved the entire sensor tuning to expert, still WIP 2012-08-04 23:03:00 -07:00
James Cotton
d201cad768 Connect correct signal to relay tuning so the UI populates the calculated 
stabilization settings.
 2012-08-04 12:03:53 -05:00
Chris Pember
0d2e307885 resized the save area on stabi page, added axislock and weakleveling to advanced menu 2012-08-03 22:01:54 -07:00
Mike LaBranche
0643f59b85 Merge branch 'pt/CC3d_Release' of ssh://gitolite@git.openpilot.org/OpenPilot.git into CC3D_Release 
Conflicts:
	ground/openpilotgcs/src/plugins/uavobjectwidgetutils/popupwidget.cpp
 2012-08-03 14:36:16 -07:00
Mike LaBranche
38e521fc1a TelemetryWidget: set AlignCenter, chasing osx render correctness. 2012-08-03 13:52:35 -07:00
PT_Dreamer
df61d33f66 GCS- Added the ability to have more than 1 ui limit per index 2012-08-03 18:57:24 +01:00
PT_Dreamer
d043d53a3d Merge branch 'pt/boardbased_ui_limits' of ssh://git.openpilot.org/OpenPilot into pt/boardbased_ui_limits 2012-08-03 18:16:50 +01:00
PT_Dreamer
4d19062059 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into pt/boardbased_ui_limits 2012-08-03 18:14:51 +01:00
Fredrik Arvidsson
3bc1fbd8f1 Merge branch 'next' into thread/OP-39 2012-08-03 18:33:39 +02:00
Fredrik Arvidsson
86f210e7f4 OP-39 Added code to jump from the SetupWizard directly to the InputWizard in the ConfigurationPlugin to complete the vehicle setup and realize the 1-2-Fly idea. 
Re-factored some code in the ConfigurationPlugin.
Fixed a bug in the Levelling page when performing levelling multiple times.
 2012-08-03 18:31:47 +02:00
Mike LaBranche
83c920799d TelemetryWidget: rescaled .svg; transparent background; hide data rates when not connected. 2012-08-03 09:24:26 -07:00
James Cotton
c3df203d7c Make the autotune UI allow recomputing the values based on the measured system 
properties.
 2012-08-03 09:37:45 -05:00
James Cotton
dfd1aceb06 More work on autotune from GCS 2012-08-03 09:37:45 -05:00
James Cotton
c365a9c7ff Add stub for the autotune configuration widget 2012-08-03 09:37:45 -05:00
James Cotton
9ce7d9b4ac Add UAVOs for relay tuning 2012-08-03 09:37:44 -05:00
James Cotton
6948f1dc41 Merge remote-tracking branch 'origin/master' into next 
Conflicts:
	package/winx86/translations/strings_de.nsh
 2012-08-03 09:35:18 -05:00
David Ankers
8ec9355a29 Merge remote-tracking branch 'origin/pt/CC3d_Release' into pt/CC3D_Release 
Conflicts:
	ground/openpilotgcs/src/plugins/config/stabilization.ui
 2012-08-03 15:41:33 +10:00
David Ankers
c673e5c586 Merge remote-tracking branch 'origin/CC3D_Release' into pt/CC3D_Release 2012-08-03 15:38:09 +10:00
Chris Pember
4de9cd89f7 micro GCs layout, redesigned layouts again for stabi screen 2012-08-02 22:14:39 -07:00
Mike LaBranche
5320a73adc TelemetryWidget: tweeks and bugfixes. 2012-08-02 21:19:25 -07:00
Mike LaBranche
f5bd860be1 TelemetryWidget: tweek datarate text locations. 2012-08-02 20:32:55 -07:00
Mike LaBranche
9ebf6d916a TelemetryMonitorWidget: tx/rx labels, 7 nodes, tx/rx rate text. 2012-08-02 19:33:20 -07:00
Mike LaBranche
63e5fc80ce TelemetryMonitorWidget: Alpha version with 12 dots. 2012-08-02 16:11:18 -07:00
PT_Dreamer
352f18bec0 GCS-Allow for more than 1 limit per index 2012-08-02 23:56:02 +01:00
David Ankers
4357f092a9 Remove a couple of artifact numbers from the PFD, start work on spacing 
and layout.
 2012-08-03 08:15:57 +10:00
David Ankers
64ab589c1b Fix from Berkely to the Uploader.ui 2012-08-03 06:28:08 +10:00
David Ankers
38e392d49e Update status bargraphs, stab mode is no longer hidden. Soem work to go on 
other SVGs yet but these looks better than they did.

Removed GPS Staus from the top status bar, this will be intergraded in to
the PFD
 2012-08-03 05:59:20 +10:00
Laura Sebesta
3e23163dde Improved static and update behavior. 2012-08-02 20:21:29 +02:00
Fredrik Arvidsson
40d5761a1d Merge branch 'next' into thread/OP-39 2012-08-02 19:51:36 +02:00
Kenz Dale
3e4f2e21ce Added context menu for switching UAV text output off. 2012-08-02 19:13:54 +02:00
PT_Dreamer
cb26100d65 GCS - Dummy commit to see if crucible notices this branch 2012-08-02 16:48:37 +01:00
PT_Dreamer
205d370eec GCS-Made the UI limits board specific 2012-08-02 16:34:48 +01:00
Kenz Dale
e26e996734 Added in time rings, using proper scaling. 2012-08-02 14:43:26 +02:00
Fredrik Arvidsson
6913b1b4de Added Levelling functionality. 2012-08-02 13:44:14 +02:00
PT_Dreamer
f0d6f78ba3 GCS- Fixes compile under Win. 2012-08-02 12:32:43 +01:00
Kenz Dale
d30da01ca8 Added additional message. Improved significant digit formatting. 2012-08-02 11:36:36 +02:00
Kenz Dale
3b9e3c0054 Added support for trend lines and text info on map. 2012-08-02 10:58:55 +02:00
PT_Dreamer
c4d11c40bd GCS-Fixes some value not being reloaded when reload button is pressed 
on stab screen.
 2012-08-01 17:50:48 +01:00
PT_Dreamer
8c69fff234 GCS - More fixes to the dirty status of the config widgets 2012-08-01 15:17:05 +01:00
PT_Dreamer
06455d7bfb Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 2012-08-01 14:42:53 +01:00
PT_Dreamer
0553534318 GCS - Fixed dynamic loaded widgets (according to board type) not 
alerting for unsaved changes
 2012-08-01 14:42:21 +01:00
PT_Dreamer
599d46b8fa GCS - Fixed nasty memory leak 2012-08-01 14:41:00 +01:00
PT_Dreamer
1d42b64965 GCS-Kenz arrow and text request - 5$ please 2012-08-01 13:41:22 +01:00
David Ankers
44b13a19ee Move to the QML PFD by default! Yay 2012-08-01 20:59:44 +10:00
Richard Flay (Hyper)
6d34795494 Re-enabled simposix SDCard support, and removed obsolete SDCard alarm usage from System module 2012-08-01 19:53:59 +09:30
PT_Dreamer
af98f4c2a6 GCS- Fixed board rotation being overwriten when calibrating. 2012-08-01 10:12:52 +01:00
PT_Dreamer
faee578010 GCS- Fixes from Dmytro to new PFD qml file. 2012-08-01 09:47:11 +01:00
PT_Dreamer
4f2522cd0a Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 2012-08-01 09:32:59 +01:00
Mike LaBranche
84c7325eb9 SvgImageProvider signature correction to use utils_global macro QTCREATOR_UTILS_EXPORT 2012-08-01 09:40:33 +10:00
Mike LaBranche
4c3c94eba5 SvgImageProvider signature correction to use utils_global macro QTCREATOR_UTILS_EXPORT 2012-07-31 16:15:58 -07:00
Fredrik Arvidsson
e891cd2dc3 Added some more wizard pages. The basic structure for multirotors is in place. 2012-08-01 00:21:15 +02:00
Ryan Hunter
4d257860c8 Moved the matlab files to matlab folder for GCS plugin 2012-07-31 13:26:35 -05:00
David Ankers
5da204f4b7 Change welcome plugin to use Steve's system icons 2012-08-01 02:51:34 +10:00
David Ankers
67ba889659 Swap icons for firmware and system tabs, matches Steve's icons better and 
makes more sense
 2012-08-01 02:45:15 +10:00
David Ankers
a8fd51985a Add Steve's system icons for the Welcome Plugin 2012-08-01 02:44:06 +10:00
Fredrik Arvidsson
348cdfaed7 Merge branch 'next' into thread/OP-39 2012-07-31 18:04:58 +02:00
PT_Dreamer
68740940de Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 
Conflicts:
	ground/openpilotgcs/src/plugins/uavobjectwidgetutils/popupwidget.cpp
 2012-07-31 16:17:29 +01:00
Dmytro Poplavskiy
a140c76a6f Hide terrain related options if compiled without OSG 2012-08-01 00:35:21 +10:00
Dmytro Poplavskiy
ce00c0bc4d Fixed compilation with OSG enabled 
trivial .pro file fix
 2012-08-01 00:34:25 +10:00
Dmytro Poplavskiy
68652ef643 PFD qml: Load Terrain and World views dynamicaly 
Moved them to separate qml files
loaded by reqest using Loader.

This allows to keep PFD working even if one of views
can't be loaded and avoids the cost of loading expensive
views like camera.
 2012-08-01 00:32:46 +10:00
Dmytro Poplavskiy
4e28a529db Merge branch 'CC3D_Release' into dmytro/pfd_qml 2012-07-31 23:43:16 +10:00
PT_Dreamer
1f7b95805e GCS-Added Hyper's fix to glc crashes under certain systems. 2012-07-31 12:18:05 +01:00
David Ankers
f5a2591d81 Correct default paths for qml pfd files 2012-07-31 09:03:24 +10:00
Mike LaBranche
a306b31c9c Resolve build errors: add Q_DECL_EXPORT to SvgImageProvider; 
change unsetenv to qputenv.
 2012-07-31 08:44:59 +10:00
Mike LaBranche
5cab871ac6 PopupWidget, Bugfix: put the mixer back into the frame at the same size it started from; 
keeps it from oversetting neighbors when the dialog is closed.
 2012-07-31 08:44:34 +10:00
Werner Backes
b8450d4a07 Fixed World Magnetic Model to accept altitude in meters instead of kilometers 2012-07-31 00:18:10 +02:00
Mike LaBranche
5398d96839 PopupWidget: Start the dialog at twice the size of the embedded widget. 2012-07-30 15:02:18 -07:00
Mike LaBranche
6adafbc4bf PopupWidget, Bugfix: put the mixer back into the frame at the same size it started from; 
keeps it from oversetting neighbors when the dialog is closed.
 2012-07-30 14:45:56 -07:00
Mike LaBranche
b490fdb6e9 Resolve build errors: add Q_DECL_EXPORT to SvgImageProvider; 
change unsetenv to qputenv.
 2012-07-30 14:30:03 -07:00
David Ankers
c93cfc5d50 Fixed qmake copy of qss by borrowing code from Oleg who has a better 
handle on qmake than I guess I ever will.
 2012-07-31 04:11:33 +10:00
David Ankers
f00874efa2 Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 2012-07-31 02:51:55 +10:00
David Ankers
574fbe2fd9 Copy one file at a time with cp 2012-07-31 02:50:41 +10:00
PT_Dreamer
b15091fead GCS - Made the GCS compile without OSG support 2012-07-30 16:11:36 +01:00
PT_Dreamer
d8c2bb3292 Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 2012-07-30 15:25:59 +01:00
PT_Dreamer
7884b7002e Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 
Conflicts:
	HISTORY.txt
 2012-07-30 15:24:36 +01:00
PT_Dreamer
1927e8bce9 Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 2012-07-30 14:55:24 +01:00
PT_Dreamer
bb66dc9535 GCS- Made the importexport dialog close when GCS closes. 2012-07-30 14:53:57 +01:00
David Ankers
31a788e44e Change the icon to go to the system page, icon is still wrong but now at 
least the button works.
 2012-07-30 22:28:28 +10:00
David Ankers
0b055d61fd Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 2012-07-30 22:00:20 +10:00
David Ankers
b997a4a7fe Make connect button use onclicked() signal rather than onpressed() 2012-07-30 21:58:36 +10:00
Kenz Dale
0874b3db62 Fixed GPS position to include gps heading. 2012-07-30 13:37:56 +02:00
PT_Dreamer
c6088b5417 Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 
Conflicts:
	ground/openpilotgcs/src/plugins/config/camerastabilization.ui
	ground/openpilotgcs/src/plugins/config/stabilization.ui
	ground/openpilotgcs/src/plugins/config/txpid.ui
 2012-07-30 00:12:15 +01:00
PT_Dreamer
9ab86f7c7e GCS-Changed "wiki" help buttons to the standard ones. 
Updated the links to tiny links.
 2012-07-29 23:29:39 +01:00
Chris Pember
ef04025d05 couple small sizing issues in stabi, and spacer in hw settings 2012-07-29 15:14:40 -07:00
Chris Pember
ddf04abc5e Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 2012-07-29 14:54:19 -07:00
Chris Pember
005f08cbc2 added help buttons, removed wiki buttons, fixed input spacing, misc text fixes, tooltips, removed headings from input chan form 2012-07-29 14:51:39 -07:00
Oleg Semyonov
51b7e11160 AeroSimRC: remove unused MSVC options 2012-07-30 00:08:43 +03:00
Oleg Semyonov
dcf68c2359 AeroSimRC: fix MinGW DLL locations for Qt 4.8.1+ (4.8.0 compatible) 2012-07-30 00:03:01 +03:00
Oleg Semyonov
e75a2718f1 Windows packaging: fix MinGW DLL locations for Qt 4.8.1+ (4.8.0 compatible) 2012-07-29 23:59:54 +03:00
David Ankers
ca22b54b86 Change dates on copyright 2012-07-30 06:28:40 +10:00
Oleg Semyonov
fc51680e6c Windows packaging: fix MinGW DLL locations for Qt 4.8.1+ (4.8.0 compatible) 2012-07-29 23:08:59 +03:00
PT_Dreamer
62bbe208af GCS-Fixes wrong flight mode settings 2012-07-29 15:10:30 +01:00
PT_Dreamer
4dc5e4580d Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 
Conflicts:
	ground/openpilotgcs/src/plugins/config/airframe.ui
	ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp
	ground/openpilotgcs/src/plugins/uavtalk/telemetry.cpp
 2012-07-29 14:28:59 +01:00
David Ankers
cc512715b9 Update icon to a better one 2012-07-29 22:25:06 +10:00
Dmytro Poplavskiy
c7b8fe9efd Moved terrain rendering to background thread 
osgEarth may block the main thread during network io,
the rendering is moved to OsgEarthItemRenderer
class, running in the bg thread.

May require Qt 4.8.0+ to work correctly.
 2012-07-29 22:15:24 +10:00
David Ankers
19b101bc4b Make a start on the new layout 2012-07-29 21:28:32 +10:00
Dmytro Poplavskiy
9d884ca12c PFD terrain view: switch between GPS and predefined positions. 2012-07-29 16:05:59 +10:00
Dmytro Poplavskiy
ec3919d2b7 Enabled osgEarth caching 2012-07-29 12:17:10 +10:00
PT_Dreamer
6b84b58bfe GCS-Moved the wizard and calibration widgets to the stacked widget 
so that they disapear during the wizard
 2012-07-29 00:53:05 +01:00
PT_Dreamer
14b7666c1b GCS-disabled the reload board data button while it is doing its work. 
minimized uavo transactions when button is pressed.
 2012-07-29 00:44:08 +01:00
PT_Dreamer
4530a13f93 Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 2012-07-28 19:08:28 +01:00
David Ankers
27fca079d8 Change language used per David J's suggestion 2012-07-29 04:07:55 +10:00
PT_Dreamer
5f8c6dc7af Remove unwanted file 2012-07-28 19:06:54 +01:00
David Ankers
9395df6d2d Make size of labels consistant 2012-07-29 03:27:51 +10:00
David Ankers
1fca385fc4 Change RPY to Roll,Pitch and Yaw for the mixer on the aircraft screen, as 
per mikes suggestion
 2012-07-29 03:00:17 +10:00
David Ankers
deefe31546 Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into jose5 2012-07-29 01:54:51 +10:00
David Ankers
fef831ec2b Add stylesheets and ensure they are copied on build 2012-07-29 01:53:45 +10:00
PT_Dreamer
c8e94ed874 Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into CC3D_Release 2012-07-28 15:06:26 +01:00
PT_Dreamer
dc4254d7d8 GCS-Several UI fixes according to beta testers reports. 2012-07-28 15:04:55 +01:00
Dmytro Poplavskiy
999e5e9cc5 Fixed uninitialized terrainEnabled property 2012-07-28 21:00:02 +10:00
David Ankers
83ae672533 Gonfig gadget now gets the whole of the screen. 2012-07-28 17:26:43 +10:00
James Cotton
eae94b2188 Use setField instead of setData in SetConfigData because that doesn't trigger a 
transaction immediately before the smartSaveButton tries to trigger one.
 2012-07-28 00:00:50 -05:00
James Cotton
bd3ebe5b61 Undo the previous patch to abort transactions if one is pending, but throw a 
warning still
 2012-07-27 21:09:58 -05:00
James Cotton
cddabf76cf Remove some debugging output that was a bit verbose 2012-07-27 21:09:58 -05:00
James Cotton
542483beec Rephrase "SUCCESS: Mixer saved ok" to Configuration OK since it does not 
reflect if the save succeeded and the button does.
 2012-07-27 21:09:58 -05:00
James Cotton
12192ae0cd Remove commented and debugging code 2012-07-27 21:09:57 -05:00
James Cotton
150139b711 Don't need to call updated() in the SetConfigData because the ConfigTaskWidget 
architecture will call that
 2012-07-27 20:38:50 -05:00
James Cotton
a75ed21012 Fix tab indentation to be consistent with QT Creator 2012-07-27 20:15:00 -05:00
James Cotton
9f1a8416f5 Treat the tricopter yaw channel like the other motor channels 2012-07-27 20:14:19 -05:00
James Cotton
9d82538a09 If we set FirmwareIAPObj to update on change then initial object retrieval will 
force it to be fetched before emitting the autopilotConnected signal.
 2012-07-27 16:16:16 -05:00
James Cotton
6ba8f3ca9e Fix from hyper to catch when multiple object requests stack up 2012-07-27 16:16:12 -05:00
PT_Dreamer
bf6790f554 GCS-Made the changes to vehicleconfig final and reenabled the 
system settings update call.
 2012-07-27 16:12:15 -05:00
PT_Dreamer
1955e8b842 GCS-Comment out the updated statements on vehicleconfig.cpp 
TODO check if this brings other problems. REVERT commit if it does
 2012-07-27 16:12:12 -05:00
James Cotton
330fd26f4a If we set FirmwareIAPObj to update on change then initial object retrieval will 
force it to be fetched before emitting the autopilotConnected signal.
 2012-07-27 20:57:23 +01:00
James Cotton
1803f26e9a Fix from hyper to catch when multiple object requests stack up 2012-07-27 20:55:45 +01:00
PT_Dreamer
c375d2e79d GCS-Made the changes to vehicleconfig final and reenabled the 
system settings update call.
 2012-07-27 18:42:20 +01:00
PT_Dreamer
4003cd70a8 GCS-Made rate Kd roll and pitch link when checkbox is checked. 2012-07-27 09:13:53 -05:00
PT_Dreamer
ddb144ebb5 GCS-Made rate Kd roll and pitch link when checkbox is checked. 2012-07-27 11:55:01 +01:00
PT_Dreamer
9d76c32cf5 GCS-Comment out the updated statements on vehicleconfig.cpp 
TODO check if this brings other problems. REVERT commit if it does
 2012-07-27 11:45:58 +01:00
PT_Dreamer
0f86432224 GCS-Added missing resources to the UAVO browser 2012-07-27 11:19:41 +01:00
PT_Dreamer
30c1596129 Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 2012-07-26 15:22:59 +01:00
PT_Dreamer
3cb9d70298 GCS-Made the UAVO browser view options persistent. 2012-07-26 15:22:12 +01:00
PT_Dreamer
95fb9255cc GCS-Made the buttons on the object browser smaller. 2012-07-26 14:09:33 +01:00
zedamota
4e96c743ba GCS-Make UAVO saving code more verbose. 2012-07-26 13:03:27 +01:00
zedamota
7a9835d3cf GCS-Fix compile under win. 2012-07-26 12:51:44 +01:00
Chris Pember
48b3cf7101 fixed the airframe form so it scrolls AND has the shiny new popups 2012-07-24 23:46:21 -07:00
PT_Dreamer
8c4806fa14 Revert "OP-39 Start and End pages added. Placeholder text added." 
This reverts commit 559be15142.

Conflicts:

	ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp
	ground/openpilotgcs/src/plugins/setupwizard/setupwizard.h
	ground/openpilotgcs/src/plugins/setupwizard/setupwizard.pro
	ground/openpilotgcs/src/plugins/setupwizard/setupwizardplugin.cpp
	ground/openpilotgcs/src/plugins/setupwizard/setupwizardplugin.h
 2012-07-24 22:32:54 +01:00
PT_Dreamer
82dc7e5957 Revert "OP-39 Initial commit. Created new sub project to plugins project." 
This reverts commit 532fc3071a.

Conflicts:

	ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp
	ground/openpilotgcs/src/plugins/setupwizard/setupwizard.h
	ground/openpilotgcs/src/plugins/setupwizard/setupwizard.pro
	ground/openpilotgcs/src/plugins/setupwizard/setupwizardplugin.cpp
	ground/openpilotgcs/src/plugins/setupwizard/setupwizardplugin.h
 2012-07-24 22:32:08 +01:00
PT_Dreamer
717b0d4561 Revert "OP-39 Added some pages and some functionality to the OP SetupWizard." 
This reverts commit ebe76e4ae6.
 2012-07-24 22:10:17 +01:00
PT_Dreamer
76773cd1c5 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 
Conflicts:
	ground/openpilotgcs/src/plugins/uavobjectbrowser/uavobjectbrowser.ui
	ground/openpilotgcs/src/plugins/uavobjectbrowser/uavobjectbrowserwidget.cpp
	ground/openpilotgcs/src/plugins/uavobjectbrowser/uavobjectbrowserwidget.h
	ground/openpilotgcs/src/plugins/uavobjectbrowser/uavobjecttreemodel.cpp
	ground/openpilotgcs/src/plugins/uavobjectbrowser/uavobjecttreemodel.h
 2012-07-24 21:53:58 +01:00
PT_Dreamer
667276cd61 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 2012-07-24 20:29:59 +01:00
PT_Dreamer
c8fdfb5dab Merge branch 'MikeL_MixerCurve' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 
Conflicts:
	ground/openpilotgcs/src/plugins/config/pipxtreme.ui
 2012-07-24 16:04:03 +01:00
PT_Dreamer
76f45b5218 Merge branch 'MikeL_MixerCurve' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 
Conflicts:
	ground/openpilotgcs/src/plugins/config/airframe.ui
	ground/openpilotgcs/src/plugins/config/config_cc_hw_widget.cpp
	ground/openpilotgcs/src/plugins/uploader/runningdevicewidget.cpp
 2012-07-24 16:02:07 +01:00
PT_Dreamer
54ffe04e6d Merge branch 'MikeL_MixerCurve' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 2012-07-24 15:23:21 +01:00
Dmytro Poplavskiy
f95bd8bc1b Initial implementation of QML based PFD widget 
It uses the same pfd.svg file as original PFD widget;
depends on osgearth for terrain rendering
 2012-07-23 17:19:24 +10:00
Dmytro Poplavskiy
69eb685d7b Moved svgimageprovider from qmlview plugin to utils lib 
To be reused by other qml based plugins.
 2012-07-23 15:36:53 +10:00
Dmytro Poplavskiy
6ee34931ac Expose SVG elements geometry to QML side 
This allows to reuse the existing svg file like pfd.svg
without manually positioning individual svg element.
 2012-07-23 12:21:34 +10:00
Oleg Semyonov
0c092970ca Merge remote-tracking branch 'origin/os/aerosimrc-update' into next 2012-07-22 14:35:11 +03:00
Chris Pember
54dae87017 fixed the hw settings apply button autofill, removed commented lines from the config_cc_hw_widget.cpp file 2012-07-21 12:28:55 -07:00
Oleg Semyonov
c3791532b8 AeroSimRC: fix spelling in imported sources (thanks Jose) 2012-07-21 21:32:59 +03:00
Chris Pember
a53158bec1 removed all the pushbutton stylesheets, hid all the apply buttons, applied same design ideas to the HW and the attitude forms 2012-07-21 11:26:37 -07:00
Stacey Sheldon
eafd525323 Merge remote-tracking branch 'origin/D-Lite/ubx-parser-next' into next 2012-07-21 14:22:10 -04:00
Chris Pember
1d1ef0dfce removed all the pushbutton stylesheets, hid all the apply buttons 2012-07-21 10:58:05 -07:00
Chris Pember
06e9fe0a28 removed all the pushbutton stylesheets, fixed the scrollbar area colors, compacted UI a bit more for smaller screens, misc text changes 2012-07-21 10:07:47 -07:00
Oleg Semyonov
c80e5a2bc9 AeroSimRC: (bugfix) replace non-standard _copysign() by copysign() 2012-07-20 23:13:41 +03:00
Oleg Semyonov
fc18749d1a AeroSimRC: resemble the AeroSIM-RC directory in build/ground 
... to make easier to copy plugin files into AeroSimRC folder.
 2012-07-20 17:53:21 +03:00
PT_Dreamer
ece35e7025 GCS-Added missing PipX PNG. 2012-07-20 12:55:37 +01:00
PT_Dreamer
2464fe9a2e GCS-Make flight mode switch and accessory channels move acording 
to user command.
 2012-07-20 12:47:03 +01:00
PT_Dreamer
74183db46e Merge branch 'cp_gui_fixes' of ssh://git.openpilot.org/OpenPilot into cp_gui_fixes 2012-07-19 13:23:24 +01:00
PT_Dreamer
41c0736b9b GCS- Added Expert mode setting. To make it visible go to 
tools->options->general_settings and click one of the checkboxes
to give focus to the form, then just press F7 and you will see
hidden settings.
 2012-07-19 13:22:36 +01:00
PT_Dreamer
bc5a1dd43b GCS - added an UDP UAVTalk mirror. 2012-07-19 11:55:24 +01:00
Oleg Semyonov
58de9dbd47 AeroSimRC: import the simulator plugin (proxy) source into the GCS tree 
Original location is:
  git@github.com:hhrhhr/Aerosim-plugin-for-CopterControl.git
 2012-07-19 12:47:03 +03:00
Oleg Semyonov
9e33751df3 AeroSimRC: add copyright and license comments to HITLv2 plugin 2012-07-19 12:40:28 +03:00
David
86d6724739 Change the wording to be less harsh 2012-07-19 07:04:09 +10:00
David
707f63b884 Change the wording to be less harsh 2012-07-19 07:02:49 +10:00
James Cotton
be892e236d Merge remote-tracking branch 'origin/rghunter/udp_control' into next 2012-07-18 12:43:17 -05:00
PT_Dreamer
205e71e06e GCS- Allow stylesheets to be loaded from files acording to OS. 
Use "linux.qss", "macos.qss" and "windows.qss" filenames and
place them on the app directory.
 2012-07-18 12:41:13 +01:00
PT_Dreamer
ad260e98bb GCS - Added PNGs, should have been part of previous commit. 2012-07-18 12:10:54 +01:00
Chris Pember
719a556b78 fixed the colos for all the forms so its not a topographic map greyscale look now, still converting the buttons all back to non style sheet 2012-07-17 21:54:38 -07:00
Fredrik Arvidsson
ebe76e4ae6 OP-39 Added some pages and some functionality to the OP SetupWizard. 2012-07-17 01:24:22 +02:00
Mike LaBranche
9507a79c6d MultiRotor Config, Bugfix: include TriYaw channel in getChannelDescriptions 2012-07-16 17:01:51 -05:00
Mike LaBranche
9f67e24ee5 MultiRotor Config, Bugfix: include TriYaw channel in getChannelDescriptions 2012-07-16 17:01:39 -05:00
Mike LaBranche
d8e685a226 MixerCurve, Tweek: adjust positive node text location. 2012-07-16 13:30:36 -07:00
Mike LaBranche
faa7fafcbd MultiRotor Config, Bugfix: include TriYaw channel in getChannelDescriptions 2012-07-16 13:08:12 -07:00
James Cotton
719772c98a Merge remote-tracking branch 'origin/Brian-PipXtreme-V2' into next 2012-07-16 11:42:29 -05:00
James Cotton
de2cee1b7f Merge remote-tracking branch 'origin/pt/haltfixes' 2012-07-16 11:27:46 -05:00
PT_Dreamer
a1593968f1 GCS-Changes uploader device pictures from SVG to some very 
nice looking PNGs.
TODO-PNG for PIPX
 2012-07-16 13:20:11 +01:00
James Cotton
3e44389fa8 Merge remote-tracking branch 'origin/pt/haltfixes' into next 2012-07-15 11:23:57 -05:00
Chris Pember
27b53bf092 deleted the commented lines, tried resizing the margins and I couldnt get it to look quite right, so I ditched it. 2012-07-14 21:26:38 -07:00
PT_Dreamer
3879baf263 GCS/OPMap-Fixes the jump and error destination number 2012-07-14 20:14:42 +01:00
Chris Pember
d612f67b8d more GUI changes and reorganizations 2012-07-14 11:50:17 -07:00
Mike LaBranche
4a13554e1f MixerCurve: disable command buttons; add conventional Reset/Advanced buttons; 
move min/max/step into SettingsGroup;
 2012-07-14 07:25:57 -07:00
Mike LaBranche
685fb4e1d4 MixerCurve bugs and tweeks: don't popup if already a popup; enable drawing only text in nodes; 
trap close/done/accept/reject events as closePopup();
 2012-07-13 22:41:58 -07:00
Mike LaBranche
cb66f5000a MixerCurve, add support for node background image. 2012-07-13 16:34:29 -07:00
Mike LaBranche
d2c99fefaf MixerCurve, Popup Dialog Support. 2012-07-13 13:44:56 -07:00
Chris Pember
268b941542 UI changes to the GCS interface pages 2012-07-12 22:23:37 -07:00
Oleg Semyonov
1d1915d2be GCS Input widget: make RC inputs the default tab 2012-07-13 01:55:00 +03:00
Mike LaBranche
2be7721a0f MixerCurve, Commands on/off button. 2012-07-12 12:40:51 -07:00
Mike LaBranche
a5e117101b Mixercurve, change command location/colors; add tooltips; subdue node colors. 2012-07-12 10:49:22 -07:00
Kenz Dale
bc87319a03 Minor int vs. unsigned int bugfix. 2012-07-12 14:41:41 +02:00
Kenz Dale
8c252f4474 Fixed bug in throttle. Slightly reworked UDP config page. Added comments to matlab file. 2012-07-12 14:39:36 +02:00
Mike LaBranche
e1b469b130 MixerCurve: simplified. 2012-07-11 21:49:05 -07:00
Brian Webb
3fabdb9963 Fixed conflicted merge with origin/next. 2012-07-11 19:25:05 -07:00
Oleg Semyonov
cfb8d24941 GCS Input widget: make RC inputs the default tab 2012-07-12 01:41:24 +03:00
James Cotton
53be9e5fdb Merge remote-tracking branch 'origin/dwillis/OP-646' into next 
Conflicts:
	ground/openpilotgcs/src/plugins/systemhealth/systemhealthgadgetwidget.cpp
 2012-07-11 13:10:02 -05:00
Chris Pember
9d32e1789b UI changes to the GCS interface pages 2012-07-10 20:53:31 -07:00
Fredrik Arvidsson
559be15142 OP-39 Start and End pages added. Placeholder text added. 2012-07-11 01:00:41 +02:00
Werner Backes
f1b846593f Fixed line endings 2012-07-10 11:40:55 +02:00
Werner Backes
6751a4cd8b Satellite constellation display shouldn't display satellites with 
negative elevation angle.
 2012-07-10 11:01:45 +02:00
Werner Backes
0424172398 Better separation between UBX and NMEA parser 
Make GPS protocol a user selectable option
Support for UBX protocol on CopterControl
 2012-07-10 11:01:41 +02:00
Mike LaBranche
0c6bd52a57 Tweek: ConfigInputWidget, change default flightmode for fm1 from Manual to Stabilized1; 
result of changing aircraft default to multirotor.
 2012-07-09 21:34:31 -07:00
David Willis
37ecfdcf1f Modify to show all alarm descriptions when no specific alarm is clicked on 2012-07-09 23:42:59 +01:00
Mike LaBranche
584d173de6 Merge branch 'ConfigHardware' into MikeL_MixerCurve 2012-07-09 15:32:23 -07:00
Fredrik Arvidsson
532fc3071a OP-39 Initial commit. Created new sub project to plugins project. 
Added plug-in and registering menu item to start the wizard.
Created SetupWizard sub class of QWizard to host logic for wizard traversal and data collection.
 2012-07-10 00:26:59 +02:00
Kenz Dale
4df81c5f85 UDP Control Plugin. Initial merge for review. 2012-07-09 18:18:57 +02:00
Mike LaBranche
923345762b mixercurve, dblspindelegate names 2012-07-09 09:07:22 -07:00
Mike LaBranche
898bd7dbf1 rename doublespindelegate files 2012-07-09 08:59:52 -07:00
PT_Dreamer
58a9e9a6f7 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next 2012-07-09 15:07:47 +01:00
PT_Dreamer
93f7494930 GCS/USB-Increase USB write timeout, this prevents 
PipX from becoming disconnected to the GCS.
TODO:Handle timeouts in a better way
 2012-07-09 14:39:17 +01:00
Mike LaBranche
efdd42da0c Merge branch 'next' of ssh://gitolite@git.openpilot.org/OpenPilot.git into ConfigHardware 2012-07-08 18:36:09 -07:00
Mike LaBranche
9c716abb11 Bugfixes: get both confighardware and firmware widgets to show CC3D image if detected. 2012-07-08 18:34:23 -07:00
PT_Dreamer
4c9327da7e GCS-Fixes some crashes on hw disconnection. 2012-07-09 00:15:21 +01:00
David Willis
e15615b2e4 Add all new alarm descriptions to resource file. Modify to show OK message and general usage tooltip. 2012-07-08 23:04:39 +01:00
Mike LaBranche
ea60769680 Tweeks: restore 'step' curve logic to original; adjust node text position, clipping; 2012-07-08 10:38:15 -07:00
Fredrik Arvidsson
cbb66e5997 OP-642 Fixed meta data state bug. 2012-07-08 16:45:58 +02:00
Fredrik Arvidsson
9f9d294f6c OP-359 Fixed colors, hilight time and meta data state bug when switching using scientific editors and not. 2012-07-08 16:43:47 +02:00
Fredrik Arvidsson
3c32490f7e OP-642 Hopefully fixed color and highlight time bug that occurred after changing categorized node mode. 2012-07-08 16:17:59 +02:00
Mike LaBranche
a328ab9973 Bugfix: step curvetype; Tweek: adjust node value position and color. 2012-07-07 21:56:07 -07:00
Mike LaBranche
13cd6c56f7 bugfix: correct spelling, multirotor widget 2012-07-07 17:49:51 -07:00
Mike LaBranche
5c0984cfba Merge branch 'next' of ssh://gitolite@git.openpilot.org/OpenPilot.git into MikeL_MixerCurve 2012-07-07 12:48:23 -07:00
Mike LaBranche
a6568dc468 merge next conflict resolution 2012-07-07 12:47:07 -07:00
Mike LaBranche
0e3236553b Merge next conflict resolution 2012-07-07 12:41:43 -07:00
Mike LaBranche
0a4101c915 VehicleConfig, multirotor, slight refactor; 2012-07-07 10:07:04 -07:00
Mike LaBranche
594453d191 MixerCurve, Tweek: use base curve min to init custom curve2 2012-07-07 09:00:59 -07:00
Mike LaBranche
9c1f9d6b74 MixerCurve, Bugfix: make custom curve2 aware of throttle vs pitch curvetypes 2012-07-07 08:45:28 -07:00
PT_Dreamer
42d06ef7d9 GCS/OPMap-fixes math error which was causing wrong wp location 
and high processor usage
 2012-07-07 16:05:28 +01:00
Mike LaBranche
c3057dc72e VehicleConfig Bugfix/tweek: change getChannelDescs to static in all airframes; 
avoids entire widget creation just to get channel descs.
 2012-07-07 08:02:10 -07:00
David
452e3d6a22 spacing 2012-07-07 21:39:21 +10:00
Fredrik Arvidsson
4bc951025f Merge branch 'next' into thread/OP-359 2012-07-07 13:14:16 +02:00
David
99c033bc3b Case issue with the SVG, updated comments 2012-07-07 21:08:11 +10:00
Fredrik Arvidsson
115f9ba473 OP-359 Added setting in UAVO browser widget to enable/disable editors 
using scientific notation.
 2012-07-07 12:57:11 +02:00
David
ec864c71cb Add update from dcat, fix prop directions 2012-07-07 20:46:57 +10:00
David
9ed60a2283 Lets default to MultiRotor and to a Quad X type as it is most common 2012-07-07 20:10:36 +10:00
David
4d5ddba2f9 Rename quad-shapes to multi-rotor shapes 2012-07-07 16:44:15 +10:00
Mike LaBranche
b95290a32f Bugfix: reset min/max ui spinboxes on curvetype change. 2012-07-06 21:47:08 -07:00
Mike LaBranche
6a12701e63 Bugfix: wire up the mixercurvewidget to the dirty manager rather than the parent MixerCurve 2012-07-06 16:12:53 -07:00
Mike LaBranche
dc4c6c74e4 Tweek: set min/max spinboxes to match the settings table when edited. 2012-07-06 15:16:54 -07:00
PT_Dreamer
61dea64a76 GCS/OPMap-Increase several value limits and added 
missing label on the wp editor.
 2012-07-06 23:02:56 +01:00
Mike LaBranche
44140931ae Tweek: resize the settings table row heights. 2012-07-06 15:02:34 -07:00
PT_Dreamer
66ed4552be GCS/OPMap-add apply and cancel buttons to the wp editor 2012-07-06 22:57:20 +01:00
Mike LaBranche
a794bf1dba Merge branch 'next' of ssh://gitolite@git.openpilot.org/OpenPilot.git into MikeL_MixerCurve 2012-07-06 14:03:01 -07:00
Mike LaBranche
51891881db Tweeks: verify heli init's curves correctly; mixer pre-allocates a spindelegate 
so we can reset min/max later
 2012-07-06 14:01:53 -07:00
PT_Dreamer
71a35b2dd8 GCS/OPMap-make the waypoint numbers start with 1. 
This is only visual, internal implementation is still zero based
 2012-07-06 21:57:43 +01:00
Mike LaBranche
382fecabbe Bugfixes: distingish between curve base min/max and client requested (multi's & 90% max); 
keep spindelegate synched with requested min/max's;
clean up a few old field based references;
make all nodes move when curve is flat;
 2012-07-06 13:38:46 -07:00
Mike LaBranche
06eb23abe6 MixerCurve, bugfix: min and max nodes no longer clipped. 2012-07-06 11:44:16 -07:00
Mike LaBranche
de590dfdd7 MixerCurve: Bwahaha, it resizes. 2012-07-06 11:28:46 -07:00
Mike LaBranche
eeb9ce9909 Bugfix: resolve curveUpdated() signal signature issue. 2012-07-06 10:43:24 -07:00
PT_Dreamer
96fb46b38d GCS/OPMap-comment cleaning 2012-07-06 11:26:27 +01:00
PT_Dreamer
de633d1bcc GCS/OPMap-Give lines of different colors different widths and z orders. 2012-07-06 11:25:35 +01:00
Mike LaBranche
8692855208 Bugfixes: spindelegate is online and fairly smart, knows min/max for curve; 
heli config is fully on board with integrated curve;
custom vehicle now displays 10 channels in custom grid;
mixercurve ui getting better;
 2012-07-05 15:31:36 -07:00
PT_Dreamer
2fa4afd4a7 GCS/OPMap-Make the wp editor show on wp doubleclick if it is 
already open
 2012-07-05 22:44:39 +01:00
PT_Dreamer
68fba80301 GCS/OPMap-Add remove leg button functionality. 2012-07-05 21:58:23 +01:00
Mike LaBranche
23aea6eac4 MixerCurve: integrated into all airframes. 2012-07-05 12:58:00 -07:00
Laura Sebesta
2d94e29fd9 GCS/OPMap-Added dialog box to confirm on clear waypoints. 
Also fixed some indenting.
 2012-07-05 19:53:14 +01:00
Laura Sebesta
9938f221e1 GCS/OPMap-Improved dialog message in mac ripper. We might also want to rename module, as "rip" is a somewhat loaded word. Pre-cache might be more neutral. 2012-07-05 19:52:08 +01:00
Laura Sebesta
fa643e8dbb GCS/OPMap-Added tooltip to home location in waypoint editor. 2012-07-05 19:50:16 +01:00
PT_Dreamer
d2d4d4dabd GCS/OPMap-Move line path arrow to the midle of the line. 2012-07-05 19:24:41 +01:00
Mike LaBranche
0c9e5c5e66 MixerCurve: Move code into \config folder; slice out doublespindelegate; 
enhanced mixercurve in all airframes except heli; layout is better, not there yet.
VehicleConfig, Bugfix: update custom mixer table to 10 channels.
 2012-07-04 10:21:48 -07:00
James Cotton
bdfefa25f2 Fix input label width to fit properly 2012-07-04 12:02:13 +02:00
James Cotton
58abe910d0 Merge remote-tracking branch 'origin/os/extended-flightmode-switch' into next 2012-07-04 11:52:38 +02:00
David
a3956c9c7c Change CPU gauge to be more meaningful 2012-07-04 15:07:06 +10:00
Oleg Semyonov
954cd9febc FlightMode GUI: remove ugly right slider 2012-07-04 07:46:38 +03:00
Oleg Semyonov
dd398e9bd5 FlightMode GUI: update right slider on settings change 2012-07-04 00:13:20 +03:00
Oleg Semyonov
4a75e226eb FlightMode GUI: attempt to fix label overlap on linux and OSX 2012-07-04 00:06:55 +03:00
Oleg Semyonov
12106c5549 FlightMode GUI: replace numeric value by slider 2012-07-03 17:20:10 +03:00
David
e0c4c97601 Remove redundant dial 2012-07-03 22:44:35 +10:00
James Cotton
e309ff7f2d Merge remote-tracking branch 'origin/MikeL_ConfigVehicle' into next 2012-07-03 14:19:33 +02:00
Oleg Semyonov
3cd293a5e6 Cosmetic FlightMode GUI fix (OPReview-228) 2012-07-03 11:04:18 +03:00
Mike LaBranche
8088f7aee9 MixerCurve: wire new curve into all airframes except heli; 
ConfigMultiRotor: Bugfix boundary condition on channel descriptions;
prune unused mixercurvewidget resets,values etc from vehicle specific configs
 2012-07-02 10:46:21 -07:00
James Cotton
534d559501 Merge remote-tracking branch 'origin/brian/multi-trans-telem' into next 2012-07-02 18:21:19 +02:00
James Cotton
9de47330b5 Indentation fix. Fixed copyright dates. 2012-07-02 17:55:00 +02:00
James Cotton
305d881724 Merge remote-tracking branch 'origin/dwillis/OP-646' into next 2012-07-02 17:45:08 +02:00
PT_Dreamer
5fd4daa8f8 GCS/Uploader - Some changes to fix "halt" on Linux 2012-07-02 16:11:34 +01:00
Fredrik Arvidsson
d83bff100b Merge branch 'next' into thread/OP-642 2012-07-01 12:25:23 +02:00
Fredrik Arvidsson
069b5dda44 OP-642 Added a checkbox in the UAVOBrowser widget to select if the objects should be shown in a categorized manner or not. 
It is now possible to switch between categorized and 'classic' view.
 2012-07-01 09:58:55 +02:00
Stacey Sheldon
d9dca0b553 Merge branch 'wireshark-plugins' into next 2012-06-30 22:42:38 -04:00
Mike LaBranche
09a2a007a8 MixerCurve, Bugfix: use widget values for min/max for curve generation. 2012-06-30 15:27:42 -07:00
Mike LaBranche
7f3a810fa6 MixerCurve: alpha version of integrated mixer curve; 
only in fixedwing config currently.
 2012-06-30 14:35:38 -07:00
Brian Webb
3405bc3ebe Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2 2012-06-30 10:06:51 -07:00
Fredrik Arvidsson
32abd2e32f Merge branch 'next' into thread/OP-642 2012-06-30 16:51:19 +02:00
Fredrik Arvidsson
ee9912c45d OP-642 Added code to create category items in tree. Changed some support methods to handle the the now arbitrary depth of the uavo tree. Removed several hard coded functions depending on tree only being two levels deep. 
Changed implementation to use maps instead of lists to find tree items and meta items. This is probably much better performance wise, and the code gets much cleaner.
Changed the background highlight code to highlight all tree nodes that aren't TopTreeItem:s to enable category items to be highlighted.
Cleaned up some code.
 2012-06-30 16:45:08 +02:00
Corvus Corax
bf0bea49da Merge remote branch 'baseorigin/kenz/math_scope' into basenext 2012-06-29 11:22:38 +02:00
Corvus Corax
d2606e64e4 bitfields: bugfix for bugfix: forgot one line 2012-06-29 09:48:35 +02:00
Corvus Corax
8e790642a0 GCS Bitfield: size bugfix 2012-06-29 09:48:20 +02:00
Corvus Corax
2540ee53dc Merge commit '80f53b185c67d475ead43df97c4a62bcc36d7d90' into gcsbitfields 2012-06-29 09:45:44 +02:00
PT_Dreamer
8bc83d49a5 GCS/OPMap-Make the overlays opacity user selectable and persistent. 2012-06-29 01:20:38 +01:00
Mike LaBranche
1e985f3aed MixerCurve: start branch with integrated mixer curve widget featuring all heli coolness for every curve. 2012-06-28 16:01:27 -07:00
Mike LaBranche
604a8e06cd Enhancement: change mixercurve points from pass by value to pass by const ref; 2012-06-28 15:56:40 -07:00
David Willis
3125f4089d Add remaing alarm descriptions 2012-06-28 22:37:34 +01:00
PT_Dreamer
70bdbf49c3 GCS/OPMap- Fixes bad coordinate calculation on home drag. 2012-06-28 20:17:16 +01:00
Mike LaBranche
5b64393f7f ConfigVehicle, all airframes: change return from throwConfigError to bool; 
eliminates channel checking redundancy.  Smart ptr new VehicleConfig()'s.
 2012-06-27 21:32:32 -07:00
zedamota
ee81296872 Merge remote-tracking branch 'remotes/origin/next' into MapEnhancements 2012-06-28 00:00:15 +01:00
zedamota
5eff06bdc1 GCS/OPMap-Fixes compilation under windows...again... 2012-06-27 23:54:41 +01:00
David Willis
7da39b23de Update alarm text. Add attitude critical and error descriptions 2012-06-27 23:33:40 +01:00
PT_Dreamer
b467a3e81e GCS/OPMap-Fixes compile under windows. 2012-06-27 15:06:53 +01:00
Mike LaBranche
3a8429d89b Merge branch 'next' of ssh://gitolite@git.openpilot.org/OpenPilot.git into MikeL_ConfigVehicle 2012-06-26 16:43:06 -07:00
Mike LaBranche
94ba42a3a9 MultirotorConfig, Bugfix: no default mixer values set for Tricopter; 
setting defaults now to roll(100), pitch(100), yaw(50)
 2012-06-26 16:34:36 -07:00
PT_Dreamer
6a85da9b46 GCS/OPMap-Fixes relative altitude refresh issue. 2012-06-27 00:25:40 +01:00
David Willis
bac7d171b0 Tweaked actuator critical text. Added r/c input critical and warning text 2012-06-26 23:17:19 +01:00
David Willis
14708a2e45 Updated to use html file as source of popup text. Updated to latest system health svg file. Support popup for actuator critical. 2012-06-26 22:14:56 +01:00
PT_Dreamer
96a8ff3a34 GCS/OPMap-Added relative altitude info to waypoint tooltip. 2012-06-26 20:47:14 +01:00
PT_Dreamer
2074889c9d GCS/OPMap-Clean commented out code. Delete some qDebugs 2012-06-26 20:22:55 +01:00
Fredrik Arvidsson
88a9b4cf89 Merge branch 'next' into thread/OP-642 2012-06-26 21:13:40 +02:00
PT_Dreamer
89d7f0adfd GCS/OPmap-Changed slot names to get rid of the automatic signal conection failure warning. 2012-06-25 21:11:07 +01:00
PT_Dreamer
2e97f1ac6a GCS/OPmap-Changed slot names to get rid of the automatic signal 
conection failure warning.
 2012-06-25 21:10:40 +01:00
PT_Dreamer
ecbf02fd33 GCS/OPMap-Added missing header information. Did some cleaning 2012-06-25 19:41:59 +01:00
Oleg Semyonov
727e67d7fd Even more optimize FlightMode switch position calculation 
This runs in a high frequency loop and should use as little of
floating point as possible. Thanks to Kenn for the idea.
 2012-06-25 11:41:42 +03:00
Oleg Semyonov
2c896c9e91 Do not care about FlightMode channel if only one flight mode configured 2012-06-25 01:52:06 +03:00
Oleg Semyonov
02fa6fde09 Optimize FlightMode switch position calculation 2012-06-25 00:30:42 +03:00
PT_Dreamer
55af80ffaf GCS/OPMap- handles home icon doubleclick. 
Visual changes to the waypoint editor.
 2012-06-24 20:05:27 +01:00
PT_Dreamer
b84af5c338 GCS/OPMap-Model/UAVO proxy class. 
Handles the convertion between flight plan data from the model
to/from UAVObjects.
 2012-06-24 20:04:13 +01:00
PT_Dreamer
2b85f1a9fd GCS/OPMap- Bugfixes to the model/map proxy. 
Dynamic overlay creation based on the path plan actions.
 2012-06-24 20:02:45 +01:00
PT_Dreamer
ff48babb46 GCS/OPMap- Small visual changes to the pathplanner editor. 
Add buttons to synchronize planner data with UAVObjects.
 2012-06-24 20:00:35 +01:00
PT_Dreamer
3466420a32 GCS - OPMap - small changes to the home editor. 2012-06-24 19:58:09 +01:00
PT_Dreamer
e34fc5be71 GCS - OPMap - allow different colors for overlays. 
This is so we can use a different color for each kind
of route ex:error destination, jump destination, next destination
 2012-06-24 19:57:02 +01:00
PT_Dreamer
2b9ad9dcb9 GCS - OPMap - Handle magic waypoint as special case with 
different picture. This is not used now but can be needed in
the future
 2012-06-24 19:55:23 +01:00
Mike LaBranche
fc5d0a0175 ConfigVehicleType, bugfix: set/get feedforward settings; 
refactor set/getMixerValue into vehicleConfig;
 2012-06-24 11:11:53 -07:00
David Willis
f492ea8527 First pass at popup info for alarms in system health widget 2012-06-24 01:22:43 +01:00
Brian Webb
43786c914d Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2 2012-06-23 15:01:53 -07:00
David
d43afddd14 Another Update from Chris 2012-06-24 06:54:24 +10:00
Oleg Semyonov
cd6387d0a6 Add support for more than 3-pos FlightMode switches 
It is now possible to have 1 to 6 flight mode switch positions
(usefull for guidance, position hold and similar use).

The input channel range is divided into N (1 to 6) zones and each
zone represents a flight mode. Default is 3 zones (backward compatible),
but more can be chosen.

How to use: configure Tx mixers in a way they provide required number
of different values for the same FlightMode channel. For instance,
using Turnigy 9X radio with ER9X firmware, one can create a mixer like
this:

     -100 MAX ID0   Manual
   R  -50 MAX ID1   Stabilized1 (Rate)
   R    0 MAX ID2   Stabilized2 (Attitude)
   R   50 MAX RUD   PositionHold
   R  100 MAX ELE   ReturnToBase

And set number of flight mode positions to 5. As a result, the 3-pos
switch (ID0, ID1, ID2) will provide first three flight modes, the rudder
D/R switch will override those and enable the 4th flight mode, and
elevator D/R switch will have highest precedence and activate the 5th
flight mode.

This will change the ManualControlSettings objectID.
 2012-06-23 22:10:19 +03:00
David
a242c2f383 From Gunnah, remove the odd letters from the QC artwork 2012-06-23 18:09:51 +10:00
Mike LaBranche
f6f98aa091 MixerCurveWidget refine setCurve logic 2012-06-22 17:31:14 -07:00
Mike LaBranche
9b25f68898 MixerCurveWidget: bugfix- don't delete edges in initNodes, just remove from scene; 
simplify and remove unused objects in configccpm;  respect min/max in initLinearCurve.
 2012-06-22 17:01:33 -07:00
Mike LaBranche
7eb0105886 MixerCurveWidget: enhance node value handling; draw node mixer value inside node; 2012-06-21 11:53:51 -07:00
Stacey Sheldon
5c7295549e gcs: fix incorrect file case on include path 
This breaks the Linux build.  Introduced in d03282d.
 2012-06-20 22:07:14 -04:00
Brian Webb
04f49498b2 Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2 2012-06-20 18:34:56 -07:00
Brian Webb
7bd32253e5 Removed debug from GCS telemetry. 2012-06-20 18:34:16 -07:00
Brian Webb
3da382e828 Merge remote-tracking branch 'origin/next' into brian/multi-trans-telem 2012-06-20 17:43:17 -07:00
Mike LaBranche
5edd952ed6 VehicleConfig/mixer bugfix: keep the ui in synch when 'Save'ing from uavbrowser; 
spruce up vehicleconfig with a couple more helpers;
 2012-06-20 12:46:07 -07:00
Fredrik Arvidsson
3c754af484 OP-642 Added <category> element which is a string in uavo object type definition to be used in uavo browser to categorise uavo:s visually into subtrees. Category value is assigned in generated code and accessible via getter method. OP-644 Fixed option for uavo browser to enable disable hilights for objects which values wasn't really changed to indicate stream activity in uavo object tree. 2012-06-20 21:26:18 +02:00
PT_Dreamer
7425547b33 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next 2012-06-20 16:16:29 +01:00
PT_Dreamer
5216835e18 GCS - OPMap - test functions 2012-06-20 15:02:57 +01:00
PT_Dreamer
09a67af3e1 GCS - MapLib - added home item editor 2012-06-20 15:01:03 +01:00
PT_Dreamer
b8b46e90a3 GCS - OPMapLib - data model cleaning 2012-06-20 15:00:15 +01:00
PT_Dreamer
1299bbda93 GCS -OPMapLib - add relative altitude to waypoints 2012-06-20 14:59:23 +01:00
PT_Dreamer
3cf4676aef GCS - OPMap - create doubleclick signal on the home item 2012-06-20 14:58:33 +01:00
James Cotton
621c78e5cb Merge remote-tracking branch 'origin/MikeL_ConfigVehicle' into next 2012-06-20 09:35:18 +02:00
James Cotton
28c5a038d1 Merge remote-tracking branch 'origin/amorale/fix_osx_multiple_usb_serial' into next 2012-06-20 09:02:33 +02:00
Mike LaBranche
02cdc6feff MixerCurveWidget: make Node smarter by storing a value whenever pos changes; 
getCurve now reports back the list of node->getValue()
 2012-06-19 16:51:22 -07:00
Mike LaBranche
9da2ffff2f MixerCurveWidget: incorporate m_thread's delete leak fix, combined node+edge init 2012-06-19 15:22:11 -07:00
Mike LaBranche
04ea5f24fa MixerCurveWidget: first pass refactoring for performance; bugfix for negative values 2012-06-19 10:28:42 -07:00
Mike LaBranche
fe2aed328e bugfix: configccpmwidget, updatethrottlecurvevalue using wrong table index 2012-06-19 10:27:08 -07:00
Brian Webb
c05b41aca6 Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2 2012-06-19 06:16:30 -07:00
Stacey Sheldon
4c47a36bda uavobjgenerator: Add generator for wireshark UAVO plugin 
Using 'make uavobjects_wireshark' now generates a complete
wireshark dissector that can decode all fields of the available
UAVObjects.
 2012-06-19 00:21:35 -04:00
PT_Dreamer
88a089804b GCS - added uavo per instance "new instance" signal. 2012-06-18 00:16:23 +01:00
PT_Dreamer
e71ab57ffa Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into pt/MapEnhancements 
Conflicts:
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
 2012-06-17 23:56:27 +01:00
PT_Dreamer
35cf2fe374 GCS/OPMap - pathplanner - added modelUavoProxy class. 2012-06-17 20:09:21 +01:00
PT_Dreamer
5d07b67922 GCS/OPMap - pathplanner - graphical stuff and GUI done. UAVO interfacing left. 2012-06-17 19:24:02 +01:00
Fredrik Arvidsson
c8b4abc71f Added comments to the code. 2012-06-17 12:46:45 +02:00
Fredrik Arvidsson
0e4ffa7f6d Merge branch 'next' into thread/uavobrowser_perf 2012-06-17 09:21:22 +02:00
Mike LaBranche
4650d4909d Add virtual keyword ConfigTaskWidget:: dtor; assures correct child deletion 2012-06-16 13:39:58 -07:00
Mike LaBranche
4807eb730f Compiler Warning kill: rearrange ctor member init order in ConfigInputWidget 2012-06-16 13:38:05 -07:00
Oleg Semyonov
4120eb300c HITLv2: fix shared object name captitalization 2012-06-16 20:13:41 +03:00
Fredrik Arvidsson
d03282d9b0 Changed the way change hilight of three cells works to bring down the 
number of QTimer instances and the number of redraws to hopefully
increase performance.
Changed so that when a child gets hilighted it will hilight its parent.
 2012-06-16 17:38:05 +02:00
Brian Webb
0bf27de28d Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2 2012-06-16 08:28:03 -07:00
Mike LaBranche
c1689b2205 VehicleConfig: add set/getThrottleCurve, enhance configwidgets to consume; 
add resetMixerVector call in multirotor; ConfigVehicleType now VehicleConfig aware
 2012-06-14 15:40:17 -07:00
PT_Dreamer
82b7f9f08d GCS/OPmap lib - changed the flight planner to a model view aproach 2012-06-14 23:06:37 +01:00
Brian Webb
6c8d8aeafb Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2 2012-06-14 06:55:52 -07:00
Mike LaBranche
a7ae258bc8 Bugfix, oops: missed a couple resetMixerVector opportunities. 2012-06-13 15:14:18 -07:00
Mike LaBranche
8de40c7847 BugFix: ConfigFixedWing reset the mixer vectors to zero prior to writing anew. 2012-06-13 15:09:54 -07:00
Mike LaBranche
8283d4280e UAVTalk, change private member QIODevice* io to smart pointer QPointer<QIODevice> 2012-06-13 14:57:43 -07:00
Laura Sebesta
9409ea53da Minor GUI settings upgrades, to fit small screens better. 2012-06-13 08:40:29 +03:00
James Cotton
295fa4a8f3 Fix bug where the aircraft gadget initially shows the quad tab but the selector 
says plane.
 2012-06-12 23:12:53 -05:00
Brian Webb
c06412f83b Removed some qDebug from PipX configuration widget. 2012-06-12 20:00:58 -07:00
Brian Webb
aa8ba898fc Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2 2012-06-12 19:49:03 -07:00
Brian Webb
69a38ddd77 PipX configuration screen improvements. 2012-06-12 19:48:31 -07:00
James Cotton
1fad5c9fc2 Fix the stabilization expert UI so the label is in the right place 2012-06-12 01:52:32 -05:00
Brian Webb
ce9d96e1b1 Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2 2012-06-11 21:30:31 -07:00
Brian Webb
9c1549e6a2 Change return type from Telemetry::transactionTimeout back to void. 2012-06-11 21:24:56 -07:00
Brian Webb
952c6d9f32 Added support for multiple transactions to GCS telemetry. 2012-06-11 21:06:50 -07:00
James Cotton
9870abcd2f Fix some slots in config revo calibration 2012-06-11 14:42:08 -05:00
James Cotton
dba47a7d41 Remove the connection to refreshWidgetValues() in output widget. Mike was 
right and it's not needed since hte configTaskWidget takes care of this
connection.
 2012-06-11 13:22:37 -05:00
James Cotton
93b77becc0 More the system task priority down and increase the timeout for erasing the 
flash so it says completed.  However, it still blocks the system for a long
time.  During an erase the heartbeat will flash at 10 Hz to indicate what's
happening.

This still blocks telemetry even after lowering hte system priority (and there
is a vTaskDelay) which makes me think that the SPI bus being locked is blocking
Sensors or somethign else.  This should not be permited when the system is
armed.

The reason the system locks up during the erase is that the file system
operations occur within the event dispatcher thread.  It is very bad practice
for anything to block this (i.e. callbacks should never take very long).  We
should probably move the object persistence handling into the system thread or
something but that can be a separate issue.
 2012-06-11 12:03:32 -05:00
James Cotton
6f09b6d087 Fix misnamed slot in the output widget 2012-06-11 11:31:28 -05:00
Brian Webb
71287e4cb4 Fixed setting of the PairID on PipX GCS and added selection for broadcast mode. 2012-06-09 10:54:24 -07:00
James Cotton
7b8110a457 Merge branch 'MikeL' into next 2012-06-07 11:31:41 -05:00
James Cotton
9b7a8dc15f Merge remote-tracking branch 'origin/Brian-PipXtreme-V2' into next 2012-06-07 11:27:51 -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
PT_Dreamer
5da9efd673 GCS/MapLib - Several fixes, changes and enhancements. 2012-06-06 20:52:00 +01: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
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