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
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
James Cotton
3e6f98b2e8
Update the OSX packaged icons to those from 3rdeyepro / dacat.
2012-08-28 18:32:49 -05:00
James Cotton
57cf7c67a6
AndroidGCS PFD: Properly center image now so it works over multiple sizes.
...
However, it doesn't automatically fill the screen in normal PFD view yet. Specifying the width in pfd.xml directly does fix that but is incorrect.
2012-08-27 11:05:52 -05:00
James Cotton
7b5470dcf2
Merge branch 'android_osg' into revo
...
Conflicts:
androidgcs/AndroidManifest.xml
androidgcs/res/layout/gcs_home.xml
androidgcs/res/values/strings.xml
androidgcs/src/org/openpilot/androidgcs/HomePage.java
2012-08-27 10:03:48 -05:00
James Cotton
e6ccfb9c61
AndroidGCS: Make sure the telemetry sevice checks there is a telemetry task AND it's connected before sending the OPConnected service. Otherwise the objMngr is undefined.
2012-08-27 09:55:23 -05:00
James Cotton
c2e55ecc21
AndroidGCS: Suppress some warnings related to not implementing the STRING uavfield type properly.
2012-08-27 09:55:23 -05:00
James Cotton
89997de1cc
AndroidGCS: Suppress some warnings from Controller.java
2012-08-27 09:55:23 -05:00
James Cotton
882f23b344
AndroidGCS: Clean up some warnings from OsgViewer
2012-08-27 09:55:23 -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
81ddbda972
Sensors: Scope some variables to suppress warnings
2012-08-25 17:30:04 -05:00
James Cotton
a9b48cf1ca
Merge remote-tracking branch 'revo/amorale/revolution_baro_fixes' into revo
2012-08-25 14:55:23 -05:00
a*morale
c696cccff8
Added an option to be able to change the interleave between Pressure and Temperature conversion for the MS5611
...
To enable this option define the PIOS_MS5611_SLOW_TEMP_RATE with the number of Pressure conversion for each Temperature conversion.
2012-08-25 13:04:41 +02:00
a*morale
257b00a400
Fixed a typo on I2C speed for the MS5611
2012-08-25 12:28:25 +02:00
a*morale
789746151a
Fixes the selection of the oversample settings from the pios_ms5611_cfg.oversapling configuration
2012-08-25 11:29:01 +02:00
James Cotton
f37433e280
AndroidGCS OSG: Force inclusion of the 3DS plugin and use a 3DS model. Also include the jpeg and png libraries and plugins to load the textures. However they currently aren't visible.
2012-08-23 11:20:01 -05: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
08bb355749
AndroidGCS OSG: Increase OSG debugging level and try and include osgdb_3ds without success from the git build.
2012-08-22 22:34:20 -05:00
James Cotton
a99b5454eb
Merge remote-tracking branch 'origin/os/CameraStab-use-ConfigTaskWidget' into next
2012-08-22 08:06:34 -05:00
David Ankers
2f168323d2
Default to telem on main port, no reasons against this unless I am being
...
stupid (very possible).
2012-08-22 07:12:47 +10:00
James Cotton
f60a6baf3e
AndroidGCS OSG: Switch to hardcoded quad model instead of cow. The quad file was made from the 3DS models using
...
osgconv --enable-object-cache -s 0.01,0.01,0.01 --simplify 0.1 --smooth ~/Programming/OpenPilot/artwork/3D\ Model/multi/joes_cnc/J14-QT_X.3DS quad.osg
to get teh scaling normal for the screen too.
2012-08-21 15:24:07 -05:00
David Ankers
8d5c1e4253
Change Default GPS protocol to UBX
2012-08-22 05:11:28 +10:00
Oleg Semyonov
ffd5220071
CameraStab UI: some reformatting and comments
2012-08-21 22:09:53 +03:00
a*morale
d8ea84cdf1
Fix output power selection from the configured value at startup
2012-08-21 18:51:45 +02:00
James Cotton
f8804574e8
AndroidGCS OSG: Clean up function API
2012-08-21 11:25:14 -05:00
James Cotton
4dbaa63931
AndroidGCS OSG: Register for attitude updates in the OSG view
2012-08-21 11:09:52 -05:00
James Cotton
b9e20ad0b7
AndroidGCS OSG: Add the OSG view to the main launcher page
2012-08-21 11:02:57 -05:00
James Cotton
616f488c6c
AndroidGCS OSG: Add stub for rotating model
2012-08-21 10:30:20 -05: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
James Cotton
905a81844c
AndroidGCS OSG: Now shows a cow. The model path is hardcoded.
2012-08-21 00:23:04 -05:00
James Cotton
129edf4398
AndroidGCS OSG: Get context showing
2012-08-21 00:04:26 -05:00
James Cotton
34b21bec3c
AndroidGCS: OSG import basic OSG code
2012-08-20 22:56:21 -05:00
Stacey Sheldon
2d0e4944d3
Merge remote-tracking branch 'origin/stac/actuator-task-cpu-optimization' into next
2012-08-20 19:13:39 -04: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
113a759cd9
Merge branch 'next' into revo
2012-08-19 21:22:02 -05: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
PT_Dreamer
42119f8d67
GCS/OPMap- UAVItem - removed everything that doesn't belong
...
on the paint function
2012-08-19 01:40:05 +01:00
Stacey Sheldon
bb26f5118d
Merge remote-tracking branch 'origin/stac/enable-sections-gc-options' into next
2012-08-18 19:12:03 -04: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