m_thread
|
f5811e7747
|
OP-1777 Adding settings to general settings panel.
|
2015-03-10 22:20:08 +01:00 |
|
James Duley
|
ba5f395f41
|
Merge remote-tracking branch 'dev/parched/OP-1695_ubuntu_PPA' into next
|
2015-03-10 11:40:59 +13: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 |
|
abeck70
|
f706a3013b
|
rel-15.02 RC6 whatsnew
|
2015-03-09 23:33:37 +11:00 |
|
Laurent Lalanne
|
3973858c47
|
Merge branch 'rel-15.02' of ssh://git.openpilot.org/OpenPilot into rel-15.02
|
2015-03-09 13:24:04 +01:00 |
|
Laurent Lalanne
|
0e2fb2231e
|
OP-1764 Add missing files and changes from review
|
2015-03-09 13:08:56 +01:00 |
|
abeck70
|
f8ef21e18a
|
rel-15.02 RC5 updated whatsnew
|
2015-03-09 22:44:09 +11:00 |
|
abeck70
|
d94b015ed1
|
OP-1764 spelling mistake
|
2015-03-09 22:36:54 +11:00 |
|
abeck70
|
dc3610f4e8
|
OP-1764 uncrustify
|
2015-03-09 22:31:40 +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
|
993481c11e
|
OP-1764 added flight side sanity checks
|
2015-03-09 21:31:42 +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
|
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
|
782df3ca0c
|
rel15.02 RC5
|
2015-03-08 08:52:50 +11: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 |
|
abeck70
|
1897b9b44e
|
rel-15.02 RC4 release notes update
|
2015-03-06 12:41:07 +11: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 |
|
abeck70
|
7d9b4710e8
|
rel-15.02 updated whatsnew
|
2015-03-04 09:30:48 +11: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
|
a73193f948
|
rel-15.02 update WHATSNEW.txt for RC3
|
2015-03-04 07:54:07 +11:00 |
|
abeck70
|
1557570b4d
|
OP-1745 Updated cloudconfigs from failsafe
|
2015-03-04 07:20:31 +11:00 |
|
James Duley
|
b1adc38f05
|
OP-1695 Ubuntu PPA: suppress 'which' stderr
|
2015-03-03 18:19:42 +13:00 |
|
James Duley
|
655e907506
|
OP-1695 Ubuntu PPA: remove dirty from version-info.json
|
2015-03-03 17:51:43 +13:00 |
|
James Duley
|
54df9d1ea0
|
firmware-defs.mk: added '+' to replace_special_characters
|
2015-03-03 15:38:53 +13:00 |
|
James Duley
|
0b20faf6a3
|
OP-1695 Ubuntu PPA: added trusty suffix to DEB_REV if trusty
|
2015-03-03 15:38:37 +13:00 |
|
James Duley
|
afe0949f00
|
OP-1695 Ubuntu PPA: added check for debian distro
|
2015-03-03 13:06:53 +13:00 |
|
James Duley
|
0899403877
|
OP-1695 Ubuntu PPA: added workaround for when calling standard package rule
|
2015-03-03 13:06:53 +13:00 |
|
James Duley
|
f59512cdc1
|
OP-1695 Ubuntu PPA: added trusty depends workaround
|
2015-03-03 13:06:53 +13:00 |
|
James Duley
|
2efa05c17a
|
OP-1695 Ubuntu PPA: added runtime depends
|
2015-03-03 13:06:53 +13:00 |
|
James Duley
|
2eb5fbee8a
|
OP-1695 Ubuntu PPA: set debian section to electronics
|
2015-03-03 13:06:52 +13:00 |
|
James Duley
|
c23f7ec94c
|
OP-1695 Ubuntu PPA: add option to set debian distribution
|
2015-03-03 13:06:52 +13:00 |
|
James Duley
|
c0c2e0b721
|
OP-1695 Ubuntu PPA: made dist targets depend on .git/index instead of being PHONY
|
2015-03-03 13:06:52 +13:00 |
|
James Duley
|
51e4f3aa0e
|
OP-1695 Ubuntu PPA: add missing build depends
|
2015-03-03 13:06:52 +13:00 |
|