m_thread
5b08f02aae
Merge remote-tracking branch 'origin/next' into thread/OP-1763_CloudConfigs_outside_of_Wizard
2015-03-17 22:25:10 +01:00
abeck70
5c9b6fac29
OP-1769 uncrustify
2015-03-14 12:15:59 +11:00
abeck70
616cd466d2
OP-1769 align tank throttle curve
2015-03-14 10:04:54 +11:00
abeck70
ea47436091
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1769-Ground
2015-03-12 22:34:43 +11:00
abeck70
ad44b313fc
Release 15.02 Merge branch 'master' into next
...
Conflicts:
ground/openpilotgcs/src/plugins/setupwizard/pages/outputcalibrationpage.h
2015-03-12 21:45:00 +11:00
abeck70
d4c4c68131
Release 15.02
...
Update whatsnew and uncrustify.
2015-03-12 21:33:30 +11:00
abeck70
8defea867b
OP-1769 ground support wizard alignment with flight side code
...
1. Moved to using throttle curve 1 which is meant to be primary for throttle. Curve1 can support reversible motor mixer so ok.
2. Changed default throttle1 curve to linear 0-1 representing x>0. For x < 0 the same throttle curve is applied symmetrically to the reverse direction.
3. Allowed in UI both throttle curves to be visible. Throttle curve 2 manually can be used to mix other inputs to affect motor. E.g. slow down in turning.
2015-03-12 08:46:43 +11:00
abeck70
1d7059d4d7
OP-1769 Ground support: Align wizard to flight side code implementation
2015-03-11 22:07:57 +11:00
abeck70
9b726777ea
Updated cloud configs
2015-03-11 13:55:02 +11:00
m_thread
bb880b451e
OP-1763 Moving code to widget from form.
2015-03-10 19:48:56 +01:00
Laurent Lalanne
8727720026
Merge remote-tracking branch 'origin/laurent/OP-1337_15.02' into rel-15.02
2015-03-09 23:05:40 +01:00
Laurent Lalanne
e8a9f698a3
OP-1337 translations updates - rel-15.02
2015-03-09 23:04:04 +01:00
Laurent Lalanne
56fbf1b5ca
Typo s/us/µs/
2015-03-09 22:23:58 +01:00
Laurent Lalanne
12a81827f8
Merge remote-tracking branch 'origin/rel-15.02' into next
...
Conflicts:
ground/openpilotgcs/src/plugins/setupwizard/pages/outputcalibrationpage.h
2015-03-09 22:21:55 +01:00
Laurent Lalanne
0e2fb2231e
OP-1764 Add missing files and changes from review
2015-03-09 13:08:56 +01:00
abeck70
d94b015ed1
OP-1764 spelling mistake
2015-03-09 22:36:54 +11:00
abeck70
2b12b18167
OP-1764 Add explanation html for the new throttle/collective input channel min/max range check
2015-03-09 22:27:25 +11:00
abeck70
d22cb21022
Merge branch 'laurent/OP-1764_Rc_input_ranges' into abeck/OP-1764
2015-03-09 21:26:20 +11:00
m_thread
389577e62a
OP-1763 Adding Widget for template selection gui.
2015-03-08 09:33:54 +01:00
m_thread
54b00dd3e6
OP-1768 Added PWMSync to warning text
2015-03-08 09:26:59 +01:00
m_thread
efd66c375e
Merge branch 'thread/OP-1747_Max_Output_Rates' into rel-15.02
2015-03-08 09:22:12 +01:00
Laurent Lalanne
4b640c5d1d
OP-1764 Add Throttle range check
2015-03-08 02:20:57 +01:00
abeck70
65a3c858dd
rel-15.02 updated cloudconfigs from failsafe
2015-03-08 08:44:53 +11:00
abeck70
7f5d4082d3
rel-15.02 remove all cloudconfigs
2015-03-08 08:42:56 +11:00
Laurent Lalanne
b0a7a19a94
Uncrustify
2015-03-07 12:52:06 +01:00
Laurent Lalanne
fba3281a8c
Merge remote-tracking branch 'origin/laurent/OP-1734_Wizard_show_servo_movement' into next
...
Conflicts:
ground/openpilotgcs/src/plugins/setupwizard/pages/outputcalibrationpage.cpp
2015-03-07 12:43:03 +01:00
abeck70
8c31f96dd7
Merge branch 'rel-15.02' RC4 into next
...
Conflicts:
ground/openpilotgcs/src/plugins/config/input.ui
ground/openpilotgcs/src/plugins/setupwizard/connectiondiagram.cpp
2015-03-07 16:47:46 +11:00
samguns
e6f5b5c50f
Merge branch 'samguns/zh_CN_GCS' into rel-15.02
2015-03-06 10:34:16 +08:00
samguns
d13848a921
OP-1748 one final revision for 15.02
2015-03-06 07:56:56 +08:00
m_thread
840cc86a8d
Uncrustify
2015-03-06 00:37:36 +01:00
m_thread
6fb19b99cb
Merge branch 'thread/OP-1756_Multi_Motor_Calibration' into next
2015-03-06 00:22:31 +01:00
m_thread
9aaf1d6984
OP-1761 Fixes to summary page and connection diagram.
2015-03-06 00:18:00 +01:00
m_thread
1a21b8fce6
OP-1761 Fixing a type
2015-03-06 00:10:21 +01:00
m_thread
25c52d6430
OP-1761 Changed code to not allow PWMSync to be configured if CC or CC3D and > Hexa
2015-03-06 00:05:38 +01:00
m_thread
d4c562eb11
OP-1747 Updated code in SetupWizard to use different max rate outputs for pwm and OneShot125.
2015-03-05 21:45:08 +01:00
samguns
d77c317e37
Revise translations after testing in 15.02-RC3
2015-03-04 09:56:11 +08:00
samguns
08564a739f
Merge branch 'rel-15.02' into samguns/zh_CN_GCS
2015-03-04 08:45:44 +08:00
samguns
ae234e3fa2
Revise some translations after testing in 15.02-RC2
2015-03-04 08:44:29 +08:00
m_thread
a253884edb
Merge branch 'rel-15.02' of ssh://git.openpilot.org/OpenPilot into rel-15.02
2015-03-03 23:23:49 +01:00
m_thread
779415c384
OP-1759 Added limits to field. Changed attached attribute in .ui file to enable limits.
2015-03-03 23:00:52 +01:00
abeck70
1557570b4d
OP-1745 Updated cloudconfigs from failsafe
2015-03-04 07:20:31 +11:00
Laurent Lalanne
843325d44e
GUI input / helicopter tab : Define first tab as default
2015-03-03 00:40:50 +01:00
Laurent Lalanne
a61891cd2e
Fixed Flight Mode layout
2015-03-03 00:09:50 +01:00
Laurent Lalanne
bce05a2312
Fixed Stab layout
2015-03-02 23:32:04 +01:00
m_thread
f1b213834a
OP-1758 Backed out Windows changes due to issues with board detection in certain situations.
2015-03-02 22:26:52 +01:00
m_thread
f3ee2f4845
Fixed layout
2015-03-02 22:22:41 +01:00
abeck70
109b8cd551
OP-1758 usb hidapi upgrade
2015-03-02 22:06:23 +11:00
samguns
45f589627e
Merge branch 'rel-15.02' into samguns/zh_CN_GCS
2015-03-02 10:03:09 +08:00
m_thread
7d62152a98
OP-1756 Removed obsolete concect
2015-03-01 23:09:56 +01:00
m_thread
1c4a861211
OP-1756 Uncrustify
2015-03-01 22:50:14 +01:00