1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-04 12:24:11 +01:00
Commit Graph

1478 Commits

Author SHA1 Message Date
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
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
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
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
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
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
PT_Dreamer
1d42b64965 GCS-Kenz arrow and text request - 5$ please 2012-08-01 13:41:22 +01:00
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
James Cotton
9d82538a09 If we set FirmwareIAPObj to update on change then initial object retrieval will
force it to be fetched before emitting the autopilotConnected signal.
2012-07-27 16:16:16 -05:00
James Cotton
6ba8f3ca9e Fix from hyper to catch when multiple object requests stack up 2012-07-27 16:16:12 -05:00
PT_Dreamer
bf6790f554 GCS-Made the changes to vehicleconfig final and reenabled the
system settings update call.
2012-07-27 16:12:15 -05:00
PT_Dreamer
1955e8b842 GCS-Comment out the updated statements on vehicleconfig.cpp
TODO check if this brings other problems. REVERT commit if it does
2012-07-27 16:12:12 -05:00
PT_Dreamer
4003cd70a8 GCS-Made rate Kd roll and pitch link when checkbox is checked. 2012-07-27 09:13:53 -05:00
James Cotton
0ed5b84ee9 Move the try catch when parsing overo files 2012-07-25 14:41:10 -05:00
James Cotton
41f80eb34f Disable offset nulling while performing GCS mag calibration. 2012-07-25 11:26:37 -05:00
James Cotton
d1e6dcc2f0 First pass implementation of William Premerlani's magnetometer bias correction 2012-07-25 11:07:40 -05:00
James Cotton
82219d2511 Make matlab log processing support overo UAVtalk packets now 2012-07-24 14:08:14 -05:00
Oleg Semyonov
0c092970ca Merge remote-tracking branch 'origin/os/aerosimrc-update' into next 2012-07-22 14:35:11 +03:00
James Cotton
93faf131b0 Merge branch 'next' into revo
Conflicts:
	flight/Modules/GPS/GPS.c
	flight/Modules/GPS/NMEA.c
	flight/Modules/GPS/UBX.c
	flight/Modules/GPS/inc/NMEA.h
	flight/Modules/GPS/inc/UBX.h
	flight/Revolution/System/inc/pios_config.h
	flight/Revolution/UAVObjects.inc
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
	ground/openpilotgcs/src/plugins/waypointeditor/waypointeditorplugin.h
	shared/uavobjectdefinition/gpsvelocity.xml
2012-07-22 00:43:19 -05:00
James Cotton
e239424ddd Fix some typos in the GCS calibration 2012-07-21 15:12:45 -05:00
Oleg Semyonov
c3791532b8 AeroSimRC: fix spelling in imported sources (thanks Jose) 2012-07-21 21:32:59 +03:00
Stacey Sheldon
eafd525323 Merge remote-tracking branch 'origin/D-Lite/ubx-parser-next' into next 2012-07-21 14:22:10 -04:00
James Cotton
6eb0fd2b3b Validate the mag and accel calibration before setting to prevent block NAN on
the FC side.
2012-07-21 12:13:20 -05:00
Oleg Semyonov
c80e5a2bc9 AeroSimRC: (bugfix) replace non-standard _copysign() by copysign() 2012-07-20 23:13:41 +03:00
Oleg Semyonov
fc18749d1a AeroSimRC: resemble the AeroSIM-RC directory in build/ground
... to make easier to copy plugin files into AeroSimRC folder.
2012-07-20 17:53:21 +03:00
James Cotton
7492d34d25 Merge branch 'overo_control' into revo 2012-07-19 08:35:39 -05:00
James Cotton
5ebd368b18 Merge branch 'next' into revo
Conflicts:
	flight/PiOS/STM32F10x/link_STM32103CB_PIPXTREME_sections.ld
2012-07-19 08:35:30 -05:00
Oleg Semyonov
58de9dbd47 AeroSimRC: import the simulator plugin (proxy) source into the GCS tree
Original location is:
  git@github.com:hhrhhr/Aerosim-plugin-for-CopterControl.git
2012-07-19 12:47:03 +03:00
Oleg Semyonov
9e33751df3 AeroSimRC: add copyright and license comments to HITLv2 plugin 2012-07-19 12:40:28 +03:00
David
86d6724739 Change the wording to be less harsh 2012-07-19 07:04:09 +10:00
David
707f63b884 Change the wording to be less harsh 2012-07-19 07:02:49 +10:00
James Cotton
be892e236d Merge remote-tracking branch 'origin/rghunter/udp_control' into next 2012-07-18 12:43:17 -05:00
Mike LaBranche
9507a79c6d MultiRotor Config, Bugfix: include TriYaw channel in getChannelDescriptions 2012-07-16 17:01:51 -05:00
Mike LaBranche
9f67e24ee5 MultiRotor Config, Bugfix: include TriYaw channel in getChannelDescriptions 2012-07-16 17:01:39 -05:00
James Cotton
719772c98a Merge remote-tracking branch 'origin/Brian-PipXtreme-V2' into next 2012-07-16 11:42:29 -05:00
James Cotton
de2cee1b7f Merge remote-tracking branch 'origin/pt/haltfixes' 2012-07-16 11:27:46 -05:00
James Cotton
6b101d71af Merge remote-tracking branch 'origin/Brian-PipXtreme-V2' into revo 2012-07-15 12:32:35 -05:00
James Cotton
3e44389fa8 Merge remote-tracking branch 'origin/pt/haltfixes' into next 2012-07-15 11:23:57 -05:00
PT_Dreamer
3879baf263 GCS/OPMap-Fixes the jump and error destination number 2012-07-14 20:14:42 +01:00
James Cotton
5f337afb36 Add a setting to determine when the overo module logs 2012-07-14 09:21:38 -05:00
James Cotton
d150fd5331 Merge branch 'next' into revo
Conflicts:
	flight/Modules/ManualControl/manualcontrol.c
	ground/openpilotgcs/src/plugins/config/input.ui
	ground/openpilotgcs/src/plugins/uavtalk/telemetry.cpp
	shared/uavobjectdefinition/manualcontrolsettings.xml
2012-07-13 10:40:14 -05:00
Oleg Semyonov
1d1915d2be GCS Input widget: make RC inputs the default tab 2012-07-13 01:55:00 +03:00
Kenz Dale
bc87319a03 Minor int vs. unsigned int bugfix. 2012-07-12 14:41:41 +02:00
Kenz Dale
8c252f4474 Fixed bug in throttle. Slightly reworked UDP config page. Added comments to matlab file. 2012-07-12 14:39:36 +02:00
Brian Webb
3fabdb9963 Fixed conflicted merge with origin/next. 2012-07-11 19:25:05 -07:00
Oleg Semyonov
cfb8d24941 GCS Input widget: make RC inputs the default tab 2012-07-12 01:41:24 +03:00
James Cotton
53be9e5fdb Merge remote-tracking branch 'origin/dwillis/OP-646' into next
Conflicts:
	ground/openpilotgcs/src/plugins/systemhealth/systemhealthgadgetwidget.cpp
2012-07-11 13:10:02 -05:00
Werner Backes
f1b846593f Fixed line endings 2012-07-10 11:40:55 +02:00
Werner Backes
6751a4cd8b Satellite constellation display shouldn't display satellites with
negative elevation angle.
2012-07-10 11:01:45 +02:00
Werner Backes
0424172398 Better separation between UBX and NMEA parser
Make GPS protocol a user selectable option
Support for UBX protocol on CopterControl
2012-07-10 11:01:41 +02:00
David Willis
37ecfdcf1f Modify to show all alarm descriptions when no specific alarm is clicked on 2012-07-09 23:42:59 +01:00
Kenz Dale
4df81c5f85 UDP Control Plugin. Initial merge for review. 2012-07-09 18:18:57 +02:00
PT_Dreamer
58a9e9a6f7 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next 2012-07-09 15:07:47 +01:00
PT_Dreamer
93f7494930 GCS/USB-Increase USB write timeout, this prevents
PipX from becoming disconnected to the GCS.
TODO:Handle timeouts in a better way
2012-07-09 14:39:17 +01:00
PT_Dreamer
4c9327da7e GCS-Fixes some crashes on hw disconnection. 2012-07-09 00:15:21 +01:00
David Willis
e15615b2e4 Add all new alarm descriptions to resource file. Modify to show OK message and general usage tooltip. 2012-07-08 23:04:39 +01:00
Fredrik Arvidsson
cbb66e5997 OP-642 Fixed meta data state bug. 2012-07-08 16:45:58 +02:00