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
samguns
b37429c89d
2015-02-16
2015-02-16 16:09:33 +08: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
8e5dfff555
Updated Ts file from source
2015-02-15 10:17:53 +01:00
Laurent Lalanne
9344351665
Merge remote-tracking branch 'origin/next' into samguns/zh_CN_GCS
2015-02-15 10:16:28 +01:00
samguns
9f65db5e0b
Initial commit of Chinese translation for GCS.
2015-02-15 15:27:56 +08: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
Fredrik Larsson
b0a0582e85
update default model to BO
2015-02-12 10:47:12 +11: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
Nuno Guedes
e4c431da49
New 3D model: Blackout Mini H Quad
...
New 3D model for the Modelview
Blackout Mini H Quad with lighter texture
2015-02-11 20:44:22 +00: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
abeck70
4f0ab4ae85
rel-15.01 Corrected whatsnew and new cloud configs
2015-02-08 14:56:44 +11: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
Laurent Lalanne
be342b7ad3
OP-1337 French updates : Autoupdate firmware
2015-01-30 20:29:14 +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
m_thread
8ffc77f537
OP-1628 Fixed some review issues. Updated some text.
2015-01-27 08:43:06 +01:00
m_thread
205a2d7b7a
OP-1628 Uncrustify
2015-01-26 23:03:39 +01:00
m_thread
373ed5df36
Merge remote-tracking branch 'origin/next' into thread/OP-1628_Reboot_Board_In_Wizard
2015-01-26 23:00:33 +01:00
m_thread
d8ab9e6175
OP-1628 Added better timeouts and failure mode descriptions.
2015-01-26 22:59:41 +01:00
Alessio Morale
97bf9f74b6
OP-1683 - Enables only available output bank mode Combos
2015-01-26 12:24:10 +01:00
Philippe Renon
e7214588d4
OP-1651 added GCS log command line option to log to file
2015-01-25 18:04:23 +01:00
Corvus Corax
7e421b99a4
uncrustificationization
2015-01-25 15:48:45 +01:00
Alessio Morale
73dc04b436
OP-1683 - Fix save for BankMode.
2015-01-24 21:12:31 +01:00
Alessio Morale
5901dbda35
OP-1683 - Add bank mode selection UI
2015-01-24 15:40:21 +01:00
Laurent Lalanne
7a24fc62a6
Merge branch 'laurent/OP-1674_GUI_display_oplm_frequency' into next
2015-01-24 01:28:28 +01:00
Alessio Morale
d0629926f0
OP-1683 - fixes for GCS
2015-01-23 23:57:12 +01:00
m_thread
b24f154ad4
OP-1628 Added handling of autoupdate when board connection is in progress.
2015-01-23 00:44:50 +01:00
Laurent Lalanne
8f0c0407fb
OP-1674 Changes from review : added constants and set limits - UI changes, Freq close to channel number.
2015-01-22 23:56:20 +01:00
Laurent Lalanne
fa7159686b
OP-1337 Gps assist translation
2015-01-21 22:26:16 +01:00
m_thread
1cd46f049f
OP-1628 Adding more fine grained connection states to TelemetryManager.
2015-01-21 10:01:10 +01:00
Laurent Lalanne
ded27c6f46
OP-1337 Wiki links English only
2015-01-20 23:18:20 +01:00
Laurent Lalanne
ce9244fb75
OP-1337 Translation update for 15.01
2015-01-20 22:43:55 +01:00
m_thread
e313d1ec67
OP-1628 Uncrustify
2015-01-20 00:01:03 +01:00
m_thread
514d38216b
OP-1628 Handling dialog 'modality' and z-order in a less bad but still bad way.
2015-01-19 23:14:54 +01:00
m_thread
bd1f40da1f
Merge remote-tracking branch 'origin/next' into thread/OP-1628_Reboot_Board_In_Wizard
2015-01-19 21:18:13 +01:00
Richard von Lehe
4ac6aea23e
OP-1681 Fix Qwt library debug build naming
...
+review OPReview
2015-01-18 22:12:44 -06:00
m_thread
85fb2b41b6
OP-1628 Some smaller changes tryingto addressthe modal dialog issues in Qt...
2015-01-15 09:42:58 +01:00
James Duley
a35fc57b29
Merge branch 'parched/OP-1666_deb_tidy' into next
...
Conflicts:
package/linux/deb_common/openpilot.dirs
2015-01-13 11:25:27 +13:00
m_thread
fb9bcde440
Merge remote-tracking branch 'origin/next' into thread/OP-1628_Reboot_Board_In_Wizard
2015-01-11 23:47:12 +01:00
Laurent Lalanne
ada09a8aaa
OP-1674 Add frequency display and limiting values - Allow channel 250.
2015-01-11 19:39:53 +01:00
James Duley
d1229adc37
OP-1666 deb tidy and OP-1663: move Qt inside OP
...
lib dir to avoid conflict and match Qt dir structure so their rpath is correct. part 2 (fix part 1)
2015-01-10 11:41:24 +13:00
James Duley
95fe38143f
OP-1666 deb tidy and OP-1663: move Qt inside OP
...
lib dir to avoid conflict and match Qt dir structure so their rpath is correct
2015-01-10 10:53:22 +13:00
Fredrik Arvidsson
7c3cecea8f
Merge remote-tracking branch 'origin/abeck/gpsassist' into next
2015-01-09 21:44:23 +01:00
Alessio Morale
b9566545ed
OP-1660 - HotFix: Force min to 1000 to prevent dangerous behaviours (motors spinning) during calibration
2015-01-09 16:25:34 +01:00
James Duley
240f862196
OP-1666 deb tidy: Removed FORCE_COPY_QT
...
It does not really make sense because it is designed for OP Qt
which is copied by default if it exists.
2015-01-10 00:19:40 +13:00
m_thread
230d7eaef5
OP-1628 Removed reboot page in wizard and replaced it with reboot dialog. Still some quirks to fix.
2015-01-09 00:42:43 +01:00
abeck70
2b6d79467c
gpsassist:code review comments
...
1. Defines
2. Name of adjustments changed to vtolSelfTuningStats
2015-01-09 07:51:37 +11:00
abeck70
b1c94e83d0
gpsassist: One commit new branch
...
Collapsed into one branch for a new code review. Some unnecssary committed files removed.
2015-01-08 13:20:47 +11:00
Laurent Lalanne
a7677843e6
Merge remote-tracking branch 'origin/laurent/OP-1648_PFD_flight_mode_update' into next
2015-01-07 14:09:45 +01:00
Laurent Lalanne
4df1ae9911
Merge remote-tracking branch 'origin/laurent/OP-1662_SystemHealth_verbose' into next
2015-01-07 14:09:21 +01:00
m_thread
bd5171d442
Merge remote-tracking branch 'origin/next' into thread/OP-1628_Reboot_Board_In_Wizard
2015-01-06 23:18:32 +01:00
Laurent Lalanne
0b5188c9c3
OP-1654 Bracket missing
2015-01-06 22:24:01 +01:00
James Duley
1c680084f9
OP-1656 qt 5.4 upgrade: update python dir for qt creator
2015-01-07 07:47:22 +13:00
Fredrik Arvidsson
f70eb1f6ee
OP-1668 Adding control and some init code.
2015-01-06 19:03:35 +01:00
m_thread
3be7b06ae9
Merge remote-tracking branch 'origin/next' into thread/OP-1628_Reboot_Board_In_Wizard
2015-01-06 10:50:01 +01:00
James Duley
3f3012d837
OP-1656 upgrade qt 5.4: make 5.2 the minimum compatible version
2015-01-06 22:28:43 +13:00
Laurent Lalanne
df2e1497f4
OP-1662 Add info for Stack alarm
2015-01-05 20:49:04 +01:00
Laurent Lalanne
f4b5c2c7dd
OP-1662 French translations, file encoding issue (bad display with some characters)
2015-01-04 20:08:16 +01:00
Laurent Lalanne
c1286eb56e
OP-1648 Only use one font for all PFD stuff
2015-01-04 13:29:58 +01:00
Philippe Renon
88ce627e2b
Merge remote-tracking branch 'origin/shared/OP-1656_upgrade_to_qt_5_4_0' into next
2015-01-04 12:28:46 +01:00
James Duley
0841141bc3
Merge branch 'parched/OP-1657_Remove_linux_bin_wrapper' into next
2015-01-04 09:49:21 +13:00
Laurent Lalanne
5ddc70e2f0
Merge branch 'laurent/OP-1660_RCInput_Manual_Calibration' into next
2015-01-03 13:22:16 +01:00
Laurent Lalanne
4edc97291c
OP-1660 Little pixel issue on groove (margin left on blue, margin right on white) and margin not needed (not active, typo)
2015-01-03 13:01:25 +01:00
James Duley
927c55291c
Merge branch 'parched/OP-1654_Fix_linux_rpath' into next
2015-01-03 11:39:49 +13:00
Philippe Renon
822e7e6f73
OP-1656 upgraded to Qt 5.4.0 - check that version 5.4.0 is used
2015-01-02 22:23:32 +01:00
Philippe Renon
5b2eac268a
OP-1656 upgraded to Qt 5.4.0 (linux) - code compiles - GCS not tested...
2015-01-02 22:22:31 +01:00
Laurent Lalanne
df7201857c
OP-1662 Changed filenames for some alarms not displayed : CPU, memory, stack
2014-12-30 20:25:49 +01:00
Laurent Lalanne
45c96f3378
OP-1660 Changes from review
2014-12-30 14:57:34 +01:00
Laurent Lalanne
90e4e9276e
OP-1660 Disable all outputs while calibrate (Manual calibration or Wizard) : No servo jitter
2014-12-30 09:49:35 +01:00
Fredrik Arvidsson
1c764c4001
Fixed a gcc compiler warning that was a result of clang compiler warning cleanup.
2014-12-30 09:41:37 +01:00
Christian Gudrian
04dda828f0
added config parameter
2014-12-30 17:52:47 +13:00
Christian Gudrian
ed99869c7b
fixed comparison
2014-12-30 17:52:47 +13:00
Christian Gudrian
e5d19972e6
fixed type check warning
2014-12-30 17:52:47 +13:00
Christian Gudrian
98387d2639
fixed formatting of error message
2014-12-30 17:52:46 +13:00
Christian Gudrian
30b97bbb29
removed extraneous semicolon
2014-12-30 17:52:46 +13:00
Christian Gudrian
5caee931f5
fixed method signature to match the one in the superclass
2014-12-30 17:48:56 +13:00
Christian Gudrian
bdf4386dfa
fixed header guards
2014-12-30 17:48:56 +13:00
Laurent Lalanne
8a02c1c5a2
OP-1662 Typo fixes from Jack
2014-12-29 21:30:58 +01:00
m_thread
61b2b0f07a
OP-1628 Fixed button enablement glitch. Added style sheet to reboot page progress bar.
2014-12-29 18:03:20 +01:00
m_thread
9614397694
OP-1628 Uncrustify
2014-12-29 14:51:12 +01:00
m_thread
82c65b6b3f
OP-1628 Added software reboot to wizard.
2014-12-29 14:50:20 +01:00
Laurent Lalanne
64cea89d3e
OP-1660 Reset channel data : Type and number. Prevent bad channel setting like channel type set and no channel number or wizard freezes.
2014-12-29 01:07:11 +01:00
James Duley
0d17376e26
OP-1654 fix linux rpath: added Qt for plugins
2014-12-29 11:54:24 +13:00
Laurent Lalanne
265bd9c19e
OP-1662 Typo
2014-12-28 23:23:01 +01:00
Laurent Lalanne
08b66cb151
OP-1662 Attitude-Error message update
2014-12-28 23:21:21 +01:00
