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
14652440a2
OP-1161 skip magnetometer entirelly if complementary (no mag) mode, thus not triggering magnetometer alarms
2014-05-06 18:46:58 +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
b42cd8e862
Merge remote-tracking branch 'origin/Bertrand/OP-1303_Add_PathPlan_Alarm_In_SystemHealth' into next
2014-05-06 16:58:17 +02:00
Corvus Corax
e6875a7e13
Merge branch 'corvuscorax/OP-1259_Cruise_Control_Tweaks' into next
2014-05-06 16:32:27 +02:00
Philippe Renon
e3e92efc70
OP-1174 uncrustified
2014-05-05 00:05:51 +02:00
Philippe Renon
1e803c292b
OP-1174 beautified various uploader popups
2014-05-04 22:53:14 +02:00
Philippe Renon
f38de84aa2
OP-1174 changed title of firmware mismatch popup
2014-05-04 22:52:09 +02:00
Philippe Renon
bcb16f7618
OP-1174 minor uploader ui tweaks : Status text now has minimum size to avoid jumps of the toolbar buttons. Capitalized Erase Settings button.
2014-05-04 22:51:24 +02:00
Philippe Renon
a60a46489b
Merge branch 'corvuscorax/OP-1259_Cruise_Control_Tweaks' of ssh://git.openpilot.org/OpenPilot into corvuscorax/OP-1259_Cruise_Control_Tweaks
2014-05-04 18:27:39 +02:00
Philippe Renon
465f57215c
OP-1309 restored tab index to 0 in input.ui
2014-05-04 18:22:28 +02:00
Philippe Renon
8abd540eb9
OP-1309 fixed label alignment issue in input.ui affecting Stabilization Modes
2014-05-04 12:47:40 +02:00
Corvus Corax
08a627db6f
Merge remote-tracking branch 'origin/Bertrand/OP-1314_Fix_Airspeed_Stack_Size' into next
2014-05-04 12:34:07 +02:00
Corvus Corax
4d9de8f56b
Merge branch 'corvuscorax/OP-1309_Stabilization-Refactoring' into corvuscorax/OP-1259_Cruise_Control_Tweaks
2014-05-04 12:18:47 +02:00
Corvus Corax
d3bf817434
OP-1309 fix typo in stabilizedhandler (manualcontrol) for stabi flightmode 4-6
2014-05-04 12:17:34 +02:00
Corvus Corax
2b00cb31a4
Merge branch 'next' into corvuscorax/OP-1259_Cruise_Control_Tweaks
2014-05-04 12:12:51 +02:00
Corvus Corax
64d18c1a31
Merge branch 'corvuscorax/OP-1316_fix-gravity-constants' into next
2014-05-04 12:07:22 +02:00
Corvus Corax
aee6a3b85b
Merge branch 'corvuscorax/OP-1309_Stabilization-Refactoring' into corvuscorax/OP-1259_Cruise_Control_Tweaks
2014-05-04 12:04:43 +02:00
Corvus Corax
fb41258e57
OP-1309 fixed missing assignment in manualcontrol FM switch
2014-05-04 12:03:56 +02:00
Corvus Corax
6b25c06a03
Merge branch 'corvuscorax/OP-1309_Stabilization-Refactoring' into corvuscorax/OP-1259_Cruise_Control_Tweaks
2014-05-04 11:39:34 +02:00
Corvus Corax
942b53a66b
OP-1309 removed unnecessary NUMELEM run time check from sanitychecks and put it into manualcontrol.h as a compile time static assert
2014-05-04 11:38:10 +02:00
Corvus Corax
23654cf565
Merge branch 'next' into corvuscorax/OP-1259_Cruise_Control_Tweaks
2014-05-04 11:21:52 +02:00
Corvus Corax
5965a5a96e
Merge branch 'corvuscorax/OP-1309_Stabilization-Refactoring' into corvuscorax/OP-1259_Cruise_Control_Tweaks
2014-05-04 11:21:23 +02:00
Corvus Corax
80468fda0b
OP-1309 Updated sanitycheck to reflect new modes for flight side config validation
2014-05-04 11:19:58 +02:00
Corvus Corax
e476addf80
Merge remote-tracking branch 'origin/andrecillo/OP-1315_Unable_to_arm_UAV' into next
2014-05-03 22:25:18 +02:00
Alessio Morale
1395bd524c
OP-975 fix help, make instruction text more visible
2014-05-03 19:45:22 +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
Alessio Morale
c15b415499
OP-975 have differenet set of messages for accel only(ignore orientation on xy plane) and mag calibration.
2014-05-03 18:40:04 +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
Philippe Renon
1bca36ab8d
OP-1174 auto update wizard : removed now (hopefully) uneeded workarounds
2014-05-03 17:42:19 +02:00
Philippe Renon
5b64459eb3
OP-1174 changed fw version check popup from QErrorMessage to QMessageBox. This allows to use a warning icon, etc... And opens the door to more improvments.
2014-05-03 17:41:01 +02:00
Corvus Corax
0d070a5857
Merge branch 'corvuscorax/OP-1309_Stabilization-Refactoring' into corvuscorax/OP-1259_Cruise_Control_Tweaks
2014-05-03 17:27:17 +02:00
Corvus Corax
69b5f41e58
OP-1309 correctly set StabilizationMode.Thrust in all other modules that set StabilizationDesired (Autotune,Pathfollowers)
2014-05-03 17:25:53 +02:00
Corvus Corax
e6a69c2f78
Merge branch 'corvuscorax/OP-1309_Stabilization-Refactoring' into corvuscorax/OP-1259_Cruise_Control_Tweaks
2014-05-03 15:59:03 +02:00
Corvus Corax
e95b25dca8
OP-1309 fixed missing thrust mode assignment in manualcontrol
2014-05-03 15:57:00 +02:00
Philippe Renon
8c0560418d
OP-1174 moved firmware version check (again) from uploader plugin to telemetry plugin
2014-05-03 14:32:46 +02:00
Alessio Morale
19caa57dc6
OP-1312 fix copy/paste-naming issue
2014-05-03 11:45:30 +02:00
Philippe Renon
6fe1c9acd2
OP-1174 OP-1285 Fixed uploader gadget button tooltip. Was wrongly indicating that the erase feature is available from BL version 4 and earlier instead of later.
2014-05-02 23:46:30 +02:00
Philippe Renon
81b7063f04
OP-1174 OP-1131 moved firmware version check from uploader gadget to uploader plugin - removed test code
2014-05-02 23:42:28 +02:00
Philippe Renon
40dcd94b5c
OP-1174 OP-1131 moved firmware version check from uploader gadget to uploader plugin.
...
This ensures that the check is always done even if the uploader gadget is not displayed.
2014-05-02 23:36:05 +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
Philippe Renon
4b379a1816
OP-1174 unrelated cleanup :)
2014-05-02 08:56:09 +02:00
Philippe Renon
f4f3f74948
OP-1174 uploader gadget - now wait for all boards to be disconnected (used to wait for *one* board to be disconnected).
...
This was acheived by reusing new ConnectionWaiter.
2014-05-02 08:55:46 +02:00
Philippe Renon
9573e141aa
OP-1174 auto update wizard - error messages are now shown in red
2014-05-02 08:53:40 +02:00
Philippe Renon
6dd88da492
OP-1174 uploader gadget - made all strings translatable
2014-05-01 23:48:17 +02:00
Philippe Renon
9132e3d44f
OP-1174 uploader gadget - removed deprecated code and minor renaming
2014-05-01 23:21:57 +02:00
Philippe Renon
fababeeeee
OP-1174 wizard upgrade page - made all strings translatable
2014-05-01 23:19:50 +02:00
Philippe Renon
7fef044325
OP-1174 wizard upgrade page - removed now uneeded fix that caused the wizard dialog to flicker
2014-05-01 23:14:35 +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
Philippe Renon
e8cb96f90d
OP-1174 uploader gadget - removed popup to disconnect when using auto update.
...
Fix also applies to vehicule setup wizard autoupdate page
Instead of using a popup that requires user to click Ok, GCS will wait untill all boards are disconnected
This fix induces lots of cleanups.
2014-05-01 22:48:22 +02:00
