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
m_thread
d3a4977947
OP-1685 Fixed group box caption
2015-02-21 09:27:45 +01: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
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
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
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
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
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
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
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
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
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
Laurent Lalanne
6da3c99af2
OP-1635 Remove QuadH in config tab - AirframeType
2015-02-10 22:48:43 +01:00
Laurent Lalanne
bf3866d12e
OP-1706 Output range from 500 to 2500
2015-02-08 19:10:56 +01:00
Alessio Morale
46521f1c2d
Merge remote-tracking branch 'origin/amorale/OP-1683_syncupdate_oneshot' into next
2015-02-08 17:59:59 +01:00
Laurent Lalanne
105b01680d
Merge branch 'laurent/OP-1644_Wrong_wizard_neutral' into next
2015-02-07 19:03:36 +01:00
Laurent Lalanne
21fe64eec0
Merge branch 'laurent/OP-1698_Easy_setup_channel_passtrough' into next
2015-02-07 19:02:19 +01:00
Laurent Lalanne
7c4dfc9608
OP-1706 Uncrustify
2015-02-07 13:19:46 +01:00
Laurent Lalanne
9c31d2fcb5
OP-1706 Disable checkboxes if no range - Enable only channels already set in mixer - Add limits
2015-02-07 13:04:42 +01:00
m_thread
aa891801f4
OP-1628 Removed obsolete slot declaration.
2015-02-05 11:35:22 +01:00
m_thread
f42afa61cd
OP-1628 Fixed a bug introduced in refactoring.
2015-02-05 10:05:47 +01:00
m_thread
87bd6243b4
OP-1628 Uncrustify
2015-02-05 09:55:31 +01:00
m_thread
9a5dc36826
Merge remote-tracking branch 'origin/rel-15.01' into thread/OP-1628_AutoUpgrade_OPLM_Issues
2015-02-05 09:51:02 +01:00
m_thread
a24fd253b4
OP-1628 Fixed review comments.
2015-02-03 22:24:57 +01:00
Laurent Lalanne
2454ac6d6c
OP-1644 Reuse the same function for special neutrals
2015-02-03 22:13:30 +01:00
Laurent Lalanne
23865ed0b0
OP-1644 Really set FlightMode neutral centered + some minor fixes in code
2015-02-03 21:50:45 +01:00
James Duley
3d797914a3
OP-1701 Fix Linux Qt config: added a resource with qt.conf which has correct prefix set
2015-02-03 15:51:59 +13:00
Karl Knutsson
137c183ec2
OP-1522 Remove unused channel set cfg
...
Remove unused channel set configuration option.
With the new channel allocation the old channel set
configuration isn't needed.
2015-02-02 21:25:38 +01:00
m_thread
d72504d20f
OP-1576 Removed TxResent from GUI. Renamed some files.
2015-02-02 21:25:38 +01:00
Alessio Morale
09319c3805
OP-1683 - fix casing and cleanup of gcs code
2015-02-02 20:35:39 +01:00
m_thread
31a6a32fce
OP-1628 Added special handling for OPLink boards and Upgrade/Reboot functionality.
2015-02-02 00:14:02 +01:00
Laurent Lalanne
d567d88216
OP-1698 Changes from review
2015-02-01 23:19:04 +01:00
Alessio Morale
a7caee7bc4
OP-1683 - update tooltips, small UI changes
2015-02-01 21:27:25 +01:00
Laurent Lalanne
4ca715bddf
OP-1698 Removed empty lines
2015-02-01 18:30:39 +01:00
Laurent Lalanne
4423fa9d0c
OP-1698 Added channel allocation checking - Little HexaH bug - Uncrustify
2015-02-01 18:02:19 +01:00
Laurent Lalanne
f18aa3d2cb
OP-1698 Add curve choice for all accessory outputs
2015-02-01 14:59:18 +01:00
Laurent Lalanne
8c0a33cd6f
OP-1698 First commit : Add Accessory0,1,2 to Output
2015-02-01 06:22:38 +01:00
Philippe Renon
0d317d1435
OP-1071 fixed merge issue
2015-01-31 15:49:22 +01:00
Philippe Renon
44f3821dc6
OP-1071 uncrustified
2015-01-31 15:36:59 +01:00
Philippe Renon
5bc17d7b87
Merge remote-tracking branch 'origin/thread/OP-1071_Map_Emergency_Line' into next
...
Conflicts:
ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/waypointcircle.cpp
ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/waypointline.cpp
2015-01-31 15:35:07 +01:00
Alessio Morale
6f3f7b9972
OP-1683 - fix limits handling and definitions
2015-01-30 21:43:59 +01:00
m_thread
f61a013e0b
Merge branch 'thread/OP-1628_Reboot_Board_In_Wizard' into next
2015-01-30 16:43:21 +01:00
m_thread
e88aa12d78
OP-1628 Adjusting some form labels.
2015-01-30 16:40:36 +01:00
m_thread
5027875655
OP-1628 Forms cleanup.
2015-01-29 22:28:05 +01:00
m_thread
292bfccd29
OP-1628 Changed text on some buttons.
2015-01-29 21:25:28 +01:00
Philippe Renon
faacd3e34b
OP-1651 uncrustified
2015-01-29 21:18:35 +01:00
Philippe Renon
c69d8841f4
Merge branch 'origin/filnet/OP-1651_add_gcs_command_line_option_to_log_to_file' into next
2015-01-29 21:15:20 +01:00
m_thread
d378ecb3b6
OP-1668 Adjusting layout.
2015-01-28 00:41:11 +01:00
Alessio Morale
26fcec09e3
OP-1683 - Show bank number and color beside output number
2015-01-27 19:39:45 +01:00
m_thread
73954dadea
OP-1668 Fixed widget updates.
2015-01-27 15:05:59 +01:00
m_thread
4f7344121e
Merge remote-tracking branch 'origin/next' into thread/OP-1668_Mixer_Curve_2_Source
2015-01-27 13:31:09 +01:00
