rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-02 10:24:11 +01:00
Code Issues Releases Activity
13,237 Commits 5 Branches 8 Tags 266 MiB
f44884f072
Commit Graph

1014 Commits

Author SHA1 Message Date
a*morale
7c1265ee30 OP-1548 - Change Fusion algorithm names to make clear their pourpose 2014-10-21 00:49:00 +02:00
a*morale
561fb364a5 OP-1548 - Adding limits to FusionAlgorithm 2014-10-21 00:12:09 +02:00
Alessio Morale
c661920039 OP-1520 - another two modes removed from yaw 2014-10-18 15:20:50 +02:00
Alessio Morale
77860c1448 OP-1520 - remove unsuitable modes for yaw 2014-10-18 15:10:19 +02:00
Alessio Morale
c45c18261c OP-1544 - Change default GPSSettings.UbxAutoConfig option to Configure 2014-10-18 11:44:49 +02:00
Fredrik Arvidsson
2b637080fe Merge remote-tracking branch 'origin/next' into thread/OP-1504_Vehicle_Name_Setting 
Conflicts:
	ground/openpilotgcs/src/plugins/config/stabilization.ui
 2014-10-17 08:09:57 +02:00
m_thread
f73726b3c0 Merge branch 'thread/OP-1538_Embedded_Documentation' into next 2014-10-16 00:34:48 +02:00
Alessio Morale
1e4c5b9780 Merge remote-tracking branch 'origin/thread/OP-1539_Parsing_Error' into next 2014-10-14 21:46:33 +02:00
Alessio Morale
15cd40a907 Merge remote-tracking branch 'origin/skarlsso/OP-1534_add_expo_and_acro_insanity_factor_to_txpid' into next 2014-10-14 21:43:59 +02:00
Alessio Morale
7968bcdb00 Merge remote-tracking branch 'origin/skarlsso/OP-1528_telemetry_on_flexi-io' into next 2014-10-14 21:17:37 +02:00
Laurent Lalanne
a4bbdbc7f2 OP-1538 UavObjectDefinition typos 2014-10-14 08:12:17 +02:00
Fredrik Arvidsson
638588c182 Merge remote-tracking branch 'origin/next' into thread/OP-1538_Embedded_Documentation 2014-10-13 17:48:42 +02:00
m_thread
1b027d0e7a OP-1504 Added VehicleName to SystemSettings and a GUI in Vehicle configuration to set it. 
The name is restricted to 20 chars to save resources.
 2014-10-13 15:54:16 +02:00
m_thread
8300e61717 OP-1539 Fixed limits for AcroInsanityFactor field. 2014-10-13 14:57:15 +02:00
Fredrik Arvidsson
ef15064b26 OP-1538 Added description to fields in the UAVObject description files. 
Descriptions can be added to fields either as attributes or child nodes.
Descriptions are not mandatory at this stage.
The description shows up when hovering over objects and fields in the UAVObject browser.

Added example descriptions to a few fields in the UAVO descriptor files.
 2014-10-11 16:12:58 +02:00
Stefan Karlsson
bedb749f72 OP-1534 Add expo and acro insanity factor to TxPID 2014-10-10 17:57:24 +02:00
m_thread
657ae91f86 OP-1504 Added VehicleName field and started to add GUI support. 2014-10-10 12:14:02 +02:00
m_thread
b794c87d3b Merge remote-tracking branch 'origin/next' into thread/OP-1525_Acro_GUI 2014-10-08 00:56:24 +02:00
Stefan Karlsson
004f5a32a9 OP-1528 Enable Telemetry on the Flexi-IO (receiver) port on the Revo 2014-10-06 21:28:09 +02:00
Fredrik Larsson
e0b1e58e85 Stabbank to match all banks 2014-10-06 02:01:29 +11:00
Fredrik Larsson
bab279172d Roll and pitch to match yaw limits 2014-10-05 19:51:49 +11:00
Corvus Corax
bdb5c88d08 OP-1516 added bank configurable expo to stick to allow snappier rate response 2014-10-03 19:07:47 +02:00
m_thread
0aa8c47b48 OP-1524 Added Array tree node value preview. 2014-10-03 18:00:59 +02:00
m_thread
5c2a013433 OP-1524 Added CharFieldTreeItem and the check for the 'char' unit in array fields. 2014-10-03 16:44:00 +02:00
Corvus Corax
ac0fccc10a OP-1516 re-introduce sanity to Acro+ 2014-10-03 15:44:02 +02:00
Corvus Corax
17f187468c Merge remote-tracking branch 'origin/next' into corvuscorax/OP-1516_acro+ 2014-10-03 12:34:35 +02:00
Alessio Morale
e553014596 Merge branch 'amorale/OP-1476_1477_1275_GPSV9_pios_firmware_bootloader' into next 2014-10-03 00:37:55 +02:00
Corvus Corax
dcb354b0b1 OP-1516 Enable PiroComp per setting 2014-10-02 22:42:08 +02:00
Corvus Corax
3ad47bfa0a OP-1516 added Acro+ stabi mode 2014-10-02 22:13:10 +02:00
Fredrik Larson
ffdfa62d22 Bandwidth testing 2014-09-30 16:54:24 +10:00
Fredrik Larson
efde46cf7a Merge branch 'next' into fw_wiz 2014-09-30 15:41:19 +10:00
Alessio Morale
005b0feec1 Change Revo Main port default to disabled as telemetry causes issues with OPlink 2014-09-27 11:11:51 +02:00
Fredrik Larsson
a01f446cae Merge remote-tracking branch 'origin/next' into fw_wiz 2014-09-26 09:58:57 +10:00
Fredrik Larsson
045757a6bb Back to 2K 2014-09-26 08:47:42 +10:00
Alessio Morale
8712a1dfdc OP-1477 - Board support for updated SYS message 2014-09-24 01:06:49 +02:00
m_thread
7bcdff9f2f Merge remote-tracking branch 'origin/next' into thread/OP-1222_FW_Wizard 
Conflicts:
	ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp
	ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp
	ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationsource.h
 2014-09-23 22:30:49 +02:00
Corvus Corax
ca7a3e4333 Merge branch 'next' into corvuscorax/OP-1483_leaky-integrals-and-post-filtering 2014-09-23 13:54:33 +02:00
Werner Backes
b621df59f2 Merge remote-tracking branch 'origin/D-Lite/OP-1483-PathFollower-DisablePosKi' into next 2014-09-23 13:33:32 +02:00
m_thread
19aa3ed5a3 Merge remote-tracking branch 'origin/next' into thread/OP-1222_FW_Wizard 2014-09-22 23:05:21 +02:00
Fredrik Larson
c36e9a9122 Merge remote-tracking branch 'origin/thread/OP-1474_PID_Scaling_Banks' into next 2014-09-23 06:20:34 +10:00
Fredrik Larsson
b93a7a9dce Arming for Helis on Revo 2014-09-23 05:35:35 +10:00
m_thread
daae74f9e8 Merge remote-tracking branch 'origin/next' into thread/OP-1222_FW_Wizard 
Conflicts:
	ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configfixedwingwidget.cpp
 2014-09-21 22:58:15 +02:00
Corvus Corax
41e062373d OP-1483 enable postfilter for indoor mode for filter debugging, change default filter alpha coefficient to 0.999 2014-09-21 19:26:01 +02:00
m_thread
e4d6171f2c OP-1474 Moved TPS settings to PID banks. Rearranged GUI. 2014-09-20 17:30:19 +02:00
Corvus Corax
76f94e13ef Revert "OP-1483 implement leaky integral on position control loop in pathfollower (vtol only)" 
This reverts commit 1a0ab29050.
 2014-09-20 13:45:45 +02:00
Corvus Corax
b315c8f106 OP-1483 Added velocity filter to correct EKF's velocity estimate for static velocity offsets 
(caused for example by sensor disagreement or calibration issues)
 2014-09-19 16:34:20 +02:00
Corvus Corax
1a0ab29050 OP-1483 implement leaky integral on position control loop in pathfollower (vtol only) 2014-09-19 15:52:11 +02:00
m_thread
226fe186c4 Merge branch 'skarlsso/OP-1474-PID_Scaling_one_factor' of ssh://git.openpilot.org/OpenPilot into thread/OP-1474_PID_Scaling_Banks 2014-09-19 15:15:52 +02:00
Stefan Karlsson
9a21eed71e OP-1474 Make it possible to select axes to scale 2014-09-19 15:11:15 +02:00
m_thread
3b1e67d185 Merge remote-tracking branch 'origin/next' into thread/OP-1474_PID_Scaling_Banks 
Conflicts:
	ground/openpilotgcs/src/plugins/config/stabilization.ui
 2014-09-19 09:01:02 +02:00
Stefan Karlsson
31c5f1c519 OP-1474 Make it possible to select the combination of P, I, and D to scale 2014-09-19 01:16:49 +02:00
Stefan Karlsson
d3e7ef300f OP-1474 Use PID banks for the TPS settings 2014-09-19 01:05:08 +02:00
Werner Backes
c90973cb99 Removed the now unused position Ki from VtolPathFollowerSettings UAVObject 2014-09-18 17:01:50 +02:00
Fredrik Larson
97ccde9118 Uplimits 2014-09-17 22:02:54 +10:00
Laurent Lalanne
bc9e6b24f9 Merge remote-tracking branch 'origin/laurent/OP-1491_HQuad_mixing_values' into laurent/OP-1222_FW_Wizard 
Conflicts:
	ground/openpilotgcs/src/plugins/setupwizard/pages/multipage.cpp
	ground/openpilotgcs/src/plugins/setupwizard/resources/connection-diagrams.svg

Conflicts resolved in artwork, same style as FW branch
 2014-09-16 18:55:43 +02:00
Alessio Morale
c49497f2e0 Merge branch 'amorale/OP-1434_GPSV9_fc_support' into next 2014-09-15 23:49:54 +02:00
Laurent Lalanne
48ce38370c OP-1491 HQuad_mixing_values First commit : add QuadH artwork, config tab 2014-09-15 22:25:07 +02:00
Stefan Karlsson
bdbe875a90 OP-1474 Use ActuatorDesiredThrust as default source for TPS 2014-09-14 16:08:21 +02:00
Stefan Karlsson
8cd7a71c18 Merge branch 'next' into thread/OP-1474-PID_Scaling 2014-09-11 00:00:02 +02:00
Werner Backes
907b4668aa Merge remote-tracking branch 'origin/next' into D-Lite/OP-1462-NewEKFdefaults 2014-09-10 12:51:20 +02:00
Stefan Karlsson
7afb211330 OP-1474 Revert TPS debugging code 2014-09-10 00:42:40 +02:00
Alessio Morale
c777f9e194 OP-1406 - Fixes from review comments 2014-09-08 23:24:18 +02:00
Stefan Karlsson
c0152b7e19 OP-1474 Thrust PID scaling 2014-09-08 00:14:49 +02:00
Fredrik Larrson
d91db0af6f Revert "Merge remote-tracking branch 'origin/proff/OP-1373_DSMFixes' into next" 
This reverts commit a39e393274, reversing
changes made to ebfdaf28b5.
 2014-09-08 02:31:02 +10:00
Fredrik Larrson
a39e393274 Merge remote-tracking branch 'origin/proff/OP-1373_DSMFixes' into next 
Conflicts:
	shared/uavobjectdefinition/hwsettings.xml
 2014-09-08 01:54:59 +10:00
Fredrik Larson
7a98dc7227 More rate work 2014-09-07 16:49:08 +10:00
Fredrik Larson
9e13c9c8da Atom tinkering, prepare for new config system 2014-09-07 15:52:22 +10:00
Corvus Corax
4a19f98c95 OP-1156 hotfix in pathfollower code - use correct VerticalPosPI.Ki and ILimit + uavobject typo 2014-09-06 13:51:30 +02:00
Alessio Morale
157ab9c0d2 OP-1370 - Change default options to use SBAS only as ranging source 2014-09-03 18:12:27 +02:00
Alessio Morale
884f797d61 OP-1370 - Add SBAS configuration options 2014-09-02 21:26:56 +02:00
Alessio Morale
2ddbb72bcf OP-1370 - Fixes parameters name, values and cosmetic issues. 2014-09-02 21:26:43 +02:00
Fredrik Larson
93792510bc Pid testing 2014-08-31 00:32:00 +10:00
Alessio Morale
f69e476ed3 Merge branch 'amorale/OP-1452_comusbbridge_improvements' into next 2014-08-29 20:25:29 +02:00
Werner Backes
398a546cac Significantly lower some EKF variance settings to improve stability and 
tracking accuracy.
 2014-08-28 11:14:43 +02:00
Laurent Lalanne
f313bef2e5 OP-1422 Tricopter_mixers_settings Store mixing / sliders values on board - Wizard/Config tab. Tricopter Yaw mixing now applies to servo, 100% default. 2014-08-27 20:33:11 +02:00
Alessio Morale
5a3ea5fde0 OP-1370 - Add an option to store the configuration onto GPS 2014-08-22 23:16:38 +02:00
Alessio Morale
c4d5234ee6 OP-1370 - Show AutoConfig status in GPSPositionSensor 2014-08-22 22:32:57 +02:00
Alessio Morale
af9dce3569 OP-1370 - Settings definition 2014-08-22 02:43:47 +02:00
Alessio Morale
002c35163a OP-1370 - Add support for mon-ver ack-ack and ack-nak messages for gps hw version detection 2014-08-21 19:34:36 +02:00
Alessio Morale
0198129a1c OP-1434 - Add 230400 to GPS port speed list 2014-08-21 19:34:36 +02:00
Alessio Morale
55557ecd60 OP-1434 - Add gps extended status 2014-08-21 19:34:35 +02:00
Alessio Morale
e511190ad3 OP-1406 - Improve handling of external magnetometer, add additional settings 2014-08-21 19:34:35 +02:00
Alessio Morale
cced294760 OP-1406 - Add support for aux mag calibration settings. 
todo:
- GCS handling for extenal mag calibration
 2014-08-21 19:34:35 +02:00
Alessio Morale
9d7a493c26 OP-1406 - Allows filtermag to switch between onboard and aux mag 2014-08-21 19:34:35 +02:00
Alessio Morale
52ad63be33 OP-1406 - Add support for Aux magnetometer on flight controllers 2014-08-21 19:34:35 +02:00
Alessio Morale
bb085ddab9 OP-1452 - Auto enable COMBridge module if a port is configured as ComBridge 2014-08-21 11:43:36 +02:00
Corvus Corax
8daa5dfa12 Merge branch 'next' into corvuscorax/OP-1156_pathfollower-unification 2014-08-16 13:58:40 +02:00
Corvus Corax
915c24c8b6 OP-1156 changed PID control loops to use generic pid library, readded unnecessary integral and derivative terms to vtolpathfollower 2014-08-15 21:00:48 +02:00
Corvus Corax
b562fcb02e OP-1156 fix path logic to not deviate from correct altitude too much 2014-08-15 17:56:57 +02:00
Stefan Karlsson
53fd76911e OP-1433 Group the PID options by Roll, Pitch, Roll+Pitch, and Yaw. 2014-08-14 07:23:25 +02:00
Alessio Morale
5dbbda3adc Merge remote-tracking branch 'origin/amorale/OP-1404_ublox_pvt_support' into next 2014-08-13 15:27:10 +02:00
Corvus Corax
09e8b38407 OP-1156 fixed EmergencyFlyaway detection algorithm 2014-08-12 19:12:05 +02:00
Corvus Corax
4fc071978c OP-1156 commit changed xml file 2014-08-12 18:23:45 +02:00
Corvus Corax
8944419b0f OP-1156 refactored pathfollower - new unified module as delayed callback - compiles but untested 2014-08-10 19:41:40 +02:00
Corvus Corax
a3d18bb578 Merge remote-tracking branch 'origin/D-Lite/PathFollowerImprovements' into corvuscorax/OP-1156_pathfollower-unification 2014-08-10 13:53:52 +02:00
Corvus Corax
ca1923f76f OP-1156: Added new (stub template) pathFollower Module as well as builkd environment changes to compile it instead of old pathfollowers 2014-08-10 12:50:38 +02:00
Stefan Karlsson
454d491e48 Merge branch 'next' into skarlsso/OP-1397_add_responsiveness_to_txpid 
Conflicts:
	ground/openpilotgcs/src/plugins/config/configtxpidwidget.cpp
	ground/openpilotgcs/src/plugins/config/configtxpidwidget.h
 2014-08-10 10:06:44 +02:00
Corvus Corax
c5fae5ee84 Merge branch 'next' into andrecillo/OP-1317_IMU_wind_estimation 2014-08-09 10:43:48 +02:00
Gasté Olivier
dfb21482f4 DSM protocol improvement 
added item in DSM protocol in GCS
 2014-08-08 13:14:39 +02:00
Alessio Morale
a18009e875 OP-1429 Change datatype for elevation and azimuth respectively to int8 and int16. 2014-08-06 12:55:07 +02:00
Alessio Morale
6884e9f378 Merge remote-tracking branch 'origin/amorale/OP-1395_flight_log_enhancements' into next 2014-08-02 20:41:58 +02:00
Stefan Karlsson
a7ee6fa764 OP-1397 Add initial support for rate mode response (deg/s) 2014-07-30 23:49:56 +02:00
Stefan Karlsson
2113e1a2e1 OP-1397 Add initial support for attitude mode response (deg) 2014-07-30 23:48:55 +02:00
Cliff Geerdes
16ca5b67ff OP-1421 Cruise Control fix xml defaultvalue 2014-07-29 13:31:05 -04:00
Werner Backes
065ba1a0c8 Adds a 3D mode to path_vector. This allows vertical path segments without 
position changes. PathStatus now also contains correction_direction and
path_direction to make path following behaviour more transparent.
 2014-07-29 13:16:47 +02:00
Werner Backes
7da0034775 Improved automatic landing algorithm to better track descend speed. 
Desired descend speed is now a FlightModeSetting.
 2014-07-29 13:16:43 +02:00
Corvus Corax
5451003a58 Merge branch 'next' into corvuscorax/OP-1317_IMU_wind_estimation 
Conflicts:
	flight/modules/Airspeed/airspeed.c
	flight/modules/Airspeed/gps_airspeed.c
 2014-07-26 16:16:02 +02:00
Alessio Morale
e5b52d46d9 Merge remote-tracking branch 'origin/amorale/OP-1358_add_separate_rotation_calibration_offset_revo_only' into rel-14.06 2014-07-24 23:47:14 +02:00
Corvus Corax
2740631e06 OP-1412 change systemalarms to update periodic to not loose data 2014-07-22 23:50:39 +02:00
Corvus Corax
eec6c482ea OP-1412 change initial gyro bias uncertainty variance setting 
from 1e-4 to 1e-6 to allow more stable filter initialization.
this is now valid thanks to available temp compensation and gyro bias
calibration in GCS
 2014-07-22 23:38:50 +02:00
Alessio Morale
9bee143476 OP-1358 Revo:Implement roll/pitch trim settings separated from "nominal" board rotation settings 2014-07-21 11:01:07 +02:00
Alessio Morale
c5a9e1f3e1 OP-1413 - Land flight mode is actually not a finished auto landing system but rather a PH hack, thus it needs to be disabled from gcs until it is will be implemented properly. 2014-07-20 11:02:43 +02:00
Laurent Lalanne
c26e33964a OP-1063 Multi_config_Hexa_fixes Added OctoX, define new mixer table for Octo(p) and OctoX. New motor definition for OctoX (NNE, ENE...) Fixes for svg frames. Defined default settings for OctoP/X in setupwizard (but disabled) 2014-07-13 13:58:18 +02:00
Laurent Lalanne
a46480a99b OP-1063 Multi_config_Hexa_fixes : Added real HexaX, renamed HexaX > HexaH 
Added artwork in config and wizard svg. Cleanup on svg connection diagram (layers)
DO NOT USE until mixers are fixed
 2014-07-10 06:01:28 +02:00
Alessio Morale
55b325966a OP-1395 - Pack several objects on a single Debug Log "slot", after ten consecutive failures (log full) gives up trying to save to prevent wasting time. Use PIOS_Delay for timestamp 2014-07-08 02:47:09 +02:00
Alessio Morale
8b180dbbb9 Merge remote-tracking branch 'origin/amorale/OP-1378_check_limits' into rel-14.06 2014-06-30 23:16:22 +02:00
Alessio Morale
a3e808032c OP-1378 - Review the flight mode settings limits 2014-06-29 22:10:35 +02:00
Alessio Morale
fdbe58e8e6 OP-1375 Update Mag Ki and Kp default settings 2014-06-29 16:06:54 +02:00
Alessio Morale
1b823b7b92 Merge remote-tracking branch 'origin/Bertrand/OP-1308_Set_Same_Logic_To_Alarms' into next 
Conflicts:
	flight/libraries/sanitycheck.c
	flight/modules/StateEstimation/filtermag.c
	flight/modules/System/systemmod.c
 2014-06-26 20:31:27 +02:00
Alessio Morale
cbddcf9e5f Change SystemAlarm mode to Throttled to prevent any risk of telemetry flooding 2014-06-22 20:42:18 +02:00
Alessio Morale
c6a773363f Merge branch 'amorale/OP-943_add_malloc_for_ccsram' into next 
Conflicts:
	flight/pios/common/pios_adxl345.c
	make/apps-defs.mk
 2014-06-22 19:31:03 +02:00
Alessio Morale
f30dd414ac Merge branch 'amorale/OP-1227_cc_high_cpu_utilization' into next 2014-06-22 16:06:08 +02:00
Corvus Corax
f1b7f339b6 OP-1371 setting to disable sanity checks for debugging and testing - will set config alarm to warning if set 2014-06-18 21:39:16 +02:00
Corvus Corax
7245ea9267 OP-1317 changed type and default for airspeedsettings filter coefficients 2014-06-18 20:36:50 +02:00
Corvus Corax
205edac762 Merge branch 'next' into corvuscorax/OP-1317_IMU_wind_estimation 2014-06-17 18:14:27 +02:00
Alessio Morale
68de1e4d4d OP-943 Raise heapremaining to uint32 2014-06-11 22:15:40 +02:00
Corvus Corax
80280256f9 OP-1287 changed default offsets for better behaviour with vtolpathfollower - needs to be increased to 500 on horizontal and 5 veetical for use with fixedwings 2014-06-11 18:29:43 +02:00
Corvus Corax
78acaf49ad OP-1287 fixed telemetry options for pathdesired , which were set way too aggressive 2014-06-09 23:39:05 +02:00
Corvus Corax
a19ebfec14 OP-1287 separate stick response setting for vertical and horizontal in PositionVario/AutoCruise modes 2014-06-07 23:06:11 +02:00
Alessio Morale
e9364271d1 OP-1365 Flight code instrumentation API: define ID unit as hex for perfcounter uavo 2014-06-06 22:40:22 +02:00
Alessio Morale
2396350f2f OP-1365 Flight code instrumentation API: Implementation of UAVObject wrapper layer 2014-06-06 22:19:27 +02:00
Corvus Corax
b9f9b91c8c OP-1287 added new pos vario flightmodes 2014-06-04 09:57:37 +02:00
Corvus Corax
f0c4b8f9c7 OP-1287 renamed VELOCITYCONTROL back to AltitudeVario for consistency 2014-06-03 18:42:54 +02:00
Corvus Corax
6bdcdba335 OP-1327 hotfix: change systemalarms acked to false 2014-05-27 18:50:16 +02:00
Corvus Corax
c6e168c972 Merge branch 'next' into corvuscorax/OP-1352_Headwind-improvements 2014-05-26 17:17:43 +02:00
Andres
9e80c4da9c OP-1317 Low-pass filter parameters added to airpeedSettings: IMUBasedEstimationLowPassPeriod1 pre-filter period in seconds, IMUBasedEstimationLowPassPeriod2 filter period in seconds. Oscillations with shorter periods than these, are filtered. If airspeed has too much noise increase IMUBasedEstimationLowPassPeriod2, else if it is too smooth descrease it. 2014-05-23 11:55:06 +02:00
Corvus Corax
5544e9c984 OP-1352 redesigned course calculation to take complete wind vector into account 2014-05-17 22:02:04 +02:00
Alessio Morale
80bd04075f OP-1350 Rename ReturnToHomeAltitudeOffset to ReturnToBaseAltitudeOffset 2014-05-16 18:51:04 +02:00
Alessio Morale
86b0829823 OP-1350 Add takeofflocation UAVO 2014-05-16 00:40:19 +02:00
Alessio Morale
58bba31c72 Merge remote-tracking branch 'origin/amorale/OP-1312_pios_ws2811_driver' into next 2014-05-15 20:30:43 +02:00
Alessio Morale
7182fe0194 Merge remote-tracking branch 'origin/amorale/OP-1329_airspeed_fixes' into next 2014-05-15 20:30:10 +02:00
Bertrand Oresve
fd1b786868 Merge branch 'next' 
Conflicts:
	flight/libraries/sanitycheck.c
	flight/modules/Stabilization/stabilization.c
 2014-05-08 21:36:54 +02:00
Corvus Corax
4cf667123c OP-1161 changed default maximum warning and critical deviations for magnetometer 2014-05-08 00:20:00 +02:00
Alessio Morale
2ceef9ce86 OP-1326 Change default airspeed sensor to "None" 2014-05-07 22:47:50 +02:00
Corvus Corax
a2ae0601bb Merge remote-tracking branch 'origin/amorale/OP-975_calibration_process_changes' into corvuscorax/OP-1161_magnetometer-alarm 2014-05-06 18:51:46 +02:00
Corvus Corax
2bd7609de9 Merge branch 'next' into corvuscorax/OP-1161_magnetometer-alarm 
Conflicts:
	ground/openpilotgcs/share/openpilotgcs/diagrams/default/system-health.svg
 2014-05-06 17:30:00 +02:00
Corvus Corax
8ec8c4e235 Merge branch 'corvuscorax/OP-1309_Stabilization-Refactoring' into corvuscorax/OP-1259_Cruise_Control_Tweaks 2014-05-03 18:40:10 +02:00
Corvus Corax
0509595137 OP-1309 present for Laurent: 3 more Stabilized modes (and a bit of cleanup) 2014-05-03 18:38:45 +02:00
Corvus Corax
c63540b2ec Merge branch 'corvuscorax/OP-1309_Stabilization-Refactoring' into corvuscorax/OP-1259_Cruise_Control_Tweaks 
Conflicts:
	flight/modules/Stabilization/stabilization.c
	shared/uavobjectdefinition/stabilizationsettings.xml
 2014-05-02 18:25:57 +02:00
Corvus Corax
f7a2e31809 Merge branch 'next' into theothercliff/OP-1259_Cruise_Control_Tweaks 
Conflicts:
	flight/pios/stm32f10x/inc/usb_conf.h
 2014-05-01 22:58:10 +02:00