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
James Duley
1c5710942c
OP-1741 Path wrong in version_info.pro: set it to ROOT_DIR
2015-02-23 14:15:52 +13:00
m_thread
14d4156d1f
Uncrustify
2015-02-23 00:01:22 +01:00
m_thread
9e6d71120b
Merge remote-tracking branch 'origin/next' into thread/OP-1685_GUI_Fixes
2015-02-23 00:00:39 +01:00
m_thread
ae0e79172f
Uncrustify
2015-02-23 00:00:11 +01:00
m_thread
423191eae1
Merge remote-tracking branch 'origin/next' into thread/OP-1685_cc_oneshot_support
...
Conflicts:
ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
ground/openpilotgcs/src/plugins/config/output.ui
2015-02-22 23:59:01 +01:00
Laurent Lalanne
1f767be636
OP-1685 Add unused wires to CC-PPM
2015-02-22 18:17:11 +01:00
m_thread
da7015ccee
OP-1685 Added oneshot support to connection diagram. Updated connection diagram artwork naming slightly.
2015-02-22 17:56:55 +01:00
m_thread
d8ef4c3044
OP-1685 Added code to disable oneshot as an alternative in certain conditions.
2015-02-22 17:30:49 +01: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
Laurent Lalanne
4c50fefaea
OP-1737 Fix for PassTrough setup : Set mixerType to disabled on reset
2015-02-22 15:00:18 +01:00
m_thread
e5d8255c7a
OP-1685 Re-factored some code.
2015-02-22 14:46:08 +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
Laurent Lalanne
3c6b7523f0
OP-1685 Wrong pin, should be input6, pin8
2015-02-22 13:21:10 +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
Laurent Lalanne
62aaade9e1
OP-1737 Change channelOutTest checkbox signal to clicked
2015-02-21 23:56:29 +01:00
Laurent Lalanne
ec9b380389
OP-1737 Only enable active outputs
2015-02-21 22:58:31 +01:00
samguns
c468831f2c
Add more translations
2015-02-21 22:28:09 +08:00
m_thread
d3a4977947
OP-1685 Fixed group box caption
2015-02-21 09:27:45 +01:00
samguns
7860c772d6
Merge remote-tracking branch 'origin/next' into samguns/zh_CN_GCS
2015-02-21 13:06:25 +08:00
samguns
169b1f91bf
Add more translations
2015-02-20 22:40:33 +08:00
Laurent Lalanne
e3e271a83a
OP-1685 Formatting issue
2015-02-20 14:54:12 +01:00
Laurent Lalanne
00a50044cf
OP-1685 Again
2015-02-20 14:51:27 +01:00
Laurent Lalanne
4bc6e4abd0
OP-1685 Add last wire !
2015-02-20 14:26:05 +01:00
Laurent Lalanne
6437b1c6cf
OP-1685 Add cc-ppm, cc-ppm-oneshot, cc-pwm, revo-ppm, revo-pwm
2015-02-20 14:08:56 +01: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
Nuno Guedes
08b85b7b88
Brighter Blackout Mini H Quad texture
...
Blackout Mini H Quad 3D model texture is now brighter, due to the difference in gamma between Windows and OS X.
2015-02-19 22:32:42 +00: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
samguns
94ba26ed11
End of the day. Add more translations.
2015-02-19 22:34:09 +08: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
