Laurent Lalanne
|
6701b57943
|
Add Sam to credits, thanks for Chinese translations.
|
2015-02-25 00:32:44 +01:00 |
|
Laurent Lalanne
|
c827ce9111
|
Merge remote-tracking branch 'origin/samguns/zh_CN_GCS' into next
|
2015-02-25 00:23:12 +01:00 |
|
Laurent Lalanne
|
e0ba62ba8f
|
Merge branch 'laurent/OP-1337_15.02' into next
|
2015-02-24 23:55:13 +01:00 |
|
Laurent Lalanne
|
3bcf22fea3
|
OP-1337 Last update for 15.02
|
2015-02-24 23:53:51 +01:00 |
|
abeck70
|
1cd8baf17b
|
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
|
2015-02-25 09:47:31 +11:00 |
|
abeck70
|
05f96d2fc0
|
Merge branch 'muralha/Artwork-Modelview' into next
|
2015-02-25 09:42:07 +11:00 |
|
m_thread
|
3160b3ea30
|
Fixing flightmode setup values to avoid unsupported combination.
|
2015-02-24 23:17:12 +01:00 |
|
Alessio Morale
|
a01cab1e72
|
OP-1743 - Fix attitude issue on CC3D
|
2015-02-24 22:39:34 +01:00 |
|
Alessio Morale
|
bcbb1d08e4
|
Merge branch 'amorale/OP-1743_fix_cc_target' into next
|
2015-02-24 22:26:10 +01:00 |
|
Alessio Morale
|
400a99f365
|
missing uncrustification
|
2015-02-24 22:04:11 +01:00 |
|
Alessio Morale
|
81b9d2e379
|
OP-1743 - Raise manualcontrol stack
|
2015-02-24 22:03:18 +01:00 |
|
Alessio Morale
|
a30f115567
|
OP-1743 - Fix uninitialized objects usage
|
2015-02-24 22:02:56 +01:00 |
|
Alessio Morale
|
84465ae0cb
|
OP-1743 - Fix a very ugly error in attitude(cc/cc3d)
|
2015-02-24 22:02:25 +01:00 |
|
abeck70
|
c5275fc89b
|
OP-1744 fix crash on revo with ubx config
|
2015-02-24 22:40:49 +11:00 |
|
Laurent Lalanne
|
1cdc00d285
|
Hot fix : wrong conflict resolve in previous merge
|
2015-02-24 12:05:34 +01:00 |
|
Laurent Lalanne
|
aa8dde905e
|
Merge branch 'laurent/OP-1737_Output_tab_minmax_greyed' into next
Conflicts:
ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
|
2015-02-24 11:52:20 +01:00 |
|
samguns
|
d994c5a2ea
|
Merge 15.02 and add more translations. Now it's ready to merge to next GCS release.
|
2015-02-24 12:33:52 +08:00 |
|
James Duley
|
3e15cac357
|
fix rogue \n in outputchannelform.ui
|
2015-02-24 12:16:30 +13:00 |
|
James Duley
|
36634a5747
|
Merge branch 'parched/OP-1741_path_wrong_in_version_info.pro' into next
|
2015-02-24 10:56:20 +13:00 |
|
m_thread
|
a249415ffa
|
OP-1685 Simple fix to disabled link buttons.
|
2015-02-23 21:02:48 +01:00 |
|
samguns
|
a9676d3311
|
It seems OK for a first version of CN translation.
|
2015-02-23 22:17:02 +08:00 |
|
Laurent Lalanne
|
d0e959af97
|
OP-1737 Missing actuatorLink line - Remove focus code
|
2015-02-23 12:09:28 +01:00 |
|
abeck70
|
9701cbca84
|
Merge branch 'thread/OP-1685_GUI_Fixes' into abeck/test-oneshot
|
2015-02-23 19:38:39 +11:00 |
|
abeck70
|
76167fd92a
|
OP-1685 Fix build problem
|
2015-02-23 19:35:45 +11:00 |
|
m_thread
|
970dedb93c
|
OP-1628 Fixed a disconnect warning
|
2015-02-23 09:32:22 +01:00 |
|
abeck70
|
51a9c7d468
|
Merge branch 'thread/OP-1685_cc_oneshot_support' into abeck/test-oneshot
|
2015-02-23 18:56:54 +11:00 |
|
abeck70
|
2af67618a4
|
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/test-oneshot
|
2015-02-23 18:55:51 +11:00 |
|
abeck70
|
58f5565e30
|
OP-1738 Fix flightmodesettings default
Change Stabi6 from CruiseControl to Manual for Rate/Rate/Rate default to avoid conflict in config due to new sanity check.
|
2015-02-23 18:05:47 +11:00 |
|
abeck70
|
0a3f649eeb
|
Merge branch 'thread/OP-1685_GUI_Fixes' into test-oneshot
|
2015-02-23 16:48:21 +11:00 |
|
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 |
|
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 |
|