rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-29 07:24:13 +01:00
Code Issues Releases Activity
9,225 Commits 5 Branches 8 Tags 266 MiB
3dcaea1cb0
Commit Graph

588 Commits

Author SHA1 Message Date
Stacey Sheldon
4892fdb33d telemetry: allow telemetry to flow when not connected to GCS 
Previously, when unconnected, only the flighttelemetrystats
UAVO was Tx'd.  All other UAVOs were inhibited.  This led to
zero telemetry data when the connection to the GCS was gone.
This precluded getting useful telemetry from a receive-only
station.

This commit changes two main areas.

First, UAVO updates are now allowed regardless of the "connected"
state between the GCS/FC.

Second, it makes both the flighttelemetrystats and gcstelemetrystats
UAVOs un-acked.  This prevents these objects from blocking all
other UAVOs while they wait for their ack.  This is OK since the
real "connection" negotiation happens via the states exchanged in
the Status field of these UAVOs.
 2012-10-21 22:51:17 -04: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
James Cotton
96afe7cffd Merge remote-tracking branch 'origin/stac/add-debug-consoles' into next 2012-10-12 08:07:44 -05:00
Stacey Sheldon
f0e0c2e79e console: add debug console via USB CDC/VCP interface 
The USB VCP Port has a new DebugConsole setting that
routes all output destined for PIOS_COM_DEBUG to the
emulated serial port.

To enable this in your build, you'll have to build like:
 - make fw_coptercontrol_clean
 - make fw_coptercontrol ENABLE_DEBUG_CONSOLE=YES

You can then output formatted text to the console
like this:
  #if defined(PIOS_INCLUDE_DEBUG_CONSOLE)
  PIOS_COM_SendFormattedString(PIOS_COM_DEBUG,
                               "foo is %u\r\n",
                               foo);
  #endif	/* PIOS_INCLUDE_DEBUG_CONSOLE */

Please ensure that all of your debug output is
wrapped with these macros so that your debug
code doesn't bloat the firmware image.
 2012-10-11 00:51:09 -04:00
Stacey Sheldon
6088c05946 console: add support for serial debug consoles 
Serial ports now have a new HW setting called DebugConsole
which can be used to dump internal state to a serial port
for debug.

To enable this feature, you need to:
 - make fw_coptercontrol_clean
 - make fw_coptercontrol ENABLE_DEBUG_CONSOLE=YES
 - configure one of the serial ports as DebugConsole in the GCS
 - save settings
 - power-cycle your board

Things to note:
 - The console is at 57600,8N1.
 - This is not currently configurable via the GCS.
 - You can only have a single console enabled at a time.
 2012-10-11 00:22:07 -04:00
Laura Sebesta
c2b49b6ef3 Merge branch 'kenz/cc_hitl_merge' into next 
Conflicts:
	ground/openpilotgcs/src/plugins/gcscontrol/gcscontrolgadgetoptionspage.ui
	ground/openpilotgcs/src/plugins/hitlnew/hitloptionspage.ui
	ground/openpilotgcs/src/plugins/hitlv2/hitlv2optionspage.ui
 2012-10-08 15:30:27 +02:00
James Cotton
2191befe17 Merge remote-tracking branch 'revo/brian/rfm22_rf2' into revo 
Conflicts:
	flight/PiOS/Common/pios_rfm22b.c
 2012-10-05 08:20:35 -05:00
Brian Webb
5724fa083c RFM22B: Added link quality calculation based on number of dropped packets. Also added packet error correction, which apparently wasn't being done before. 2012-10-04 21:11:40 -07:00
James Cotton
193fdcd9a2 Make the default PipX RF power 1.25 mW to avoid damanging anything when there is no antenna 2012-10-04 16:41:02 -05:00
Stacey Sheldon
2f4b1e69dd rcvr: Support PPM and PWM at the same time on CC 
Adds a new mode for the receiver port (PPM+PWM) which
will allow simultaneous use of 1 pin for PPM and the
rest of the pins for PWM inputs.
 2012-09-29 19:11:48 -04: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
6e114360f4 Merge branch 'next' into revo 
Conflicts:
	shared/uavobjectdefinition/taskinfo.xml
 2012-09-27 14:04:44 -05:00
James Cotton
684620dce6 Merge remote-tracking branch 'origin/hyper/uavobjectparser-tweaks' into next 
Conflicts:
	shared/uavobjectdefinition/taskinfo.xml
 2012-09-27 13:49:34 -05:00
James Cotton
0fa4b062a4 Merge branch 'next' into revo 2012-09-26 00:43:02 -05:00
PT_Dreamer
43f85d9617 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next 2012-09-25 10:44:32 +01:00
PT_Dreamer
3d5381893b GCS-Changed relaytuning uavo to gcs readOnly 2012-09-24 22:47:18 +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
Stacey Sheldon
c5fda86e96 Merge branch 'next-merge' into revo-next 2012-09-15 21:47:32 -04:00
Stacey Sheldon
9a5ba841cf Merge remote-tracking branch 'op-public/next' into revo-next 
Conflicts:
	ground/openpilotgcs/src/libs/utils/coordinateconversions.cpp
	ground/openpilotgcs/src/plugins/hitlnew/il2simulator.cpp
	ground/openpilotgcs/src/plugins/hitlnew/xplanesimulator.cpp
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.h
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
	shared/uavobjectdefinition/pathaction.xml
	shared/uavobjectdefinition/waypointactive.xml
 2012-09-15 19:55:47 -04:00
a*morale
af9a3baffd Added the 5&6th banks on ChannelUpdateFreq 2012-09-15 00:38:38 +02:00
James Cotton
13e7733e5f Merge branch 'revo-mini' into revo 2012-09-12 02:30:10 -05:00
James Cotton
223a3473c2 Merge branch 'next' into revo-mini 2012-09-12 02:03:39 -05:00
James Cotton
11b099b1ef Stabilization: Add configuration terms for the derivative calculation to the UAVO and pass 
them in to the PID system.
 2012-09-11 12:29:38 -05:00
a*morale
cf7aea6499 Support for Led Outputs as actuator channels 9&10. 
Added the ARMING LED  and INFO LED option for actuator channel
 2012-09-10 20:14:24 -05:00
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
4d87af38b6 Make sure the orders of the UAVOs match 2012-09-10 10:52:05 -05:00
Richard Flay (Hyper)
53e2db3b24 Added a backwards-compatible way to specify UAVO field element names and options as lists of child elements of the field element. Added the ability to specify that a field is a clone of another field, just with a different name 2012-09-08 14:41:55 +09:30
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
c9f66f5145 Merge branch 'revo' into revo-mini 
Conflicts:
	androidgcs/AndroidManifest.xml
	androidgcs/res/layout/gcs_home.xml
	androidgcs/res/values/strings.xml
	androidgcs/src/org/openpilot/androidgcs/AttitudeView.java
	androidgcs/src/org/openpilot/androidgcs/HomePage.java
	flight/PipXtreme/System/pios_board.c
	ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp
	shared/uavobjectdefinition/taskinfo.xml
 2012-09-01 16:57:27 -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
James Cotton
f3327e3993 RM: Enabled optional modules and got the battery module working again. 
Changed the hardcoded (ick) battery lines for RM.  Also removed the reference
to PIOS_ADC_GetPin(4) as that pin is no longer available.  Finally
changed the default FlightBatterySettings to work out of the box
for the standard recommended sensors.
 2012-09-01 11:03:32 -05:00
Kenz Dale
e123a88262 Added UAVO for airspeeds. 2012-08-29 16:04:47 +02:00
James Cotton
b08775666b Disable the telemetry port by default 2012-08-25 22:12:41 -05:00
David Ankers
69cd7235d3 Change Default GPS protocol to UBX 2012-08-25 19:16:16 -05:00
James Cotton
a7b5fcd77c Monitor the radio threads 2012-08-25 18:48:30 -05:00
Brian Webb
415b86879c Added the RFM22B driver to the Revo to support an RFM22B radio on the external SPI port. 2012-08-25 11:45:43 -07:00
James Cotton
8d70a632fe Autotune: Increase the default step size for autotuning. 2012-08-24 23:06:41 -05:00
Brian Webb
b1c88628f6 Merge branch 'james/revo' of ssh://git.openpilot.org/revo into brian/revo_link 2012-08-24 19:35:40 -07:00
James Cotton
a3f1894cd7 Autotuning: Make the estimator require the value to toggle above and below the hysteresis level. 2012-08-24 21:33:08 -05:00
Brian Webb
76907fe8f1 Changed PipXStatus UAVO to update 1 / second. 2012-08-23 07:02:51 -07:00
David Ankers
2f168323d2 Default to telem on main port, no reasons against this unless I am being 
stupid (very possible).
 2012-08-22 07:12:47 +10:00
David Ankers
8d5c1e4253 Change Default GPS protocol to UBX 2012-08-22 05:11:28 +10: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
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
44dc01126e Merge branch 'next' into revo 2012-08-12 16:12:54 -05:00
James Cotton
5e61f66fc0 Messed up merge on manualcontrol settings 2012-08-12 14:44:54 -05: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
Stacey Sheldon
63c167c183 taskinfo: also track Event thread's stack usage and CPU utilization 
The event dispatcher thread is started differently than most other
threads so it was missed in the taskinfo tracking information.  Now
it's also included.
 2012-08-11 18:47:03 -04:00
Stacey Sheldon
b505602c15 Merge remote-tracking branch 'origin/stac/rc-tx-joystick-emulation' into next 2012-08-11 11:21:18 -04:00
James Cotton
7cca5696a2 Merge remote-tracking branch 'origin/pt/boardbased_ui_limits' into next 2012-08-08 14:11:24 -05:00
James Cotton
06a6e367b0 Merge remote-tracking branch 'origin/hyper/OP-661' into next 2012-08-08 13:49:48 -05:00
Stacey Sheldon
ef0c12b1b6 hid joystick: emulate a USB HID joystick using RC Transmitter 
Adds a new RCTransmitter setting for the USB HID interface which
emulates a USB HID joystick.  The scaled RC receiver channels
from any RCVR protocol are passed through to the various emulated
joystick controls.

The main use for this feature is to allow you to use your own RC
transmitter with any RC simulator on a PC.

This is known to work with CRRCsim but should work with any simulator
that supports joystick input.
 2012-08-05 21:45:27 -04:00
PT_Dreamer
df61d33f66 GCS- Added the ability to have more than 1 ui limit per index 2012-08-03 18:57:24 +01:00
James Cotton
ccbbda1b51 Make default tuning mode Attitude to make it easier on people like me :) 2012-08-03 12:41:00 -05:00
PT_Dreamer
4d19062059 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into pt/boardbased_ui_limits 2012-08-03 18:14:51 +01:00
James Cotton
652647fc87 Make autotuning module optional 2012-08-03 09:37:46 -05:00
James Cotton
2ccd6605a4 Now the stabilization refactor is in we can make swapping between tuning the 
system in rate or attitude mode software configurable.
 2012-08-03 09:37:45 -05:00
James Cotton
28539a80d1 Change default tuning settings 2012-08-03 09:37:45 -05:00
James Cotton
7ea14ecc22 Track the output gain instead of amplitude so the measured values are 
consistent if the settings are changed afterwards.
 2012-08-03 09:37:45 -05:00
James Cotton
5c00451c9e Remove unused value field from the relaytuning object 2012-08-03 09:37:45 -05:00
James Cotton
52ffec0be4 Increase the initial tuning amplitude to 0.15 2012-08-03 09:37:45 -05:00
James Cotton
dfd1aceb06 More work on autotune from GCS 2012-08-03 09:37:45 -05:00
James Cotton
a9af53b4f3 Create new autotuning module which rotates through the axes for autotuning and 
then computes new stabilization settings.
 2012-08-03 09:37:44 -05:00
James Cotton
4ac8df6aa8 Make the system perform an online estimate of the period and amplitude of the 
oscillation during relay tuning
 2012-08-03 09:37:44 -05:00
James Cotton
17a0d3ebb4 Add a relay stabilization mode 2012-08-03 09:37:44 -05:00
James Cotton
9ce7d9b4ac Add UAVOs for relay tuning 2012-08-03 09:37:44 -05:00
James Cotton
6948f1dc41 Merge remote-tracking branch 'origin/master' into next 
Conflicts:
	package/winx86/translations/strings_de.nsh
 2012-08-03 09:35:18 -05:00
PT_Dreamer
205d370eec GCS-Made the UI limits board specific 2012-08-02 16:34:48 +01:00
Richard Flay (Hyper)
56647f5409 Fix for OP-661: error messages in GCS log due to obsolete AHRSComms and SDCard related alarms. Change also disables obsolete SDCard support on the flight side of CC and PipX 2012-07-31 11:07:07 +09:30
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
James Cotton
c587ceebfd Make the mag offset nulling convergence rate come from the UAVO. When it is 
set to zero nulling does not occur to allow us to still calibrate the sensors.
 2012-07-25 11:23:27 -05:00
James Cotton
d1e6dcc2f0 First pass implementation of William Premerlani's magnetometer bias correction 2012-07-25 11:07:40 -05:00
Kenz Dale
aa5e5a9b01 Removed "airspeed" field from Airspeed UAVO. Now everything is done either with true airspeed or calibrated airspeed 2012-07-24 15:15:21 +02: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
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
5649813c2b Make sure to always compare BiasCorrectedRaw against its enum. Also reversed 
the order of TRUE,FALSE in the definition to make it safer anyway.
 2012-07-21 17:24:58 -05:00
Stacey Sheldon
eafd525323 Merge remote-tracking branch 'origin/D-Lite/ubx-parser-next' into next 2012-07-21 14:22:10 -04:00
Kenz Dale
1d976b3095 dded support for multiple airspeed sources. Added GPS airspeed estimation. Extended BaroAirspeed UAVO. Added new AirspeedSettings UAVO. 2012-07-20 13:08:54 +02:00
Werner Backes
b6ebee403d Removed reference to AHRSCommsModule 2012-07-19 20:48:35 +02:00
James Cotton
7492d34d25 Merge branch 'overo_control' into revo 2012-07-19 08:35:39 -05:00
James Cotton
4306afa841 Update the module and overosyncstats to track buffer underruns 2012-07-17 17:21:51 -05:00
James Cotton
9c91436428 Clean up some cruft from Overo module and add a packet counter 2012-07-17 16:17:56 -05:00
James Cotton
bc075c5d2c Only schedule overo packets on the NSS line rising to avoid the frame sync 
errors we were seeing previously
 2012-07-17 11:45:45 -05:00
James Cotton
6b101d71af Merge remote-tracking branch 'origin/Brian-PipXtreme-V2' into revo 2012-07-15 12:32:35 -05:00
James Cotton
7bddf2a988 Correct default value for overo sync settings 2012-07-14 17:38:49 -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
9eee4f1bc7 Made OverSynce an optional module. 
Conflicts:

	shared/uavobjectdefinition/hwsettings.xml
 2012-07-14 09:07:22 -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
Brian Webb
3fabdb9963 Fixed conflicted merge with origin/next. 2012-07-11 19:25:05 -07:00
Werner Backes
0a7fa8dc5f Revert "Removed ECEF and RNE flields to be compatible with Revo" 
This reverts commit feb063dda7.
 2012-07-10 23:06:42 +02:00
Werner Backes
feb063dda7 Removed ECEF and RNE flields to be compatible with Revo 2012-07-10 16:40:58 +02:00
Werner Backes
19a9cd03c2 Introduced GPSVelocity UAVObject 
Conflicts:

	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
 2012-07-10 16:23:10 +02:00
Werner Backes
94b610c882 Added missing gpssettings.xml 2012-07-10 11:01:42 +02:00
PT_Dreamer
f6e4318c2a GCS- Don't add category to object definition yet. 2012-07-09 15:21:20 +01:00
PT_Dreamer
58a9e9a6f7 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next 2012-07-09 15:07:47 +01:00
Stacey Sheldon
54a161a3d4 Merge remote-tracking branch 'op-public/next' into revo-next 
Conflicts:
	shared/uavobjectdefinition/manualcontrolsettings.xml
 2012-07-08 18:14:09 -04:00
Laura Sebesta
cfb8e72679 Improved battery module to fully support regeneration. Fixed bug in builtin battery module. Improved ADC routing names. 2012-07-08 23:13:05 +02:00
Laura Sebesta
a98991d8a1 Created ADC routing UAVO. This allows to direct ADC inputs to various modules. 
Tested and works on FlightBattery, currently the only module using the ADC.
 2012-07-08 13:16:05 +02:00
Stacey Sheldon
8651132b5a systemsettings: default airframe is now QuadX 2012-07-07 15:42:31 -04:00
Laura Sebesta
54f3fbf226 Made OverSynce an optional module. 2012-07-07 11:53:58 +02:00
Brian Webb
10e52b31c5 Added the ability on the PipX to specify if a comport is used to connect to the GCS (ground side), so it will receive status, etc, or UAVTalk (flight side). The data passing in RadioComBridge was also made more uniform, which allows for easier reconfiguration. 2012-06-30 10:06:28 -07:00
James Cotton
04e784edc7 Make pathdesired update on change with throttling to avoid slamming telemetry 
in position hold mode.
 2012-06-26 11:57:11 +03:00
Oleg Semyonov
cd6387d0a6 Add support for more than 3-pos FlightMode switches 
It is now possible to have 1 to 6 flight mode switch positions
(usefull for guidance, position hold and similar use).

The input channel range is divided into N (1 to 6) zones and each
zone represents a flight mode. Default is 3 zones (backward compatible),
but more can be chosen.

How to use: configure Tx mixers in a way they provide required number
of different values for the same FlightMode channel. For instance,
using Turnigy 9X radio with ER9X firmware, one can create a mixer like
this:

     -100 MAX ID0   Manual
   R  -50 MAX ID1   Stabilized1 (Rate)
   R    0 MAX ID2   Stabilized2 (Attitude)
   R   50 MAX RUD   PositionHold
   R  100 MAX ELE   ReturnToBase

And set number of flight mode positions to 5. As a result, the 3-pos
switch (ID0, ID1, ID2) will provide first three flight modes, the rudder
D/R switch will override those and enable the 4th flight mode, and
elevator D/R switch will have highest precedence and activate the 5th
flight mode.

This will change the ManualControlSettings objectID.
 2012-06-23 22:10:19 +03:00
Fredrik Arvidsson
b73cde1787 OP-642 Changed from using an xml element for category to have it defined 
as an attribute on the uav object definition. This attribute is
optional. If absent no category (empty string) is assigned to the uav
object type.
Added category attribute to a small selection of uavo definition files
to test parsing.
 2012-06-20 22:23:06 +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
e71ab57ffa Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into pt/MapEnhancements 
Conflicts:
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
 2012-06-17 23:56:27 +01: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
James Cotton
f8d196ffe8 Added support for board voltage monitor to battery module. 
The module can be configured to enable what's needed from board voltage, battery voltage and battery current measurement.
In GCS the POWER box in system healt will show alarm related to the supply voltage to the board.
If a power warning/critical alarm is raised, the warning condition is left even if the board voltage return to an acceptable value.

Conflicts:

	ground/openpilotgcs/share/openpilotgcs/diagrams/default/system-health.svg
	shared/uavobjectdefinition/systemalarms.xml
 2012-06-15 19:43:34 -05:00
Laura Sebesta
0e201818f0 Refactored variable names for more clarity. Changed some integrals, alititude control 
seem to work a little better.
 2012-06-15 18:02:24 +03:00
James Cotton
9218145aa9 Merge remote-tracking branch 'origin/Brian-PipXtreme-V2' into revo 2012-06-12 22:53:30 -05: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
Brian Webb
2088753ee5 Changed the flight side access of GCSReceiver to readwrite to support sending GCSReceiver object in response to PPM packets on the PipX. 2012-06-09 10:54:07 -07:00
James Cotton
9e5b1658b1 Remove AHRSComms from SystemAlarms 2012-06-09 12:14:11 -05:00
James Cotton
463ad550e2 A few comments in my code and some simplication to the fixedwingfollower to get 
it compiling against my path planner.
 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
f5b2575c88 Merge branch 'next' into revo 
Conflicts:
	flight/PiOS/Boards/STM32F4xx_Revolution.h
	flight/Revolution/System/inc/pios_config.h
	package/Makefile
 2012-06-07 12:45:06 -05:00
James Cotton
7b8110a457 Merge branch 'MikeL' into next 2012-06-07 11:31:41 -05:00
James Cotton
c689bcfb80 Merge remote-tracking branch 'origin/Brian-PipXtreme-V2' into revo 2012-06-07 09:49:18 -05:00
James Cotton
5e01617cbd Merge branch 'next' into MikeL 
Conflicts:
	ground/openpilotgcs/src/plugins/config/airframe.ui
	ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
	ground/openpilotgcs/src/plugins/config/configoutputwidget.h
	ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp
	ground/openpilotgcs/src/plugins/config/configvehicletypewidget.h
 2012-06-06 11:58:06 -05:00
Brian Webb
4e68f6543e Added tracking of dropped packets to PipX and turned off visible text on signal strength meters. 2012-06-04 21:18:13 -07:00
Mike LaBranche
0ba8345c51 Merge branch 'next' into MikeL 
Conflicts:
	flight/Bootloaders/Revolution/inc/pios_config.h
	flight/Modules/OveroSync/inc/overosync.h
	flight/Modules/Sensors/inc/sensors.h
	flight/PiOS/Boards/STM32F4xx_Revolution.h
	flight/PiOS/STM32F4xx/pios_iap.c
	flight/Revolution/System/inc/pios_config.h
	ground/openpilotgcs/src/plugins/config/config.pro
	ground/openpilotgcs/src/plugins/config/configccattitudewidget.cpp
	ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp
 2012-06-04 16:59:31 -07:00
Mike LaBranche
bf591ebe45 Merge branch 'next' into MikeL 
Conflicts:
	flight/Bootloaders/Revolution/inc/pios_config.h
	flight/Modules/OveroSync/inc/overosync.h
	flight/Modules/Sensors/inc/sensors.h
	flight/PiOS/Boards/STM32F4xx_Revolution.h
	flight/PiOS/STM32F4xx/pios_iap.c
	flight/Revolution/System/inc/pios_config.h
	ground/openpilotgcs/src/plugins/config/config.pro
	ground/openpilotgcs/src/plugins/config/configccattitudewidget.cpp
	ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp
 2012-06-04 15:38:57 -07:00
James Cotton
0b828fbdd0 Merge branch 'next' into revo 
Conflicts:
	Makefile
 2012-06-04 14:12:19 -05:00
James Cotton
ff0a3a156e Merge remote-tracking branch 'origin/os/AeroSimRC' into next 2012-06-04 12:25:59 -05:00
James Cotton
ed2fb5cb09 Merge branch 'next' into revo 2012-06-04 12:23:58 -05:00
James Cotton
bda3f301cb Rename VBar mode to VirtualBar 2012-06-04 12:22:39 -05:00
James Cotton
4c562b88d1 Make the amount to suppress the gyros adjustable instead of binary 2012-06-04 12:22:39 -05:00
James Cotton
59972d5570 Limit the number of degrees the vbar can deflect. This is good for fast flips 
etc.
 2012-06-04 12:22:39 -05:00
James Cotton
6719ee8639 Add piro compensation option to the vbar mode 2012-06-04 12:22:39 -05:00
James Cotton
3283b99d4e For hardcode flipping allow full stick to completely override the gyro 
feedback.
 2012-06-04 12:22:39 -05:00
James Cotton
df82cb6ada Change the units to something more reasonable 2012-06-04 12:22:39 -05:00
James Cotton
fe978504bc Add friendly settings for the vbar mode including the VbarTau which acts like 
the time constant.
 2012-06-04 12:22:39 -05:00
James Cotton
1b55df733d Create virtual flybar setting for stabilization modes 2012-06-04 12:22:38 -05:00
James Cotton
daaa661080 Turned "Battery" into an optional module. It otherwise prevents flying if no voltage sensor is installed. 
Conflicts:

	shared/uavobjectdefinition/hwsettings.xml
 2012-06-04 10:50:45 -05:00
Corvus Corax
78857cefaa Turned "Battery" into an optional module. It otherwise prevents flying if no voltage sensor is installed. 2012-06-04 17:31:45 +02:00
James Cotton
10aa31a57f When ManualControlSettings.FailsafeBehavior is set to RTH and no valid input is 
detected and the aircraft is armed enter RTH mode.
 2012-06-04 09:48:05 -05:00
James Cotton
21eb48c58c Add a RTH flight mode and remove it from the waypoint actions as that is 
redundant with flying to (0,0,0)
 2012-06-03 22:14:11 -05:00
James Cotton
71e14a691e Merge branch 'next' into revo 2012-06-03 19:00:51 -05:00
James Cotton
484057e9ae Revert "Change waypoints to update on change" 
This reverts commit 2e5c34b8efce01810f2da26c1b7b54a70e90daad.
 2012-06-02 18:40:54 -05:00
James Cotton
3ac14fccb7 Change waypoints to update on change 2012-06-02 18:40:54 -05:00
James Cotton
4ad23864c8 Treat the waypoint action as something to do once you hit that location. (e.g. 
PathToNext) and add a Stop value to indicate not to advance to the next
waypoint.  This is essentially a perament loiter to the pathfollower (I think)
but it's really just to have the ability to "delete" waypoints.
 2012-06-02 18:40:53 -05:00
Corvus Corax
ab28686976 Merge branch 'corvuscorax/new_navigation' into revo-next 2012-06-02 22:30:44 +02:00
James Cotton
25f85ee4fe Add an error flag to ObjectPersistence and when saving a setting make it verify 
that the data reads successfully.
 2012-06-02 10:23:27 -05:00
PT_Dreamer
3106917703 GCS/MapLib - added some UAVOs from Corvus pathplanner branch 2012-06-01 19:14:50 +01:00
Sambas
ed1a4dada6 Merge remote-tracking branch 'remotes/origin/sambas/osd_test_v1' into revo-next 
Conflicts:
	flight/PiOS/STM32F4xx/pios_adc.c
 2012-05-30 16:30:09 +03:00
Corvus Corax
298b6233ed Merge branch 'revo-next' into corvuscorax/new_navigation 
Conflicts:
	flight/Libraries/paths.c
	flight/Modules/ManualControl/manualcontrol.c
	flight/Revolution/Makefile
	shared/uavobjectdefinition/taskinfo.xml
 2012-05-30 00:51:52 +02:00
James Cotton
1934752d50 Merge branch 'revo-next' into revo 2012-05-28 15:23:14 -05:00
Corvus Corax
1ad2b19d28 PathPlanner: fixed a few failsafes, changed waypointID to int16 - negative jump ids have special meaning 2012-05-28 20:50:09 +02:00
Oleg Semyonov
5739dfbfc8 Merge remote-tracking branch 'origin/next' into os/aerosimrc 
Conflicts:
	shared/uavobjectdefinition/gcsreceiver.xml
 2012-05-28 21:46:43 +03:00
James Cotton
4360d8adfd Merge branch 'next' into revo-next 2012-05-28 11:25:40 -05:00
Sambas
147100bc2f Merge remote-tracking branch 'remotes/origin/revo-next' into osd_test_v1 
Conflicts:
	Makefile
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
 2012-05-28 19:06:25 +03: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
089aa54a59 FixedWingpathFollower: Added debug output of error indicators 2012-05-28 14:46:03 +02:00
Corvus Corax
90e4047e2c bugfix to etasv3 - made uavobject def compatible with new update modes 2012-05-28 13:09:38 +02:00
Corvus Corax
978ab5b96c Merge remote branch 'origin/stac/etasv3' into revo-next 2012-05-28 12:56:27 +02:00
Oleg Semyonov
f95d29a3b8 TxPID: add GyroTau to the list of parameters (OP-637) 2012-05-28 12:48:55 +03:00
Corvus Corax
e6f4a40d3e path library: updated API and usage from pathfollowers, added new conditions and additional user feedback in pathstatus 2012-05-28 01:51:17 +02:00
Corvus Corax
634a190d4f FixedWingPathFollower: Redesigned and tested FixedWingpathFollower 2012-05-27 20:49:07 +02:00
Corvus Corax
ef8d7275a8 PathFollower and PathPlanner: fixes for fixed wing 2012-05-27 02:38:56 +02:00
Corvus Corax
922b3b7f1e Merge branch 'basenext' into corvuscorax/new_navigation 
Conflicts:
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
 2012-05-27 01:41:51 +02:00
Sambas
36ea394d84 More graphic fixes 
setting to change screens
 2012-05-26 18:39:42 +03:00
Corvus Corax
e5d5da973a BaroAirspeed: fixed uavobject definition 2012-05-24 18:57:22 +02:00
Corvus Corax
435b494b0c Merge remote branch 'origin/stac/etasv3' into corvuscorax/new_navigation 
Conflicts:
	flight/Revolution/Makefile
	shared/uavobjectdefinition/hwsettings.xml
	shared/uavobjectdefinition/taskinfo.xml
 2012-05-24 18:55:20 +02:00
Mike LaBranche
7fb96f1acd Bugfixes in configwidgets; 
Refactor mixer type and vector set/get, named vector elements;
 2012-05-24 09:38:34 -07:00
Corvus Corax
3868cfd6f0 Updated FixedWingPathFollowerSettings 2012-05-24 18:33:35 +02:00
Corvus Corax
63cd7b063f Refactored Guidance to apropriate pathfollower in uavobjects 2012-05-24 11:09:53 +02:00
Corvus Corax
25e21fde73 Renamed Guidanceto FixedWingPathFollower 2012-05-24 10:56:41 +02:00
Corvus Corax
f27416c95a Hwsettings: Renamed module name VTOLPathFollower to VtolPathFollower in uavobject 2012-05-22 13:12:13 +02:00
Corvus Corax
ea7d9b6610 Merge branch 'basenext' into corvuscorax/new_navigation 2012-05-22 13:11:04 +02:00
Corvus Corax
68fe938016 Implemented new programmable PathPlanner 2012-05-21 21:42:28 +02:00
Corvus Corax
992e189bcd added PathAction (again) 2012-05-21 12:10:01 +02:00
Corvus Corax
09f25ab11b Refactorted VTOLPathFollower to fit into new scheme: optional module, reports status and knows advanced FlightModes 2012-05-21 12:10:01 +02:00
Corvus Corax
84a0fd731f Added ReturnToBase flightmode and correct behaviour in ManualControl 2012-05-21 12:10:01 +02:00
Corvus Corax
6a6eace700 Added forced disarming via systemalarm 2012-05-21 12:10:01 +02:00
Corvus Corax
9dd94f98b6 New UAVObjects for programmable PathPlanner 2012-05-21 12:10:00 +02:00
Brian Webb
6cb13aa2ba Fixed failed merge with next. 2012-05-20 18:36:08 -07:00
Brian Webb
2f1a9e3e7d Added PPM input to the PipXtreme. Also added configurable GCSReceiver timeout. 2012-05-20 18:30:37 -07:00
Stacey Sheldon
ba8d60301c usb: remove run-time selectable device descriptors 
BL images now always use hid-only.

FW images can use hid-only or hid+vcp but this is selected
ONLY at compile time based on whether PIOS_INCLUDE_USB_CDC
is defined.

CC uses HID+VCP by default now.
 2012-05-19 16:06:48 -04:00
Stacey Sheldon
48cb20dc81 hid+vcp: change default USB descriptor to HID+VCP 
Now that we have a USB descriptor for HID+VCP that works
on Ubuntu 11.10, MacOS 10.7.3, Win7-SP1-32bit,
WinXP-SP3-32bit, Win7-SP1-64bit.

VCP is known to not work on WinXP without service pack 3.
 2012-05-19 16:06:30 -04:00
Brian Webb
6a7179120d Fixed setting of PipX description, and changed gcs receiver object to be update on change on flight side so that it works on the PipX. 2012-05-19 09:25:11 -07:00
Brian Webb
93ec7c11a6 Fixed race condition on getting packets. 2012-05-15 19:38:14 -07:00
Mike LaBranche
ed54716436 add gui config data bit storage to fixedwing,multirotor,ground vehicles 2012-05-14 10:05:40 -07:00
Brian Webb
ec67742ff6 Added configuration of COM ports on PipX. 2012-05-12 13:16:36 -07: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
James Cotton
420829e549 Update the default AltitudeHoldSettings to something that works well on my quad 2012-05-12 13:12:56 -05:00
Brian Webb
1f5dbcf57c Mostly complete PipX configuration GUI. 2012-05-11 17:51:18 -07:00
James Cotton
2857b58f8e Migrate path planner from position desired to path desired 2012-05-08 03:04:44 -05: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
a8bdd4a44a Coalescene PositionDesired and PathDesired into PathDesired and add a mode 
field to indicate how it should be interpreted.
 2012-05-08 02:29:58 -05:00
James Cotton
cbedb5b53b Move Guidance to VtolPathFollower to make room for FWPathFollower 2012-05-08 02:29:50 -05:00
James Cotton
e4cec48f35 Update the logging mode of a few objects for the meta data reduction 2012-05-07 22:22:30 -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
Oleg Semyonov
a3906aa7ea Merge remote-tracking branch 'origin/hhrhhr/AeroSimRC_plugin' into os/aerosimrc 2012-05-07 16:09:35 +03:00
Brian Webb
454144f46c Pairing and saving settings working. 2012-05-06 20:47:21 -07:00
Brian Webb
480371a43e Resolving merge with origin/next 2012-05-05 09:53:54 -07: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
297ed01aee Update the logging modes for these objects to match the new meta information 2012-05-03 17:00:41 -05:00