Bertrand Oresve
fd1b786868
Merge branch 'next'
...
Conflicts:
flight/libraries/sanitycheck.c
flight/modules/Stabilization/stabilization.c
2014-05-08 21:36:54 +02:00
Philippe Renon
cc1c4db786
Merge branch 'filnet/OP-1174_beautify_uploader_gadget_popups' into next
2014-05-08 00:28:26 +02:00
Cliff Geerdes
ead576bab4
OP-1323 GCS label font tweaks
2014-05-06 21:52:32 -04: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
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
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
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
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
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
Philippe Renon
8c0560418d
OP-1174 moved firmware version check (again) from uploader plugin to telemetry plugin
2014-05-03 14:32:46 +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
Corvus Corax
e47cad8ab8
OP-1309 changed default maximum rate for yaw (was too low, old Stabi ignored that setting)
2014-05-01 19:33:03 +02:00
Philippe Renon
39205e350f
OP-1174 uploader gadget - added comments and cleaned up logging
2014-05-01 17:19:33 +02:00
Philippe Renon
c981da5f09
OP-1174 uploader gadget - make sure UI is updated before modal popup is executed
2014-05-01 17:19:24 +02:00
Philippe Renon
3ebe4a7c77
OP-1174 uploader gadget - refactored duplicated code into new "sleep" method
2014-05-01 17:19:23 +02:00
Philippe Renon
b13b72acad
OP-1174 uploader gadget - fixed spelling mistake and simplfied erase button logic
2014-05-01 17:18:58 +02:00
Philippe Renon
ef9eaaba35
OP-1174 added timing out dialog used for board disconnect and connect detection (no need to click ok anymore when disconnecting while rescuing)
2014-05-01 16:37:12 +02:00
Corvus Corax
6993570cc9
OP-1309 integrated AltitudeHold into new Stabilization
2014-05-01 11:48:38 +02:00
Corvus Corax
3ada1da71a
uncrustify
2014-04-30 22:20:07 +02:00
Bertrand Oresve
e37acae75f
OP-1303 Modify INPUT & OUTPUT label
2014-04-30 20:54:25 +02:00
Bertrand Oresve
0a5811fcf9
OP-1303 Change the receiver and actuator boxes
2014-04-30 13:52:37 +02:00
Cliff Geerdes
5ee2930181
OP-1259 Removed inverted flight pitch and yaw reverse option
2014-04-29 20:24:49 -04:00
Bertrand Oresve
567b86167f
OP-1303 Corrects the red-cross (bis)
2014-04-29 21:25:23 +02:00
Corvus Corax
33acbc4209
OP-1309 added new thrust mode default to setup wizard
2014-04-26 20:57:39 +02:00
Corvus Corax
599661ba18
OP-1309 UAVObject changes, GCS changes and Makefile changes needed for Stabi refactoring
2014-04-26 15:14:40 +02:00
Bertrand Oresve
aea3ea0f00
OP-1303 correct Airspeed-Error alarm
2014-04-25 10:06:05 +02:00
Bertrand Oresve
30fb96c39f
OP-1303 Add PathPlan and SystemConfig Alarm (with correct red cross and labels in capital)
2014-04-23 15:49:17 +02:00
Alessio Morale
7be6c16a40
OP-1301 allow GPS protocol selection only if GPS module is enabled.
...
This allow to be able to save HW settings with GPS module disabled.
2014-04-20 13:26:06 +02:00
Alessio Morale
d9b25db36d
OP-1196 Populate attitude tab at connection for CC
2014-04-20 13:08:07 +02:00
Bertrand Oresve
bb0097cb76
OP-1303 Add PathPlan Alarm & SystemConfigAlarm, interface refurbishment
2014-04-17 12:38:53 +02:00
Alessio Morale
000ba5e8f3
Merge remote-tracking branch 'origin/laurent/OP-1172_fonts_in_default_config_files' into next
...
Conflicts:
ground/openpilotgcs/share/openpilotgcs/default_configurations/Developer.xml
ground/openpilotgcs/share/openpilotgcs/default_configurations/OpenPilotGCS_wide.xml
2014-04-15 22:42:18 +02:00