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
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
Laurent Lalanne
89f4bf56a8
OP-1734 Review changes
2015-02-20 16:54:16 +01:00
Laurent Lalanne
518059a6b1
OP-1734 replace double with qreal
2015-02-20 16:39:19 +01: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
Laurent Lalanne
1792991012
OP-1734 Display min/max servo values
2015-02-20 12:16:59 +01:00
Laurent Lalanne
3c93738404
OP-1734 Add opacity fading - Remove debug code - Uncrustify
2015-02-20 03:17:18 +01:00
Laurent Lalanne
5cf14c9c73
OP-1734 Ground vehicle and FixedWing Wizard : Add arrows Up/Down and Left/Right, tell user for servo movement
2015-02-20 01:26:06 +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
Laurent Lalanne
b297816b8b
OP-1734 Better highlight on every element
2015-02-19 18:23:33 +01:00
Laurent Lalanne
3d10d33ac3
OP-1734 Rename elements for FW single servo to 'aileronsingle'
2015-02-19 17:44:55 +01:00
Laurent Lalanne
ae5dbc3096
OP-1734 Change mixer values : Vtail and FixedWing rudder
2015-02-19 17:13:56 +01: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
