1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-03-02 19:29:15 +01:00

1587 Commits

Author SHA1 Message Date
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
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
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
PT_Dreamer
74cd57e8a0 GCS - IFDEFed everything pathplanner related. 2012-08-07 22:03:40 +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
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
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
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
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
PT_Dreamer
352f18bec0 GCS-Allow for more than 1 limit per index 2012-08-02 23:56:02 +01:00
Laura Sebesta
3e23163dde Improved static and update behavior. 2012-08-02 20:21:29 +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
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