rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-03-04 21:29:16 +01:00
Code Issues Releases Activity
6,777 Commits 5 Branches 8 Tags
Commit Graph

134 Commits

Author SHA1 Message Date
James Cotton
38e9d105aa Merge branch 'pidt1' into test2 
Conflicts:
	flight/Modules/ManualControl/inc/manualcontrol.h
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
	shared/uavobjectdefinition/flightstatus.xml
	shared/uavobjectdefinition/hwsettings.xml
	shared/uavobjectdefinition/manualcontrolsettings.xml
	shared/uavobjectdefinition/taskinfo.xml
 2012-09-10 14:37:52 -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
2f65fc1e8e Merge branch 'next' into relay_tuning 
Conflicts:
	shared/uavobjectdefinition/manualcontrolsettings.xml
	shared/uavobjectdefinition/taskinfo.xml
 2012-09-04 10:43:04 -05:00
James Cotton
a3b75a3cc7 Merge remote-tracking branch 'origin/kenz/matlab_parser_vectorizing' into next 2012-09-02 19:23:18 -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
PT_Dreamer
fa465c54a8 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next 
Conflicts:
	ground/openpilotgcs/src/plugins/config/input.ui
 2012-08-21 14:46:16 +01:00
Laura Sebesta
699b2f3030 Cleaned up variable names, fixed bug in saving whereby the a log file could be saved over if the extension were not "opl". 2012-08-16 08:37:26 +02:00
Laura Sebesta
69133c1427 Further optimized Matlab parsing. It now does most typecast as vectorized operations. 
The upshot is an approximately 50% performance boost.
 2012-08-16 00:13:19 +02: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
James Cotton
9ce7d9b4ac Add UAVOs for relay tuning 2012-08-03 09:37:44 -05:00
PT_Dreamer
352f18bec0 GCS-Allow for more than 1 limit per index 2012-08-02 23:56:02 +01:00
PT_Dreamer
205d370eec GCS-Made the UI limits board specific 2012-08-02 16:34:48 +01:00
James Cotton
0ed5b84ee9 Move the try catch when parsing overo files 2012-07-25 14:41:10 -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
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
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
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
James Cotton
c9bf5f5d06 Merge branch 'next' into revo 2012-07-01 14:44:22 +02:00
Fredrik Arvidsson
d83bff100b Merge branch 'next' into thread/OP-642 2012-07-01 12:25:23 +02:00
Stacey Sheldon
d9dca0b553 Merge branch 'wireshark-plugins' into next 2012-06-30 22:42:38 -04:00
Fredrik Arvidsson
32abd2e32f Merge branch 'next' into thread/OP-642 2012-06-30 16:51:19 +02:00
Corvus Corax
d2606e64e4 bitfields: bugfix for bugfix: forgot one line 2012-06-29 09:48:35 +02:00
Corvus Corax
8e790642a0 GCS Bitfield: size bugfix 2012-06-29 09:48:20 +02:00
Corvus Corax
2540ee53dc Merge commit '80f53b185c67d475ead43df97c4a62bcc36d7d90' into gcsbitfields 2012-06-29 09:45:44 +02:00
Fredrik Arvidsson
3c754af484 OP-642 Added <category> element which is a string in uavo object type definition to be used in uavo browser to categorise uavo:s visually into subtrees. Category value is assigned in generated code and accessible via getter method. OP-644 Fixed option for uavo browser to enable disable hilights for objects which values wasn't really changed to indicate stream activity in uavo object tree. 2012-06-20 21:26:18 +02:00
PT_Dreamer
5216835e18 GCS - OPMap - test functions 2012-06-20 15:02:57 +01:00
Stacey Sheldon
4c47a36bda uavobjgenerator: Add generator for wireshark UAVO plugin 
Using 'make uavobjects_wireshark' now generates a complete
wireshark dissector that can decode all fields of the available
UAVObjects.
 2012-06-19 00:21:35 -04:00
PT_Dreamer
88a089804b GCS - added uavo per instance "new instance" signal. 2012-06-18 00:16:23 +01:00
James Cotton
823538dbbb Forgot the fixed wing follower status 2012-06-08 10:46:40 -05:00
James Cotton
4c3ca17e34 Backport the fixed wing path follower 2012-06-08 10:46:39 -05:00
James Cotton
574ab3fcaa Make the VtolPathFollower an optional module 
Note that RTH mode right now checks that throttle control is enabled, but this
should only occur if the system is a VTOL.
 2012-06-08 10:46:38 -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
Corvus Corax
978ab5b96c Merge remote branch 'origin/stac/etasv3' into revo-next 2012-05-28 12:56:27 +02:00
Corvus Corax
80f53b185c GCS: BITFIELD: Set lists of options hardcoded in uavobjectfield.cpp (can only be "0" or "1" ) 2012-05-15 19:40:58 +02:00
Corvus Corax
aa7788d04c UAVObjects: Bugfixes to BITFIELD type 2012-05-15 19:01:32 +02:00
Corvus Corax
8fc471463d UAVOBJECTS: On GCS side, handle Mode Bitfield in UAVOBJECT Metadata as a type BITFIELD. This has no effect on flight side, since the serialized form is identical to an UINT8 that's interpreted as a bitfield which is used there, so that can change later if necessary 2012-05-15 18:23:25 +02:00
Corvus Corax
31fd30b108 UABOBJECTS: Made GCS aware of new BITFIELD type in UAVObjects - so far not used by UAVObjectgenerator, but can be used (hardcoded) in metadata objects 2012-05-15 18:22:36 +02:00
Corvus Corax
badf509d1d UAVObjects: switched around order of update modes to give each bit semantic meaning - important to allow usage of a bitfield type later 2012-05-15 18:21:27 +02:00
James Cotton
46fc5fa4fb Create a PathPlannerSettings object and move the PathMode setting to there. 
Also add a (temporary) field to allow storing some custom paths to select on
the fly.  Later will be replaced with some code to fetch from the flash chip.
 2012-05-12 13:12:57 -05:00
Brian Webb
513c014f5a Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2 2012-05-11 17:44:23 -07:00
PT_Dreamer
f716f16b60 Fixes compile issues on Ubuntu with qt 4.8.0 2012-05-10 14:47:30 +01:00
James Cotton
37bb2cfb77 Finish getting rid of PositionDesired in favor of PathDesired and add the 
ability to move the magic waypoint with the transmitter
 2012-05-08 02:42:58 -05:00
James Cotton
0f2c41ac5d Merge branch 'revolution' into navigation 
Conflicts:
	flight/Modules/ManualControl/manualcontrol.c
	flight/Project/OpenPilotOSX/OpenPilotOSX.xcodeproj/project.pbxproj
 2012-05-07 21:53:10 -05:00
Brian Webb
e83fec0463 Merged latest origin/next. 2012-05-05 09:40:44 -07:00
Brian Webb
44d95003f3 Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2 2012-05-03 17:56:08 -07:00
James Cotton
3155324384 Merge branch 'next' into cc3d 
Conflicts:
	Makefile
	ground/openpilotgcs/src/plugins/config/configahrswidget.cpp
	shared/uavobjectdefinition/ahrscalibration.xml
	shared/uavobjectdefinition/ahrssettings.xml
	shared/uavobjectdefinition/attituderaw.xml
 2012-05-03 16:31:49 -05:00
Brian Webb
aab47d6ed4 Final updates to throttled mode and further memeory reduction in the object manager and event dispatcher to reflect smaller data sizes in metadata. 2012-04-22 14:56:26 -07:00
Brian Webb
eb6f175af4 Fixed metadata settings in object browswer, and removed update mode never from all uavobjects that used it (changed to manual). 2012-04-21 11:59:14 -07:00