1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-13 20:48:42 +01:00
Commit Graph

75 Commits

Author SHA1 Message Date
Corvus Corax
59b50ee84e uncrustification 2014-01-22 18:30:30 +01:00
Fredrik Arvidsson
4cac7d18ac OP-1166 Fixes the maxed out bug and beautifies some gui. 2014-01-21 00:06:20 +01:00
Philippe Renon
d43b220dc0 OP-1122 uncrustified gcs and flight 2014-01-14 22:46:01 +01:00
Philippe Renon
ff8a001a51 Merge remote-tracking branch 'origin/next' into filnet/OP-1122_gcs_waypoint_editor_stabilization
Conflicts:
	ground/openpilotgcs/src/plugins/config/configpipxtremewidget.cpp
	ground/openpilotgcs/src/plugins/uavobjectutil/uavobjectutilmanager.cpp
2014-01-12 16:29:17 +01:00
Philippe Renon
9c7fcbe47c [OP-1105] uncrustified 2014-01-09 21:17:44 +01:00
Philippe Renon
6b3a02c485 [OP-1105] improved handling of missing firmware description in GCS 2014-01-05 18:53:21 +01:00
Philippe Renon
cceb9a363c [OP-1105] improved handling of missing firmware description in GCS 2014-01-05 18:45:57 +01:00
Philippe Renon
df7db8a01a OP-1122 OP-1125 removed spurious qDebug() calls 2013-12-11 23:57:27 +01:00
Corvus Corax
0e8f01baa8 uncrustification for ground/openpilotgcs/src/plugins/uavobjectutil/uavobjectutilplugin.h 2013-11-16 17:34:42 +01:00
Philippe Renon
f85498e7c5 [OP-1085] Qt5.1.1 - a bit of manual uncrustifying 2013-10-24 00:12:35 +02:00
Philippe Renon
a2ba33f28a [OP-835] Qt 5.1.0 - migrated GCS plugins 2013-09-15 23:37:20 +02:00
Corvus Corax
6fdf554d4a Merge branch 'next' into corvuscorax/OP-947_stateestimator-module
Conflicts:
	flight/modules/Attitude/revolution/attitude.c
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
	shared/uavobjectdefinition/attitudesettings.xml
2013-06-06 19:25:54 +02:00
Oleg Semyonov
444431579e OP-770: add/rename some version-info.py template variables 2013-05-25 23:02:29 +02:00
Corvus Corax
9b95af2006 refaktored GPS Sensor UAVObjects 2013-05-22 22:36:23 +02:00
Sexy Pony
900f643bbd Reformat source code with 'make uncrustify_all' run twice. NO CODE CHANGES 2013-05-19 17:37:30 +03:00
Corvus Corax
80caceb984 make uncrustify_all;make uncrustify_all; 2013-05-18 14:17:26 +02:00
Fredrik Arvidsson
361f8397c9 OP-885 Fixed some code formatting issues. 2013-04-14 13:24:07 +02:00
Fredrik Arvidsson
471afde5f8 Merge remote-tracking branch 'origin/next' into thread/OP-885_Update_Boards_Artwork
Conflicts:
	ground/openpilotgcs/share/share.pro
2013-04-14 11:30:40 +02:00
Oleg Semyonov
5bb6b56b4a OP-772: Normalize line endings 2013-04-05 23:46:56 +03:00
Fredrik Arvidsson
a338257b2d OP-885 Added configuration for Zagi 3D model. Changed some rendering attributes and changed the name of Revomini to Revolution. 2013-04-03 19:56:41 +02:00
Philippe Renon
ed83f282a5 OP-834 home location related error reporting improvments and comment
cleanups
2013-02-23 18:35:07 +01:00
Philippe Renon
43786badfa OP-834 fixed bad Q_ASSERT around effective code 2013-02-23 18:35:07 +01:00
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
Alessio Morale
19c95a4f1b OP-798 uavobjectutil/devicedescriptorstruct.h miss a case for 0x903-revomini target 2013-01-11 01:11:06 +01:00
a*morale
903bbffc6b Changed reference to PipXtreme to OPLink on config tab and Firmware tab/OP-750 2012-12-02 13:39:02 +02: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
PT_Dreamer
70d7d16aff GCS-Debug message to understand different uavohash behaviour 2012-10-14 14:52:04 +01: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
Laura Sebesta
a899c87c56 Remove superflous UAVO update call.
Add documentation.

Remove commented code.
2012-09-27 19:21:00 +02:00
Laura Sebesta
09b8980881 Fixed copy-pasta error. 2012-09-27 18:06:48 +02: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
PT_Dreamer
4e08fa548f GCS/Uploader- Added leading zeros to git hash 2012-09-24 11:50:15 +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
PT_Dreamer
ba575edbbc Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
OPReview 248
2012-09-09 12:30:09 +01:00
Stacey Sheldon
d4794d139f 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:46:40 -04: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
Stacey Sheldon
1f1b240b2a Merge remote-tracking branch 'op-public/next' into revo-next
Conflicts:
	shared/uavobjectdefinition/manualcontrolsettings.xml
	shared/uavobjectdefinition/taskinfo.xml
2012-08-20 21:22:02 -04: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
Laura Sebesta
87900043a4 Typo fix. Grammarians will be extreamely glad to complement the OP team now that these errors haved disappeared. 2012-06-17 10:21:58 +03:00
Stacey Sheldon
c73cffce59 Merge remote-tracking branch 'op-public/next' into revo-next
Conflicts:
	Makefile
	flight/PiOS/Boards/STM32F4xx_Revolution.h
	flight/Revolution/System/inc/pios_config.h
	package/Makefile

Fixed CRLF line end clobbering in:
	flight/Bootloaders/Revolution/inc/pios_config.h
	flight/Modules/OveroSync/inc/overosync.h
	flight/Modules/Sensors/inc/sensors.h
	flight/PiOS.posix/posix/Libraries/FreeRTOS/Source/tasks.c
	flight/PiOS/Boards/STM32F4xx_Revolution.h
	flight/PiOS/Common/pios_usb_util.c
	flight/PiOS/STM32F4xx/pios_iap.c
	flight/PiOS/inc/pios_rfm22b_priv.h
	flight/PiOS/inc/pios_usb_util.h
2012-06-10 19:01:11 -04:00
James Cotton
4d75718347 While change the util manager make a few other methods use static accessors. 2012-06-03 18:16:21 -05:00
James Cotton
2d80d59e93 Make the uavobjectutilmanager handle the error condition on saving and not
segfault when a save fails.
2012-06-03 17:41:51 -05:00
James Cotton
33e39713d1 Make GCS aware of revo board number again 2012-05-28 09:34:23 -05:00
James Cotton
8a6073fbaf Merge remote-tracking branch 'revo/revo-next' into testing
Conflicts:
	Makefile
	flight/PiOS.osx/osx/Libraries/FreeRTOS/Source/portable/GCC/Posix/port.c
	flight/PiOS.osx/osx/Libraries/FreeRTOS/Source/task.c
	flight/PiOS.posix/posix/Libraries/FreeRTOS/Source/portable/GCC/Posix/port_posix.c
	flight/PiOS.posix/posix/Libraries/FreeRTOS/Source/tasks.c
	flight/Revolution/Makefile
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
	ground/openpilotgcs/src/plugins/uploader/devicewidget.cpp
	shared/uavobjectdefinition/taskinfo.xml
2012-05-28 09:13:26 -05:00
James Cotton
f1f01f2b4b Fix uploader gadget to not throw warnings when uploading to CC3D. Also added a
different icon to it.  The description is still "CC3D" for "CopterControl".
The whole names/board types/etc really needs centralizing into
devicedescriptorstructure which should become a general class for checking if
firmware is good etc.
2012-05-26 09:46:29 -05:00
Brian Webb
dd02873908 Reverted changed mode. 2012-05-11 17:53:53 -07:00
Brian Webb
1f5dbcf57c Mostly complete PipX configuration GUI. 2012-05-11 17:51:18 -07:00