Stacey Sheldon
9a5ba841cf
Merge remote-tracking branch 'op-public/next' into revo-next
...
Conflicts:
ground/openpilotgcs/src/libs/utils/coordinateconversions.cpp
ground/openpilotgcs/src/plugins/hitlnew/il2simulator.cpp
ground/openpilotgcs/src/plugins/hitlnew/xplanesimulator.cpp
ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.h
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
shared/uavobjectdefinition/pathaction.xml
shared/uavobjectdefinition/waypointactive.xml
2012-09-15 19:55:47 -04:00
PT_Dreamer
fa2aa81079
First pass on using the uavo hash to check compatability between GCS and FW
2012-09-15 23:02:45 +01:00
James Cotton
51683ffb65
Merge branch 'next' into revo
...
Conflicts:
ground/openpilotgcs/src/plugins/config/input.ui
ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.h
ground/openpilotgcs/src/plugins/plugins.pro
2012-09-15 16:31:30 -05:00
chris pember
80c86b0b26
omg I think I fixed the mac spacing,linux and windows tweak test
2012-09-15 12:59:16 -07:00
chris pember
556c8b4464
omg I think I fixed the mac spacing, just checking on windows build now
2012-09-15 12:27:59 -07:00
Fredrik Arvidsson
e3b5727dc1
OP-39 Fixed some layout stuff.
2012-09-15 11:06:19 +02:00
Kevin Vertucio
3236f432b9
Content revisions and updates to SetupWizard plugin
...
Corrected grammar and spelling.
Revised Wizard introduction, multirotor platform descriptions for QuadX, Quad+, Tricopter.
Signed-off-by: Kevin Vertucio <kevin.vertucio@eurorscg.com>
2012-09-14 11:32:09 -04:00
PT_Dreamer
c88c4f0fc0
Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
...
Conflicts:
ground/openpilotgcs/src/plugins/config/config.pro
ground/openpilotgcs/src/plugins/config/configccattitudewidget.cpp
ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.cpp
ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.h
2012-09-14 14:12:16 +01:00
Dmytro Poplavskiy
a8e6f4991b
Added "use OpenGL" option to qml based PFD
2012-09-14 08:50:02 +10:00
Fredrik Arvidsson
463c14bf84
OP-39 Removed the motor max rate calibration steps from the wizard. Hardcoded max rate to 1900 ms for now.
...
Fixed a bug with button enable/disable in the output calibration page.
2012-09-13 23:49:08 +02:00
Fredrik Arvidsson
4a09886e91
Merge branch 'next' into thread/OP-39
...
Conflicts:
ground/openpilotgcs/src/plugins/config/configgadgetwidget.h
ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.cpp
ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.h
2012-09-13 22:11:37 +02:00
PT_Dreamer
9f0ad56745
GCS-Minor cleaning acording to review comments
2012-09-13 16:25:32 +01:00
James Cotton
42213b21f7
Make OSG selection a QMake config option (OSG)
...
To include this module from the command line:
make GCS_QMAKE_OPTS="CONFIG+=OSG" -j7 gcs
2012-09-13 09:46:03 -05:00
James Cotton
69688813b5
GCS Build: Include UAVTalk in SystemHealth dependencies
2012-09-13 09:28:46 -05:00
chris pember
9fbaa4410f
new quick gui fixes branch, changed input form so the checkbox for calibrate is now a button, resized that and the wizard button to not be ginormous. no new functionality added, just desing changes
2012-09-12 19:12:23 -07:00
James Cotton
36242fa70e
Delete file that shouldn't have been committed
2012-09-12 16:06:47 -05:00
PT_Dreamer
abbf858123
Fixes special settings not being saved.
2012-09-12 21:57:49 +01:00
PT_Dreamer
d4cd0a9f89
GCS- Config fix and new copy method for data collections
2012-09-12 13:39:35 +01:00
PT_Dreamer
7b1f9bf14e
Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
2012-09-12 11:10:15 +01:00
PT_Dreamer
c11958c9b6
GCS-Review comments changes
...
Added font mixer curve font size to linux default and wide stylesheets
Change Node class name to MixerNode to ease stylesheet access
Changed language selection to top of the list
2012-09-12 11:09:30 +01:00
James Cotton
223a3473c2
Merge branch 'next' into revo-mini
2012-09-12 02:03:39 -05:00
James Cotton
f9fd2bd1af
Merge branch 'pidt1' into next
2012-09-11 23:39:50 -05:00
David Ankers
a4729ea27c
Changes to default config, make UAVOB fill left side, add logging as it
...
fits on system better, add GPS desplay gadget also.
2012-09-12 07:49:16 +10:00
Fredrik Arvidsson
a5335a0ace
OP-39 Minor fixes
2012-09-11 20:05:07 +02:00
James Cotton
7cb6e71fae
Remove a Q_UNUSED where the parameter doesn't exist.
2012-09-11 10:21:01 -05:00
James Cotton
2488b48f50
Merge branch 'usb_fixes' into next
2012-09-11 10:18:45 -05:00
James Cotton
d74b9c9b9f
Revert changes from Kenn in pjrc_rawhid which conflict with usb cleanup
2012-09-11 10:18:31 -05:00
James Cotton
509e7a2ec1
Merge remote-tracking branch 'origin/hyper/gcs-levelling-fixes' into next
2012-09-11 03:05:47 -05:00
Dmytro Poplavskiy
02c00fabb2
GCS/PFDqml: split the world view to smaller parts
...
Ground and sky is rendered as QML Rectangle with gradients;
Pitch scale and center line are rendered separately from the world
element, so they always fit the maximum texture size.
2012-09-11 15:25:13 +10:00
Dmytro Poplavskiy
288cb40c92
Updated the pfd.svg file
...
compass-band has a hidden vertical square to make the vertical limit.
New IDs:
world-bg (group of sky and ground)
sky (blue part of the world)
ground (orange part of the world)
pitch_scale (the center scale)
world-centerline (the centerline in the center of the world and in
the middle of the sky and ground)
By muralha
2012-09-11 15:22:04 +10:00
Dmytro Poplavskiy
53d8fa4666
Added the border parameter to the svg image provider
...
it's useful to extent the image by 1 pixel sometimes,
so the AA area is not clipped.
2012-09-11 15:19:19 +10:00
Dmytro Poplavskiy
18a9ad3aa8
PFD: split the compass band to parts to fit the texture limit
...
On older graphics cards the texture size limit
may be smaller than the compass band width,
QML downscales the element to fit the texture.
To avoid this, split compass band to tiles.
Added parameter like hslice=2:8 to svg image provider
and SvgElementImage.
2012-09-11 15:16:58 +10:00
Fredrik Arvidsson
7d7d1644bc
OP-39 Fixed disabling of wizard buttons during bias calculation and saving of configuration.
2012-09-10 22:55:02 +02:00
Fredrik Arvidsson
37abf82fc2
OP-39 Added saving as image to the connection diagram dialog.
2012-09-10 22:37:39 +02:00
James Cotton
c97e3ddb3d
Merge branch 'usb_fixes' into revo-mini
...
Conflicts:
ground/openpilotgcs/src/plugins/rawhid/pjrc_rawhid_mac.cpp
ground/openpilotgcs/src/plugins/rawhid/rawhid.cpp
2012-09-10 15:21:27 -05:00
James Cotton
38e9d105aa
Merge branch 'pidt1' into test2
...
Conflicts:
flight/Modules/ManualControl/inc/manualcontrol.h
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
shared/uavobjectdefinition/flightstatus.xml
shared/uavobjectdefinition/hwsettings.xml
shared/uavobjectdefinition/manualcontrolsettings.xml
shared/uavobjectdefinition/taskinfo.xml
2012-09-10 14:37:52 -05:00
James Cotton
386a9d41ef
Merge branch 'next' into test2
...
Conflicts:
ground/openpilotgcs/src/plugins/config/configrevowidget.cpp
ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
ground/openpilotgcs/src/plugins/uavobjects/uavobjecttemplate.m
2012-09-10 14:29:26 -05:00
PT_Dreamer
09f950ff76
GCS Fixes -clean-config command line argument segfault
2012-09-10 19:46:13 +01:00
Richard Flay (Hyper)
5b7fb6bcef
Minor improvement to GCS bias calibration logic, plus minor UI behaviour tweak
2012-09-10 22:22:36 +09:30
James Cotton
59dcbf5cb6
GCS OSX: More refinements to the USB code to make it more robust and work for reset/halt.
2012-09-10 02:04:59 -05:00
James Cotton
e027c25071
OSX USB: Add write and read mutexs to avoid closing mid write.
2012-09-10 00:32:40 -05:00
James Cotton
f8e5654ff4
Remove some comments
2012-09-09 23:45:04 -05:00
James Cotton
26ff40b5f3
GCS OSX: Work on how the receive threads are stopped properly
2012-09-09 23:43:38 -05:00
James Cotton
604e125251
GCS RawHID: Refactor the code to move most of the
...
functionality into one class. Removed support for
multiple open devices since we can just use multiple
classes.
2012-09-09 17:10:50 -05:00
Fredrik Arvidsson
b889035a24
Merge branch 'next' into thread/OP-39
2012-09-09 23:46:39 +02:00
Fredrik Arvidsson
d337fcf1d8
OP-39 Finished up motor/servo calibration, actuator settings.
...
Bug fixes after initial testing end2end testing.
I am making a note here: First successful 1-2-Fly! session ever!
2012-09-09 23:44:42 +02:00
James Cotton
741207ddc0
GCS OSX HID: Tweak the closing so that it doesn't crash. Still fails to unregister
...
the input callback.
2012-09-09 13:03:57 -05:00
James Cotton
8bb6a2600f
GCS Serial: Was double detecting USBCDC devices.
2012-09-09 11:40:14 -05:00
James Cotton
06fc1ed963
GCS USB: More the opening and closing code into the read
...
thread to simplify some threading issues on OSX. Should
not influence other operating systems.
2012-09-09 11:04:52 -05:00
PT_Dreamer
78a4241ba2
Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
...
Conflicts:
ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configfixedwingwidget.cpp
ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configgroundvehiclewidget.cpp
ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp
ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/vehicleconfig.cpp
ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp
2012-09-09 13:04:29 +01:00
PT_Dreamer
ba575edbbc
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
...
OPReview 248
2012-09-09 12:30:09 +01:00
Dmytro Poplavskiy
4cc13c9eea
GCS/PFDqml: use the correct sceneSize for svg element images
...
Pass the element source size instead of the scene source size
to ensure the element is not downscalled.
2012-09-09 16:58:54 +10:00
chris pember
6a94cd49b5
reworked ALL the ui pages in windows so they work there, so pushing this for now, it just needs love in osx
2012-09-08 18:35:14 -07:00
James Cotton
b84f833287
GCS Uploader: Remove dialog about another board since it's
...
not used for any boards now.
2012-09-08 20:05:07 -05:00
James Cotton
44d271ac79
GCS USB: Get rid of some unnecessary code
2012-09-08 20:04:44 -05:00
James Cotton
cf1c986550
OSX USB: Close more handles properly
2012-09-08 19:48:33 -05:00
James Cotton
3f11c398db
GCS USB: Start with polling enabled so it acts like before and grabs first available USB device
2012-09-08 19:46:45 -05:00
James Cotton
1aadcf4e70
GCS USB: Make sure to fully unregister all the callbacks when disconnect.
2012-09-08 19:31:32 -05:00
James Cotton
9b7060a491
GCS USB: Increase the max timeout before giving up on stopping the USB threads.
2012-09-08 19:07:14 -05:00
James Cotton
82f752685a
GCS ConnectionManager: When polling is disabled don't automatically connect to boards either.
2012-09-08 19:06:03 -05:00
James Cotton
2ec8434941
OSX USB: Make sure to store the run loop handle before connecting the signals that can use it.
2012-09-08 16:06:01 -05:00
James Cotton
6840b8934b
GCS ConnectionManager: More cleaner code structure.
2012-09-08 16:05:51 -05:00
James Cotton
8e8cbd0b75
GCS ConnectionManager: Use some cleaner code coventions
2012-09-08 15:45:08 -05:00
James Cotton
19eaa77a15
Remove some comments and unused variables
2012-09-08 15:32:12 -05:00
James Cotton
65ef8a59b4
GCS ConnectionManager: Get rid of all the copies of various forms of the names and
...
store a handle to the IConnection::device and generate the appropriate names from
consistent functions.
2012-09-08 15:14:06 -05:00
James Cotton
1ca8abb3c8
GCS ConnectionManager: Properly check it is the active connection before closing it when a USB device is disconnected.
2012-09-08 14:31:16 -05:00
James Cotton
3563c7376f
GCS ConnectionManager: When plugging in a new device don't glitch the connectionwq
2012-09-08 14:04:59 -05:00
James Cotton
9912432e84
GCS ConnectionManager: Remove some commented code
2012-09-08 13:33:50 -05:00
James Cotton
44e7c4542f
GCS USB: Implement structure for only adding new devices but need a way of
...
identifying them
2012-09-08 13:23:37 -05:00
James Cotton
e5ab9f0fda
GCS ConnectionManager: Consolidate the unregistering and registering devices
...
into one method
2012-09-08 12:53:00 -05:00
James Cotton
e6bcf96e2a
GCS USB: Remove unused include file
2012-09-08 12:47:15 -05:00
Richard Flay (Hyper)
c5745b0817
Fixes/tweaks to GCS levelling code. Fixed a deadlock and take more samples
2012-09-08 15:58:39 +09:30
Fredrik Arvidsson
3a38cb2cc1
OP-39 Added new button graphix.
...
Implemented servo min/max/neutral calibration.
Added check for Actuator module alarm before running calibrarion.
2012-09-07 07:35:43 +02:00
PT_Dreamer
6325263a1d
Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
...
Conflicts:
ground/openpilotgcs/src/plugins/config/configccattitudewidget.cpp
2012-09-06 12:41:08 +01:00
Fredrik Arvidsson
0871cd3db2
OP-39 More Motor and servo calibration code.
2012-09-05 00:58:53 +02:00
James Cotton
2f65fc1e8e
Merge branch 'next' into relay_tuning
...
Conflicts:
shared/uavobjectdefinition/manualcontrolsettings.xml
shared/uavobjectdefinition/taskinfo.xml
2012-09-04 10:43:04 -05:00
Fredrik Arvidsson
51dc691ab8
OP-39 Motor and servo calibration code.
2012-09-04 01:28:28 +02:00
Dmytro Poplavskiy
1102587570
GCS/PFDqml: fixed compass rendering
...
Converted AttitudeActual.Yaw to -180..180 range,
so the whole compass band is always filled
2012-09-03 15:23:51 +10:00
James Cotton
a3b75a3cc7
Merge remote-tracking branch 'origin/kenz/matlab_parser_vectorizing' into next
2012-09-02 19:23:18 -05:00
James Cotton
db083aa0e9
Merge branch 'android' into next
2012-09-02 19:19:23 -05:00
Fredrik Arvidsson
b150375ff5
Merge branch 'next' into thread/OP-39
2012-09-03 01:05:47 +02:00
Fredrik Arvidsson
a44ea92df7
OP-39 Output calibration functionality. Connection diagram updates.
2012-09-03 01:01:57 +02:00
Dmytro Poplavskiy
99b898c5c2
GCS/PFDqml: display the VSI bar
...
updated pfd.svg file with new compass and VSI bar
2012-09-02 13:33:29 +10:00
James Cotton
c9f66f5145
Merge branch 'revo' into revo-mini
...
Conflicts:
androidgcs/AndroidManifest.xml
androidgcs/res/layout/gcs_home.xml
androidgcs/res/values/strings.xml
androidgcs/src/org/openpilot/androidgcs/AttitudeView.java
androidgcs/src/org/openpilot/androidgcs/HomePage.java
flight/PipXtreme/System/pios_board.c
ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp
shared/uavobjectdefinition/taskinfo.xml
2012-09-01 16:57:27 -05:00
James Cotton
2c003d8b0b
PathCompiler: Link up the path compiler to the map again. Got broken in the merge.
2012-09-01 16:50:08 -05:00
James Cotton
6bfb2a5e45
Merge branch 'next' into revo
...
Conflicts:
ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/mapgraphicitem.cpp
ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/mapripper.cpp
ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/waypointitem.cpp
ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/waypointitem.h
ground/openpilotgcs/src/libs/utils/coordinateconversions.cpp
ground/openpilotgcs/src/libs/utils/coordinateconversions.h
ground/openpilotgcs/src/plugins/opmap/opmap.pro
ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.h
ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp
shared/uavobjectdefinition/taskinfo.xml
shared/uavobjectdefinition/waypoint.xml
2012-09-01 16:18:03 -05:00
chris pember
26b682122b
fixed the text on the mixer, need mike or someone to hook up the reverse button for the yaw mixer, as well as change the range on the slider
2012-09-01 11:11:44 -07:00
chris pember
77ea0277d0
made some more adjustments to the stylesheet for osx, sliders in particular
2012-09-01 01:20:51 -07:00
chris pember
704cad9313
fixed up the feed forward tab, as well as renamed advanced to feed forward on the tab
2012-08-31 21:55:10 -07:00
chris pember
777bad5708
fixed the vertical sliders, fixed input/output header spacing over the config sliders, switched around the progress bar in stabi ui, more to come
2012-08-30 23:00:25 -07:00
Fredrik Arvidsson
df987ab57f
OP-39 Connection diagram changes.
...
Fixed a bug levelling util and changed rate from 100ms to 30ms.
2012-08-30 22:13:44 +02:00
James Cotton
60051e88cc
Calibration: Fix both accels and gyros to 30 ms. Should be reasonably sustainable through USB.
2012-08-30 11:38:15 -05:00
Kenz Dale
b9fe954d87
Added simulator support for AirspeedActual UAVO.
2012-08-29 16:28:02 +02:00
Kenz Dale
034b366578
Fixed timer bug in baroAlt.
2012-08-29 16:09:01 +02:00
Kenz Dale
e123a88262
Added UAVO for airspeeds.
2012-08-29 16:04:47 +02:00
Kenz Dale
ff0de79147
Improved default HiTL timer periods for more reactivity.
2012-08-29 14:41:45 +02:00
Kenz Dale
037182f522
Fixed bug which prevented HiTL timers from functioning as intended.
2012-08-29 14:41:23 +02:00
Kenz Dale
f888eaed41
Implemented gcsReceiver.
2012-08-29 14:24:58 +02:00
Kenz Dale
494b3d156e
Fixed bug by which attitude HiTL settings were not taken into account.
2012-08-29 14:23:14 +02:00
Kenz Dale
d9139c6529
Extended HiTL API to the rest of the simulators.
2012-08-29 12:35:46 +02:00
Kenz Dale
cb377e0f1d
Fixed typo, changed some wording to be clearer.
2012-08-29 12:15:27 +02:00
James Cotton
75db9f5941
OP-669: Gyros were not being sent at a rapid rate during calibration making the results quite noisy.
...
Now both accels and gyros require a minimum number of updates before calibration completes.
Thanks to ti.dyer for the report and fix.
2012-08-29 04:29:55 -05:00
chris pember
528cea9418
almost done fixing any spacing isues, changed the font so its bigger, added some new stylesheet properties to linux and osx
2012-08-28 23:27:36 -07:00
James Cotton
3e6f98b2e8
Update the OSX packaged icons to those from 3rdeyepro / dacat.
2012-08-28 18:32:49 -05:00
Fredrik Arvidsson
d647e9d6bb
Merge branch 'thread/OP-39' of ssh://git.openpilot.org/OpenPilot into thread/OP-39
2012-08-28 18:13:35 +02:00
Fredrik Arvidsson
41f2a49bb2
OP-39 Added outputcalibration page to wizard.
2012-08-28 18:11:49 +02:00
Fredrik Arvidsson
955b1f489e
OP-39 Fixed svg file
2012-08-28 16:19:32 +02:00
Fredrik Arvidsson
8c1fbb0352
Merge branch 'next' into thread/OP-39
2012-08-27 21:23:30 +02:00
Fredrik Arvidsson
66534ae91c
OP-39 Fiddling around with connection diagram.
...
Updated some GUI.
Started on motor calibration function.
2012-08-27 07:19:46 +02:00
James Cotton
001c43c090
Increase timeout to shut down the telemetry threads. Might fix some OSX USB related crashes.
2012-08-25 23:44:58 -05:00
Stacey Sheldon
144fea1bd1
gcs: fix pipx-related typos in GCS
...
This also fixes the auto-selecting of FW images for
pipx in the uploader GUI by making the board name
match fw_pipxtreme.
2012-08-25 23:22:56 -05:00
Stacey Sheldon
d4794d139f
gcs: fix pipx-related typos in GCS
...
This also fixes the auto-selecting of FW images for
pipx in the uploader GUI by making the board name
match fw_pipxtreme.
2012-08-25 23:46:40 -04:00
James Cotton
446870d869
TxPID: Set the timeOut to NULL after deleting it. I had a segfault from here.
2012-08-25 19:37:50 -05:00
James Cotton
524540895f
Never ask if there are other devices to enumerate. We don't do that anymore for any active boards.
2012-08-25 19:32:06 -05:00
PT_Dreamer
96e8d668b2
GCS-UI Fixes
...
Fixes rotation of board on hw settings page
Fixes airframe size on airframe settings page
2012-08-24 17:50:28 +01:00
Fredrik Arvidsson
4d701a2f7a
OP-39 Updated some GUI. Changed stylesheet on some elements. Switched button graphix and added new graphix.
2012-08-24 16:22:21 +02:00
Kenz Dale
7c49d47046
Rearranged HiTL preferences layout to make more efficient use of space.
2012-08-24 13:50:26 +02:00
Kenz Dale
00963e3647
Fixed bug where actCommand was unassigned.
...
Added in some additional functionality for appropriately setting update rates.
2012-08-24 13:23:36 +02:00
Kenz Dale
91852e8550
Updated xml file to reflect changes in HiTL.
2012-08-24 13:21:53 +02:00
Fredrik Arvidsson
49bdb731f5
OP-39 Added button for Radio Config Wizard.
...
Cleaned up the GUI, removed all group boxes and aligned components on pages.
Changed place of rapid and default esc buttons.
Set the size of the wizard to a fix size.
Updated some of the texts.
Changed font sizes.
Added resources.
Started the connection diagram implementation.
2012-08-24 00:48:09 +02:00
Fredrik Arvidsson
962fa3958a
Merge branch 'thread/OP-39' of ssh://git.openpilot.org/OpenPilot into thread/OP-39
2012-08-23 18:38:26 +02:00
Fredrik Arvidsson
bc9181ba04
OP-39 Added dialog for the connection diagram.
2012-08-23 18:37:55 +02:00
Kenz Dale
0ff46af74c
Changes requested in review.
...
All cosmetic (removing comments or fixing whitespaces), so does not affect functionality.
2012-08-23 18:10:27 +02:00
Kenz Dale
76b0d3b1da
Redefined isIntermediateValueHelper
as class static.
2012-08-23 18:03:19 +02:00
Kenz Dale
9ebc32da3d
Eliminated several (dozen) compiler warnings.
...
Conflicts:
ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp
2012-08-23 18:03:17 +02:00
Kenz Dale
def4601008
Moved HiTLnew to HiTL.
2012-08-23 17:26:37 +02:00
Kenz Dale
569f3736f9
Removed HiTLv2 sources.
2012-08-23 17:14:47 +02:00
Kenz Dale
05db4c64b1
Got rid of some compiler warnings, and fixed a few whitespaces.
2012-08-23 17:14:21 +02:00
Kenz Dale
05f131fa46
Refactored HiTL to add functionality created by hrrrrr in HiTLv2.
2012-08-23 17:11:20 +02:00
PT_Dreamer
3a0ca3c724
GCS-ConfigTaskWidget
...
Fixes the dirty status being wrongly set
2012-08-23 16:07:10 +01:00
Fredrik Arvidsson
cd0ff804eb
OP-39 Added new graphics for buttons.
...
Added fix trying to handle when config plugin is not loaded in workspace and we are trying to jump to Input Wizard on the end page of the wizard.
2012-08-23 16:28:57 +02:00
Oleg Semyonov
c47c8c373d
Merge remote-tracking branch 'origin/os/CameraStab-use-ConfigTaskWidget' into next
2012-08-23 13:41:34 +03:00
Oleg Semyonov
b946d8162a
CameraStab UI: add comment about reference implementation
2012-08-23 13:39:37 +03:00
Kenz Dale
cf9b04d0ac
Finished port, but still untested.
2012-08-23 10:34:24 +02:00
Laura Sebesta
d4a1fb28c7
Merged HiTLv2 into HiTLnew. AeroSimRC support in HiTLnew is currently untested.
2012-08-23 10:29:58 +02:00
James Cotton
a99b5454eb
Merge remote-tracking branch 'origin/os/CameraStab-use-ConfigTaskWidget' into next
2012-08-22 08:06:34 -05:00
PT_Dreamer
bd913d1333
Merge branch 'dmytro/welcome_page_update' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
2012-08-22 13:29:57 +01:00
Dmytro Poplavskiy
13a10b309a
Fixed segfault when ScrollDecorator is destroyed
...
looks like the qt declarative bug, as a workaround
unset the source componet on destruction.
2012-08-22 09:00:29 +10:00
Fredrik Arvidsson
b804bc4634
Merge branch 'next' into thread/OP-39
2012-08-21 23:18:53 +02:00
Fredrik Arvidsson
8e66133b2d
OP-39 Added reset of stabilization data to default values when wizard writes its configuration.
2012-08-21 23:10:38 +02:00
Oleg Semyonov
ffd5220071
CameraStab UI: some reformatting and comments
2012-08-21 22:09:53 +03:00
PT_Dreamer
8bb94e052b
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
...
Conflicts:
ground/openpilotgcs/src/plugins/config/camerastabilization.ui
ground/openpilotgcs/src/plugins/config/configcamerastabilizationwidget.cpp
ground/openpilotgcs/src/plugins/config/configcamerastabilizationwidget.h
ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp
2012-08-21 17:05:36 +01:00
PT_Dreamer
caecc0e3ff
GCS- Added missing definition to h file. Something went wrong with
...
the merge.
2012-08-21 16:19:55 +01:00
Laura Sebesta
a94142ec30
Fixed several compile warning complaints.
...
Conflicts:
ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/uavitem.cpp
2012-08-21 16:18:58 +01:00
PT_Dreamer
da41a30273
Merge branch 'dmytro/welcome_page_update' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
2012-08-21 14:56:42 +01:00
PT_Dreamer
adba241131
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
...
Conflicts:
ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
2012-08-21 14:51:50 +01:00
PT_Dreamer
fa465c54a8
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
...
Conflicts:
ground/openpilotgcs/src/plugins/config/input.ui
2012-08-21 14:46:16 +01:00
PT_Dreamer
e7a7a30e19
GCS-Created new command line option to allow choosing the config file
...
to use. This is a last resort option to mac problems displaying the
initial dialog.
2012-08-21 14:41:53 +01:00
Stacey Sheldon
1f1b240b2a
Merge remote-tracking branch 'op-public/next' into revo-next
...
Conflicts:
shared/uavobjectdefinition/manualcontrolsettings.xml
shared/uavobjectdefinition/taskinfo.xml
2012-08-20 21:22:02 -04:00
Fredrik Arvidsson
5199d9e738
Merge branch 'next' into thread/OP-39
2012-08-21 01:09:02 +02:00
Fredrik Arvidsson
c483d42937
OP-39 Added mixer and motor configuration for Hexa and Octocopters.
...
Changed so that the Flex port is set to be serial telemetry port by default.
Added some description texts for the different multirotor types.
Fixed disabling/enabling of Cancel and Back buttons during processing like bias calculation and saving of configuration.
Converted summary text to html and added some formatting of the text.
Added message if no controller is connected on saving the configuration.
2012-08-21 01:07:38 +02:00
James Cotton
d58831d3f1
GCS: Add conditial flag to include OGS plugins. Must compile with qmake CONFIG+=OSG
...
To include this module from the command line:
make GCS_QMAKE_OPTS="CONFIG+=OSG" -j7 gcs
2012-08-20 15:36:18 -05:00
PT_Dreamer
0c240cffa5
GCS/OPMap- Change one of the function names to proper camelcase
2012-08-20 16:21:12 +01:00
PT_Dreamer
56b094abab
GCS/OPMap - Changed the date of the license header on both the lib and plugin
2012-08-20 16:10:17 +01:00
James Cotton
4a0d43cb54
GCS: When PipX is detected do not make it the active configuration tab to prevent the dialog about dirty tabs appearing.
...
Conflicts:
ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp
2012-08-19 21:20:18 -05:00
James Cotton
237ec188f9
GCS: When PipX is detected do not make it the active configuration tab to prevent the dialog about dirty tabs appearing.
2012-08-19 21:17:37 -05:00
Fredrik Arvidsson
10b9f00fac
OP-39 Added setting of default flightmodes..
2012-08-20 00:14:17 +02:00
Fredrik Arvidsson
9205400cf0
OP-39 Implemented functionality for reliable writing of UAVOs to controller board.
...
Removed the option to configure the board without having it connected.
Added Tri, QuadX and QuadP configuration code.
Updated some of the texts.
2012-08-19 23:25:50 +02:00
James Cotton
d186069ebd
Update hardcoded OSG paths. Very dirty I need to fix this properly.
2012-08-19 12:48:48 -05:00
PT_Dreamer
84d55ca416
GCS-Added a few overloaded functions so that object and field pointers
...
can be used with confitaskwidget framework
2012-08-19 14:41:57 +01:00
PT_Dreamer
45e21acefd
GCS- Get rid of the double hwsettings update. setData triggers an
...
update so the other functions should be used instead.
MixerSettings should be refactored next.
2012-08-19 14:41:09 +01:00
PT_Dreamer
83097ecffb
GCS/OPMap- bumped up the QPixmap max cache value
2012-08-19 01:43:49 +01:00
PT_Dreamer
42119f8d67
GCS/OPMap- UAVItem - removed everything that doesn't belong
...
on the paint function
2012-08-19 01:40:05 +01:00
PT_Dreamer
4b8bfcb997
GCS/OPMap - Changed several foreach chield methods to signal/slot
2012-08-18 23:04:31 +01:00
PT_Dreamer
2a4c54a073
Revert "Fixed several compile warning complaints."
...
These touch much more than the map lib and plugin so they should
be base on next and sent for review
This reverts commit ca4fbd5102
.
2012-08-18 20:09:04 +01:00
PT_Dreamer
c6706ce6b2
Merge branch 'pt/MapEnhancements' of ssh://git.openpilot.org/OpenPilot into pt/MapEnhancements
...
Conflicts:
ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/uavitem.cpp
2012-08-18 20:01:32 +01:00
Oleg Semyonov
0afd923708
CameraStab UI: more comments to serve as a self-documented code sample
...
Also disabled "module enable" checkbox reload/default actions.
2012-08-18 20:45:05 +03:00
PT_Dreamer
f56b4b8a9b
GCS/MapLib - Switched to a signal slot aproach on several functions which need
...
to be propagated.
2012-08-18 18:07:39 +01:00
Laura Sebesta
ca4fbd5102
Fixed several compile warning complaints.
2012-08-18 14:18:10 +02:00
Laura Sebesta
b7298f890f
homeitem.cpp fixed to erase the safe area when turning off ShowSafeArea.
2012-08-18 09:28:30 +02:00
Laura Sebesta
375ecfb369
Streamlined paint function.
2012-08-18 09:23:09 +02:00
Laura Sebesta
d3daa06713
Improved filtered groundspeed calculation. Now the filtering rise time no longer on the refresh rate.
2012-08-18 09:19:59 +02:00
Laura Sebesta
28f382d472
Disabled dragging and dropping of UAV and Home icons.
2012-08-18 09:15:55 +02:00
Dmytro Poplavskiy
89023e8c41
Welcome page: display tooltips below buttons if necessary
...
Useful on low res screen, to ensure tooltips are visible
2012-08-18 11:30:50 +10:00
Kenz Dale
c484dcb1db
Corrected mathematics for estimating rate of turn.
2012-08-17 17:26:15 +02:00
Kenz Dale
e3a60b7677
Merge branch 'pt/MapEnhancements' of ssh://git.openpilot.org/OpenPilot into pt/MapEnhancements
2012-08-17 16:56:44 +02:00
Laura Sebesta
34efc4d3b7
Dramatic performance gains by turning on caching for homeitem and mapgraphicitem.
2012-08-17 16:47:11 +02:00
Kenz Dale
e648a778db
Enabled caching for map widget.
2012-08-17 11:51:50 +02:00
Laura Sebesta
e52d141e3e
Improved bounding rect dimensioning.
2012-08-17 10:11:45 +02:00
Laura Sebesta
7e55b31ca1
Fixed bounding box size.
...
Conflicts:
ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/uavitem.h
2012-08-17 09:46:35 +02:00
Mike LaBranche
13e631a2e4
ConnectionManager: add connect/reconnect timer management into telemetryconnect/disconnect slots
2012-08-16 21:13:07 -07:00
David Ankers
ca7827e0cd
Monkey work!!
2012-08-17 09:21:46 +10:00
Fredrik Arvidsson
98b5bc305b
OP-39 Re-factored the configuration code to be implemented in a separate helper class to enable it to be used in a better and more stand alone way. The actual wizard class does not contain any uavo configuration code at all now.
...
Added an interface that provides all configuration parameters for a vehicle.
Changed the default ESC to Rapid instead of Default 50Hz. Default ESC was renamed to Legacy ESC.
Started to implement mixer configuration.
Started to implement flight mode configuration code.
Cleaned up some code and removed warnings.
2012-08-17 00:47:31 +02:00
PT_Dreamer
525dec1748
GCS-Added gradient to edit gadgets bar
2012-08-16 23:30:31 +01:00
dwobdar
92114bf952
Fixing white border in aircraft config screen.
2012-08-16 22:19:24 +02:00
PT_Dreamer
af61e983b8
Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
2012-08-16 19:39:07 +01:00
PT_Dreamer
b91afc2c12
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
2012-08-16 19:37:55 +01:00
Laura Sebesta
699b2f3030
Cleaned up variable names, fixed bug in saving whereby the a log file could be saved over if the extension were not "opl".
2012-08-16 08:37:26 +02:00
Fredrik Arvidsson
16d0252d12
OP-39 Added some basic code to reset the mixers. Started to implement mixer configuration for all multirotors.
2012-08-16 00:27:40 +02:00
Laura Sebesta
69133c1427
Further optimized Matlab parsing. It now does most typecast as vectorized operations.
...
The upshot is an approximately 50% performance boost.
2012-08-16 00:13:19 +02:00
PT_Dreamer
57d4aaaf17
GCS-Handle reload for unbounded objects
2012-08-15 22:50:09 +01:00
PT_Dreamer
a78766c7b2
Merge branch 'os/CameraStab-use-ConfigTaskWidget' of ssh://git.openpilot.org/OpenPilot into CameraStab-use-ConfigTaskWidget
2012-08-15 12:52:51 +01:00
PT_Dreamer
93124bbfee
GCS-Fixed reload operation, sorry Oleg
2012-08-15 12:37:00 +01:00
Oleg Semyonov
fd9f1491ba
CameraStab UI: fix spacing and add comments according to OP coding style guidelines
...
More info:
http://wiki.openpilot.org/display/Doc/Coding+Style
http://qt-project.org/wiki/Qt_Coding_Style
2012-08-15 10:31:19 +03:00
PT_Dreamer
d3c5fcfa7e
GCS-Handle reload operation config camera stab
2012-08-15 00:13:26 +01:00
Fredrik Arvidsson
2b541219bf
OP-39 Added condition for multirotor type. If PWM input option is enable only up to Hex is selectable, otherwise Octo is selectable to.
...
Added initial configuration code that applies the users choices in the UAVOs.
Changed order of pages so that Input page comes before vehicle page.
2012-08-15 01:04:54 +02:00
PT_Dreamer
ae962f507b
GCS-Couple of bug fixes and created a new defaultRequested signal
2012-08-14 23:55:53 +01:00
PT_Dreamer
2ddb0e63d2
GCS-Couple of bug fixes and created a new defaultRequested signal
2012-08-14 23:02:08 +01:00
Mike LaBranche
8c3488e220
TelemetryMonitorWidget: add op-131 support for connect/disconnect signals
...
from telemetrymonitor, slots and timers in connectionmanager;
2012-08-14 12:35:53 -07:00
PT_Dreamer
0f8974178a
GCS-Fixes crash if autoLoadWidgets is called after addUAVObject
2012-08-14 18:12:07 +01:00
Oleg Semyonov
64e5ff8e6d
CameraStab UI: rescan widget if changed during UAVObject update
2012-08-14 17:52:44 +03:00
Oleg Semyonov
c8e90a537e
CameraStab UI: use ConfigTaskWidget API to take care of other widgets
2012-08-14 17:15:53 +03:00
Oleg Semyonov
a0977b405b
CameraStab UI: use ConfigTaskWidget API with objrelation dynamic property
...
This supports most of widgets which are directly related to UAVObjects.
2012-08-14 17:12:55 +03:00
Dmytro Poplavskiy
69bd17c6a8
Welcome page: display the scroll decorator
...
To give a hint the news list is scrollable
2012-08-14 23:06:31 +10:00
Dmytro Poplavskiy
81d4fd3740
Updated welcome page to work better on small screen
...
if the buttons grid overlaps vertically with wizard buttons,
move it left to use only the space left to wizard buttons;
Hide the OpenPilot Logo when workspace buttons don't
fir the screen;
Limit the size of community panel on small screen
2012-08-14 22:54:08 +10:00
Dmytro Poplavskiy
31cb4b7ea5
Welcome page: added wizard buttons
...
Not connected to anything yet, may be necessary
to update the workspace names once new workspaces added.
2012-08-14 22:46:35 +10:00
PT_Dreamer
40da558131
GCS-Update the path to the stylesheets on Mac to.
2012-08-13 22:48:45 +01:00
James Cotton
e9a355077f
Look for the default configurations in a platform dependent location,
...
unfortunately.
2012-08-13 22:42:17 +01:00
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
dc5cec8c06
Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
2012-08-12 22:09:04 -07: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
James Cotton
edec288812
Update the config file so the mag scopes selection works
2012-08-13 10:34:55 +10: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
254f98aad5
GCS-Updated configuration file with the latest changes
2012-08-09 22:47:48 +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
James Cotton
7cca5696a2
Merge remote-tracking branch 'origin/pt/boardbased_ui_limits' into next
2012-08-08 14:11:24 -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
James Cotton
06a6e367b0
Merge remote-tracking branch 'origin/hyper/OP-661' into next
2012-08-08 13:49:48 -05: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
4357f092a9
Remove a couple of artifact numbers from the PFD, start work on spacing
...
and layout.
2012-08-03 08:15:57 +10:00
David Ankers
64ab589c1b
Fix from Berkely to the Uploader.ui
2012-08-03 06:28:08 +10:00
David Ankers
38e392d49e
Update status bargraphs, stab mode is no longer hidden. Soem work to go on
...
other SVGs yet but these looks better than they did.
Removed GPS Staus from the top status bar, this will be intergraded in to
the PFD
2012-08-03 05:59:20 +10:00
Laura Sebesta
3e23163dde
Improved static and update behavior.
2012-08-02 20:21:29 +02:00
Fredrik Arvidsson
40d5761a1d
Merge branch 'next' into thread/OP-39
2012-08-02 19:51:36 +02:00
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
Richard Flay (Hyper)
6d34795494
Re-enabled simposix SDCard support, and removed obsolete SDCard alarm usage from System module
2012-08-01 19:53:59 +09:30
PT_Dreamer
af98f4c2a6
GCS- Fixed board rotation being overwriten when calibrating.
2012-08-01 10:12:52 +01:00
PT_Dreamer
faee578010
GCS- Fixes from Dmytro to new PFD qml file.
2012-08-01 09:47:11 +01:00
PT_Dreamer
4f2522cd0a
Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
2012-08-01 09:32:59 +01:00
Mike LaBranche
84c7325eb9
SvgImageProvider signature correction to use utils_global macro QTCREATOR_UTILS_EXPORT
2012-08-01 09:40:33 +10:00
Mike LaBranche
4c3c94eba5
SvgImageProvider signature correction to use utils_global macro QTCREATOR_UTILS_EXPORT
2012-07-31 16:15:58 -07:00
Fredrik Arvidsson
e891cd2dc3
Added some more wizard pages. The basic structure for multirotors is in place.
2012-08-01 00:21:15 +02:00
Ryan Hunter
4d257860c8
Moved the matlab files to matlab folder for GCS plugin
2012-07-31 13:26:35 -05:00
David Ankers
5da204f4b7
Change welcome plugin to use Steve's system icons
2012-08-01 02:51:34 +10:00
David Ankers
67ba889659
Swap icons for firmware and system tabs, matches Steve's icons better and
...
makes more sense
2012-08-01 02:45:15 +10:00
David Ankers
a8fd51985a
Add Steve's system icons for the Welcome Plugin
2012-08-01 02:44:06 +10:00
Fredrik Arvidsson
348cdfaed7
Merge branch 'next' into thread/OP-39
2012-07-31 18:04:58 +02:00
PT_Dreamer
68740940de
Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
...
Conflicts:
ground/openpilotgcs/src/plugins/uavobjectwidgetutils/popupwidget.cpp
2012-07-31 16:17:29 +01:00
Dmytro Poplavskiy
a140c76a6f
Hide terrain related options if compiled without OSG
2012-08-01 00:35:21 +10:00
Dmytro Poplavskiy
ce00c0bc4d
Fixed compilation with OSG enabled
...
trivial .pro file fix
2012-08-01 00:34:25 +10:00
Dmytro Poplavskiy
68652ef643
PFD qml: Load Terrain and World views dynamicaly
...
Moved them to separate qml files
loaded by reqest using Loader.
This allows to keep PFD working even if one of views
can't be loaded and avoids the cost of loading expensive
views like camera.
2012-08-01 00:32:46 +10:00
Dmytro Poplavskiy
4e28a529db
Merge branch 'CC3D_Release' into dmytro/pfd_qml
2012-07-31 23:43:16 +10:00
PT_Dreamer
1f7b95805e
GCS-Added Hyper's fix to glc crashes under certain systems.
2012-07-31 12:18:05 +01:00
David Ankers
f5a2591d81
Correct default paths for qml pfd files
2012-07-31 09:03:24 +10:00
Mike LaBranche
a306b31c9c
Resolve build errors: add Q_DECL_EXPORT to SvgImageProvider;
...
change unsetenv to qputenv.
2012-07-31 08:44:59 +10:00
Mike LaBranche
5cab871ac6
PopupWidget, Bugfix: put the mixer back into the frame at the same size it started from;
...
keeps it from oversetting neighbors when the dialog is closed.
2012-07-31 08:44:34 +10:00
Werner Backes
b8450d4a07
Fixed World Magnetic Model to accept altitude in meters instead of kilometers
2012-07-31 00:18:10 +02:00
Mike LaBranche
5398d96839
PopupWidget: Start the dialog at twice the size of the embedded widget.
2012-07-30 15:02:18 -07:00
Mike LaBranche
6adafbc4bf
PopupWidget, Bugfix: put the mixer back into the frame at the same size it started from;
...
keeps it from oversetting neighbors when the dialog is closed.
2012-07-30 14:45:56 -07:00
Mike LaBranche
b490fdb6e9
Resolve build errors: add Q_DECL_EXPORT to SvgImageProvider;
...
change unsetenv to qputenv.
2012-07-30 14:30:03 -07:00
David Ankers
c93cfc5d50
Fixed qmake copy of qss by borrowing code from Oleg who has a better
...
handle on qmake than I guess I ever will.
2012-07-31 04:11:33 +10:00
David Ankers
f00874efa2
Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
2012-07-31 02:51:55 +10:00
David Ankers
574fbe2fd9
Copy one file at a time with cp
2012-07-31 02:50:41 +10:00
PT_Dreamer
b15091fead
GCS - Made the GCS compile without OSG support
2012-07-30 16:11:36 +01:00
PT_Dreamer
d8c2bb3292
Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
2012-07-30 15:25:59 +01:00
PT_Dreamer
7884b7002e
Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
...
Conflicts:
HISTORY.txt
2012-07-30 15:24:36 +01:00
PT_Dreamer
1927e8bce9
Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
2012-07-30 14:55:24 +01:00
PT_Dreamer
bb66dc9535
GCS- Made the importexport dialog close when GCS closes.
2012-07-30 14:53:57 +01:00
David Ankers
31a788e44e
Change the icon to go to the system page, icon is still wrong but now at
...
least the button works.
2012-07-30 22:28:28 +10:00
David Ankers
0b055d61fd
Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
2012-07-30 22:00:20 +10:00
David Ankers
b997a4a7fe
Make connect button use onclicked() signal rather than onpressed()
2012-07-30 21:58:36 +10:00
Kenz Dale
0874b3db62
Fixed GPS position to include gps heading.
2012-07-30 13:37:56 +02:00
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
Oleg Semyonov
e75a2718f1
Windows packaging: fix MinGW DLL locations for Qt 4.8.1+ (4.8.0 compatible)
2012-07-29 23:59:54 +03:00
David Ankers
ca22b54b86
Change dates on copyright
2012-07-30 06:28:40 +10:00
Oleg Semyonov
fc51680e6c
Windows packaging: fix MinGW DLL locations for Qt 4.8.1+ (4.8.0 compatible)
2012-07-29 23:08:59 +03:00
PT_Dreamer
62bbe208af
GCS-Fixes wrong flight mode settings
2012-07-29 15:10:30 +01:00
PT_Dreamer
4dc5e4580d
Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
...
Conflicts:
ground/openpilotgcs/src/plugins/config/airframe.ui
ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp
ground/openpilotgcs/src/plugins/uavtalk/telemetry.cpp
2012-07-29 14:28:59 +01:00
David Ankers
cc512715b9
Update icon to a better one
2012-07-29 22:25:06 +10:00
Dmytro Poplavskiy
c7b8fe9efd
Moved terrain rendering to background thread
...
osgEarth may block the main thread during network io,
the rendering is moved to OsgEarthItemRenderer
class, running in the bg thread.
May require Qt 4.8.0+ to work correctly.
2012-07-29 22:15:24 +10:00
David Ankers
19b101bc4b
Make a start on the new layout
2012-07-29 21:28:32 +10:00
Dmytro Poplavskiy
9d884ca12c
PFD terrain view: switch between GPS and predefined positions.
2012-07-29 16:05:59 +10:00
Dmytro Poplavskiy
ec3919d2b7
Enabled osgEarth caching
2012-07-29 12:17:10 +10:00
PT_Dreamer
6b84b58bfe
GCS-Moved the wizard and calibration widgets to the stacked widget
...
so that they disapear during the wizard
2012-07-29 00:53:05 +01:00
PT_Dreamer
14b7666c1b
GCS-disabled the reload board data button while it is doing its work.
...
minimized uavo transactions when button is pressed.
2012-07-29 00:44:08 +01:00
PT_Dreamer
4530a13f93
Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
2012-07-28 19:08:28 +01:00
David Ankers
27fca079d8
Change language used per David J's suggestion
2012-07-29 04:07:55 +10:00
PT_Dreamer
5f8c6dc7af
Remove unwanted file
2012-07-28 19:06:54 +01:00
David Ankers
9395df6d2d
Make size of labels consistant
2012-07-29 03:27:51 +10:00
David Ankers
1fca385fc4
Change RPY to Roll,Pitch and Yaw for the mixer on the aircraft screen, as
...
per mikes suggestion
2012-07-29 03:00:17 +10:00
David Ankers
deefe31546
Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into jose5
2012-07-29 01:54:51 +10:00
David Ankers
fef831ec2b
Add stylesheets and ensure they are copied on build
2012-07-29 01:53:45 +10:00
PT_Dreamer
c8e94ed874
Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into CC3D_Release
2012-07-28 15:06:26 +01:00
PT_Dreamer
dc4254d7d8
GCS-Several UI fixes according to beta testers reports.
2012-07-28 15:04:55 +01:00
Dmytro Poplavskiy
999e5e9cc5
Fixed uninitialized terrainEnabled property
2012-07-28 21:00:02 +10:00
David Ankers
83ae672533
Gonfig gadget now gets the whole of the screen.
2012-07-28 17:26:43 +10:00
James Cotton
eae94b2188
Use setField instead of setData in SetConfigData because that doesn't trigger a
...
transaction immediately before the smartSaveButton tries to trigger one.
2012-07-28 00:00:50 -05:00
James Cotton
bd3ebe5b61
Undo the previous patch to abort transactions if one is pending, but throw a
...
warning still
2012-07-27 21:09:58 -05:00
James Cotton
cddabf76cf
Remove some debugging output that was a bit verbose
2012-07-27 21:09:58 -05:00
James Cotton
542483beec
Rephrase "SUCCESS: Mixer saved ok" to Configuration OK since it does not
...
reflect if the save succeeded and the button does.
2012-07-27 21:09:58 -05:00