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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
James Cotton
|
06a6e367b0
|
Merge remote-tracking branch 'origin/hyper/OP-661' into next
|
2012-08-08 13:49:48 -05: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
|
e1ba3d2e63
|
Update the UAVObjects to the version on next. At some point a make script
should generate these and copy from build/uavobjects-synth/java to this
directory automatically.
Also make sure java objects use CamelCase
|
2012-08-06 16:54:54 -05:00 |
|
James Cotton
|
6dd509ded3
|
Make the initial values for enums be the string. Make setValue accept
numerical or string constants for enums. Only returns a string though.
|
2012-08-06 16:54:19 -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
|
cc7eb0f261
|
Make object store with the minimal amount of space and deal with unsigned
values
|
2012-08-06 16:54:18 -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 |
|
James Cotton
|
f6692c07fe
|
AndroidGCS: Clean up some warnings in UAVO templates
|
2012-08-06 01:17:19 -05: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 |
|
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 |
|
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 |
|
PT_Dreamer
|
352f18bec0
|
GCS-Allow for more than 1 limit per index
|
2012-08-02 23:56:02 +01: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 |
|
PT_Dreamer
|
cb26100d65
|
GCS - Dummy commit to see if crucible notices this branch
|
2012-08-02 16:48:37 +01:00 |
|
James Cotton
|
739dc0f984
|
Update the UAVObjects to the version on next. At some point a make script
should generate these and copy from build/uavobjects-synth/java to this
directory automatically.
Also make sure java objects use CamelCase
|
2012-08-02 10:40:39 -05:00 |
|
James Cotton
|
6758d5c598
|
Make the initial values for enums be the string. Make setValue accept
numerical or string constants for enums. Only returns a string though.
|
2012-08-02 10:40:34 -05: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
|
5aa8eb522a
|
Make object store with the minimal amount of space and deal with unsigned
values
|
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 |
|
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 |
|
Ryan Hunter
|
4d257860c8
|
Moved the matlab files to matlab folder for GCS plugin
|
2012-07-31 13:26:35 -05:00 |
|
Werner Backes
|
b8450d4a07
|
Fixed World Magnetic Model to accept altitude in meters instead of kilometers
|
2012-07-31 00:18:10 +02: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 |
|