samguns
2ea025a4c2
OP-1746 Revise some translations after testing in 15.02-RC1
2015-02-25 14:11:28 +08:00
James Duley
93fb2d588a
fix some artwork permissions part 2
2015-02-25 13:53:30 +13:00
abeck70
deafed615d
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
2015-02-25 11:00:00 +11:00
abeck70
714d450d49
OP-1745 update cloud configs from failsafe
2015-02-25 10:59:22 +11: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
400a99f365
missing uncrustification
2015-02-24 22:04:11 +01: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
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
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
Laurent Lalanne
3c6b7523f0
OP-1685 Wrong pin, should be input6, pin8
2015-02-22 13:21:10 +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
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
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
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
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
Laurent Lalanne
4b187f0f2d
Merge branch 'next' into laurent/OP-1337_15.02
2015-02-18 22:25:21 +01: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
899cf3aa1d
OP-1685 Added more OneShot code to wizard.
2015-02-18 12:03:43 +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
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
m_thread
d859ad78df
Merge remote-tracking branch 'origin/next' into thread/OP-1685_cc_oneshot_support
...
Conflicts:
ground/openpilotgcs/src/plugins/config/output.ui
2015-02-18 00:26:04 +01:00
m_thread
6afbec4fc2
OP-1685 Fixed Output config layout, fixed HW config layout for CC.
2015-02-18 00:19:58 +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
samguns
621edd4463
2015-2-17 Add more translations, still ongoing
2015-02-17 22:19:21 +08: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
m_thread
821573144a
OP-1685 Adding new artwork for oneshot esc. Adding more configuration logic.
2015-02-17 01:08:23 +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
samguns
b37429c89d
2015-02-16
2015-02-16 16:09:33 +08: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
Laurent Lalanne
f4e11fa6ef
OP-1723 Missing tr() - removed debug code
2015-02-15 21:35:39 +01:00
Laurent Lalanne
b6937764aa
OP-1718 Set all servos outputs to 1500 before plug battery for Esc calibration (Tricopter)
2015-02-15 20:51:49 +01:00
Laurent Lalanne
c645738bc5
OP-1723 Ground wizard, reversable motor support - Fixes default outputs levels issue (OP-1718)
2015-02-15 18:32:01 +01:00
Laurent Lalanne
8e5dfff555
Updated Ts file from source
2015-02-15 10:17:53 +01:00
Laurent Lalanne
9344351665
Merge remote-tracking branch 'origin/next' into samguns/zh_CN_GCS
2015-02-15 10:16:28 +01:00
samguns
9f65db5e0b
Initial commit of Chinese translation for GCS.
2015-02-15 15:27:56 +08:00
Laurent Lalanne
f1f8e285e9
OP-1723 Ground config tab : Allow reverse/brake in RcCar
2015-02-14 19:52:47 +01:00
Alessio Morale
d9216d72fe
OP-1685 - Fixes for review comments
2015-02-14 17:23:27 +01:00
James Duley
4cc4ef1537
OP-1722 libusb include incorrect: make ophid.pro use pkg-config
...
correctly
2015-02-14 18:37:26 +13:00
James Duley
fb59e5aef4
OP-1722 libusb include incorrect: tidy ophid.pro
2015-02-14 18:37:26 +13:00
James Duley
88d8e3d215
OP-1722 libusb include incorrect: removed rogue <usb.h> inlcude
2015-02-14 18:36:26 +13:00
Nuno Guedes
71e579ebce
OneShot125 Wizard buttons
...
OneShot125 Wizard up and down buttons
2015-02-13 23:12:13 +00:00
m_thread
a17553ce30
OP-1685 Adding support for synched and oneshot in Vehicle Setup Wizard.
2015-02-12 23:55:44 +01:00
Fredrik Larsson
b0a0582e85
update default model to BO
2015-02-12 10:47:12 +11:00
Alessio Morale
ed56d39ccc
OP-1685 - fix warning text in GCS
2015-02-12 00:00:07 +01:00
Laurent Lalanne
88dc843f4e
OP-1718 RcInput calibration : Set output to 1000 for motor, 1500 for all others (servos, reversedMotor, accessory...)
2015-02-11 23:38:01 +01:00
Alessio Morale
7177e77d23
OP-1685 - Show a warning in output tab if config issues are found
2015-02-11 22:33:57 +01:00
Alessio Morale
a4da83a1be
OP-1685 - Add OneShot compatible configurations
2015-02-11 22:33:57 +01:00
Nuno Guedes
e4c431da49
New 3D model: Blackout Mini H Quad
...
New 3D model for the Modelview
Blackout Mini H Quad with lighter texture
2015-02-11 20:44:22 +00:00
Alessio Morale
544b0357c7
uncrustify
2015-02-10 23:51:19 +01:00
Alessio Morale
6ed06362a7
Merge branch 'master' into next
2015-02-10 23:50:19 +01:00
