abeck70
0cd7e20425
Merge branch 'amorale/OP-1685_various_fixes' into test-oneshot
2015-02-23 16:47:12 +11:00
abeck70
57e0a8baf5
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1721
...
Conflicts:
flight/modules/Sensors/sensors.c
2015-02-23 14:40:55 +11:00
Alessio Morale
ad42ca7f16
Merge remote-tracking branch 'origin/amorale/OP-1658_sensor_overhaul_next' into next
2015-02-22 16:28:04 +01:00
Alessio Morale
1f5f5747f7
OP-1685 - Fix glitches on output settings save. It was due to wrong check for bankmode changes.
2015-02-22 14:21:23 +01:00
Alessio Morale
60abae8a8b
OP-1685 - Rename PIN6 to PIN8 (that's Input6)
2015-02-22 13:25:07 +01:00
Alessio Morale
2a90e86e58
OP-1685 - Try to avoid unneded updates to prevent output glitches
2015-02-22 13:12:00 +01:00
Fredrik Larsson
2cc7064552
Merge remote-tracking branch 'origin/dmytro/OP-969' into next
2015-02-22 21:31:16 +11:00
abeck70
4032b24a6f
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1721
2015-02-20 18:34:09 +11:00
Alessio Morale
0cd545f5e4
OP-1658 - Fix ms5611 units
2015-02-20 05:47:31 +01:00
James Duley
31c13855eb
Merge branch 'parched/OP-1735_Build_fails_with_tidle_in_path' into next
2015-02-20 11:59:12 +13:00
James Duley
911ddff2d5
OP-1735 build fails with tidle in path: tidy after review comment
2015-02-20 10:48:51 +13:00
James Duley
624767a18d
OP-1735 build fails with tidle in path:fixed
2015-02-20 10:23:40 +13:00
lilvinz
745bf1a9db
firmware_defs.mk: add support for build paths containing @
2015-02-20 10:22:18 +13:00
Dmytro Poplavskiy
d7bf842899
OP-969 - Fixed unnecessary resizing of input config wizard
...
Instead of dynamicly adding/removing widgets to the
single wizard page, created all the widgets ahead
and added them to QStackedWidget.
QStackedWidget keeps the size of the biggest child,
so re-layouting is not necessary.
Moved wizard UI to the separate .ui form
as original input.ui and/or implementation
file would be to overloaded otherwise.
2015-02-19 22:44:45 +10:00
abeck70
b9d7408da6
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1721
2015-02-19 16:44:52 +11:00
abeck70
171d335d76
OP-1721 C++ compile review comments
2015-02-19 12:45:21 +11:00
abeck70
b61a76eeae
Merge branch 'next' into abeck/OP-1721
2015-02-19 12:19:28 +11:00
James Duley
db7d605ebc
Merge branch 'parched/OP-1733_version-info.py_should_check_for_json_first' into next
2015-02-19 11:25:04 +13:00
abeck70
b49d0e861e
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
2015-02-19 08:48:00 +11:00
Laurent Lalanne
89353a890c
OP-1337 - 15.02 French update - Wizard and Oneshot
2015-02-18 22:44:41 +01:00
James Duley
a70c972572
OP-1733_version-info.py_check_for_json_first
2015-02-19 10:43:15 +13:00
abeck70
9b373ffe49
Merge branch 'abeck/OP1670' into next
2015-02-19 08:32:58 +11:00
abeck70
4cc70d975a
Merge branch 'thread/OP-1685_GUI_Fixes' into next
2015-02-19 08:31:31 +11:00
abeck70
dc23a5bb43
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into thread/OP-1685_GUI_Fixes
2015-02-19 08:30:41 +11:00
abeck70
bc94fbc2df
OP-1670 uncrustify sanitycheck
2015-02-19 08:27:10 +11:00
Laurent Lalanne
4b187f0f2d
Merge branch 'next' into laurent/OP-1337_15.02
2015-02-18 22:25:21 +01:00
abeck70
d157b1f553
OP1670:Sanitycheck acro/rate+cruisecontrol
2015-02-19 08:25:07 +11:00
Laurent Lalanne
54b8e7a2ab
Merge branch 'laurent/OP-1728_Output_tab_servo_ignore_set_neutral' into next
2015-02-18 22:18:09 +01:00
Laurent Lalanne
0947ab6433
Merge branch 'laurent/OP-1723_Allow_RcCar_reverse' into next
2015-02-18 22:17:40 +01:00
Laurent Lalanne
cb188ed317
Merge branch 'laurent/OP-1718_Fixed_wing_servo_setup+RcInput_calibration' into next
2015-02-18 22:17:14 +01:00
Laurent Lalanne
00f18b83e7
OP-1337 translation update - 15.02
2015-02-18 14:22:18 +01:00
m_thread
1b805610ef
OP-1685 Fixed some more tooltip texts.
2015-02-18 13:49:27 +01:00
m_thread
8c6da7e7ee
OP-1685 Fixed some tooltip texts.
2015-02-18 13:33:15 +01:00
Laurent Lalanne
a9c442916f
OP-1728 Remove keyboard focus on Spin/Checkboxes - Typo - Uncrustify
2015-02-18 12:37:23 +01:00
m_thread
c93c25e657
OP-1685 Made warning message even more informational.
2015-02-18 10:56:31 +01:00
m_thread
6c33fb8185
OP-1685 Simplifying the warning label code and layout.
2015-02-18 10:26:59 +01:00
m_thread
1b842ec322
OP-1685 Fixed Output config layout, fixed HW config layout for CC.
...
Conflicts:
ground/openpilotgcs/src/plugins/config/output.ui
2015-02-18 08:44:57 +01:00
Laurent Lalanne
26ec24f5b1
Merge remote-tracking branch 'origin/laurent/OP-1601_CC3D_Ubx_only' into next
2015-02-18 02:58:19 +01:00
Laurent Lalanne
25c8d43db3
Merge remote-tracking branch 'origin/laurent/OP-1635_Remove_QuadH_config_tab' into next
2015-02-18 02:56:23 +01:00
Laurent Lalanne
f44a663e27
OP-1728 Add message dialog if something to save
2015-02-18 02:46:53 +01:00
Laurent Lalanne
ee3efc535e
OP-1728 Fix output value
2015-02-18 01:50:38 +01:00
Laurent Lalanne
4b24707f82
OP-1728 Remove unused code
2015-02-18 00:51:42 +01:00
Laurent Lalanne
745ada0781
OP-1728 First commit - Maybe better behavior - Display motors with red handle
2015-02-18 00:34:38 +01:00
Alessio Morale
99ab3719c4
Merge remote-tracking branch 'origin/amorale/OP-1685_cc_oneshot_support' into next
2015-02-17 23:46:57 +01:00
Alessio Morale
39513f0533
OP-1685 - Rename OneShot to PWMSync to avoid confusion
2015-02-17 23:20:07 +01:00
Laurent Lalanne
fdc80fd595
Merge remote-tracking branch 'origin/laurent/OP-1706_Output_tab' into next
...
Conflicts:
ground/openpilotgcs/src/plugins/config/outputchannelform.cpp
2015-02-17 14:09:29 +01:00
Laurent Lalanne
6ba3aa0424
OP-1723 Changes for review - Fix for FW dual aileron (output6 not set to 1500)
2015-02-17 13:35:47 +01:00
Alessio Morale
75b3e2f1dc
OP-1685 - Bank mode Combo content was truncated for OneShot/OneShot125 items
2015-02-16 23:12:35 +01:00
Laurent Lalanne
d76affcae3
OP-1723 English typo
2015-02-16 01:22:04 +01:00
Laurent Lalanne
60f9e96571
OP-1723 keep only tr()
2015-02-16 00:11:29 +01:00
