rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-09 20:46:07 +01:00
Code Issues Releases Activity
12,142 Commits 5 Branches 8 Tags 266 MiB
64cea89d3e
Commit Graph

1510 Commits

Author SHA1 Message Date
Fredrik Larsson
0db0c1cc03 Save AuxMag settings 2014-09-24 19:17:20 +10:00
m_thread
0d6aabe37b OP-1222 Added generated file name and export to a specific directory. 
Added scaling of image to save file size.
Added sanity check of input data to not be empty fields.
 2014-09-24 01:06:16 +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
m_thread
cc381075ce OP-1222 We don't add personal names to the @author tag 2014-09-21 22:59:56 +02: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
m_thread
508112d5a3 OP-1474 Fixed code asserting in debug. 2014-09-21 22:38:49 +02:00
m_thread
25cf7fcaf5 OP-1474 Added Axis labels to curves. 2014-09-21 14:28:07 +02:00
m_thread
e4d6171f2c OP-1474 Moved TPS settings to PID banks. Rearranged GUI. 2014-09-20 17:30:19 +02:00
m_thread
76b45ea87a OP-1474 Moving Thrust PID Curve to PID banks. Adding ThrustPIDScalingSource, ThrustPIDScalingTargets and ThrustPIDScalingAxis. 2014-09-19 15:14:29 +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
Fredrik Larson
8a5174de67 Merge remote-tracking branch 'origin/skarlsso/OP-1458_remove_delays_from_tx_wizard' into next 2014-09-19 06:07:20 +10:00
Laurent Lalanne
e88b8ccbdb OP-1222 FW_Wizard Ground shapes : Better labels, cleanup 2014-09-18 20:05:44 +02:00
Laurent Lalanne
d99aba54e3 OP-1222 Added ground shapes : Motorbike, Tank and Car 2014-09-17 22:44:08 +02:00
Fredrik Larson
c4e049f1ed Merge remote-tracking branch 'origin/hayvosh/OP-1489_ILimits' into next 2014-09-18 02:37:53 +10:00
Fredrik Larson
db94453bdf comment typeo 2014-09-18 00:35:07 +10:00
Fredrik Larson
e95689b0fc Old bug, buttongroup clash 2014-09-17 22:33:32 +10:00
Fredrik Larson
1de454a4cf Merge remote-tracking branch 'origin/next' into hayvosh/OP-1489_ILimits 2014-09-17 21:47:54 +10:00
Fredrik Larson
f5fa57c7da Merge remote-tracking branch 'origin/laurent/OP-1134_Populate_new_custom_tab' into next 2014-09-17 08:15:31 +10:00
Fredrik Larson
e4e1e0ed24 Uncrusty 2014-09-17 07:23:58 +10:00
Fredrik Larson
d7ffa008b1 Make alt hold default buttons disabled, they were missing from the constructor 2014-09-17 06:15:07 +10:00
Fredrik Larson
6fe00a773c Some buttons missing from UI setup 2014-09-17 05:47:27 +10:00
Fredrik Larson
cb38cfb118 New UI layout, remove a tab 2014-09-17 05:30:28 +10:00
Laurent Lalanne
a8f0bb6eb6 OP-1222 Uncrustify 2014-09-16 19:27:18 +02: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
Fredrik Larson
20b635fa07 Merge branch 'next' into hayvosh/OP-1489_ILimits 2014-09-17 02:25:53 +10:00
Fredrik Larson
ad65312b41 Merge branch 'next' into fw_wiz 2014-09-17 02:09:07 +10:00
Laurent Lalanne
4bc89ef638 OP-1491 HQuad_mixing_values : Renamed with quad-h labels, artwork fixes. 2014-09-16 01:47:34 +02:00
Laurent Lalanne
fb4b9b05cd OP-1491 Artwork fixes + wizard support - work in progress 2014-09-16 00:48:45 +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
adeb51bb10 OP-1491 Fixes for Config tab 2014-09-15 22:54:46 +02:00
Laurent Lalanne
3f9cd2f3aa OP-1491 Missing quadH code 2014-09-15 22:29:55 +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
Fredrik Larson
bc0e8521e0 Prefer this wording, technically might be wrong, but it's what it acts 
like it does
 2014-09-16 01:28:07 +10:00
Fredrik Larson
5c7fbebb1c More usability bits, less scary knobs to tweek. 2014-09-16 01:14:17 +10:00
Fredrik Larson
599112e50e Some Minor language changes 2014-09-16 01:03:11 +10:00
Fredrik Larson
98cf9d7063 ILimits are so not touched by usrs, even the tinkers, lets clean this up a 
bit.
 2014-09-16 00:54:43 +10:00
Stefan Karlsson
eacf0a1693 Merge branch 'skarlsso/OP-1474-PID_Scaling' into thread/OP-1474-PID_Scaling 
Conflicts:
	shared/uavobjectdefinition/stabilizationsettings.xml
 2014-09-10 21:41:40 +02:00
Alessio Morale
c777f9e194 OP-1406 - Fixes from review comments 2014-09-08 23:24:18 +02:00
m_thread
1a68ba062d Merge remote-tracking branch 'origin/next' into thread/OP-1222_FW_Wizard 
Conflicts:
	ground/openpilotgcs/src/libs/sdlgamepad/sdlgamepad.pro.user
 2014-09-08 21:48:33 +02:00
Fredrik Larrson
849bbfd481 Merge remote-tracking branch 'origin/skarlsso/OP-1455_no_output_from_test_outputs' into next 2014-09-08 04:25:02 +10:00
Fredrik Larrson
32773c0245 Merge remote-tracking branch 'origin/laurent/OP-1349_GCS_Neutral_Spinboxes_in_Input_and_Output' into next 2014-09-08 01:27:23 +10:00
m_thread
474466ac92 OP-1474 Uncrustify. 2014-09-07 00:23:20 +02:00
m_thread
45ea8015ed OP-1474 Updated GUI to follow the standard way of handling checked groups. 
Added missing push buttons to widget list to make then enable/disable correctly.
 2014-09-07 00:20:22 +02:00
m_thread
7fb064cf22 OP-1474 Added thrust PID scale curve to stabilization configuration GUI. 2014-09-06 23:53:44 +02:00
Stefan Karlsson
fa1bd4c946 OP-1458 Deregister previous channel when the back button is pressed 2014-09-02 18:53:02 +02:00
Stefan Karlsson
6633e788b1 OP-1458 Embed the delayed next QTimer in ConfigInputWidget 2014-08-31 23:41:23 +02:00
Stefan Karlsson
a59e4defc5 OP-1458 Shorten the transition delays on the input control setup page 2014-08-31 21:27:55 +02:00
Stefan Karlsson
507aa51221 OP-1458 Make stick identification in the input wizard more stable 2014-08-31 21:27:55 +02:00
Stefan Karlsson
cd5efd61d3 OP-1458 Increase the update for the accessory channels 2014-08-31 21:26:00 +02:00
Corvus Corax
daefab99be OP-1222 fixed elevon mixer to be consistent with aileron type (no channel reversals needed), made FW wizzard and config widget create the same type of mixer setup 2014-08-31 20:15:36 +02:00
Corvus Corax
798defd12d OP-1222 uncrustify 2014-08-31 20:15:01 +02:00
Corvus Corax
5707459074 Merge branch 'next' into corvuscorax/OP-1222_FW_Wizard 2014-08-31 19:00:05 +02:00
Stefan Karlsson
644d35fa41 OP-1458 Restore to original input rate values when cancel is clicked 2014-08-31 15:47:13 +02:00
Alessio Morale
f69e476ed3 Merge branch 'amorale/OP-1452_comusbbridge_improvements' into next 2014-08-29 20:25:29 +02:00
Laurent Lalanne
5f346d81e9 OP-1349_GCS Neutral_Spinboxes_in_Input_and_Output Disable keyboard tracking on inputform spinboxes (min, max, neutral). 2014-08-29 19:45:29 +02:00
Laurent Lalanne
c39424d50a OP-1222_FW_Wizard : Finished artwork diagram, cpp file. Wing tips for FW, polished Vtail and all frames in dark gray. 2014-08-29 16:04:28 +02:00
Fredrik Arvidsson
5d928725f1 Merge remote-tracking branch 'origin/next' into thread/OP-1222_FW_Wizard 
Conflicts:
	ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp
 2014-08-29 00:50:08 +02:00
Laurent Lalanne
d5c8e9a51e OP-1134 Populate_new_custom_tab Lock Custom mixer table until frameType is saved on board, next edit. 2014-08-28 22:30:30 +02:00
Laurent Lalanne
485600ab5d OP-1134 Populate_new_custom_tab : Fix comment 2014-08-28 20:25:22 +02:00
Laurent Lalanne
944e6882c5 OP-1134 Populate_new_custom_tab : Removed question mark 2014-08-28 20:18:54 +02:00
Laurent Lalanne
465f6dc701 OP-1134 Populate_new_custom_tab Protect current mixer table : Changes on Custom tab can't be saved until frameType is set to Custom. 2014-08-28 15:59:32 +02:00
Laurent Lalanne
b8913209dc OP-1134_Populate_new_custom_tab : Typo, bad cleannup 2014-08-28 14:47:37 +02:00
Laurent Lalanne
c00aef04f8 OP-1134 Populate_new_custom_tab : Always update custom tab from airframe's mixer currently used 2014-08-28 14:43:52 +02:00
Laurent Lalanne
eda53adf9e OP-1134 Populate_new_custom_tab Sub task OP-790 : Added custom labels in output, up to 8 Motors, revMotors or Servos 2014-08-28 13:40:02 +02:00
Laurent Lalanne
4e64710c54 OP-1134 Populate_new_custom_tab Fix struct size 2014-08-28 10:43:21 +02:00
Laurent Lalanne
a78e71c31a OP-1134 Populate_new_custom_tab Fixes for files description 2014-08-28 09:55:55 +02:00
m_thread
d87cf62c00 OP-1222 Added support for correct image scaling on open and resize. 2014-08-27 22:52:30 +02:00
Fredrik Larson
271f6090b5 Enable vtail again 2014-08-28 06:43:34 +10:00
Fredrik Larson
772ea8e051 Disable sliders by default, as default airframe is Aileron and on a clean 
board with no settings the mixer slider will be enabled.

Use setCurrentText rather than relying on an index
 2014-08-28 05:58:14 +10:00
Laurent Lalanne
9857ef56dd OP-1422 Tricopter_mixers_settings : Uncrustify ! 2014-08-27 20:38:04 +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
Fredrik Larson
63c4392932 Fix slider links, did this before but reator removed them due to wrong 
naming in the UI by me.
 2014-08-27 18:13:45 +10:00
Laurent Lalanne
4099507bf6 OP-1422_Tricopter_mixers_settings Wizard : Wrong mixer type for servo (was ReversedMotor). M3/M4 bugfix 2014-08-27 02:24:14 +02:00
Fredrik Larson
4d420429ba Merge branch 'fw_wiz2' into fw_wiz 2014-08-27 08:46:03 +10:00
Fredrik Larson
73ef79a95e Header also 2014-08-27 08:45:50 +10:00
Fredrik Larson
dca5a92104 Replace with new version 2014-08-27 08:43:28 +10:00
m_thread
b31ee46724 OP-1222 Uncrustify 2014-08-26 22:34:58 +02:00
Laurent Lalanne
0edf70d0aa OP-1422_Tricopter_mixers_settings : Uncrustify 2014-08-26 19:31:08 +02:00
Laurent Lalanne
94809de9c4 OP-1422_Tricopter_mixers_settings Ternary operator and include qmath.h in cpp 2014-08-26 19:27:05 +02:00
Laurent Lalanne
aea2adf2df OP-1422 Tricopter_mixers_settings Normalize mixer values saved from Wizard and Config tab. Fix bad values saved previously like -63/64. 2014-08-26 17:07:00 +02:00
Fredrik Larson
a7ad51d335 Minor UI improvment with the sliders 2014-08-26 19:44:31 +10:00
Fredrik Larson
71a6726749 This file looked fine in inkscape but rendered with a missing gradient in 
the elevon artwork, a long battle with inkscape and it now renders correctly
again
 2014-08-26 19:25:06 +10:00
Fredrik Larson
9a59cf347e Create image for vtail in svg 2014-08-26 18:20:56 +10:00
Fredrik Larson
6ea2fc67db When qcombo disabled, change index to None, cosmetic, was never used in 
mixer but could confuse users, per Eric's suggestion.

Reenabled v-tail
 2014-08-26 16:46:52 +10:00
Fredrik Larson
8befdeb9b2 Cleanup the fixed-wing part of the config plugin, I am not sure what 
happened to this file and I'm not sure I want to know.
 2014-08-26 16:16:01 +10:00
Alessio Morale
4d0af3b6aa OP-1452 - fix hwwidget 2014-08-26 05:50:32 +02:00
Fredrik Larson
a4d2582cec Move Config plugin for fixed wings back to oly Aileron type per Eric 2014-08-26 12:44:11 +10:00
Fredrik Larson
934faa5f8a Revert adding servos based on Eric's feedback 2014-08-26 12:12:33 +10:00
m_thread
12331586b7 Merge remote-tracking branch 'origin/next' into thread/OP-1222_FW_Wizard 2014-08-25 23:47:33 +02:00
Alessio Morale
7ed3d9f7ad Merge remote-tracking branch 'origin/laurent/OP-1432_Reverse_all_motors_gui_fix' into next 2014-08-25 14:27:19 +02:00
Stefan Karlsson
8614489467 OP-1458 Use fast input update rate throughout the TX wizard 2014-08-24 21:10:58 +02:00
Fredrik Larson
6bcc6f32ed Add servos, more informative for end users 2014-08-25 03:43:59 +10:00
Fredrik Larson
8133606453 disable Mixer by default 2014-08-24 09:18:49 +10:00
Fredrik Larson
57ef5625db Add connections 2014-08-24 08:52:42 +10:00
Fredrik Larson
1776802ebd Minor clean up 2014-08-24 07:57:59 +10:00
Fredrik Larson
030736f89c First draft of totally reworked FixedWing layout for the config plugin 2014-08-24 07:37:59 +10:00
Fredrik Larson
86f8997e88 Start basics of config plugin page for FW clean up, add support for single 
servo aileron fixedwings
 2014-08-24 01:52:41 +10:00
Fredrik Larson
b119f7ee5f Update grouping to show servos 2014-08-24 00:40:24 +10:00
Fredrik Larson
6c79b5554f Add single servo artwork 2014-08-24 00:34:07 +10:00
Stefan Karlsson
f81effa7ea OP-1455 Send the current slider values when enabling Test outputs 2014-08-23 15:45:16 +02:00
Fredrik Larson
337ab6a436 Add servos to image as we will support single servo 2014-08-23 23:36:06 +10:00
m_thread
a7ab68f539 OP-1222 Fixed a 'off-by-one' bug with channels. Fixed some bugs in the configuration plugin regarding fixed wings. 2014-08-21 23:47:18 +02:00
Alessio Morale
b6c053565e OP-1434 - use degrees for rotation, fix Calibration gui 2014-08-21 19:34:36 +02:00
Alessio Morale
869515b349 OP-1406 - Enable calibration of external mag from GCS 2014-08-21 19:34:35 +02:00
m_thread
5354723928 OP-1222 Renamed some files. 
Fixed Wing wizard made only available on Revo
Moved motor for fixed wing to channel 3 since channel 3 got its own timer.
Fixed a crash in config plugin when selecting Fixed Wing.
Added code in outputcalibration in Fixed Wing setup to set min and max values as well as neutral for servos.
Added Controller type Nano.
 2014-08-18 01:20:31 +02:00
Fredrik Larson
501441d3fb Merge branch 'next' into kf_hayvosh/OP-1222_FW_Wizard_lets_get_this_finished 
Conflicts:
	ground/openpilotgcs/src/plugins/setupwizard/pages/outputcalibrationpage.cpp
	ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationsource.h
 2014-08-16 12:12:15 +10:00
Alessio Morale
eed81bd32a Merge remote-tracking branch 'origin/laurent/OP-1425_Small_typo_KpKi' into next 2014-08-13 16:36:34 +02:00
Stefan Karlsson
f569a9d8cb OP-1397 Filter out unnecessary debug messages and use asserts instead. 2014-08-10 20:19:29 +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
Laurent Lalanne
c90bf0f8e0 OP-1432 Reverse_all_motors_gui_fix : Fixes all Hexacopters error when Gcs load "Reverse all motors" parameter. 2014-08-09 04:26:16 +02:00
Stefan Karlsson
4754e62a8e OP-1423 Use the TxPIDSettings::PIDsOptions enum instead of string comparisons 2014-08-05 19:31:26 +02:00
Laurent Lalanne
8821754b4a OP-1425 Small_typo_KpKi : Fix typo + french translation / updated translation for error messages 2014-08-05 12:49:35 +02:00
Stefan Karlsson
b285df98c7 OP-1423 Populate TxPID Min/Max fields with the current values from the Stabilization page 2014-08-01 13:37:41 +02:00
Stefan Karlsson
04d9d3191d OP-1397 Fix StabilizationSettingsBankX type for defaultValueForPidOption 2014-08-01 10:50:52 +02:00
Stefan Karlsson
f9343d9959 OP-1397 Fetch default values for GyroTau 2014-08-01 09:41:13 +02:00
Stefan Karlsson
12589abe7e OP-1397 Read default values for selected PID option from StabilizationSettingsBankX 2014-07-31 00:02:07 +02:00
Stefan Karlsson
3e4737949a OP-1397 Make sure the Min/MaxPIDx widgit limits get set before the values are populated 2014-07-31 00:01:09 +02:00
Stefan Karlsson
0416c39cdb OP-1397 Limit the Attitude Responsiveness values to 180 degrees 2014-07-31 00:00:33 +02:00
Stefan Karlsson
14770876cd OP-1397 Change spinbox properties when a Responsiveness item is selected 2014-07-30 23:50:10 +02:00
Alessio Morale
5f8900f18f OP-1419 - Uses MAG_TRANSFORM_NUMELEM instead 2014-07-27 20:40:17 +02:00
Alessio Morale
401aeee9eb OP-1419 - fix mag factor r2c2 not saved 2014-07-27 20:25:57 +02:00
Alessio Morale
4de36902d0 OP-1358 Update level trim code to use the newly provided fields 2014-07-21 11:01:11 +02:00
Alessio Morale
25c54ac16d Merge remote-tracking branch 'origin/laurent/OP-1063_Multi_config_Hexa_fixes' into rel-14.06 2014-07-16 20:07:31 +02:00
Laurent Lalanne
d2471361bb OP-1063 Multi_config_Hexa_fixes : Uncrustify 2014-07-14 15:59:26 +02:00
Laurent Lalanne
748a522b5d OP-1063 Multi_config_Hexa_fixes : Commented mixer matrix, cleanup. 2014-07-14 15:50:48 +02:00
Laurent Lalanne
8c86b6d629 OP-1063 tr() missing - fix comments 2014-07-14 13:04:20 +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
5b3f2513c6 Merge branches 'laurent/OP-1063_Multi_config_Hexa_fixes' and 'laurent/OP-1063_Multi_config_Hexa_fixes' of ssh://git.openpilot.org/OpenPilot into laurent/OP-1063_Multi_config_Hexa_fixes 
Added Svg OctoX frame
 2014-07-13 11:07:40 +02:00
Laurent Lalanne
711aa7f7d6 OP-1063_Multi_config_Hexa_fixes Added OctoX Svg 2014-07-13 11:01:06 +02:00
Laurent Lalanne
64eb77ed8b OP-1063 Multi_config_Hexa_fixes Svg file : Added HexaX_reverse and fixed gradients 
SetupWizard : Updated Hexa, HexaX and HexaH default values, default
Throttle curve at 90% max
Fixed a previous bug sign in HexaH (and HexaX because previously copied)
: Bug was in M4 Roll and M6 Yaw.
 2014-07-13 10:30:45 +02:00
Laurent Lalanne
0c0ae36413 OP-1063 Multi_config_Hexa_fixes Svg file : Added HexX_reverse and fixed gradients 
SetupWizard : Updated Hexa, HexaC and HexaH default values, default Throttle curve at 90% max
Fixed a previous bug sign in HexaH (and HexaX because previously copied) : Bug was in M4 Roll and M6 Yaw.
 2014-07-13 01:39:50 +02:00
Laurent Lalanne
748190935d OP-1063 Multi_config_Hexa_fixes : Mixer matrix settings for Hexa, HexaX, HexaH. 
New mixer values (60/40) for Pitch and Roll, read from values stored in board.
Svg fixes
 2014-07-10 16:33:11 +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
Laurent Lalanne
145a69c9f5 OP-1337 Typos fixes in code + Translation update 2014-07-05 18:51:16 +02:00
Philippe Renon
01b01052a8 Merge remote-tracking branch 'origin/filnet/OP-1384_revo_board_rotation_is_cleared_by_other_calibration_steps' into next 2014-07-03 22:38:14 +02:00
Philippe Renon
f345adae44 OPO-1384 thermal calibration ui : changed label Variance back to Gradient 2014-07-03 00:54:00 +02:00
Philippe Renon
20df4b7903 OP-1384 updated calibration help text 2014-07-03 00:51:49 +02:00
Philippe Renon
0ccf4e2ea2 OP-1384 minor changes to thermal calibration textual instructions 2014-07-03 00:23:51 +02:00
Philippe Renon
4de8575fa9 OP-1384 gyro calibration will not zero revo board rotation anymore 2014-07-03 00:22:40 +02:00
Alessio Morale
4389f767f3 uncrustify 2014-07-02 23:27:58 +02:00
Philippe Renon
1497d45eee OP-1377 calibration config panel Apply button is now visible only in Expert mode 2014-06-29 21:11:34 +02:00
Philippe Renon
645f1a16ac OP-1376 calibration config panel now propoperly saves result to board SD 2014-06-29 21:10:04 +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
Laurent Lalanne
8895cae3eb Merge branch 'next' into laurent/OP-1337_French_translations_updates 
Conflicts:
	ground/openpilotgcs/src/plugins/config/calibration/thermal/compensationcalculationtransition.h
 2014-06-22 22:06:35 +02:00
Philippe Renon
d775eb536a OP-1351 changed some thermal calibration instruction messages from Warn to Info 2014-06-16 23:06:06 +02:00
Philippe Renon
0f439baff2 OP-1351 six point calibration would not clear instruction text when displaying home location not set error message 2014-06-16 23:05:19 +02:00
Philippe Renon
bd127320d7 OP-1351 thermal calibration - fixed glitch in time display 2014-06-14 22:24:07 +02:00
Philippe Renon
7eea7113e3 OP-1351 six point calibration - replaced unset home location error popup wiht instruction message 2014-06-14 18:41:53 +02:00
Philippe Renon
440741f616 OP-1351 fixed an instruction message 2014-06-14 18:19:18 +02:00
Philippe Renon
48978b523c OP-1351 minor cleanups 2014-06-14 18:14:10 +02:00