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 |
|
Erik Gustavsson
|
b63cbebc40
|
OP-1739 Add color coding for QZSS SVs (classify as SBAS), adjust GPS SV
color to better match the SNR widget
|
2015-03-04 19:12:46 +01:00 |
|
Erik Gustavsson
|
ccbe05dff5
|
Merge branch 'next' into cyr/OP-1739_GNSS
|
2015-03-04 18:07:31 +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 |
|
m_thread
|
4046439433
|
OP-1756 Added code to set the actuator command for multiple channels at the same time from calibration.
|
2015-03-01 22:48:35 +01:00 |
|
Erik Gustavsson
|
9351d822c5
|
Normalize line endings
|
2015-03-01 19:54:35 +01:00 |
|
m_thread
|
f2c80d7d06
|
OP-1756 Added code to properly handle next and back when calibrating all motors at the same time.
|
2015-03-01 17:45:19 +01:00 |
|
Erik Gustavsson
|
3a8c13a365
|
OP-1739 Add BeiDou SV display to GCS
|
2015-03-01 17:39:05 +01:00 |
|
m_thread
|
8d6070d674
|
OP-1756 Added information of the types of the svg elements to be able to enable correctly.
|
2015-03-01 12:31:57 +01:00 |
|
m_thread
|
662f1fb3f3
|
OP-1756 Added handling for svg item highlight when calibrating all motors.
|
2015-03-01 12:12:50 +01:00 |
|
Erik Gustavsson
|
a806eb6f36
|
OP-1739 Add GLONASS support to GPS constellation widget
|
2015-03-01 08:32:01 +01:00 |
|
m_thread
|
c2c5d41311
|
Merge remote-tracking branch 'origin/next' into thread/OP-1756_Multi_Motor_Calibration
|
2015-02-28 23:35:16 +01:00 |
|
Laurent Lalanne
|
1102243eae
|
Merge remote-tracking branch 'origin/laurent/OP-1752_SystemHealth_sub_alarms' into rel-15.02
|
2015-02-28 15:08:51 +01:00 |
|
m_thread
|
ed6b9a4e9c
|
Goto final/end page automatically after successfull save in wizard.
|
2015-02-28 14:46:38 +01:00 |
|
m_thread
|
f11c03d34a
|
OP-1754 Fixing PWMSync PPM connection diagram setup.
|
2015-02-28 14:38:26 +01:00 |
|
Laurent Lalanne
|
190590e1a1
|
Merge branch 'thread/15.02-RC1_fixes' of ssh://git.openpilot.org/OpenPilot into thread/15.02-RC1_fixes
|
2015-02-28 14:16:49 +01:00 |
|
Laurent Lalanne
|
1c13531043
|
OP-1754 Connection diagram : Fix regression, rename GPS, airspeed sensors and rcinput objects
|
2015-02-28 14:12:46 +01:00 |
|
m_thread
|
3cb1357069
|
OP-1756 Added checkbox to ui file.
|
2015-02-28 14:07:47 +01:00 |
|
Laurent Lalanne
|
789b71880c
|
OP-1752 Typo
|
2015-02-28 13:02:13 +01:00 |
|
m_thread
|
c358f975c4
|
Uncrustify
|
2015-02-28 09:47:23 +01:00 |
|
m_thread
|
b9ca2b92eb
|
Merge remote-tracking branch 'origin/rel-15.02' into thread/15.02-RC1_fixes
|
2015-02-28 09:46:09 +01:00 |
|
Erik Gustavsson
|
aa99c56eb3
|
OP-1739 Add separate color for GLONASS sats. Fix sat PNR > 127.
|
2015-02-28 08:09:45 +01:00 |
|
m_thread
|
a8b6e1f959
|
OP-1755 Added additional location for cloudconfigs.
|
2015-02-28 00:14:51 +01:00 |
|
Laurent Lalanne
|
39ed1b0b45
|
Merge remote-tracking branch 'origin/laurent/OP-1466_Heli_config_tab' into rel-15.02
|
2015-02-27 23:05:47 +01:00 |
|
m_thread
|
3ee481fd2a
|
OP-1754 Fixing PWMSunc PPM setting.
|
2015-02-27 23:05:10 +01:00 |
|
Laurent Lalanne
|
fcb36b3639
|
OP-1466 Cosmetic changes to Svg / Layer order
|
2015-02-27 22:37:35 +01:00 |
|
samguns
|
3d3c08dd3e
|
OP-1751 add more translation for next release
|
2015-02-27 16:09:11 +08:00 |
|
Laurent Lalanne
|
799b4d6240
|
OP-1466 Add tr()
|
2015-02-27 05:28:27 +01:00 |
|
Laurent Lalanne
|
19cbd26465
|
OP-1466 Keep previous Mixer table when user choose Custom Settings - Reuse M_PI from math.h
|
2015-02-27 05:22:20 +01:00 |
|
Laurent Lalanne
|
ac1c893b54
|
OP-1466 Resize issue
|
2015-02-27 03:49:29 +01:00 |
|
Laurent Lalanne
|
c9b80ca0a1
|
OP-1466 Add a 'Prev' button for servo adjustement
|
2015-02-27 02:33:34 +01:00 |
|
Laurent Lalanne
|
edb41b698a
|
OP-1466 Fix Heli tab crash - Refresh Gui - Typos
|
2015-02-27 01:29:20 +01:00 |
|
Laurent Lalanne
|
d26af21ee1
|
OP-1752 Add reboot-required substatus alarm
|
2015-02-26 15:59:57 +01:00 |
|
Laurent Lalanne
|
14713f2339
|
OP-1752 Add substatus alarm and tell user whats wrong with Config alarm : Flightmode or OneShot config
|
2015-02-26 15:40:14 +01:00 |
|
m_thread
|
927886bf8e
|
OP-1685 Fixed some issues in the wizard for oneshot
|
2015-02-25 21:58:12 +01:00 |
|
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 |
|