Richard Flay (Hyper)
|
53e2db3b24
|
Added a backwards-compatible way to specify UAVO field element names and options as lists of child elements of the field element. Added the ability to specify that a field is a clone of another field, just with a different name
|
2012-09-08 14:41:55 +09:30 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
PT_Dreamer
|
3a0ca3c724
|
GCS-ConfigTaskWidget
Fixes the dirty status being wrongly set
|
2012-08-23 16:07:10 +01: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 |
|
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 |
|
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 |
|
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 |
|
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 |
|