rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-13 20:48:42 +01:00
Code Issues Releases Activity
8,047 Commits 5 Branches 8 Tags 266 MiB
b6746259c8
Commit Graph

137 Commits

Author SHA1 Message Date
Alessio Morale
f293298118 Merge remote-tracking branch 'origin/revo-fixes' into amorale/revo-merge 
Conflicts:
	flight/Modules/ManualControl/manualcontrol.c
	make/scripts/version-info.py
	package/Makefile.linux
 2013-01-19 20:23:48 +01:00
Fredrik Arvidsson
02ae803a3e OP-690 Changed some texts in information dialog to better describe what the actual problem is. 2012-11-21 07:32:19 +01:00
Fredrik Arvidsson
f1590a4f66 OP-690 Added flight status check on system Reset similar to the check on Halt. Re-factored method to get hold of current FlightStatus UAVO from UAVOManager. 2012-11-19 19:43:38 +01:00
Fredrik Arvidsson
4a16909cb3 OP-690 Show dialog if halt is invoked and the board is armed or arming (not disarmed). 2012-11-18 22:40:05 +01: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
Oleg Semyonov
245e1e36cb Remove extra "Firmware tag" string from "On Device" uploader panel 2012-10-26 22:58:19 +03:00
Oleg Semyonov
721cb16c2b Adopt to the latest release policy 
See http://wiki.openpilot.org/display/Doc/Release+policy
 2012-10-22 23:44:01 +03:00
Oleg Semyonov
5184dc1087 Revert "Temporary fix for build label (until better system is implemented)" 
This reverts commit 5c141d458d.
 2012-10-22 22:52:13 +03:00
Stacey Sheldon
127ca1e7e1 Merge remote-tracking branch 'op-public/next' into revo-next 
Conflicts:
	ground/openpilotgcs/src/plugins/hitl/plugin.pro
	ground/openpilotgcs/src/plugins/hitlnew/fgsimulator.cpp
	ground/openpilotgcs/src/plugins/hitlnew/hitlconfiguration.cpp
	ground/openpilotgcs/src/plugins/hitlnew/hitloptionspage.cpp
	ground/openpilotgcs/src/plugins/hitlnew/hitloptionspage.ui
	ground/openpilotgcs/src/plugins/hitlnew/il2simulator.cpp
	ground/openpilotgcs/src/plugins/hitlnew/simulator.cpp
	ground/openpilotgcs/src/plugins/hitlnew/simulator.h
	ground/openpilotgcs/src/plugins/hitlnew/xplanesimulator.cpp
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
 2012-10-20 13:56:18 -04:00
Oleg Semyonov
5c141d458d Temporary fix for build label (until better system is implemented) 2012-10-16 01:14:12 +03:00
PT_Dreamer
b318861619 GCS-Fix eventloop on the connect board while loop 2012-10-15 19:39:20 +01:00
PT_Dreamer
e43d3dd7db GCS-Show first 4 bytes of uavohash instead of last 4. 2012-10-14 19:32:19 +01:00
PT_Dreamer
d8f99b4096 GCS - Remove test button 2012-10-11 22:33:05 +01:00
zedamota
47f94143b7 GCS- Detect fw bundle presence in a not so ugly way 2012-10-10 16:38:57 +01:00
zedamota
fb27c5d93c GCS-Fw Auto update - Try to fix win build 2012-10-10 16:36:13 +01: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
PT_Dreamer
4ef8b78ff8 GCS-Made autouploader fetch fw from fw bundle 
Fw bundle is built with "make package_resource".
This target is a dependency of the package target but needs testing
on the different systems.
If the bundle is not present the build will not fail and
the wizard will jump the autoupdate page (not working FIXME)
 2012-10-06 23:24:21 +01:00
PT_Dreamer
f6443fc995 Merge branch 'stac/package-opfw-resources' of ssh://git.openpilot.org/OpenPilot into pt/wiz_autoupdate 2012-10-06 19:50:17 +01:00
PT_Dreamer
4e4ed172c1 GCS-Added fw bundle resource to the uploader plugin 2012-10-06 19:46:33 +01:00
PT_Dreamer
a313a54c17 GCS-Added temp resource file containing fw 2012-10-06 01:43:44 +01:00
PT_Dreamer
2c4f50c4f5 GCS-Export uploader functions 2012-10-06 01:40:25 +01:00
PT_Dreamer
8c2a5e9d06 GCS-Uploader Auto update function 
Quick and dirty autoupdate function.
The uploader plugin is in need of a major refactoring to separate the
logic from the UI. This will be on my TODO list.
 2012-10-06 01:35:34 +01:00
David Ankers
7e8aa7079c Make uploader plugin board images looks nicer, spotted by Steve, fixed by 
Steve.
 2012-10-05 17:39:13 +10:00
James Cotton
13cabd2ea4 Merge branch 'next' into revo 
Conflicts:
	flight/PiOS/Common/pios_rfm22b.c
 2012-10-04 16:38:08 -05:00
James Cotton
71e1a14e93 GCS Uploader: Add a backward compatibility condition for RM1 using RM2 firmware 2012-10-02 09:37:55 -05:00
Fredrik Arvidsson
13f10949e8 OP-39 Removed an unnecessary struct declaration. Changed some texts. Removed some empty lines. 2012-10-01 21:50:00 +02:00
Stacey Sheldon
9896a0d416 Merge remote-tracking branch 'op-public/next' into revo-next 
Conflicts:
	ground/openpilotgcs/src/libs/utils/homelocationutil.cpp
	ground/openpilotgcs/src/libs/utils/homelocationutil.h
	ground/openpilotgcs/src/plugins/uavobjectutil/uavobjectutilmanager.cpp
	shared/uavobjectdefinition/taskinfo.xml
 2012-09-27 22:42:44 -04:00
James Cotton
0fa4b062a4 Merge branch 'next' into revo 2012-09-26 00:43:02 -05:00
PT_Dreamer
c8de27cbaf GCS/Uploader Changes acording to review 
Changed template comments.
Added UAVO hash to the GCS help dialog
 2012-09-24 12:17:32 +01:00
PT_Dreamer
0d30138571 GCS-Reduced UAVO hash bytes displayed from 20 to 8 2012-09-18 13:51:44 +01:00
PT_Dreamer
fb073059ad GCS-Use uavo definition hash to check for compatability 
Unfortunately had to change the iap object.
 2012-09-17 17:08:15 +01:00
Stacey Sheldon
754f58c33a Merge remote-tracking branch 'op-public/next' into revo-next 
Conflicts:
	flight/Modules/ManualControl/inc/manualcontrol.h
	flight/Revolution/Makefile.osx
	ground/openpilotgcs/src/plugins/plugins.pro
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
	ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp
	shared/uavobjectdefinition/flightstatus.xml
	shared/uavobjectdefinition/hwsettings.xml
	shared/uavobjectdefinition/manualcontrolsettings.xml
	shared/uavobjectdefinition/taskinfo.xml
 2012-09-16 09:56:35 -04:00
PT_Dreamer
fa2aa81079 First pass on using the uavo hash to check compatability between GCS and FW 2012-09-15 23:02:45 +01: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
PT_Dreamer
c88c4f0fc0 Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 
Conflicts:
	ground/openpilotgcs/src/plugins/config/config.pro
	ground/openpilotgcs/src/plugins/config/configccattitudewidget.cpp
	ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.cpp
	ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.h
 2012-09-14 14:12:16 +01:00
James Cotton
2488b48f50 Merge branch 'usb_fixes' into next 2012-09-11 10:18:45 -05:00
James Cotton
c97e3ddb3d Merge branch 'usb_fixes' into revo-mini 
Conflicts:
	ground/openpilotgcs/src/plugins/rawhid/pjrc_rawhid_mac.cpp
	ground/openpilotgcs/src/plugins/rawhid/rawhid.cpp
 2012-09-10 15:21:27 -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
James Cotton
59dcbf5cb6 GCS OSX: More refinements to the USB code to make it more robust and work for reset/halt. 2012-09-10 02:04:59 -05:00
James Cotton
26ff40b5f3 GCS OSX: Work on how the receive threads are stopped properly 2012-09-09 23:43:38 -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
b84f833287 GCS Uploader: Remove dialog about another board since it's 
not used for any boards now.
 2012-09-08 20:05:07 -05:00
James Cotton
9b7060a491 GCS USB: Increase the max timeout before giving up on stopping the USB threads. 2012-09-08 19:07:14 -05:00
James Cotton
65ef8a59b4 GCS ConnectionManager: Get rid of all the copies of various forms of the names and 
store a handle to the IConnection::device and generate the appropriate names from
consistent functions.
 2012-09-08 15:14:06 -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
Kenz Dale
9ebc32da3d Eliminated several (dozen) compiler warnings. 
Conflicts:

	ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp
 2012-08-23 18:03:17 +02: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
David Ankers
64ab589c1b Fix from Berkely to the Uploader.ui 2012-08-03 06:28:08 +10:00
PT_Dreamer
9ab86f7c7e GCS-Changed "wiki" help buttons to the standard ones. 
Updated the links to tiny links.
 2012-07-29 23:29:39 +01:00
Stacey Sheldon
f5db83bd20 Merge remote-tracking branch 'op-public/next' into revo-next 
Conflicts:
	flight/Libraries/inc/NMEA.h
	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/Modules/PathPlanner/inc/pathplanner.h
	flight/PiOS/STM32F10x/link_STM32103CB_PIPXTREME_sections.ld
	flight/Revolution/System/inc/pios_config.h
	flight/Revolution/UAVObjects.inc
	flight/SimPosix/UAVObjects.inc
	ground/openpilotgcs/src/plugins/hitlv2/aerosimrc/src/qdebughandler.h
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
	shared/uavobjectdefinition/gpsvelocity.xml
 2012-07-22 23:39:37 -04:00