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

5199 Commits

Author SHA1 Message Date
dwillis
3c3c08d2d7 OP-1453 - Modify to get network access manager to remove itself once we 
receive a response. Also check to see if we can access the network
before connection signals/slots. If the network isn't accessible, just
remove the network access manager instance.
 2014-08-25 23:53:22 +01:00
James Duley
1bea84d7c9 added icu libs to be copied again 2014-08-26 10:30:24 +12:00
Philippe Renon
174b9bb611 Merge remote-tracking branch 'origin/parched/OP-1324_fix_build_when_python_isnt_python2' into next 
Conflicts:
	ground/openpilotgcs/src/python.pri
 2014-08-26 00:08:53 +02:00
Stefan Karlsson
52420c2ed6 OP-1459 Turn off useOpenGL by default in OPMapGadget 2014-08-25 19:15:03 +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
dwillis
b3f1c0281b OP-1453 - Remove QNetworkAccessManager when we're done with it. Other 
minor tweaks arising from review.
 2014-08-24 23:50:26 +01:00
dwillis
8230f0915c OP-1453 - add version_info as dependency to fix Win and OSX builds. 2014-08-24 23:29:27 +01:00
Laurent Lalanne
c4e1400355 OP-1438 VSI_Arc_PFD+Status Info.qml cleanup, added comments. 2014-08-24 23:43:13 +02:00
James Duley
4fa543c925 OP-1324 fixed the mingw version 2014-08-25 09:08:42 +12:00
dwillis
6bb4843a22 OP-1453 - remember to schedule QNetworkReply for deletion once we're 
done with the network response.
 2014-08-24 21:30:49 +01: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
c38242f627 Missed a damn space, OCD won't let me leave it as is. 2014-08-25 02:55:19 +10:00
Fredrik Larson
4874bdc120 Mac path fix for Python 2014-08-25 02:49:00 +10:00
dwillis
efeeb705b5 OP-1453 - Add mouse area to new version text that will launch the 
software download page when clicked.
Strip CR from end of version read from website.
 2014-08-24 01:29:33 +01:00
dwillis
b1b086e09a OP-1453 - Fix relative alignment of version text and upgrade text. 2014-08-24 00:35:56 +01:00
Laurent Lalanne
72c3d3e9c1 OP-1438 VSI_Arc_PFD+Status : Display OPLinkID as hex value, all uppercase. 2014-08-24 00:23:39 +02:00
Corvus Corax
6faf1a73ac OP-1456 get rid of cast_struct_to_array because it is error prone! 2014-08-24 00:16:34 +02:00
Laurent Lalanne
f1989ad468 OP-1438 VSI_Arc_PFD+Status : Renamed System tab as OPLM tab panel, added buttons and OplmId 2014-08-24 00:08:48 +02:00
Stefan Karlsson
f81effa7ea OP-1455 Send the current slider values when enabling Test outputs 2014-08-23 15:45:16 +02:00
Laurent Lalanne
ed9f0fcf86 OP-1438 VSI_Arc_PFD+Status : Add system / info panel, work in progress. Currently only Smeter on first Oplm. 2014-08-23 09:41:59 +02:00
Laurent Lalanne
00b8fea565 OP-1438_VSI Arc_PFD+Status : Master Caution alarm, white font 2014-08-23 09:40:33 +02:00
James Duley
3dca248938 OP-1324 fixed regex 2014-08-23 15:51:56 +12:00
James Duley
3e8de2e362 OP-1324 removed use of env variable in python.pri 2014-08-23 14:53:22 +12:00
dwillis
139f9c5276 OP-1453 - Add code to query latest version from web and set up 
properties that can be used by the main form to display an 'update
available' notification if latest version doesn't match the current one.
 2014-08-23 02:05:12 +01:00
Fredrik Larson
23ba253cba Not sure if this is needed but updated the Python pri file to reflect the 
correct version
 2014-08-23 09:49:35 +10:00
dwillis
657ec00d72 OP-1453 - Fix alignment of version text 2014-08-22 23:58:17 +01:00
dwillis
7a4964eb74 OP-1453 - First pass at this: get version text on bottom of welcome 
screen
 2014-08-22 23:49:27 +01:00
Laurent Lalanne
8b6b64512f OP-1438 VSI_Arc_PFD+Status : Bugfix, MouseArea was active on hidden background panel. 2014-08-22 16:19:07 +02:00
Laurent Lalanne
8eab7400b7 OP-1438 VSI_Arc_PFD+Status : DemiBold font weight on top 2014-08-22 13:57:03 +02:00
Laurent Lalanne
3e92a26f87 OP-1438 VSI_Arc_PFD+Status Bottom alarms a little bigger 2014-08-21 23:12:44 +02:00
Alessio Morale
b6c053565e OP-1434 - use degrees for rotation, fix Calibration gui 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
869515b349 OP-1406 - Enable calibration of external mag from GCS 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
52ad63be33 OP-1406 - Add support for Aux magnetometer on flight controllers 2014-08-21 19:34:35 +02:00
Laurent Lalanne
c8cd749692 OP-1438 VSI_Arc_PFD+Status Refactored PFD for best viewing on small devices / laptops. Battery panel added on left 2014-08-21 14:28:17 +02:00
Fredrik Larson
2015968911 Merge branch 'copy' into next 2014-08-21 17:45:14 +10:00
James Duley
41fdf4e81f OP-1338 changed to check if qt in tools 2014-08-21 08:49:39 +12:00
Laurent Lalanne
501a59fcdc OP-1438 VSI_Arc_PFD+Status : Display Vsi waypoint with guided flymodes only. Check AirframeType for FW/VTOL pathfollower use. 2014-08-20 15:18:54 +02:00
Fredrik Larson
e51529d025 Update default layout config 2014-08-20 22:22:47 +10:00
Laurent Lalanne
a00de4aaae OP-1438 VSI_Arc_PFD+Status : Bigger Rcinput panel for best viewing 2014-08-20 13:36:05 +02:00
Laurent Lalanne
8447f474fd OP-1438 VSI_Arc_PFD+Status : Typo (CruiseCtrl), little cleanup 2014-08-20 13:32:19 +02:00
Laurent Lalanne
8d0f4e71ea OP-1438 VSI_Arc_PFD+Status : Added RcInput panel, work in progress 2014-08-20 02:10:31 +02:00
James Duley
675e1e4467 Merge branch 'next' into OP-1338_fix_specific_icu_so_version_number 2014-08-20 12:04:37 +12:00
Laurent Lalanne
2c25d2d875 OP-1438 VSI_Arc_PFD+Status : Added Thrust mode info close to Flightmode 2014-08-19 20:47:21 +02:00
Laurent Lalanne
47aadd25cd OP-1438 VSI_Arc_PFD+Status : Vertical velocity display looks ugly due to telemetry updates, add some filtering. 2014-08-19 16:26:05 +02:00
Laurent Lalanne
5cda39d271 OP-1438 VSI_Arc_PFD+Status : Added FlightTime, ArmStatus, Stab info 2014-08-19 14:16:48 +02:00
Laurent Lalanne
a365c5c6df OP-1438 VSI_Arc_PFD+Status : First commit, modified Vsi with arc, added foreground layer with gradient 2014-08-19 03:14:11 +02:00
James Duley
d22b0706aa Merge branch 'parched/OP-1324_fix_build_when_python_isnt_python2' of ssh://git.openpilot.org/OpenPilot into python2_fixes 2014-08-17 11:50:31 +12:00
James Duley
9e8beda778 added quotation marks for PYTHON 2014-08-17 11:08:02 +12:00
Corvus Corax
bc8ccb7be7 Revert "Revert "Merge remote-tracking branch 'origin/parched/OP-1324_fix_build_when_python_isnt_python2' into next"" 
This reverts commit 449653f01e.
 2014-08-16 23:59:37 +02:00
Stefan Karlsson
454ea624ba OP-1450 Turn on high resolution support for OSX 2014-08-16 19:58:04 +02:00
Fredrik Larson
449653f01e Revert "Merge remote-tracking branch 'origin/parched/OP-1324_fix_build_when_python_isnt_python2' into next" 
This reverts commit 4592de13bd, reversing
changes made to a309537e62.
 2014-08-16 23:53:02 +10:00
Corvus Corax
4592de13bd Merge remote-tracking branch 'origin/parched/OP-1324_fix_build_when_python_isnt_python2' into next 2014-08-16 13:53:16 +02:00
Stefan Karlsson
49c5c7a3d8 OP-1447 Use smaller steps for the output calibration wizard page slider 2014-08-15 20:03:08 +02:00
Fredrik Larsson
a309537e62 Merge branch 'hayvosh/logo_delete' into next 2014-08-15 14:27:59 +02:00
Fredrik Larson
731153043a Old logo file 2014-08-15 21:23:49 +10:00
Fredrik Larson
ab43fbe7a8 Fix missing lib 2014-08-15 21:17:01 +10:00
Fredrik Arvidsson
341de560b6 Merge remote-tracking branch 'origin/abeck/OP_1401_qt_53_upgrade_macosx' into next 2014-08-13 23:41:09 +02: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
m_thread
2e7eea7383 Merge remote-tracking branch 'origin/next' into thread/OP-1400_Qt_5.3.1_Upgrade 2014-08-12 10:37:15 +02:00
Fredrik Arvidsson
1558c6d735 Merge remote-tracking branch 'origin/shared/OP-1398_qt531_upgrade' into thread/OP-1400_Qt_5.3.1_Upgrade 
Conflicts:
	make/tools.mk
 2014-08-11 23:25:37 +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
Fredrik Arvidsson
bc5bf38ec5 Merge remote-tracking branch 'origin/skarlsso/OP-1423_populate_txpid_min_max_fields' into next 2014-08-09 10:28:07 +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
m_thread
717de29648 OP-1400 Upgraded make and copydata files to use Qt 5.3.1 Opensource. 2014-08-08 13:48:36 +02:00
Gasté Olivier
dfb21482f4 DSM protocol improvement 
added item in DSM protocol in GCS
 2014-08-08 13:14:39 +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
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
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
33439a8781 Merge remote-tracking branch 'origin/amorale/OP-1419_mag_r2c2_factor_not_saved' into rel-14.06 2014-07-29 00:58:23 +02:00
Alessio Morale
61cdd530c6 Merge remote-tracking branch 'origin/laurent/OP-1337_French_translations_updates' into rel-14.06 2014-07-29 00:55: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
Laurent Lalanne
e7ce7ae4f7 OP-1337 French_translations_updates : Typo 2014-07-27 12:55:22 +02:00
Laurent Lalanne
6d096cad4a OP-1337 French_translations_updates : Calibration help text again 2014-07-27 12:43:03 +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
Alessio Morale
f6ab4cdfb1 Merge remote-tracking branch 'origin/filnet/OP-1383_fixed_GCS_crashes_when_using_serial_connections' into rel-14.06 2014-07-16 20:00:32 +02:00
Alessio Morale
cacccd985e Merge remote-tracking branch 'origin/filnet/OP-1393_SerialPlugin_destructor_generates_valgrind_error' into rel-14.06 2014-07-16 19:57:44 +02:00
Philippe Renon
859cb59df9 OP-1383 minor improvment to original fix + better comment 2014-07-15 00:02:16 +02:00
Philippe Renon
ef785bd060 OP-1383 follow up cleanup - ConnectionManager should not readily expose internal QIODevice 2014-07-14 22:09:53 +02:00
Philippe Renon
e261404206 OP-1383 follow up cleanup - improved closeDevice making sure that m_deviceOpened is always set back to false 2014-07-14 22:07:44 +02:00
Philippe Renon
3e5240062a OP-1383 fixed Qt warning about QSerialPort parenting and thread ownership (seems to fix a crash on Windows when using serial connections) 2014-07-14 22:04:47 +02:00
Philippe Renon
89bc0b13f2 OP-1398 OP-1399 Windows Qt 5.3.1 upgrade - workaround for QSerialPortInfo::availablePorts() returning spurious ports (QTBUG-39748) 2014-07-14 20:03:19 +02:00
Philippe Renon
e196a1f01b OP-1398 OP-1399 Windows Qt 5.3.1 upgrade - removed duplicate method declarations in ophid header (were added in standard hidsdi.h header?) 2014-07-14 18:26:41 +02:00
Philippe Renon
c60417badb OP-1398 OP-1399 Windows Qt 5.3.1 upgrade - updated ICU version from 51 to 52 in copydata.pro 2014-07-14 18:26:40 +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
Alessio Morale
6c8e4c8fad uncrustify 2014-07-14 11:17:42 +02:00
Alessio Morale
dd19818e1b Merge branch 'amorale/OP-1347_flight_logs_segfault' into rel-14.06 2014-07-14 11:07:54 +02:00
Alessio Morale
9af1d500f7 OP-1395 - Remove Qt::Dialog flag as it is misbehaving in linux 2014-07-14 11:06:35 +02:00
Alessio Morale
19a891c296 Merge remote-tracking branch 'origin/laurent/OP-1354_Current_voltage_fixes_and_more_in_PFD' into rel-14.06 2014-07-14 10:56:40 +02:00
Alessio Morale
167f392384 Merge remote-tracking branch 'origin/laurent/OP-1337_French_translations_updates' into rel-14.06 2014-07-14 10:33:11 +02:00
Alessio Morale
b86905e6fa Merge remote-tracking branch 'origin/laurent/OP-1390_OpenGL_for_old_graphics' into rel-14.06 2014-07-14 10:19:15 +02:00
Alessio Morale
2acb60921b Merge remote-tracking branch 'origin/rodneygrainger/OP-1391_fix_to_prevent_arming_if_unsafe_due_to_thrust_mode' into rel-14.06 2014-07-14 10:08:52 +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
Alessio Morale
fd307479e8 OP-1395 - Change labels for better readability remove trailing spaces from translated strings 2014-07-10 22:12:25 +02:00
Alessio Morale
ca12105527 OP-1395 - missing uncrustification 2014-07-10 22:05:12 +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
Alessio Morale
c01047920a OP-1395 - Remove Qt::Dialog flag as it is misbehaving in linux 2014-07-09 23:06:14 +02:00
Alessio Morale
e53be4f8ec OP-1395 - Fix log entries downloaded counter in dialog 2014-07-09 19:49:14 +02:00
Alessio Morale
dc11ff51b1 OP-1395 - fix typo in Flight log dialog 2014-07-09 08:40:31 +02:00
Alessio Morale
0b16d33b88 Merge branch 'amorale/OP-1347_flight_logs_segfault' into amorale/OP-1395_flight_log_enhancements 2014-07-08 18:27:25 +02:00
Alessio Morale
5284419cda OP-1347 - Add title/icon, cleanup and fix modality 2014-07-08 15:13:52 +02:00
Alessio Morale
80169e998f OP-1395 - Handles and unpack multiple uavos in single Debug Log Slot, default interval set to 500ms, 2014-07-08 02:51:50 +02:00
Alessio Morale
3f60e75d2c OP-1347 - Get rid of QDialog and all QWidget stuffs. 
Todo: make it modal, the problem right now is with its parent being an QWidget
 2014-07-07 16:50:03 +02:00
James Duley
95676043d7 on linux check whether QT_INSTALL_LIBS are /usr/lib/* set copyqt to 0 if that is the case 2014-07-07 08:43:04 +12:00
Philippe Renon
352f0112e9 OP-1393 fixed valgrind error reported in SerialPlugin destructor 2014-07-06 17:56:34 +02:00
Laurent Lalanne
fc1b49fe01 OP-1354 PFD fixes for telemetry rates display / Telemetry status. Sumdist only displayed if connected via OPLM 2014-07-06 14:53:43 +02:00
Laurent Lalanne
145a69c9f5 OP-1337 Typos fixes in code + Translation update 2014-07-05 18:51:16 +02:00
Laurent Lalanne
05e7339ecc OP-1390 Copy only opengl32.dll 32bit version 2014-07-05 14:12:27 +02:00
James Duley
90b84b210e Revert "removed so version number from linux icu libs" 
it breaks the build with qt_sdk_install

This reverts commit d437976287.
 2014-07-05 23:40:37 +12:00
dwillis
4e78d3cafa OP-792 
Clear bound combo box lists on board disconnect to ensure that we get
new options added on the next connected signal. This ensures that
different board types always get the correct options when connected.
 2014-07-05 01:44:55 +01:00
Laurent Lalanne
db63158bc6 OP-1390 Updated wiki link for download, removed extra space added. 2014-07-04 18:36:43 +02:00
Laurent Lalanne
99db0c5025 OP-1390 First commit - Need valid download link 2014-07-04 17:21:39 +02:00
James Duley
455c33fb29 check whether python is python 2 use python2 if not 2014-07-04 14:43:15 +12:00
dwillis
5c085823cf OP-792 
Make sure m_currentBoardId is initialized to a known value that we can
use to check to see if we actually have a board id or not. Only set up
limits for UAVObjects bound to combo box if we have a board id that is
not set to the default value.
 2014-07-04 01:18:24 +01: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
James Duley
d437976287 removed so version number from linux icu libs 2014-07-03 19:40:41 +12: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
Alessio Morale
1c4d48b663 Merge remote-tracking branch 'origin/filnet/OP-1376_calibration_results_not_saved_to_SD' into rel-14.06 2014-06-30 23:10:17 +02:00
Alessio Morale
5b4a086193 Merge remote-tracking branch 'origin/laurent/OP-1337_French_translations_updates' into rel-14.06 2014-06-30 23:07:25 +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
Laurent Lalanne
dcaa9e19ca OP-1337 Translations fixes 2014-06-28 14:17:32 +02:00
Alessio Morale
0587a2b368 Merge remote-tracking branch 'origin/laurent/OP-1339_System_Health_fixes' into next 2014-06-28 11:36:25 +02:00
Laurent Lalanne
1ed2dbfe29 OP-1337 Little typo error 2014-06-28 11:06:33 +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
b16f8c54e2 Merge remote-tracking branch 'origin/laurent/OP-1337_French_translations_updates' into next 2014-06-26 19:41:01 +02:00
Alessio Morale
cf6d5be009 Merge remote-tracking branch 'origin/laurent/OP-1354_Current_voltage_fixes_and_more_in_PFD' into next 2014-06-26 19:39:49 +02:00
Laurent Lalanne
75160750fb OP-1337 Translations updates 2014-06-22 22:53:28 +02:00