1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-14 21:23:52 +01:00
Commit Graph

50 Commits

Author SHA1 Message Date
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
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
James Cotton
f20e5da9ed Merge branch 'next' into revolution
Conflicts:
	ground/openpilotgcs/src/plugins/config/config.pro
	ground/openpilotgcs/src/plugins/config/configrevowidget.h
	ground/openpilotgcs/src/plugins/scope/scopegadgetwidget.cpp
2012-03-03 11:41:41 -06:00
James Cotton
fbb0b1173a More work from Kenz to improve the matlab parser 2012-02-16 04:24:10 -06:00
James Cotton
7c65bcc5ac Merge remote-tracking branch 'origin/pt/gcs_uavobj_widget_framework' into next 2012-02-14 14:24:23 -06:00
James Cotton
bb89b82865 Merge branch 'next' into GCS_QML_Dmytro 2012-02-14 12:35:14 -06:00
James Cotton
fea4accb07 Patch from Kenz to suppress warnings about unknown object IDs until end of
parsing
2012-02-13 16:36:05 -06:00
James Cotton
c111e26958 Patch from Kenz to suppress warnings about unknown object IDs until end of
parsing
2012-02-13 14:55:44 -06:00
James Cotton
6d6c7cac60 Added CRC calculation to the matlab log parsing 2012-02-10 08:07:51 -06:00
Dmytro Poplavskiy
aead288304 Generate properties for UAVDataObject fields.
Also changed UAVObject::requestUpdate() and UAVObject::update() to be slots.

This makes possible to use objects directly from QML.
2012-02-05 13:58:17 +10:00
zedamota
427acee559 Added support for objects value limits on the GCS to the GCS and generator. 2012-02-03 20:29:28 +00:00
James Cotton
bb0bfe0ae4 Merge branch 'next' into revolution3
Conflicts:
	flight/Bootloaders/CopterControl/Makefile
	flight/Bootloaders/PipXtreme/Makefile
	flight/Bootloaders/Revolution/inc/pios_config.h
	flight/CopterControl/Makefile
	flight/INS/inc/pios_config.h
	flight/Libraries/taskmonitor.c
	flight/Modules/Altitude/altitude.c
	flight/Modules/Attitude/attitude.c
	flight/OpenPilot/Makefile
	flight/OpenPilot/Makefile.posix
	flight/OpenPilot/System/inc/pios_usb_board_data.h
	flight/OpenPilot/System/inc/taskmonitor.h
	flight/OpenPilot/System/pios_board.c
	flight/OpenPilot/System/taskmonitor.c
	flight/PiOS/Boards/STM32F4xx_Revolution.h
	flight/PiOS/STM32F4xx/pios_bmp085.c
	flight/PiOS/STM32F4xx/pios_iap.c
	flight/PiOS/pios.h
	flight/Revolution/System/inc/pios_config.h
	flight/Revolution/System/inc/taskmonitor.h
	flight/Revolution/System/taskmonitor.c
	ground/openpilotgcs/src/plugins/serialconnection/serialplugin.cpp
	shared/uavobjectdefinition/systemalarms.xml
	shared/uavobjectdefinition/taskinfo.xml
2012-01-21 11:27:03 -06:00
James Cotton
21714911e8 Convert log files to structure of array instead of array of struct from Kenz 2012-01-01 13:19:07 -06:00
James Cotton
0024cbaa51 Merge branch 'next' into revolution_sensors 2011-12-18 16:28:30 -06:00
James Cotton
c996cbf00e Small tweak to Kenn's patch to grow array exponentially. This has large gains
for long logs.
2011-12-18 16:27:45 -06:00
James Cotton
2b5f0bccc6 Merge branch 'next' into revolution_sensors 2011-12-16 15:31:14 -06:00
James Cotton
99201d152a Patch from Kenn to speed up matlab parsing by preallocating arrays 2011-12-16 15:30:48 -06:00
James Cotton
a1c9818964 Merge remote-tracking branch 'origin/stac/logging_fixes' into revolution_sensors 2011-12-16 13:55:19 -06:00
James Cotton
b56c11d1d9 Merge remote-tracking branch 'origin/stac/logging_fixes' into next 2011-12-16 13:54:49 -06:00
Stacey Sheldon
624562aa07 uavobjgen: fix order of struct fields in autogen matlab code
Matlab needs field order to match in struct assignment.
This moves the instanceId field after the timestamp in all
encodings.
2011-12-14 23:10:08 -05:00
James Cotton
4b6aab0513 Merge remote-tracking branch 'origin/stac/logging_fixes' into revolution_sensors
Conflicts:
	ground/openpilotgcs/src/plugins/scope/scopegadgetwidget.cpp
2011-12-14 10:38:05 -06:00
James Cotton
33a12d829e Merge branch 'next' into revolution
Conflicts:
	flight/PiOS/Common/pios_flashfs_objlist.c
2011-12-11 22:55:54 -06:00
Stacey Sheldon
15c9b32392 uavobjgen: Add missing instanceID field in multi-instance structs 2011-12-10 16:50:15 -05:00
LM
30b6ae90f3 Added UAVObject sorting to make UAVObj structs align to word-boundaries. Else copying to / from UAVObjects will fail on Cortex M4 with an alignment error, since the proper alignment is not visible to the compiler in a line like this: float* data = UAVObj.Roll; data[2] = yaw; 2011-11-22 23:48:11 -08:00
James Cotton
684715930a Merge branch 'next' into revolution
Conflicts:
	flight/OpenPilot/Makefile
	flight/Revolution/System/inc/openpilot.h
2011-11-14 10:11:53 -06:00
James Cotton
3e2558bec6 Patch from PH which orders fields by size - important for using the M4 FPU 2011-11-14 09:49:50 -06:00
James Cotton
6fd2426a90 Patch from Kenn for the matlab processing function to fix issue with multiple
isntance objects
2011-11-09 12:49:50 -06:00
Oleg Semyonov
51ec7da0a2 uavobjgenerator: enable '(' and ')' characters in object field names
Useful for names like "DSM (FlexiPort)" or similar. Will be removed
from symbolic indentifiers.
2011-10-30 11:34:47 +02:00
Oleg Semyonov
b8d9d300c8 uavobjgenerator: enable '+' character in object field names
Useful for names like "Pitch+Roll" or similar. Will be removed
from symbolic indentifiers.
2011-10-24 00:23:03 +03:00
Corvus Corax
6fe495c088 Merge remote branch 'origin/next' into OP-536_CorvusCorax_ObjectOrientedFirmwareUAVTalk
Conflicts:
	flight/Modules/Telemetry/telemetry.c
2011-08-17 08:30:32 +02:00
James Cotton
2ab57910ce Make object IDs depend on the names of any enums so if field names change then
bad settings won't be picked up.
2011-07-15 11:08:47 -05:00
Corvus Corax
f52f6d30c6 VTalk (flight): Buffers allocated dynamically with size calculated by UAVObjGenerator. Support for tx packet sizes < object size.i 2011-06-24 02:08:20 +02:00
James Cotton
4f47c06547 Merge branch 'saving_crc' into bugfix-flight 2011-06-05 15:37:44 -05:00
James Cotton
e02aa1b818 OP-152: Make the zeroing of LSB of has occur after hash is computed so that the
LSB of individual field values still influences the hash

Note: This update changes ALL object IDs.  A new GCS is required to match the
firmware.
2011-06-04 18:36:44 -05:00
Mathieu Rondonneau
31a06a5ae7 OP-423 add set/get uavobjects functions to access objects fields separately. 2011-06-02 21:18:34 -07:00
ligi
bb9306d018 - fill deserializing gaps
- byte->int for arraypos and fieldid ( better save than sorry )

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@3129 ebee16cc-31ac-478f-84a7-5cbb03baadba
2011-04-09 04:25:15 +00:00
vassilis
b084ea7ea1 FlightPlan/Python: Updated object generator to create a Python file for each UAVObject. It is now possible to access all UAVObjects from the FlightPlan Python scripts.
Warning: The memory utilization when importing objects is unacceptably high making it unusable in the flight code at this point. It can be however used with the SITL simulator. Some more investigation is needed to understand why several kb of memory are used each time a module is imported (even before any functions are called or objects from the module are created). 


git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2938 ebee16cc-31ac-478f-84a7-5cbb03baadba
2011-03-03 02:22:50 +00:00
peabody124
39588fef39 UAVParser: Support comments in objects
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2934 ebee16cc-31ac-478f-84a7-5cbb03baadba
2011-03-02 01:25:40 +00:00
corvus
afdaf88d4a UAVObjects: Allow Generation and Initialisation of individual UAVObjects
per target as defined in Makefile (and/or Make include file) For
OpenPilot this is flight/OpenPilot/UAVObjects.inc For sim_posix and
sim_win32 needs rebuild of uavobjectgenerator and uavobjects!

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2736 ebee16cc-31ac-478f-84a7-5cbb03baadba
2011-02-05 22:17:40 +00:00
corvus
16eef53f02 UAVObjectgenerator: Autogenerate Make include-file for flight UAVObjects to be used in firmware Makefiles.
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2702 ebee16cc-31ac-478f-84a7-5cbb03baadba
2011-02-02 20:15:28 +00:00
peabody124
d33d044088 Revert "Revert "Fix to make stacs auto-loading of UAVObjects downwards compatible, since its not working on all architectures""
Putting Corvus patch back in.  Need to delete uavobjects-synthetics directory
for this to work.

This reverts commit 9cd98bec8fb5e0679c625eb256a94d161a8ce345.

Conflicts:

	flight/CopterControl/Makefile

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2671 ebee16cc-31ac-478f-84a7-5cbb03baadba
2011-02-01 15:46:59 +00:00
peabody124
bbbdea26b9 Revert "Fix to make stacs auto-loading of UAVObjects downwards compatible, since its not working on all architectures"
Note: This patch did not build after a clean build.

This reverts commit 7e75b5d16481a32689433c868b67916816d8b9fb.

Conflicts:

	flight/CopterControl/Makefile

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2651 ebee16cc-31ac-478f-84a7-5cbb03baadba
2011-02-01 01:56:02 +00:00
corvus
c2ba1f517b Fix to make stacs auto-loading of UAVObjects downwards compatible, since its not working on all architectures
On architectures supporting automatic initializing, flight/UAVObjects/uavobjectsinit_linker.c is used
On architectures NOT supporting automatic initializing, an uavobjectgenerated file build/uavobject-synthetics/flight/init/uavobjectsinit.c is used
build/uavobjects-synthetics/flight/uavobjectsinit.c went away, so that a wildcard include in the Makefile will not include the (wrong) initialisation code in either version



git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2640 ebee16cc-31ac-478f-84a7-5cbb03baadba
2011-01-31 20:37:11 +00:00
corvus
f6805de71e UAVObjGenerator: Allow generation of specific UAVObjects only per commandline specified list - possibly needed for CopterControl
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2616 ebee16cc-31ac-478f-84a7-5cbb03baadba
2011-01-28 22:35:44 +00:00
osnwt
61d8c23a51 OP-301 Allow some special characters in uavobject enum options.
Now they can include special chars like '.' (dot), '-' (dash), '/' (slash), ' ' (space). All such chars will be removed from autogenerated identifiers ("S.Bus" -> SBUS), but kept intact in text strings (to be displayed by the GCS).

This will not change any existing object IDs.


git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2592 ebee16cc-31ac-478f-84a7-5cbb03baadba
2011-01-26 00:22:54 +00:00
cwabbott
38458856d2 Fix error in matlab template path.
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2554 ebee16cc-31ac-478f-84a7-5cbb03baadba
2011-01-23 20:06:56 +00:00
stac
7195862d77 build: Move openpilotgcs into its own subdirectory
This will allow us to build a parent project for
qt-creator that sits above both openpilotgcs and
uavobjgenerator so that we can build both projects
at the same time.

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2528 ebee16cc-31ac-478f-84a7-5cbb03baadba
2011-01-22 17:40:26 +00:00
stac
b736b2a956 UAVObjects-java: move java output files into synthetic dir
Move generated Java UAVObject output into the common synthetic
tree for all UAVObject output.

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2527 ebee16cc-31ac-478f-84a7-5cbb03baadba
2011-01-22 17:38:48 +00:00
stac
5e6d87b2db UAVObjects-xml: Move UAVObject definitions outside of gcs dir
The UAVObject definition (.xml) files are used by both the
GCS build as well as the flight software builds.

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2526 ebee16cc-31ac-478f-84a7-5cbb03baadba
2011-01-22 17:38:43 +00:00
stac
205e09a8d1 uavobjgenerator: Move generator out of the gcs subdir
The UAVObject generator is intended to be a standalone tool.
As such, it doesn't belong under the openpilotgcs directory.

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2525 ebee16cc-31ac-478f-84a7-5cbb03baadba
2011-01-22 17:38:37 +00:00