1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-10 18:24:11 +01:00
Commit Graph

340 Commits

Author SHA1 Message Date
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
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
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
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
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
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
8651132b5a systemsettings: default airframe is now QuadX 2012-07-07 15:42:31 -04: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
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
James Cotton
9218145aa9 Merge remote-tracking branch 'origin/Brian-PipXtreme-V2' into revo 2012-06-12 22:53:30 -05: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