rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-10 20:52:11 +01:00
Code Issues Releases Activity
12,202 Commits 5 Branches 8 Tags
Commit Graph

174 Commits

Author SHA1 Message Date
PT_Dreamer
06e56165c5 GCS-PathPlanner 
Fixes loading path from file.
 2012-10-30 13:48:02 +00:00
Stacey Sheldon
5aa3777078 Merge remote-tracking branch 'op-public/next' into revo-next 
Conflicts:
	flight/Modules/Telemetry/telemetry.c
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
 2012-10-30 00:41:35 -04:00
Stacey Sheldon
2119067722 Merge remote-tracking branch 'op-revo/james/revo' into revo-next 
Conflicts:
	Makefile
	flight/Modules/Attitude/revolution/attitude.c
	flight/Modules/Battery/battery.c
	flight/Modules/FixedWingPathFollower/fixedwingpathfollower.c
	flight/Modules/GPS/GPS.c
	flight/Modules/ManualControl/inc/manualcontrol.h
	flight/Modules/ManualControl/manualcontrol.c
	flight/Modules/OveroSync/overosync.c
	flight/Modules/PathPlanner/inc/pathplanner.h
	flight/Modules/PathPlanner/pathplanner.c
	flight/Modules/Sensors/sensors.c
	flight/Modules/VtolPathFollower/vtolpathfollower.c
	flight/PiOS/Boards/STM32F4xx_Revolution.h
	flight/PiOS/Boards/pios_board.h
	flight/PiOS/STM32F4xx/library.mk
	flight/PiOS/inc/pios_hmc5883.h
	flight/PiOS/inc/pios_l3gd20.h
	flight/PiOS/inc/pios_rfm22b_priv.h
	flight/Revolution/Makefile
	flight/Revolution/Makefile.osx
	flight/Revolution/System/inc/pios_config.h
	flight/Revolution/UAVObjects.inc
	ground/openpilotgcs/src/libs/utils/coordinateconversions.cpp
	ground/openpilotgcs/src/libs/utils/homelocationutil.cpp
	ground/openpilotgcs/src/libs/utils/homelocationutil.h
	ground/openpilotgcs/src/plugins/config/configrevowidget.cpp
	ground/openpilotgcs/src/plugins/hitlnew/il2simulator.cpp
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
	ground/openpilotgcs/src/plugins/plugins.pro
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
	package/Makefile
	shared/uavobjectdefinition/fixedwingpathfollowersettings.xml
	shared/uavobjectdefinition/fixedwingpathfollowerstatus.xml
	shared/uavobjectdefinition/flightstatus.xml
	shared/uavobjectdefinition/hwsettings.xml
	shared/uavobjectdefinition/manualcontrolsettings.xml
	shared/uavobjectdefinition/pathdesired.xml
	shared/uavobjectdefinition/vtolpathfollowersettings.xml
	shared/uavobjectdefinition/waypoint.xml
 2012-10-30 00:08:43 -04:00
PT_Dreamer
c31f08d350 GCS-PathPlanner 
Fixes and enhancements.
 2012-10-28 16:55:08 +00:00
James Cotton
0c3084b9b1 OPMap: Line got missed in merge 2012-10-10 09:41:44 -05:00
James Cotton
3110678321 Merge branch 'dynamic_uavo_next' into revo 
Conflicts:
	androidgcs/src/org/openpilot/uavtalk/uavobjects/ActuatorSettings.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/AltitudeHoldSettings.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/PipXSettings.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/PipXStatus.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/PositionActual.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/RelayTuning.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
	androidgcs/src/org/openpilot/uavtalk/uavobjects/Waypoint.java
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
 2012-10-10 08:27:11 -05:00
chris pember
ee031fe80d Merge branch 'next' into cp/extraGUIchanges 
Conflicts:
	ground/openpilotgcs/src/plugins/hitlv2/hitlv2optionspage.ui
	ground/openpilotgcs/src/plugins/uavobjectbrowser/uavobjectbrowseroptionspage.ui
 2012-10-07 10:32:21 -07:00
chris pember
1d345d6916 Merge branch 'next' into cp/extraGUIchanges 
Conflicts:
	ground/openpilotgcs/src/plugins/pfdqml/pfdqmlgadgetoptionspage.ui
 2012-10-07 10:20:38 -07:00
chris pember
f6c4b4b57b fixed one last settings page 2012-10-06 02:09:50 -07:00
chris pember
c2641fd21d added scroll areas to all the preference settings screens 2012-10-06 01:55:24 -07:00
PT_Dreamer
29111b3529 GCS-Map fixes 
Find place now works when the user presses enter
Find place goes to zoom level 12.
Don't go to UAV position on HW connect if "follow UAV" mode is not set
 2012-10-04 12:32:30 +01:00
James Cotton
5c13c31c08 Merge branch 'next' into revo 
Conflicts:
	ground/openpilotgcs/src/libs/utils/homelocationutil.cpp
	ground/openpilotgcs/src/libs/utils/homelocationutil.h
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
	ground/openpilotgcs/src/plugins/uavobjectutil/uavobjectutilmanager.cpp
 2012-09-28 01:00:10 -05:00
Laura Sebesta
9ec05d8928 Added dialog to request altitude when settings HomeLocation via the map. 
Fixed bug in setHomeLocation, by which altitude was scaled inappropriately.
 2012-09-27 14:44:26 +02:00
Laura Sebesta
f532f3cda5 Rewrote uavobjectutilmanager.cpp, such that upon UAVO changes it returns com 
Updated homelocationutil to remove references to ECEF and RNE.
 2012-09-27 11:45:59 +02:00
James Cotton
51683ffb65 Merge branch 'next' into revo 
Conflicts:
	ground/openpilotgcs/src/plugins/config/input.ui
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.h
	ground/openpilotgcs/src/plugins/plugins.pro
 2012-09-15 16:31:30 -05:00
James Cotton
386a9d41ef Merge branch 'next' into test2 
Conflicts:
	ground/openpilotgcs/src/plugins/config/configrevowidget.cpp
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
	ground/openpilotgcs/src/plugins/uavobjects/uavobjecttemplate.m
 2012-09-10 14:29:26 -05:00
PT_Dreamer
78a4241ba2 Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 
Conflicts:
	ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configfixedwingwidget.cpp
	ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configgroundvehiclewidget.cpp
	ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp
	ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/vehicleconfig.cpp
	ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
	ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
	ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp
 2012-09-09 13:04:29 +01: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
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
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
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
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
PT_Dreamer
42119f8d67 GCS/OPMap- UAVItem - removed everything that doesn't belong 
on the paint function
 2012-08-19 01:40:05 +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 ca4fbd5102a742132369da9f7a62e3c26423730f.
 2012-08-18 20:09:04 +01:00
Laura Sebesta
ca4fbd5102 Fixed several compile warning complaints. 2012-08-18 14:18:10 +02:00
Laura Sebesta
b7298f890f homeitem.cpp fixed to erase the safe area when turning off ShowSafeArea. 2012-08-18 09:28:30 +02:00
Laura Sebesta
d3daa06713 Improved filtered groundspeed calculation. Now the filtering rise time no longer on the refresh rate. 2012-08-18 09:19:59 +02:00
Kenz Dale
c484dcb1db Corrected mathematics for estimating rate of turn. 2012-08-17 17:26:15 +02:00
Laura Sebesta
7e55b31ca1 Fixed bounding box size. 
Conflicts:

	ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/uavitem.h
 2012-08-17 09:46:35 +02:00
PT_Dreamer
1a22eef491 GCS-Several changes according to review comments 2012-08-11 23:36:00 +01: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
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
Laura Sebesta
3e23163dde Improved static and update behavior. 2012-08-02 20:21:29 +02:00
Kenz Dale
3e4f2e21ce Added context menu for switching UAV text output off. 2012-08-02 19:13:54 +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
Kenz Dale
0874b3db62 Fixed GPS position to include gps heading. 2012-07-30 13:37:56 +02:00
PT_Dreamer
3879baf263 GCS/OPMap-Fixes the jump and error destination number 2012-07-14 20:14:42 +01:00
PT_Dreamer
61dea64a76 GCS/OPMap-Increase several value limits and added 
missing label on the wp editor.
 2012-07-06 23:02:56 +01:00
PT_Dreamer
66ed4552be GCS/OPMap-add apply and cancel buttons to the wp editor 2012-07-06 22:57:20 +01:00
PT_Dreamer
71a35b2dd8 GCS/OPMap-make the waypoint numbers start with 1. 
This is only visual, internal implementation is still zero based
 2012-07-06 21:57:43 +01:00
PT_Dreamer
2fa4afd4a7 GCS/OPMap-Make the wp editor show on wp doubleclick if it is 
already open
 2012-07-05 22:44:39 +01:00
PT_Dreamer
68fba80301 GCS/OPMap-Add remove leg button functionality. 2012-07-05 21:58:23 +01:00
Laura Sebesta
2d94e29fd9 GCS/OPMap-Added dialog box to confirm on clear waypoints. 
Also fixed some indenting.
 2012-07-05 19:53:14 +01:00
PT_Dreamer
8bc83d49a5 GCS/OPMap-Make the overlays opacity user selectable and persistent. 2012-06-29 01:20:38 +01:00
PT_Dreamer
70bdbf49c3 GCS/OPMap- Fixes bad coordinate calculation on home drag. 2012-06-28 20:17:16 +01:00