PT_Dreamer
1c344bb4fe
Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into CC3D_Release
2012-08-13 22:28:25 +01:00
Fredrik Arvidsson
25d13e4c35
Merge branch 'next' into thread/OP-39
2012-08-13 19:54:26 +02:00
Fredrik Arvidsson
bc6709cfb3
Added button imgaes for the wizard and created a resource file to host them.
2012-08-13 19:52:39 +02:00
Chris Pember
b4da3b5e54
added a little padding for the scroll area in airframe form so in windows it doesnt get squashed...i hope.
2012-08-12 22:08:56 -07:00
Laura Sebesta
62041f40ad
Changed variable from static to class static.
2012-08-12 23:36:27 +02:00
James Cotton
63e490a922
Update the config file so the mag scopes selection works
2012-08-12 16:12:21 -05:00
James Cotton
3a0c259de3
Update the config file so the mag scopes selection works
2012-08-12 16:11:49 -05:00
James Cotton
18d63f7e9c
Merge commit 'b19a0947fb72dc069540561ffeb6983ee318fcb9' into revo
2012-08-12 14:39:30 -05:00
James Cotton
75db0fcb35
Merge branch 'next' into revo
...
Conflicts:
flight/Modules/GPS/GPS.c
shared/uavobjectdefinition/manualcontrolsettings.xml
shared/uavobjectdefinition/systemalarms.xml
2012-08-12 14:38:38 -05:00
Mike LaBranche
c414f80fd7
Merge branch 'pt/CC3D_Release' of ssh://gitolite@git.openpilot.org/OpenPilot.git into CC3D_Release
2012-08-12 08:40:43 -07:00
PT_Dreamer
1a22eef491
GCS-Several changes according to review comments
2012-08-11 23:36:00 +01:00
PT_Dreamer
f4bd4c3120
Merge branch 'pt/MapEnhancements' of ssh://git.openpilot.org/OpenPilot into pt/MapEnhancements
2012-08-11 22:03:09 +01:00
PT_Dreamer
619b4ffa8c
GCS-Prevent the map from being dragged beyond the available imagery.
...
Previous way seemed broken, looked ugly and like a bug.
2012-08-11 19:58:14 +01:00
Chris Pember
180313031f
Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
2012-08-11 11:29:47 -07:00
Chris Pember
6e413d1779
locked the column headers in airframe yaw and txPID so they hopefully dont go all gigantic in windows
2012-08-11 11:29:38 -07:00
PT_Dreamer
9379eb73d7
GCS-Fix stylesheet not being saved.
2012-08-10 03:03:52 +01:00
PT_Dreamer
3df35b933c
Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
2012-08-09 22:42:35 +01:00
PT_Dreamer
b0e6566114
GCS- Handle loading of the configuration file. Stylesheets files
...
are now loaded from mainwindow instead of main.
2012-08-09 22:33:13 +01:00
PT_Dreamer
dae15702ed
GCS-Delete previously used stylesheet and configuration files
2012-08-09 22:31:51 +01:00
PT_Dreamer
e2d7e824ed
GCS-Created new wide and default stylesheets and configurations just as an example.
...
Currently they are the same.
2012-08-09 22:30:31 +01:00
PT_Dreamer
9da1372e54
GCS-Change the way the stylesheets are copied (was not working for me)
...
Also copy the default configuration xml files. These are now on
the shared folder together with the stylesheet instead of being
inside a resource file.
Stylesheets and configuration files are now copied from SRC/SHARED to
APP/SHARED
2012-08-09 22:25:34 +01:00
PT_Dreamer
e033004656
GCS-Added new dialog to let the user choose from a list of available
...
configurations uppon startup when no valid configuration is found
2012-08-09 22:22:09 +01:00
Dmytro Poplavskiy
93dd153fc4
Enabled text antialiasing for a number of widgets
...
Unlike QPainter::setRenderHints(),
QGraphicsView::setRenderHints() set the render hints to flags passed as parameter,
so QPainter::TextAntialiasing flag is cleared.
changint it to setRenderHint or adding QPainter::TextAntialiasing
value fixes the AA text rendering.
2012-08-09 22:04:40 +10:00
Fredrik Arvidsson
59d71c2b98
Merge branch 'next' into thread/OP-39
2012-08-09 11:17:52 +02:00
David Ankers
5bf98a03c7
Align the new telem to the center, it's bugging me.
2012-08-09 18:12:56 +10:00
David Ankers
92a9a57bf7
Make options Window a better size, fixes a load of the cramped layout.
2012-08-09 15:42:00 +10:00
David Ankers
40e25ff8e2
Turn on sounds by default
2012-08-09 14:58:07 +10:00
Dmytro Poplavskiy
518358c8f7
Re-enabled the notify plugin with Qt 4.8
...
On all the platform except of Qt 4.8.0 on Mac,
this combination crashes.
Fixed in Qt 4.8.1, QTBUG-23128
2012-08-09 09:06:14 +10:00
Dmytro Poplavskiy
d358591726
Fixed possible notification plugin deadlock
...
Protecting with mutex stateChanged(Phonon::State)
and starting/stopping playback looks dangerous,
the media player may emit another state change leading to deadlock.
The mutex should not be necessary here
since all the slots are executed in the main thread.
Changing the objectUpdated(UAVObject*) connection type
to Qt::QueuedConnection is not strictly necessary,
signals between threads are queued by default,
it serves more the documentation purpose.
2012-08-09 09:05:59 +10:00
Dmytro Poplavskiy
f4ff84d41a
Notify plugin cleanup
...
Removed a few unused SoundNotifyPlugin members
2012-08-09 09:05:39 +10:00
PT_Dreamer
821f954276
Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
2012-08-08 23:32:07 +01:00
Mike LaBranche
0f35e5f776
Merge branch 'pt/CC3D_Release' of ssh://gitolite@git.openpilot.org/OpenPilot.git into CC3D_Release
2012-08-08 15:05:57 -07:00
James Cotton
f530702ce9
Merge branch 'android' into sim_android
...
Conflicts:
androidgcs/AndroidManifest.xml
androidgcs/res/layout/gcs_home.xml
androidgcs/res/layout/pfd.xml
androidgcs/res/layout/system_alarms.xml
androidgcs/src/org/openpilot/androidgcs/AttitudeView.java
androidgcs/src/org/openpilot/androidgcs/BluetoothDevicePreference.java
androidgcs/src/org/openpilot/androidgcs/CompassView.java
androidgcs/src/org/openpilot/androidgcs/Controller.java
androidgcs/src/org/openpilot/androidgcs/HomePage.java
androidgcs/src/org/openpilot/androidgcs/Logger.java
androidgcs/src/org/openpilot/androidgcs/ObjectBrowser.java
androidgcs/src/org/openpilot/androidgcs/ObjectEditor.java
androidgcs/src/org/openpilot/androidgcs/ObjectManagerActivity.java
androidgcs/src/org/openpilot/androidgcs/Preferences.java
androidgcs/src/org/openpilot/androidgcs/SystemAlarmActivity.java
androidgcs/src/org/openpilot/androidgcs/TelemetryWidget.java
androidgcs/src/org/openpilot/androidgcs/UAVLocation.java
androidgcs/src/org/openpilot/uavtalk/Telemetry.java
androidgcs/src/org/openpilot/uavtalk/TelemetryMonitor.java
androidgcs/src/org/openpilot/uavtalk/UAVDataObject.java
androidgcs/src/org/openpilot/uavtalk/UAVMetaObject.java
androidgcs/src/org/openpilot/uavtalk/UAVObject.java
androidgcs/src/org/openpilot/uavtalk/UAVObjectField.java
androidgcs/src/org/openpilot/uavtalk/UAVObjectManager.java
androidgcs/src/org/openpilot/uavtalk/UAVTalk.java
androidgcs/src/org/openpilot/uavtalk/uavobjects/AltitudeHoldSettings.java
androidgcs/src/org/openpilot/uavtalk/uavobjects/FirmwareIAPObj.java
androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightBatterySettings.java
androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightBatteryState.java
androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightStatus.java
androidgcs/src/org/openpilot/uavtalk/uavobjects/HomeLocation.java
androidgcs/src/org/openpilot/uavtalk/uavobjects/HwSettings.java
androidgcs/src/org/openpilot/uavtalk/uavobjects/ManualControlSettings.java
androidgcs/src/org/openpilot/uavtalk/uavobjects/OveroSyncStats.java
androidgcs/src/org/openpilot/uavtalk/uavobjects/PositionActual.java
androidgcs/src/org/openpilot/uavtalk/uavobjects/RevoCalibration.java
androidgcs/src/org/openpilot/uavtalk/uavobjects/SystemAlarms.java
androidgcs/src/org/openpilot/uavtalk/uavobjects/TaskInfo.java
androidgcs/src/org/openpilot/uavtalk/uavobjects/UAVObjectsInitialize.java
flight/Modules/GPS/GPS.c
2012-08-08 15:50:28 -05:00
Laura Sebesta
fe6ea7e0e2
Fixed getUAVPosition to use position actual data correctly.
...
Refactored coordinate conversion names in order to be clearer, since
two identically named functions-- one in revo, one here-- performed
very different maths.
2012-08-08 20:58:13 +02:00
Kenz Dale
f3e1e768ad
Refactored variable names to be more helpful.
2012-08-08 20:57:41 +02:00
Kenz Dale
6b3cb29ea1
Fixed maximum size for title bar in map widget.
2012-08-08 20:56:29 +02:00
Chris Pember
ee217ad17e
fixed aircraft page, with different layout
2012-08-07 20:53:02 -07:00
Chris Pember
0d079f2059
fixed aircraft page, were some minor adjustments I wanted to make
2012-08-07 14:29:16 -07:00
PT_Dreamer
74cd57e8a0
GCS - IFDEFed everything pathplanner related.
2012-08-07 22:03:40 +01:00
Chris Pember
820162fa27
fixed aircraft page, specifically multirotor page so it works better
2012-08-07 13:53:13 -07:00
Chris Pember
36707aef67
fixed save area in all forms, shrunk down the output form upper groupbox a bit
2012-08-07 11:33:21 -07:00
Chris Pember
3fb6e35b7f
Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
2012-08-07 10:48:13 -07:00
PT_Dreamer
9dca82a6db
GCS-Created new stylesheet rule for the config plugin list
...
Reverted increase of list width.
2012-08-07 12:25:04 +01:00
Chris Pember
f75d710bcd
fixed save area in camerastab ui form to make skinny
2012-08-06 20:07:50 -07:00
PT_Dreamer
fc32ec8d8f
Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
2012-08-06 22:55:57 +01:00
PT_Dreamer
2963fd2658
GCS - Increased tabbed widget width on the config page.
2012-08-06 22:55:35 +01:00
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
James Cotton
f6692c07fe
AndroidGCS: Clean up some warnings in UAVO templates
2012-08-06 01:17:19 -05: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
Laura Sebesta
d7b123f836
Remove OSG from Mac compile of GCS.
2012-08-05 20:36:00 +02:00
James Cotton
cd6a2fb7da
AndroidGCS: Make sure the rest of the UAVO IDs are working as positive long
...
values instead of ints.
2012-08-05 04:41:57 -05:00
James Cotton
35d57911f9
AndroidGCS: Change the UAVO generation to suppress warnings
2012-08-05 04:11:33 -05:00
James Cotton
33132e8ebd
AndroidGCS: Convert UAVObject IDs to longs from ints because they are meant to
...
be unsigned uint32 which is unsupported by java.
2012-08-05 04:09:05 -05: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
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
James Cotton
62bb4601c5
Finish porting the meta data changes from GCS and update all the UAVOs
2012-08-02 12:49:34 -05: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
James Cotton
72de0c622a
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-02 10:40:34 -05:00
James Cotton
a9066494c7
Java autogenerated code to be more compatible with gcs code
2012-08-02 10:40:34 -05:00
James Cotton
0abd2ee671
Continuing to work on the java code to be more consistent with GCS code
2012-08-02 10:40:33 -05:00
James Cotton
7ab3f5b47e
Update the object template to be more consistent with ground code
2012-08-02 10:40:33 -05: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
PT_Dreamer
af98f4c2a6
GCS- Fixed board rotation being overwriten when calibrating.
2012-08-01 10:12:52 +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
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
Sambas
2c8929525d
Optional modules for Revolution, compiles but not flight tested.
2012-07-30 12:20:18 +03: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
David Ankers
ca22b54b86
Change dates on copyright
2012-07-30 06:28:40 +10: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
James Cotton
0ed5b84ee9
Move the try catch when parsing overo files
2012-07-25 14:41:10 -05:00
James Cotton
41f80eb34f
Disable offset nulling while performing GCS mag calibration.
2012-07-25 11:26:37 -05:00
James Cotton
d1e6dcc2f0
First pass implementation of William Premerlani's magnetometer bias correction
2012-07-25 11:07:40 -05: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
Laura Sebesta
44a3dad912
Fixed incorrect UAVO field in PFD.
...
Made scope gadget widget non-existent field message more helpful.
2012-07-25 01:34:38 +02: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
James Cotton
82219d2511
Make matlab log processing support overo UAVtalk packets now
2012-07-24 14:08:14 -05: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
Kenz Dale
aa5e5a9b01
Removed "airspeed" field from Airspeed UAVO. Now everything is done either with true airspeed or calibrated airspeed
2012-07-24 15:15:21 +02: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
Stacey Sheldon
f5db83bd20
Merge remote-tracking branch 'op-public/next' into revo-next
...
Conflicts:
flight/Libraries/inc/NMEA.h
flight/Modules/GPS/GPS.c
flight/Modules/GPS/NMEA.c
flight/Modules/GPS/UBX.c
flight/Modules/GPS/inc/NMEA.h
flight/Modules/GPS/inc/UBX.h
flight/Modules/PathPlanner/inc/pathplanner.h
flight/PiOS/STM32F10x/link_STM32103CB_PIPXTREME_sections.ld
flight/Revolution/System/inc/pios_config.h
flight/Revolution/UAVObjects.inc
flight/SimPosix/UAVObjects.inc
ground/openpilotgcs/src/plugins/hitlv2/aerosimrc/src/qdebughandler.h
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
shared/uavobjectdefinition/gpsvelocity.xml
2012-07-22 23:39:37 -04: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
James Cotton
93faf131b0
Merge branch 'next' into revo
...
Conflicts:
flight/Modules/GPS/GPS.c
flight/Modules/GPS/NMEA.c
flight/Modules/GPS/UBX.c
flight/Modules/GPS/inc/NMEA.h
flight/Modules/GPS/inc/UBX.h
flight/Revolution/System/inc/pios_config.h
flight/Revolution/UAVObjects.inc
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
ground/openpilotgcs/src/plugins/waypointeditor/waypointeditorplugin.h
shared/uavobjectdefinition/gpsvelocity.xml
2012-07-22 00:43:19 -05:00
James Cotton
e239424ddd
Fix some typos in the GCS calibration
2012-07-21 15:12:45 -05: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
James Cotton
6eb0fd2b3b
Validate the mag and accel calibration before setting to prevent block NAN on
...
the FC side.
2012-07-21 12:13:20 -05: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
Kenz Dale
1d976b3095
dded support for multiple airspeed sources. Added GPS airspeed estimation. Extended BaroAirspeed UAVO. Added new AirspeedSettings UAVO.
2012-07-20 13:08:54 +02:00
James Cotton
7492d34d25
Merge branch 'overo_control' into revo
2012-07-19 08:35:39 -05:00
James Cotton
5ebd368b18
Merge branch 'next' into revo
...
Conflicts:
flight/PiOS/STM32F10x/link_STM32103CB_PIPXTREME_sections.ld
2012-07-19 08:35:30 -05: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
6b101d71af
Merge remote-tracking branch 'origin/Brian-PipXtreme-V2' into revo
2012-07-15 12:32:35 -05: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
James Cotton
5f337afb36
Add a setting to determine when the overo module logs
2012-07-14 09:21:38 -05: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
James Cotton
d150fd5331
Merge branch 'next' into revo
...
Conflicts:
flight/Modules/ManualControl/manualcontrol.c
ground/openpilotgcs/src/plugins/config/input.ui
ground/openpilotgcs/src/plugins/uavtalk/telemetry.cpp
shared/uavobjectdefinition/manualcontrolsettings.xml
2012-07-13 10:40:14 -05: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
Stacey Sheldon
5a5694883d
Merge remote-tracking branch 'op-public/next' into revo-next
2012-07-08 19:32:51 -04:00
PT_Dreamer
4c9327da7e
GCS-Fixes some crashes on hw disconnection.
2012-07-09 00:15:21 +01:00
Stacey Sheldon
54a161a3d4
Merge remote-tracking branch 'op-public/next' into revo-next
...
Conflicts:
shared/uavobjectdefinition/manualcontrolsettings.xml
2012-07-08 18:14:09 -04: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
Laura Sebesta
ef599edd51
Updated OPPlots.m to be compatible with the current home approach.
2012-07-08 11:13:19 +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
James Cotton
c9bf5f5d06
Merge branch 'next' into revo
2012-07-01 14:44:22 +02: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
James Cotton
cd311642dd
Merge branch 'next' into revo
2012-06-28 10:35:47 +02: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
f475088585
Merge remote-tracking branch 'op-public/next' into revo-next
2012-06-20 22:45:41 -04: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
Laura Sebesta
87900043a4
Typo fix. Grammarians will be extreamely glad to complement the OP team now that these errors haved disappeared.
2012-06-17 10:21:58 +03: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
James Cotton
416618a26f
Show the altitude on the map
2012-06-15 16:01:15 -05:00
James Cotton
495bb280c7
Suppress long standing error message from telemetry we've had for ages. It
...
probably should be fixed properly though.
2012-06-15 15:51:40 -05:00
James Cotton
be360d3c21
Fix waypoint visualization in OPMap to work for multiple maps
2012-06-15 15:51:12 -05:00
James Cotton
5b2f4d6d91
Remove an outdated connect in waypointeditor
2012-06-15 14:56:55 -05:00
James Cotton
62436270e3
When moving waypoints on the map, keep the previous altitude
2012-06-15 13:15:45 -05:00
James Cotton
1ac807e1e0
Fix small bugt in the revo calibration
2012-06-15 13:15:21 -05:00
Laura Sebesta
23651cddd1
Refactored HiTL for a common API from simulators. Also added noise generator. In addition, PFD now displays calibrated airspeed.
...
Also added throttle commands for all four channesl (it is now possible to fly a 747)
2012-06-15 15:22:07 +03:00
James Cotton
07f8922f2f
Merge remote-tracking branch 'origin/MikeL_ConfigVehicle' into revo
2012-06-14 19:18:23 -05: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
James Cotton
97483bddad
Fix some indentation in the mag calibration code and no need to clear the gyro
...
accumulator.
2012-06-14 10:07:45 -05:00
James Cotton
f1aad76f71
Reorder functions for six point calibration to make more sense (the order they
...
are run) and add some comments
2012-06-14 10:06:39 -05:00
James Cotton
a91c21f53f
Don't restore the accel metadata after six point calibration unless it was
...
actually saved and changed
2012-06-14 09:57:46 -05:00
Brian Webb
6c8d8aeafb
Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2
2012-06-14 06:55:52 -07:00
James Cotton
4f37be785e
Merge branch 'next' into revo
2012-06-14 01:02:03 -05:00
James Cotton
70606a46a1
Include initial gyro bias calibration into the level calibration of revo like
...
it is with CC.
2012-06-13 23:07:23 -05:00
James Cotton
03705771dd
Get the sensor noise measurement working again, but through GCS now
2012-06-13 22:11:00 -05:00
James Cotton
ce487c9b0a
Fix the bias calculation for revo accels
2012-06-13 21:15:46 -05:00
James Cotton
293a2ee573
Rename some of the revo calibration methods
2012-06-13 18:14:20 -05:00
James Cotton
f07e1fc4e1
Separately store initial meta data for accel and mag
2012-06-13 18:09:10 -05: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
James Cotton
fc6f0f5d4d
Actually disable the 6 point calibration define
2012-06-13 14:52:34 -05:00
James Cotton
28b967689f
Remove some debugging output from configTaskWidget. In the case of the sensor
...
calibration which doesn't have any fields associated this caused a null pointer
crash and wasn't useful anyway.
2012-06-13 13:22:39 -05:00
James Cotton
d94ab30616
Make sure we don't use null pointers when refreshing the revo sensor bar graphs
2012-06-13 13:19:17 -05:00
James Cotton
7f15e87890
Make revo calibration UI use teh configtaskwidget system
2012-06-13 13:12:46 -05:00
James Cotton
7c8700b4e5
Suppress a warning and fix indentation in configgadgetwidget
2012-06-13 13:01:41 -05:00
James Cotton
49b51163bc
Rename method and UI in revo calibration to fit new uavos and stop referring to
...
things as AHRS
2012-06-13 12:41:21 -05:00
James Cotton
8ded4618ef
Only perform six point calibration on the mag. This code is #ifdef'd out
...
because we might still want the option or need it for factory calibration. I
usually find the accel scale is reproducibly at 0.98.
2012-06-13 12:28:59 -05:00
James Cotton
c9e99295ed
Merge branch 'next' into revo
2012-06-13 00:46:19 -05: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
James Cotton
9218145aa9
Merge remote-tracking branch 'origin/Brian-PipXtreme-V2' into revo
2012-06-12 22:53:30 -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
James Cotton
bfdda0e645
Fix the stabilization expert UI so the label is in the right place
2012-06-12 01:51:57 -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
8b9c7277a6
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:24:37 -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
a029fc4656
Merge branch 'next' into revo
...
Conflicts:
Makefile
2012-06-11 12:05:38 -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
James Cotton
c5a881086a
Fix some slots in config revo calibration
2012-06-11 11:30:16 -05:00
James Cotton
ec64a50ef9
Fix the slot name in map gadget
2012-06-11 11:27:08 -05:00
James Cotton
6d06daa7cd
Fix misnamed slot in the output widget
2012-06-11 11:21:08 -05:00
Sambas
0115c810f3
typo bugfix
2012-06-11 18:48:29 +03:00
Stacey Sheldon
c73cffce59
Merge remote-tracking branch 'op-public/next' into revo-next
...
Conflicts:
Makefile
flight/PiOS/Boards/STM32F4xx_Revolution.h
flight/Revolution/System/inc/pios_config.h
package/Makefile
Fixed CRLF line end clobbering in:
flight/Bootloaders/Revolution/inc/pios_config.h
flight/Modules/OveroSync/inc/overosync.h
flight/Modules/Sensors/inc/sensors.h
flight/PiOS.posix/posix/Libraries/FreeRTOS/Source/tasks.c
flight/PiOS/Boards/STM32F4xx_Revolution.h
flight/PiOS/Common/pios_usb_util.c
flight/PiOS/STM32F4xx/pios_iap.c
flight/PiOS/inc/pios_rfm22b_priv.h
flight/PiOS/inc/pios_usb_util.h
2012-06-10 19:01:11 -04: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
3af9ea9174
In OSG load an airframe model that matches the system settings. This needs to
...
come from a resource file though.
2012-06-08 13:01:50 -05:00
James Cotton
823538dbbb
Forgot the fixed wing follower status
2012-06-08 10:46:40 -05:00
James Cotton
4c3ca17e34
Backport the fixed wing path follower
2012-06-08 10:46:39 -05:00
James Cotton
574ab3fcaa
Make the VtolPathFollower an optional module
...
Note that RTH mode right now checks that throttle control is enabled, but this
should only occur if the system is a VTOL.
2012-06-08 10:46:38 -05:00
James Cotton
d54970a58a
Fix from merging the UAV Trail option
2012-06-08 10:45:13 -05:00
James Cotton
f5b2575c88
Merge branch 'next' into revo
...
Conflicts:
flight/PiOS/Boards/STM32F4xx_Revolution.h
flight/Revolution/System/inc/pios_config.h
package/Makefile
2012-06-07 12:45:06 -05: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
James Cotton
51a6370733
Separate GPS/UAV trails and context menu settings
...
Conflicts:
ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.h
2012-06-07 09:51:11 -05:00
James Cotton
c689bcfb80
Merge remote-tracking branch 'origin/Brian-PipXtreme-V2' into revo
2012-06-07 09:49:18 -05:00
James Cotton
1e041e5788
Merge remote-tracking branch 'origin/next' into revo
2012-06-07 09:49:09 -05:00
Sambas
6330d40215
Separate GPS/UAV trails and context menu settings
2012-06-07 17:46:30 +03: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
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
a*morale
37e5e0d2a2
Fixes a problem in OSX that prevent to use two serial ports with the same displayed name (for example from USB multiple serial adapter)
...
Now serial ports are internally referred using their physName instead of friendName
2012-06-03 20:31:48 +02:00
PT_Dreamer
08040ab5cf
GCS/MapLib - massive cleaning of the plugin
2012-06-03 19:19:00 +01:00
Sambas
978aba4e91
Check if Homelocation is set before calibration
2012-06-03 20:25:17 +03:00
Sambas
75bc00c534
Mag calibration, does this make any sense?
2012-06-03 20:25:05 +03: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
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
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
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
PT_Dreamer
28b754183f
GCS - MapLib change relative waypoint to distance and
...
bearing definition
2012-05-27 21:55:47 +01: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
PT_Dreamer
8fbef19f5b
GCS - Map cleaning
2012-05-26 17:18:55 +01: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
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
Laura Sebesta
423e287494
Added zoom functionality to scopes. There is a minor bias error when zooming with the legends activated.
...
This is due principally to the fact that retreiving the Qt coordinate in the frame
references to a slightly different system from Qwt invTranformation when the
legend is active.
2012-05-25 00:48:58 +03:00
Corvus Corax
435b494b0c
Merge remote branch 'origin/stac/etasv3' into corvuscorax/new_navigation
...
Conflicts:
flight/Revolution/Makefile
shared/uavobjectdefinition/hwsettings.xml
shared/uavobjectdefinition/taskinfo.xml
2012-05-24 18:55:20 +02: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
Laura Sebesta
534559680b
Fixed tiny bug in ChronoPlotData.
2012-05-23 01:18:30 +03: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
Corvus Corax
992e189bcd
added PathAction (again)
2012-05-21 12:10:01 +02:00
Corvus Corax
9dd94f98b6
New UAVObjects for programmable PathPlanner
2012-05-21 12:10:00 +02:00
Corvus Corax
73ccdd0e69
Merge remote branch 'baseorigin/next' into james/testing4
2012-05-21 11:57:02 +02: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
PT_Dreamer
bb7e85cf2c
GCS - Changes to the map lib. Preparatory steps
...
to allow WPs to be defined relative to home.
GPS fed UAV map item is only visible when diagnostics are enabled.
Should make users not be confused by 2 UAVs on screen.
2012-05-17 17:27:08 +01:00
Brian Webb
44a1663eb9
Fixed transparent comm on PipX.
2012-05-16 19:02:53 -07:00
Corvus Corax
80f53b185c
GCS: BITFIELD: Set lists of options hardcoded in uavobjectfield.cpp (can only be "0" or "1" )
2012-05-15 19:40:58 +02:00
Corvus Corax
aa7788d04c
UAVObjects: Bugfixes to BITFIELD type
2012-05-15 19:01:32 +02:00
Corvus Corax
8fc471463d
UAVOBJECTS: On GCS side, handle Mode Bitfield in UAVOBJECT Metadata as a type BITFIELD. This has no effect on flight side, since the serialized form is identical to an UINT8 that's interpreted as a bitfield which is used there, so that can change later if necessary
2012-05-15 18:23:25 +02:00
Corvus Corax
31fd30b108
UABOBJECTS: Made GCS aware of new BITFIELD type in UAVObjects - so far not used by UAVObjectgenerator, but can be used (hardcoded) in metadata objects
2012-05-15 18:22:36 +02:00
Corvus Corax
badf509d1d
UAVObjects: switched around order of update modes to give each bit semantic meaning - important to allow usage of a bitfield type later
2012-05-15 18:21:27 +02: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
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
ec67742ff6
Added configuration of COM ports on PipX.
2012-05-12 13:16:36 -07:00
James Cotton
5a67b8cc29
Add Revolution to the list of board names the DFU knows about so that the open
...
firmware dialog opens in the correct location (useful for devs). Honestly the
DFU should be rearranged so all the board ID information etc is in one location
instead of spread throughout various functions and remapped to various other
constants.
2012-05-12 13:39:40 -05:00
James Cotton
9a32e637e9
Suppress the "plug other devices in" dialog for revo bootloader, at least until
...
we can have other connected devices.
2012-05-12 13:32:48 -05:00
James Cotton
46fc5fa4fb
Create a PathPlannerSettings object and move the PathMode setting to there.
...
Also add a (temporary) field to allow storing some custom paths to select on
the fly. Later will be replaced with some code to fetch from the flash chip.
2012-05-12 13:12:57 -05:00
James Cotton
af63f94da0
OP-107 Make the waypoint editor have the ability to add new waypoints and edit their
...
positions.
2012-05-12 13:12:56 -05:00
James Cotton
d42bdacc46
OP-107 Add the model connected to the waypoints so that the waypoints show up and
...
update when connected
2012-05-12 13:12:56 -05:00
James Cotton
15067b010f
OP-107 New gadget for modifying a list of waypoints
2012-05-12 13:12:56 -05: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
James Cotton
a857530832
Update the MagicWaypoint gadget to use PathDesired instead of PositionDesired
2012-05-09 11:01:20 -05:00
PT_Dreamer
9f1afacdaf
Minor cleaning
2012-05-08 16:22:06 +01:00
James Cotton
37bb2cfb77
Finish getting rid of PositionDesired in favor of PathDesired and add the
...
ability to move the magic waypoint with the transmitter
2012-05-08 02:42:58 -05:00
James Cotton
0f2c41ac5d
Merge branch 'revolution' into navigation
...
Conflicts:
flight/Modules/ManualControl/manualcontrol.c
flight/Project/OpenPilotOSX/OpenPilotOSX.xcodeproj/project.pbxproj
2012-05-07 21:53:10 -05: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
454144f46c
Pairing and saving settings working.
2012-05-06 20:47:21 -07:00
Laura Sebesta
bcc1885785
Added tooltips to beginners stab. tab.
2012-05-06 17:53:43 -04: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
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
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
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
jb
0bca2dbba6
GCS some improvements to the ripping function of the map library.
2012-04-30 14:57:06 +01:00
zedamota
c8655acd2d
Merge remote-tracking branch 'remotes/origin/kenzPT' into PT_ui_fixes
2012-04-27 18:49:17 +01:00
jb
92b9acd6e8
GCS - Added support for map ripping
2012-04-27 15:55:06 +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
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
a1168b6658
Added additional status reporting to PipX config GUI.
2012-04-21 20:47:50 -07:00
Laura Sebesta
d9510a94eb
Fixed firmware file chooser to be a little more intelligent. Especially important for windows users.
...
However, for Mac and Linux, this currently points to a directory relative to the build directory, which is helpful for devs, but not for users.
2012-04-21 22:03:43 -04:00
Brian Webb
eb6f175af4
Fixed metadata settings in object browswer, and removed update mode never from all uavobjects that used it (changed to manual).
2012-04-21 11:59:14 -07:00
Laura Sebesta
79940287dc
Import UAV objects config gadget UI upgrades. Fixed table selectability, and progress bar.
2012-04-20 08:56:51 -04:00
Laura Sebesta
48d018f9bb
Fixed [cm] vs. [m] unit discrepencies in PFD and xml files, as per revo update to [m-kg-s] units.
2012-04-20 06:11:44 -04:00
Laura Sebesta
73cafd742c
Changed Help
in help menu from displaying plugins to sending user to Wiki.
2012-04-19 19:10:42 -04:00
Laura Sebesta
0b7b86cd24
Turned off wheel scrolling! Also changed all wheel focus
to strong focus
.
2012-04-19 13:00:20 -04:00
Laura Sebesta
ac76628c84
Moved "Help" and "Export UAV Data..." to HELP menu.
2012-04-19 11:54:43 -04:00
Laura Sebesta
ddf45b79cd
Fixed smartsave button instatiation race condition
2012-04-19 09:42:35 -04:00
Brian Webb
19166cc830
Added UPDATEMODE_THROTTLED to UAVObjects update modes.
2012-04-18 18:47:13 -07:00
Brian Webb
f4164d97bd
Merge remote-tracking branch 'origin/next' into Brian-Metadata-Mods
2012-04-17 19:34:44 -07:00
Brian Webb
a65b073c58
Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2
2012-04-17 17:43:17 -07:00
Brian Webb
16da443405
Added PipX config widget (not complete).
2012-04-17 17:40:24 -07:00
Laura Sebesta
dddbd77a89
Changed all to StrongFocus.
...
Added limits to Ki*ILimit
2012-04-17 18:48:47 -04:00
Laura Sebesta
e143f98793
Fixed steps in spin boxes.
2012-04-17 17:35:48 -04:00
Laura Sebesta
46584209fb
Fixed foxus problems in basic tab.
2012-04-17 17:14:03 -04:00
Laura Sebesta
c6c5e18992
Fixed outputchannelform.ui tab order and tab focus.
2012-04-17 16:32:07 -04:00
Corvus Corax
c5a6ed7486
add missing headers and makefile entries
2012-04-17 16:25:39 +02:00
zedamota
45e34cbae0
Force CC attitude config page refresh on board connection.
2012-04-17 15:19:41 +01:00
zedamota
411c38aebf
Fixes the incompatible message when the GIT tag has a leading zero.
2012-04-17 13:54:41 +01:00
James Cotton
af02eb6517
Merge branch 'sim' into testing
...
Conflicts:
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
2012-04-14 14:40:43 -05:00
Brian Webb
4936cd8fd2
Added PipXStatus and PipXSettings UAVObjects and added support the sending/receiving UAVTalk objects on the PipX.
2012-04-10 20:22:53 -07:00
James Cotton
26b73e3c8b
Add path navigation mode to guidance. Works well in simulation.
2012-04-10 01:48:03 -05:00
James Cotton
dbcb47e249
Merge branch 'D-Lite/ubx-parser' into revolution_ubx
2012-04-09 17:34:34 -05:00
Werner Backes
56108b5381
Introduced GPSVelocity UAVObject
2012-04-09 22:59:38 +02:00
Brian Webb
5542d7c995
Updated configvehicletypewidget.cpp with metadata mods.
2012-04-05 18:50:47 -07:00
Dmitry Zaitsev
34b8564864
add emulated sonar output
...
40 degree beam, hardcoded.
2012-04-04 01:22:34 +04:00
James Cotton
33874402ea
Store the mag node in the viewer widget
2012-04-03 09:17:56 -05:00
James Cotton
f4bd5a1c71
Add a camera tracker mode (on by default) and make the rotation apply in the
...
right coordinate system.
2012-04-03 09:17:56 -05:00
James Cotton
49d37a8382
Get rid of annoying black box around border of screen and use multithreading
...
for rendering.
2012-04-03 09:17:56 -05:00
James Cotton
86ac80e2f2
Add form to the OsgEarthView widget
2012-04-03 09:17:56 -05:00
James Cotton
c8d5a61316
Move the OSG logic into a standalone gadget instead of the widget gadget. This
...
will allow using the UI forms. Fixed the issues with requiring a popout. Also
the osgEarth takes LLA in the order long, lat, alt whereas our code takes lat,
long, alt. This was causing the NED frame to be rotated 90 degrees.
2012-04-03 09:17:56 -05:00
James Cotton
e804de0a7a
Get the attitude in there although there might be some convention problems on
...
the rotation
2012-04-03 09:17:56 -05:00
James Cotton
b2b44bd23b
Render the model in earth
2012-04-03 09:17:56 -05:00
James Cotton
19111dacd2
Get the Osg Earth View plugin stub working
2012-04-03 09:17:55 -05:00
James Cotton
b67a74a400
Import stub for the Osg Earthview Plugin
2012-04-03 09:17:55 -05:00
James Cotton
84040d25b4
Add attitudesimulated object to capture the simulated state
2012-04-03 09:16:30 -05:00
James Cotton
cd5fad2ae9
Update the map to set locations with the home location representation
2012-04-03 03:42:34 -05:00
James Cotton
3eac69e953
Create stub for waypoint navigation
2012-04-03 03:42:32 -05:00
James Cotton
56af74d17c
Fix map to work with the new HomeLocation (no ECEF)
2012-04-03 03:42:30 -05:00
James Cotton
a9aa6b696b
Add object for setting the fusion algorithm
2012-04-03 03:42:24 -05:00
James Cotton
1911c7360d
New NEDPosition object which is the transformed GPS location
2012-04-03 03:42:24 -05:00
Brian Webb
df0a1c2ac1
Upgraded Brian-Metadata-Mods to current next.
2012-04-01 12:25:13 -07:00
Brian Webb
496a323b7f
Fixed indentaion.
2012-03-31 07:59:44 -07:00
Laura Sebesta
6461b91f18
Removed commented code, as per reviewer comments. Made other small reviewer requested changes. Fixed bug with capitalization.
2012-03-29 00:54:11 -04:00
Kenn Sebesta
90e4686d70
Typo correction in airframe UI. Minor GUI upgrades to Input.
2012-03-26 11:49:10 -04:00
Laura Sebesta
ad499c8946
Removed extraneous configccpmwidget.h and configccpmwidget.cpp.
2012-03-25 18:42:32 -04:00
Laura Sebesta
88a46f9062
Merge GroundVehicle into latest next
2012-03-25 12:21:58 -04:00
Sambas
4c6ee740e2
Merge remote-tracking branch 'remotes/origin/james/revolution' into osd_test_v1
2012-03-25 14:28:25 +03:00
James Cotton
f3de06bd0f
For some reason leaving this tab on the second tab by default (while not
...
correct) causes crashes which is bad.
2012-03-23 00:56:46 -05:00
James Cotton
56233e262b
Remove unnecessary decimals for roll/pitch/yaw rates.
2012-03-22 11:35:29 -05:00
James Cotton
c7ff2a46c7
Merge remote-tracking branch 'origin/laurent/modelview' into revolution
...
Conflicts:
flight/CopterControl/Makefile
ground/openpilotgcs/src/plugins/config/config.pro
ground/openpilotgcs/src/plugins/config/configgadgetwidget.h
2012-03-22 02:58:24 -05:00
James Cotton
6cb3abec80
Allow firmware compiled for 0x902 to be downloaded to 0x901
2012-03-22 00:42:23 -05:00
James Cotton
1eaf6f66fb
Rename one of the boxes in the runnindevicewidget.ui to avoid warnings.
2012-03-22 00:42:22 -05:00
James Cotton
6350ec575e
Merge remote-tracking branch 'origin/os/features/stick-deadband-next' into next
...
Conflicts:
ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
2012-03-21 16:03:40 -05:00
zedamota
4e6114d095
Merge remote-tracking branch 'remotes/origin/laurent/modelview' into next
2012-03-20 23:20:20 +00:00
Laurent Ribon
299f9fd5d3
Comment the line "VERSION = 2.2.0"
2012-03-20 00:10:31 +01:00
Laurent Ribon
b36be73ffb
Add the possibility to set VBO usage when running.(No restart required)
...
Change Zoomm sensibility (made it more sensitive)
Remobe unecessary state variable :
- load Error
- init failed (An OpenGL init failed cause a Crash)
2012-03-19 20:41:28 +01:00
Laurent Ribon
081769fb7b
Make method setVboEnable not inline.
...
There is more stuf to do.
2012-03-19 20:38:21 +01:00
Brian Webb
aba3789d87
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into Brian-Metadata-Mods
2012-03-18 13:28:11 -07:00
Laurent Ribon
75d1f74090
Modify the modelview gadget widget in order to make it work with the
...
latest vesrion of GLC_lib and Qt4.8
2012-03-14 20:03:39 +01:00
Laurent Ribon
a636abef43
Activate Modelview plugin with QT4.8
2012-03-14 19:57:50 +01:00
Laurent Ribon
5eeafa227c
Replace GLC_lib OpenPilot version to the latest GLC_lib version.
2012-03-14 19:57:11 +01:00
banigreyling
761924e855
Made the config look-and-feel more consistent according to the stabilization panel
2012-03-11 18:56:43 +02:00
banigreyling
02b0da9b33
Made the config look-and-feel more consistent according to the stabilization panel
2012-03-11 17:21:12 +02:00
Sambas
742f3ff24d
Merge remote-tracking branch 'remotes/origin/james/revolution' into osd_test
...
Conflicts:
ground/openpilotgcs/src/plugins/scope/scopegadgetwidget.cpp
2012-03-11 09:39:51 +02:00
Sambas
ccf5c310c9
Updates
2012-03-11 09:27:38 +02:00
Stacey Sheldon
5060ad311b
gcs: remove reference to obsolete ui_ahrs.h file
2012-03-10 14:52:32 -05:00
banigreyling
909083c124
Input panel changes
2012-03-10 20:50:14 +02:00
Dmitry Zaitsev
933dfa8609
GCSReciver: fix UI and increase number of channels
2012-03-10 06:00:00 +04:00
Dmitry Zaitsev
3a5b0c2329
plugins: add hitlv2 in build tree
2012-03-10 05:56:56 +04:00
Dmitry Zaitsev
c68af6de78
HITL: initial commit
...
plugin for simulator: https://github.com/hhrhhr/Aerosim-plugin-for-CopterControl
2012-03-10 05:56:07 +04:00
Sambas
91a9e45888
Updates, first UAVtalk client test
2012-03-05 19:53:52 +02:00
James Cotton
11e7f58b63
Merge remote-tracking branch 'origin/os/features/pid-tuning-from-transmitter-next' into next
2012-03-05 00:18:17 -06:00
James Cotton
f20e5da9ed
Merge branch 'next' into revolution
...
Conflicts:
ground/openpilotgcs/src/plugins/config/config.pro
ground/openpilotgcs/src/plugins/config/configrevowidget.h
ground/openpilotgcs/src/plugins/scope/scopegadgetwidget.cpp
2012-03-03 11:41:41 -06:00
James Cotton
3c92e1cbcf
Set the grahpicssystem to "raster" in the code after the reported performance
...
benefits. This can be overriden on the commandline with -graphicssystem
2012-03-02 18:14:23 -06:00
zedamota
6d004f06f5
Merge branch 'next' of ssh://git.openpilot.org:22/OpenPilot into next
2012-03-02 18:48:11 +00:00
zedamota
05ef028f9d
GCS - Make the save/apply operation result icons disappear when the form contents changes.
2012-03-02 18:47:24 +00:00
James Cotton
21699a3fce
Set the grahpicssystem to "raster" in the code after the reported performance
...
benefits. This can be overriden on the commandline with -graphicssystem
2012-02-29 22:22:43 -06:00
zedamota
37975dc00a
GCS-Fixes new stabilization controls decimal places
2012-02-29 18:28:26 +00:00
David Ankers
d38a173bed
Bug: Spinbox for PitchRateKp was linked to the wrong UAVObject
2012-02-26 16:40:08 +11:00
Dmytro Poplavskiy
3d05256a36
Welcome page UI tweaks
...
To make it closer to proposed design.
* Aligned the background OP logo to the bottom-right corner
* Don't upscale the OP logo
* Fixed width of community panel
* Changed the vertical layout of icons and community panel
* Fixed color of community panel titles
* Use styled text for next containing &,
this fixes rendering but "..." are not displayed
2012-02-25 20:17:55 +11:00
Corvus Corax
a16c392bc6
Change to GLC Lib to make it compile on Linux with QT 4.8.0.
2012-02-24 14:28:48 +01:00
Oleg Semyonov
2271b95816
Merge remote branch 'origin/next' into os/features/stick-deadband-next
...
Conflicts:
ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
ground/openpilotgcs/src/plugins/config/configtaskwidget.cpp
ground/openpilotgcs/src/plugins/config/configtaskwidget.h
2012-02-23 08:32:27 +02:00
Oleg Semyonov
e62cc8914c
Merge remote branch 'origin/next' into os/features/pid-tuning-from-transmitter-next
...
Conflicts:
flight/CopterControl/Makefile
ground/openpilotgcs/src/plugins/config/config.pro
ground/openpilotgcs/src/plugins/config/configtaskwidget.cpp
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
shared/uavobjectdefinition/hwsettings.xml
2012-02-22 23:03:17 +02:00
Brian Webb
aea5374be9
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into Metadata-Mods
2012-02-20 19:11:23 -07:00
Brian Webb
43f6458f86
Reduced the sizeof the UAVObject metadata by:
...
1) Combining all binary or mode values into a single byte
2) Adding accessor functions to read/write the flag bits
3) Reduced the size of the time values from 32 bits to 16 bits
2012-02-20 18:45:18 -07:00
David Ankers
709c985b17
Update to Dado's work on the Stab UI
2012-02-21 03:53:00 +11:00
David Ankers
4a0d101f12
Start adding Dado's artwork and GUI changes
2012-02-19 18:05:33 +11:00
David Ankers
f6303b80a5
Constructor was called directly, GCC 4.6.1 on X64 Linux was not a fan
...
This fixes the build
2012-02-19 14:44:49 +11:00
David Ankers
d79eea0468
Use new icons for welcome plugin
2012-02-19 14:18:32 +11:00
David Ankers
0a352e179a
Add Steve's new icons
2012-02-19 13:12:27 +11:00
zedamota
6fdec3364a
Merge branch 'next' of ssh://git.openpilot.org:22/OpenPilot into next
2012-02-18 20:38:22 +00:00
zedamota
91e3ee13fd
Fix input and output configuration layout issues.
2012-02-18 20:37:30 +00:00
zedamota
949785d212
Fixes shadow widgets values not being refreshed if master widget default value is equal the the UAVObj field value.
2012-02-18 16:58:10 +00:00
Sambas
4dd91d08c2
Settings, home arrow tests & other updates
2012-02-18 12:38:50 +02:00
David Ankers
80715fbec3
Update Plist info for Mac
2012-02-18 08:38:01 +11:00
James Cotton
fbb0b1173a
More work from Kenz to improve the matlab parser
2012-02-16 04:24:10 -06:00
Oleg Semyonov
b02b64ece9
Change to GLC_lib to make it compile on Windows with Qt 4.8.0
2012-02-16 01:17:56 +02:00
James Cotton
32b156b686
Update dependencies on the Util gadget relating to the Settings gadget. Fixes
...
clean build.
2012-02-14 18:16:00 -06:00
James Cotton
68836b4a48
Disable ModelView with linux-g++-64 since it causes segfaults
2012-02-14 16:25:35 -06:00
David Ankers
688f3d9c84
Merge branch 'welcome' into next
2012-02-15 07:59:20 +11:00
James Cotton
7c65bcc5ac
Merge remote-tracking branch 'origin/pt/gcs_uavobj_widget_framework' into next
2012-02-14 14:24:23 -06:00
James Cotton
03d12915af
Merge remote-tracking branch 'origin/os/features/better-version-info-and-uav-export' into next
2012-02-14 13:39:00 -06:00
James Cotton
af189cc0ab
Merge remote-tracking branch 'origin/remote/origin/banig/ScopeChanges' into next
2012-02-14 13:24:49 -06:00
James Cotton
bb89b82865
Merge branch 'next' into GCS_QML_Dmytro
2012-02-14 12:35:14 -06:00
James Cotton
fea4accb07
Patch from Kenz to suppress warnings about unknown object IDs until end of
...
parsing
2012-02-13 16:36:05 -06:00
James Cotton
81ceb9c17a
Precompute CRC table in a global constant. Also if datasize for unknown object
...
is > 256 ignore it since corrupt data.
2012-02-13 16:27:44 -06:00
James Cotton
c111e26958
Patch from Kenz to suppress warnings about unknown object IDs until end of
...
parsing
2012-02-13 14:55:44 -06:00
Oleg Semyonov
a01e38c277
Merge remote branch 'origin/master' into os/features/pid-tuning-from-transmitter
...
Conflicts:
ground/openpilotgcs/src/plugins/config/configgadget.qrc
2012-02-13 11:51:00 +02:00
zedamota
855cc0f663
Fixes the BT telemetry not working on non windows OSs.
2012-02-12 17:27:26 +00:00
James Cotton
34ca5777dd
Kalman filter for altitude
2012-02-11 21:08:19 -06:00
zedamota
74108e200b
Merge branch 'next' of ssh://git.openpilot.org:22/OpenPilot into pt/gcs_uavobj_widget_framework
...
Conflicts:
ground/openpilotgcs/src/plugins/config/config_cc_hw_widget.cpp
ground/openpilotgcs/src/plugins/config/configstabilizationwidget.cpp
ground/openpilotgcs/src/plugins/config/configstabilizationwidget.h
ground/openpilotgcs/src/plugins/config/stabilization.ui
2012-02-11 22:29:03 +00:00
zedamota
aea1e45de7
Added some documentation to the new framework
2012-02-11 21:38:27 +00:00
zedamota
1da2cf5166
Added support for multiple instances objects.
2012-02-11 18:35:36 +00:00
banig
2aead6a7c6
Made method name more descriptive
2012-02-11 16:17:20 +02:00
banig
8e1a7ae709
Add warning to let user know if Scope refresh interval is quicker than the telemetry data
2012-02-11 15:59:34 +02:00
Dmytro Poplavskiy
e6df2ca6d3
Replaced the welcome page with a QML based one.
...
It's still necessary to replace the mode images with the correct ones.
2012-02-11 10:14:13 +10:00
zedamota
c2d9af1e89
Finished framework and stab config showcase
2012-02-10 16:34:07 +00:00
sambas
81f01a0b96
Merge remote-tracking branch 'remotes/origin/next' into qwt_6.0.1_upgrade
...
Conflicts:
ground/openpilotgcs/src/libs/qwt/src/qwt_global.h
ground/openpilotgcs/src/libs/qwt/src/src.pro
2012-02-10 17:27:23 +02:00
James Cotton
6d6c7cac60
Added CRC calculation to the matlab log parsing
2012-02-10 08:07:51 -06:00
zedamota
4cdf223bff
Added support for multiple apply/save buttons.
...
Added a few useful signals.
2012-02-08 20:15:14 +00:00
James Cotton
d5207c19f0
Fix for accidentally including inssetings back into build
2012-02-08 09:46:51 -06:00
James Cotton
49a03a868b
Merge branch 'altitudehold' into revolution_overo
...
Conflicts:
flight/OpenPilot/UAVObjects.inc
flight/Project/OpenPilotOSX/OpenPilotOSX.xcodeproj/project.pbxproj
flight/Revolution/Makefile
flight/Revolution/ins.c
2012-02-07 23:00:29 -06:00
zedamota
5cfd763f2a
Bug fixes and showcase UI setup (partial).
2012-02-07 20:29:32 +00:00
zedamota
e2c6a9d58a
Added Dado's UI.
...
Several scale bug fixes.
Added lots of debug info, will clean later.
2012-02-06 17:33:54 +00:00
James Cotton
dbcb499d7f
Add object to monitor the overo link status. Current just records the bytes/s
...
being sent and the connected status (based on sending more than 500 bytes per
second)
2012-02-06 09:37:31 -06:00
Corvus Corax
b4a8eda8db
Merge branch 'corvuscorax/Smoothed_Scope' into next
...
Conflicts:
ground/openpilotgcs/src/plugins/scope/scopegadgetwidget.cpp
2012-02-06 16:35:13 +01:00
zedamota
35c5391d53
Corrected file headers
2012-02-05 20:07:19 +00:00
sambas
a263ee7885
unix:!mac should solve all problems
2012-02-05 21:45:47 +02:00
zedamota
6d6111b9ac
Moved framework to its own plugin
2012-02-05 18:16:38 +00:00
zedamota
32ebdb63a3
Preparatory commit before moving framework to a better location.
2012-02-05 14:41:23 +00:00
Dmytro Poplavskiy
861b21a18d
Added a QML viewer plugin.
...
UAV objects used in PFD are available in the QMl context.
2012-02-05 22:33:14 +10:00
Dmytro Poplavskiy
aead288304
Generate properties for UAVDataObject fields.
...
Also changed UAVObject::requestUpdate() and UAVObject::update() to be slots.
This makes possible to use objects directly from QML.
2012-02-05 13:58:17 +10:00
zedamota
427acee559
Added support for objects value limits on the GCS to the GCS and generator.
2012-02-03 20:29:28 +00:00
zedamota
4c1e33b0b3
WIP configtaskwidget enhancements.
2012-02-02 16:22:40 +00:00
sambas
fedc62b6c3
OPReview-159: Linux posix timer thing fix
2012-02-02 16:34:46 +02:00
David Ankers
213a915f67
Remove flightplanner screen
2012-02-01 20:09:43 +11:00
James Cotton
bd77b7e5a2
Fix stupid commit on my part. Thanks for heads up brian.
2012-01-31 19:26:48 -06:00
James Cotton
eaf9a4bded
Merge branch 'master' into next
...
Conflicts:
ground/openpilotgcs/src/plugins/config/cc_hw_settings.ui
2012-01-31 17:30:05 -06:00
James Cotton
c69717edd8
DOS2UNIX cc_hw_settings.ui to make merge work
2012-01-31 17:29:29 -06:00
James Cotton
72be7bb809
Don't use usleep for the poor windows kiddies.
2012-01-31 16:32:15 -06:00
James Cotton
7990d209a8
Fix package deployment script for OSX to make sure the SVG pixmap shows up
2012-01-31 14:48:24 -06:00
James Cotton
a2979125b7
Remove the hardcoded .svg from the QLabel and load it dynamically. This will
...
be useful for CC3D.
2012-01-31 14:47:56 -06:00
James Cotton
318354a115
Fix resizing issue with input wizard
2012-01-31 13:31:14 -06:00
James Cotton
d07b386beb
Revert "made the input wizard background transparent"
...
This reverts commit c5a2afcc2c
.
2012-01-31 13:09:01 -06:00
James Cotton
3a66f70eae
Input config: Increase the delay after detecting a channel to ask for next one
2012-01-31 11:25:18 -06:00
James Cotton
e3f89eb958
Input config: Increase the delay after detecting a channel to ask for next one
2012-01-31 11:24:19 -06:00
David Ankers
a5ffdb7306
Merge branch 'master' into next
2012-01-31 05:32:49 +11:00
Oleg Semyonov
369629ad34
Add "Reset To Defaults" button to Stabilization configuration tab
...
Also add tootips to Reset/Apply/Save buttons.
2012-01-31 04:44:54 +11:00
Oleg Semyonov
911f8fde03
Add "Reset To Defaults" button to Stabilization configuration tab
...
Also add tootips to Reset/Apply/Save buttons.
2012-01-31 04:27:59 +11:00
zedamota
01c910cd2b
OP-616 Fixes wrong HW version being displayed.
2012-01-29 21:49:11 +00:00
David Ankers
6c030482a5
Fix 64 bit compile
2012-01-30 04:51:11 +11:00
Stacey Sheldon
f5e9a9365c
gcs config: fix case on revo config gadget includes
2012-01-28 21:00:15 -05:00
zedamota
c5a2afcc2c
made the input wizard background transparent
2012-01-29 10:28:24 +11:00
zedamota
3d896ffaf5
Fixes scopegadget loading issues with Qt versions > 4.7.4
2012-01-29 10:25:07 +11:00
naiiawah
fdcea01100
numberOfDevices could be left unitialized if sendData or receiveData
...
fail in findDevices or if no one ever calls findDevices. Added init of
var.
2012-01-28 15:12:27 -07:00
zedamota
f6d747d5f0
Fixes scopegadget failure to load with Qt versions > 4.7.4
2012-01-28 22:07:45 +00:00
zedamota
e1d471dc63
Fixes scopegadget loading issues with Qt versions > 4.7.4
2012-01-28 21:25:38 +00:00
zedamota
81fea31b34
made the input wizard background transparent
2012-01-27 17:54:14 +00:00
zedamota
242bfe6c69
added new Transmitter artwork to the input wizard.
2012-01-25 20:29:40 -06:00
James Cotton
3ab40b713e
Add exception to allow uploading firmware for 0x402 boards to 0x401 boards
2012-01-24 16:58:56 -06:00
zedamota
0609cd56e5
Merge branch 'next' of ssh://git.openpilot.org:22/OpenPilot into next
2012-01-24 22:30:18 +00:00
zedamota
2c4ed09707
added new Transmitter artwork to the input wizard.
2012-01-24 22:29:08 +00:00
James Cotton
4b3dcc4cc2
Make the leveling panel not crash for new gyro/accel objects but still needs
...
tweaking for CC3D.
2012-01-24 16:14:41 -06:00
James Cotton
c242ab8b86
Merge branch 'next' into revolution3
...
Conflicts:
flight/AHRS/ahrs.c
flight/AHRS/pios_board.c
flight/Bootloaders/Revolution/Makefile
flight/CopterControl/System/pios_board.c
flight/INS/pios_board.c
flight/OpenPilot/Makefile
flight/OpenPilot/System/openpilot.c
flight/OpenPilot/System/pios_board.c
flight/PiOS/Boards/STM32103CB_CC_Rev1.h
flight/PiOS/Boards/STM32F4xx_Revolution.h
flight/Revolution/Makefile
flight/Revolution/System/inc/pios_config.h
flight/Revolution/test.c
2012-01-24 10:46:35 -06:00
Oleg Semyonov
f7ac0b2645
Merge remote branch 'origin/master' into next
2012-01-24 17:27:34 +02:00
Oleg Semyonov
da650cee60
gcscontrol: keep joystick image aspect ratio
...
OP-619
2012-01-24 11:31:00 +02:00
James Cotton
c84240e485
Merge branch 'next' into revolution3
...
Conflicts:
flight/PiOS/STM32F10x/pios_bmp085.c
flight/PiOS/STM32F10x/pios_exti.c
2012-01-23 06:51:30 -06:00
James Cotton
7b69cebe04
Merge branch 'master' into next
2012-01-23 06:07:31 -06:00
James Cotton
bb0bfe0ae4
Merge branch 'next' into revolution3
...
Conflicts:
flight/Bootloaders/CopterControl/Makefile
flight/Bootloaders/PipXtreme/Makefile
flight/Bootloaders/Revolution/inc/pios_config.h
flight/CopterControl/Makefile
flight/INS/inc/pios_config.h
flight/Libraries/taskmonitor.c
flight/Modules/Altitude/altitude.c
flight/Modules/Attitude/attitude.c
flight/OpenPilot/Makefile
flight/OpenPilot/Makefile.posix
flight/OpenPilot/System/inc/pios_usb_board_data.h
flight/OpenPilot/System/inc/taskmonitor.h
flight/OpenPilot/System/pios_board.c
flight/OpenPilot/System/taskmonitor.c
flight/PiOS/Boards/STM32F4xx_Revolution.h
flight/PiOS/STM32F4xx/pios_bmp085.c
flight/PiOS/STM32F4xx/pios_iap.c
flight/PiOS/pios.h
flight/Revolution/System/inc/pios_config.h
flight/Revolution/System/inc/taskmonitor.h
flight/Revolution/System/taskmonitor.c
ground/openpilotgcs/src/plugins/serialconnection/serialplugin.cpp
shared/uavobjectdefinition/systemalarms.xml
shared/uavobjectdefinition/taskinfo.xml
2012-01-21 11:27:03 -06:00
Oleg Semyonov
9006dd558f
gcscontrol: code style formatting and cleanup
2012-01-21 00:55:21 +02:00
Oleg Semyonov
7d15cbd720
gcscontrol: new joystick image with active stick area
2012-01-21 00:55:08 +02:00
Oleg Semyonov
5a2119b896
Add stick deadband option to the config GUI
2012-01-15 21:16:57 +02:00
Oleg Semyonov
5be5fe7aa6
ConfigTaskWidget: floating point scale in addUAVObjectToWidgetRelation()
...
This is required to map object field value range [0-1] to widget field
value range [0-100] (in percents).
2012-01-15 21:13:21 +02:00
Oleg Semyonov
91ba89eece
ConfigTaskWidget: add QDoubleSpinBox to addUAVObjectToWidgetRelation()
2012-01-15 21:13:19 +02:00
Oleg Semyonov
13cee28ead
ConfigInputWidget: fix getting enum options from UAVO field
...
Should not use known field order to get UAVO field. This breaks
a widget after adding any float field to the object since after
sorting this field will have index 0 and shift other fields.
This fix should have some runtime checks to make sure the field
was really found, but it should be fixed through the whole GCS
code in a separate cleanup.
2012-01-15 21:13:18 +02:00
Oleg Semyonov
873ff617ab
Improve UAVObjects export and import file formats
...
Changed file format to be able to save settings and data together.
Old settings files still can be imported. Data export will also contain
settings, so we always have the system settings with the system state.
Sample file:
<!DOCTYPE UAVObjects>
<uavobjects>
<version>
...
</version>
<data>
<object id="0xC409985A" name="AccessoryDesired">
<field values="0" name="AccessoryVal"/>
</object>
...
</data>
<settings>
<object id="0xF2875746" name="ActuatorSettings">
...
</settings>
</uavobjects>
2012-01-15 18:37:57 +02:00
Oleg Semyonov
421cf89544
Fix device info struct fields and variable names, better version info messages
...
- fixed deviceDescriptorStruct field names
(gitTag->gitHash, buildDate->gitDate, description->gitTag);
- fixed variable names
(onBoardDescrition->onBoardDescription, LoadedDescrition->LoadedDescription);
- version info in exported UAV files looks now like this:
<version>
<hardware revision="1" serial="51ff6b064883545366621987" type="4"/>
<firmware tag="master" date="20120104 17:51" hash="14ee6e4f"/>
<gcs tag="os/features/version-info" date="20120115 12:57" hash="236fae56"/>
</version>
2012-01-15 18:37:42 +02:00
Oleg Semyonov
5c20f1e37d
ConfigTaskWidget: add some qDebug() statements for unhandled widget types
2012-01-15 00:34:23 +02:00
Oleg Semyonov
4fcd0f97c5
ConfigTaskWidget: add QDoubleSpinBox to addUAVObjectToWidgetRelation()
2012-01-15 00:34:22 +02:00
Oleg Semyonov
6444d6b3f6
TxPID: add module configuration GUI
2012-01-15 00:34:20 +02:00
Oleg Semyonov
99e73a4ae9
Merge branch 'master' into os/features/pid-tuning-from-transmitter
2012-01-14 23:38:21 +02:00
Michael Rumpler
1b314ee256
* cleaned up notifyplugin
...
cause:
/projects/OpenPilot/git/ground/openpilotgcs/src/plugins/notify/notifyplugin.cpp:104:6:
warning: unused parameter ‘configInfo’ [-Wunused-parameter]
/projects/OpenPilot/git/ground/openpilotgcs/src/plugins/notify/notifyplugin.cpp:353:6:
warning: unused parameter ‘values’ [-Wunused-parameter]
/projects/OpenPilot/git/ground/openpilotgcs/src/plugins/notify/notifypluginoptionspage.cpp:73:10:
warning: unused parameter ‘parent’ [-Wunused-parameter]
/projects/OpenPilot/git/ground/openpilotgcs/src/plugins/notify/notifypluginoptionspage.cpp:451:6:
warning: unused parameter ‘rangeStr’ [-Wunused-parameter]
/projects/OpenPilot/git/ground/openpilotgcs/src/plugins/notify/notifypluginoptionspage.cpp:512:7:
warning: unused parameter ‘oldstate’ [-Wunused-parameter]
/projects/OpenPilot/git/ground/openpilotgcs/src/plugins/notify/notifypluginoptionspage.cpp:527:6:
warning: unused parameter ‘deselected’ [-Wunused-parameter]
implemented solution:
fixed all of them (commented out var name)
* fixed bug in check code
cause:
/projects/OpenPilot/git/ground/openpilotgcs/src/plugins/notify/notifyplugin.cpp:
In member function ‘void SoundNotifyPlugin::checkNotificationRule(NotificationItem*, UAVObject*)’:
/projects/OpenPilot/git/ground/openpilotgcs/src/plugins/notify/notifyplugin.cpp:398:109:
warning: suggest parentheses around comparison in operand of ‘|’ [-Wparentheses]
implemented solution:
this is an obvious bug that is syntactically correct but leads to a
warning with a good compiler so this bug can be found. fixed that to use
logical or instead of bitwise or.
* fixed bug in include file (error in compilation under Linux)
cause:
In file included from
/projects/OpenPilot/git/ground/openpilotgcs/src/plugins/notify/notifypluginoptionspage.cpp:47:0:
/projects/OpenPilot/git/ground/openpilotgcs/src/plugins/notify/notifytablemodel.h:86:39:
error: reference ‘_list’ cannot be declared ‘mutable’ [-fpermissive]
implemented solution:
removed the mutable flag, as this is wrongly used on a reference (and
therefore correctly causing a compile-time error
2012-01-11 22:16:26 +01:00
zedamota
63bb2874d7
OP-608
...
Camera Stabilization settings not being read from CC board into GCS if CC is started first.
Created connection callback only to be called after all plugins are loaded.
2012-01-10 17:03:58 +00:00
zedamota
dbd9fcda28
OpenPilot OP-611
...
disable Flash button during operation
2012-01-09 16:53:59 +00:00
zedamota
00cb66ae79
OpenPilot OP-602
...
Please add a Help button on the Firmware page
2012-01-09 16:35:35 +00:00
zedamota
38392ee638
several fixes to the notify plugin
2012-01-09 16:09:50 +00:00
zedamota
9f2b71a351
Convert filename to lowercase
2012-01-09 14:06:27 +00:00
zedamota
553dab50fb
Merge branch 'notify-plugin-merged' into next
...
Conflicts:
ground/openpilotgcs/share/openpilotgcs/sounds/default/minus.wav
2012-01-09 14:02:04 +00:00
sambas
dd26e7c80f
qwt 6.0.1 upgrade, sadly doesn't fix QT-4.8.0 scopeplugin in windows.
2012-01-08 12:13:51 +02:00
James Cotton
534453e028
Delete unused gadget an references to unused objects
2012-01-04 21:11:31 -06:00
James Cotton
12e879ced9
Merge branch 'master' into next
2012-01-04 11:54:27 -06:00
James Cotton
14ee6e4fb5
When configuring a heli transmitter instruct the user to disable throttle hold.
2012-01-04 11:51:16 -06:00
James Cotton
82d91d9830
Talked PT into a simpler firmware mismatch warning in exchange for more
...
photoshop.
2012-01-04 11:51:12 -06:00
Stacey Sheldon
025ed0f43c
Merge remote-tracking branch 'origin/stac/usb-composite-device-v2' into next
...
Conflicts:
HISTORY.txt
2012-01-03 00:02:45 -05:00
Stacey Sheldon
4fd40ca0d2
gcs uploader: add support for "Safe Boot" to the GCS uploader
...
When halted in the bootloader or while rescuing a board, the
user can press the "Safe Boot" button in the uploader gadget
to force the FW to boot with a default hwsettings configuration.
The default conditions of the hwsettings uavo will disable all
optional modules, disable all serial port config, and ensure that
the board can communicate via the USB HID telemetry interface.
Once booted in this mode, a user can easily reconfigure the
hwsettings uavo through the config GUI and save the fixed
settings to the board to be used on the next reboot. No need
to wipe all settings just to recover from a non-functional
HW config.
NOTE: The GCS needs to grow some very clear visual clues to
indicate when the board has booted in safe mode. The
firmware helpfully raises a (new) critical alarm called
BootFault whenever it boots in safe mode.
2012-01-02 14:27:07 -05:00
James Cotton
1b6ff0e470
Merge remote-tracking branch 'origin/os/features/advanced-camera-stabilization' into next
2012-01-02 11:38:27 -06:00
James Cotton
a2b067e4d5
Fix GUI bug for the GCS controller
2012-01-02 09:19:50 -06:00
Oleg Semyonov
77a459af5c
Merge remote branch 'origin/next' into os/TxPID-module
2012-01-02 14:49:54 +02:00
Oleg Semyonov
e9ffa9d03a
CameraStab: move defaults button to the right
2012-01-02 14:27:12 +02:00
Oleg Semyonov
6e09d61d87
CameraStab: fix button tooltips
2012-01-02 14:27:10 +02:00
Oleg Semyonov
f62330fefe
CameraStab: add tooltips to all configuration settings
2012-01-02 14:27:08 +02:00
Oleg Semyonov
595c0978b3
CameraStab: add "Reset To Defaults" button
...
This loads the default settings (except output channels) to the GUI page
but does not apply them automatically. User can apply/save them or
reload current values from the board using UAVObjBrowser.
2012-01-02 14:27:07 +02:00
Oleg Semyonov
b01e332e03
CameraStab: rename UAVO field
2012-01-02 14:27:05 +02:00
Oleg Semyonov
9c35570df6
CameraStab: add advanced camera settings to the config GUI
2012-01-02 14:27:03 +02:00
James Cotton
21714911e8
Convert log files to structure of array instead of array of struct from Kenz
2012-01-01 13:19:07 -06:00
James Cotton
ef05cafaca
Merge branch 'revolution' into altitudehold
...
Conflicts:
flight/Libraries/insgps13state.c
flight/OpenPilot/Makefile
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
2012-01-01 10:50:35 -06:00
Stacey Sheldon
d43258f2fb
gcs uavtalk: improve readability of debug logging
2012-01-01 09:24:22 -05:00
Stacey Sheldon
5c0921e92c
fault: add optional fault insertion module
...
This module and its associated settings uavo can be used
to test various fault conditions during initialization.
To enable the module, add the TEST_FAULTS=YES to your make
command line:
make fw_coptercontrol TEST_FAULTS=YES
Once this module is part of your firmware load, you can
enable it in the hwsettings uavo and then select the
type of fault to insert by editing the faultsettings uavo.
On the next reset, the configured fault will be inserted
into the init sequence to allow you to test the boot fault
recovery code.
With a fault inserted, you should see 3 failed boot attempts
followed by a successful (recovery) boot. You will see the
BootFault alarm set to Critical, and the RAM version of your
hwsettings will be reset to defaults. Since the defaults have
all optional modules disabled, the fault module will be out of
the way during the recovery boot.
You can then "Load" the flash version of the hwsettings uavo
in the object browser, disable the Fault module and then "Save"
the hwsettings module back to the board. The next reset will
boot normally without the fault inserted.
2011-12-30 23:05:39 -05:00
Stacey Sheldon
1543a6dbd3
hwsettings: allow disabling of USB telemetry entirely
...
The GCS hwsettings config widget now disallows any
configuration that disables both HID and VCP telemetry
over the USB port.
The firmware will allow it if the UAVObj is set manually.
This allows a mechanism to reduce RAM usage by another
500 more bytes if USB telemetry can be sacrificed in
certain configurations.
2011-12-30 23:05:38 -05:00
Stacey Sheldon
e980bb863f
uavobj browser: add object size to tree display
2011-12-30 23:05:38 -05:00
Stacey Sheldon
bd9f3569db
gcs uavtalk: Add full state-level debug logs
...
These logs are disabled by default, and can be
turned on at compile time by defining:
UAVTALK_DEBUG
at the top of uavtalk.cpp.
These logs proved very helpful in diagnosing a
serial comms issue.
2011-12-30 23:05:37 -05:00
Stacey Sheldon
fa9702db97
gcs serial: fix broken baud rate selection
...
The difference between 56000 and 57600 baud is very
important.
When using a USB to serial adapter that is capable
of synthesizing arbitrary baud rates, these errors
resulted in a completely mismatched/unusable serial
link.
2011-12-30 23:05:37 -05:00
Stacey Sheldon
ad793f0b81
hwsettings: add HID and VCP config to hwsettings gui
2011-12-30 23:05:37 -05:00
Stacey Sheldon
87be56eff7
hwsettings: add support for com-bridge to hwsettings config gui
2011-12-30 23:05:36 -05:00
Stacey Sheldon
458d3467ab
gcs: properly label ttyACM devices in gcs pull-down selector
2011-12-30 23:05:33 -05:00
James Cotton
e34f618d89
Accel fields shouldn't be capitalized in the scope config
2011-12-24 16:15:13 -06:00
James Cotton
902a2baef7
Fix the sign of the bias terms
2011-12-24 16:14:53 -06:00
James Cotton
710f95feeb
Get the 6pt calibration working again for revo
2011-12-24 15:58:12 -06:00
James Cotton
d78d345953
Configuration tab for revo
2011-12-24 14:08:08 -06:00
zedamota
761da06b6f
small fix and some cleaning
2011-12-24 10:37:38 -06:00
zedamota
5e43f85cc4
Make the GCS serial telemetry speed configurable
2011-12-24 10:37:38 -06:00
James Cotton
24af36bba3
Merge remote-tracking branch 'origin/pt/configurable_gcs_serial_speed' into next
2011-12-24 09:50:59 -06:00
Oleg Semyonov
7fbbb0e6af
Merge remote branch 'origin/next' into os/TxPID-module
2011-12-24 15:44:16 +02:00
James Cotton
0024cbaa51
Merge branch 'next' into revolution_sensors
2011-12-18 16:28:30 -06:00
naiiawah
6dcf55c41e
Killed off file that should not have been checked in to Git.
2011-12-18 13:36:49 -07:00
James Cotton
2b5f0bccc6
Merge branch 'next' into revolution_sensors
2011-12-16 15:31:14 -06:00
James Cotton
99201d152a
Patch from Kenn to speed up matlab parsing by preallocating arrays
2011-12-16 15:30:48 -06:00
James Cotton
b56c11d1d9
Merge remote-tracking branch 'origin/stac/logging_fixes' into next
2011-12-16 13:54:49 -06:00
Corvus Corax
716bb8ec56
GCS:Scope: Backward Compatibility: Set Interpolation to minimum (1) when not set in config file
2011-12-15 23:49:01 +01:00
James Cotton
4b6aab0513
Merge remote-tracking branch 'origin/stac/logging_fixes' into revolution_sensors
...
Conflicts:
ground/openpilotgcs/src/plugins/scope/scopegadgetwidget.cpp
2011-12-14 10:38:05 -06:00
James Cotton
9f50391fc5
Merge branch 'next' into revolution_sensors
...
Conflicts:
ground/openpilotgcs/src/plugins/coreplugin/OpenPilotGCS.xml
2011-12-13 20:50:10 -06:00
James Cotton
fc2465675a
Update the config file to no longer point to the old AttitudeRaw object
2011-12-13 20:47:52 -06:00
James Cotton
7776cc529b
Remove the old AHRS configuration gadget
2011-12-13 20:32:43 -06:00
James Cotton
bdc7f762d6
Remove old test class that uses outdated objects (AttitudeRaw)
2011-12-13 20:24:57 -06:00
James Cotton
9143a716cf
Disable HITL until it is update to the new sensor objects
2011-12-13 20:24:09 -06:00
James Cotton
889a84da04
Revert "GCS/ScopePlugin: Allow SoftwareInterpolation of measurement value"
...
This reverts commit 4f485f7d61
.
2011-12-13 11:04:21 -06:00
James Cotton
98ee21ead3
Revert "GCS/Scope: CSV export exports non-interpolated data"
...
This reverts commit 99215458c2
.
2011-12-13 11:04:20 -06:00
James Cotton
bf98fe14c3
Revert "GCS/Scope: Make smooth interpolation (and internal sum) be long term correct despite limited floating point accuracy, but keep constant overhead"
...
This reverts commit 78278683cc
.
2011-12-13 11:04:20 -06:00
James Cotton
40e7bf5c59
Revert "GVS/Scope: Bugfix: Export all known data points into CSV not just one per screen redraw"
...
This reverts commit 2ce3365861
.
2011-12-13 11:04:20 -06:00
dankers
000373b421
Update default linear dials to deluxe
2011-12-14 02:24:25 +11:00
James Cotton
a37a17a4fb
Created a separate Sensor module and Attitude module for revolution
2011-12-12 21:40:39 -06:00
James Cotton
d22e0e66dd
Create separate UAVOs for the sensors.
2011-12-12 13:05:40 -06:00
Corvus Corax
2ce3365861
GVS/Scope: Bugfix: Export all known data points into CSV not just one per screen redraw
2011-12-12 09:48:05 -06:00
Corvus Corax
78278683cc
GCS/Scope: Make smooth interpolation (and internal sum) be long term correct despite limited floating point accuracy, but keep constant overhead
2011-12-12 09:48:05 -06:00
Corvus Corax
99215458c2
GCS/Scope: CSV export exports non-interpolated data
2011-12-12 09:48:05 -06:00
Corvus Corax
4f485f7d61
GCS/ScopePlugin: Allow SoftwareInterpolation of measurement value
2011-12-12 09:48:05 -06:00
James Cotton
33a12d829e
Merge branch 'next' into revolution
...
Conflicts:
flight/PiOS/Common/pios_flashfs_objlist.c
2011-12-11 22:55:54 -06:00
Stacey Sheldon
a19bbb7ea3
csvlog: Do not scale data written to CSV files
...
The autoscaling values used by the scope gadget were
being applied to the raw data being written to the CSV
files. This resulted in the CSV file containing data
that had a variable scale, thus making it useless.
2011-12-10 16:50:51 -05:00
Stacey Sheldon
8c0c39ca53
uavobjgen: Update matlab template to accept a logfile path
...
This makes the generated .m file more generally useful.
2011-12-10 16:50:51 -05:00
James Cotton
bfaed9c7e0
Merge remote-tracking branch 'origin/corvuscorax/Smoothed_Scope' into next
2011-12-10 15:20:25 -06:00
James Cotton
24d6c971e6
These layout sizes work on mac too now.
2011-12-10 12:50:30 -06:00
James Cotton
ffb5bf7a7e
Merge remote-tracking branch 'origin/ccfly/channelformlayout' into next
2011-12-10 11:13:32 -06:00
James Cotton
686d5f2dcf
Merge remote-tracking branch 'origin/naiiawah/OP-595' into next
2011-12-10 11:05:14 -06:00
James Cotton
c9933e78c2
Update to joystick image for gcs controller to be much prettier.
2011-12-10 11:01:34 -06:00
naiiawah
6dc121fda6
Updated fix to preserve assert behavior by adding a check routine that
...
is called before trying to add an item.
2011-12-06 22:20:46 -07:00
zedamota
f18c980c4e
Small bug fix.
...
Added minus.wav witch is a copy of magic.was. "minus" file needed.
2011-12-06 13:13:20 +00:00