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
Brian Webb
19166cc830
Added UPDATEMODE_THROTTLED to UAVObjects update modes.
2012-04-18 18:47:13 -07:00
Brian Webb
496a323b7f
Fixed indentaion.
2012-03-31 07:59:44 -07:00
James Cotton
c7ff2a46c7
Merge remote-tracking branch 'origin/laurent/modelview' into revolution
...
Conflicts:
flight/CopterControl/Makefile
ground/openpilotgcs/src/plugins/config/config.pro
ground/openpilotgcs/src/plugins/config/configgadgetwidget.h
2012-03-22 02:58:24 -05:00
Brian Webb
aba3789d87
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into Brian-Metadata-Mods
2012-03-18 13:28:11 -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
Oleg Semyonov
e62cc8914c
Merge remote branch 'origin/next' into os/features/pid-tuning-from-transmitter-next
...
Conflicts:
flight/CopterControl/Makefile
ground/openpilotgcs/src/plugins/config/config.pro
ground/openpilotgcs/src/plugins/config/configtaskwidget.cpp
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
shared/uavobjectdefinition/hwsettings.xml
2012-02-22 23:03:17 +02:00
Brian Webb
43f6458f86
Reduced the sizeof the UAVObject metadata by:
...
1) Combining all binary or mode values into a single byte
2) Adding accessor functions to read/write the flag bits
3) Reduced the size of the time values from 32 bits to 16 bits
2012-02-20 18:45:18 -07:00
David Ankers
f6303b80a5
Constructor was called directly, GCC 4.6.1 on X64 Linux was not a fan
...
This fixes the build
2012-02-19 14:44:49 +11: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
81ceb9c17a
Precompute CRC table in a global constant. Also if datasize for unknown object
...
is > 256 ignore it since corrupt data.
2012-02-13 16:27:44 -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
34ca5777dd
Kalman filter for altitude
2012-02-11 21:08:19 -06:00
zedamota
1da2cf5166
Added support for multiple instances objects.
2012-02-11 18:35:36 +00:00
zedamota
c2d9af1e89
Finished framework and stab config showcase
2012-02-10 16:34:07 +00:00
James Cotton
6d6c7cac60
Added CRC calculation to the matlab log parsing
2012-02-10 08:07:51 -06:00
James Cotton
d5207c19f0
Fix for accidentally including inssetings back into build
2012-02-08 09:46:51 -06:00
James Cotton
49a03a868b
Merge branch 'altitudehold' into revolution_overo
...
Conflicts:
flight/OpenPilot/UAVObjects.inc
flight/Project/OpenPilotOSX/OpenPilotOSX.xcodeproj/project.pbxproj
flight/Revolution/Makefile
flight/Revolution/ins.c
2012-02-07 23:00:29 -06:00
zedamota
5cfd763f2a
Bug fixes and showcase UI setup (partial).
2012-02-07 20:29:32 +00:00
zedamota
e2c6a9d58a
Added Dado's UI.
...
Several scale bug fixes.
Added lots of debug info, will clean later.
2012-02-06 17:33:54 +00:00
James Cotton
dbcb499d7f
Add object to monitor the overo link status. Current just records the bytes/s
...
being sent and the connected status (based on sending more than 500 bytes per
second)
2012-02-06 09:37:31 -06:00
zedamota
32ebdb63a3
Preparatory commit before moving framework to a better location.
2012-02-05 14:41:23 +00: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
zedamota
4c1e33b0b3
WIP configtaskwidget enhancements.
2012-02-02 16:22:40 +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
Stacey Sheldon
025ed0f43c
Merge remote-tracking branch 'origin/stac/usb-composite-device-v2' into next
...
Conflicts:
HISTORY.txt
2012-01-03 00:02:45 -05:00
Oleg Semyonov
77a459af5c
Merge remote branch 'origin/next' into os/TxPID-module
2012-01-02 14:49:54 +02: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
ef05cafaca
Merge branch 'revolution' into altitudehold
...
Conflicts:
flight/Libraries/insgps13state.c
flight/OpenPilot/Makefile
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
2012-01-01 10:50:35 -06:00
Stacey Sheldon
5c0921e92c
fault: add optional fault insertion module
...
This module and its associated settings uavo can be used
to test various fault conditions during initialization.
To enable the module, add the TEST_FAULTS=YES to your make
command line:
make fw_coptercontrol TEST_FAULTS=YES
Once this module is part of your firmware load, you can
enable it in the hwsettings uavo and then select the
type of fault to insert by editing the faultsettings uavo.
On the next reset, the configured fault will be inserted
into the init sequence to allow you to test the boot fault
recovery code.
With a fault inserted, you should see 3 failed boot attempts
followed by a successful (recovery) boot. You will see the
BootFault alarm set to Critical, and the RAM version of your
hwsettings will be reset to defaults. Since the defaults have
all optional modules disabled, the fault module will be out of
the way during the recovery boot.
You can then "Load" the flash version of the hwsettings uavo
in the object browser, disable the Fault module and then "Save"
the hwsettings module back to the board. The next reset will
boot normally without the fault inserted.
2011-12-30 23:05:39 -05:00
James Cotton
d78d345953
Configuration tab for revo
2011-12-24 14:08:08 -06:00
Oleg Semyonov
7fbbb0e6af
Merge remote branch 'origin/next' into os/TxPID-module
2011-12-24 15:44:16 +02: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
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
a37a17a4fb
Created a separate Sensor module and Attitude module for revolution
2011-12-12 21:40:39 -06:00
James Cotton
d22e0e66dd
Create separate UAVOs for the sensors.
2011-12-12 13:05:40 -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
8c0c39ca53
uavobjgen: Update matlab template to accept a logfile path
...
This makes the generated .m file more generally useful.
2011-12-10 16:50:51 -05:00
naiiawah
6dc121fda6
Updated fix to preserve assert behavior by adding a check routine that
...
is called before trying to add an item.
2011-12-06 22:20:46 -07:00
naiiawah
3303313908
Fixes for OP-595:
...
Changed the UAV import of saved settings to not pull in invalid enum
values. Will warn on the dialog that an element of the UAVObject was
invalid and turn off the "save" checkbox. Also will send a qDebug output
showing the UAVObject name and the invalid enum value.
2011-11-25 16:12:38 -07: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
Oleg Semyonov
de6e450b5f
Merge branch 'next' into os/TxPID-module
...
Conflicts:
flight/CopterControl/Makefile
flight/CopterControl/System/coptercontrol.c
ground/uavobjgenerator/generators/generator_common.h
shared/uavobjectdefinition/hwsettings.xml
component free heap used
----------------------------
Nothing 2544 -
PWM 2416 128
PPM 2392 152
DSM 2448 96
S.Bus 2432 112
GPS (port only) 2352 192
GPS (port+module) 1296 1248
CameraStab 2080 464
Telemetry 1912 632
TxPID 2272 272
2011-11-13 16:25:58 +02:00
Corvus Corax
aa69027cb2
Merge branch 'next' into CC_GPS
2011-11-11 11:44:11 +01:00
