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
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
m_thread
1cd46f049f
OP-1628 Adding more fine grained connection states to TelemetryManager.
2015-01-21 10:01:10 +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
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
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
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
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
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
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
James Duley
fa7196ddec
OP-1654 fix linux rpath: removed hardcoded QMAKE_RPATHDIR
2014-12-29 09:04:47 +13:00
Laurent Lalanne
bc5fb14bc9
OP-1662 Add info : Config, Mag, PathPlan, Attitude/Stabilization alarm
2014-12-28 19:09:57 +01:00
m_thread
a1e8d7efed
Merge remote-tracking branch 'origin/next' into thread/OP-1628_Reboot_Board_In_Wizard
2014-12-28 09:48:27 +01:00
Laurent Lalanne
9e91c83c60
OP-1660 Rcinput sliders : Add a small Red mark for neutral value - Tooltip for value
2014-12-27 08:09:59 +01:00
Laurent Lalanne
df8cad3190
OP-1660 Pixel issue on Win32, reduce groove height.
2014-12-27 02:12:47 +01:00
Laurent Lalanne
666f764155
OP-1660 Handle fix, was cropped
2014-12-27 00:34:20 +01:00
Laurent Lalanne
02903e7858
OP-1660 Display limits for every FlightMode position on Flightmode channel
2014-12-26 22:45:15 +01:00
Laurent Lalanne
59e461f6ce
OP-1660 Revert last commit + uncrustify
2014-12-26 00:00:08 +01:00
Laurent Lalanne
4afe6f2e1a
OP-1660 Add ticks on slider, QT stylesheet bug
2014-12-25 22:48:26 +01:00
Laurent Lalanne
b82b10e832
OP-1660 Allow realtime monitoring of inputs
2014-12-25 17:49:19 +01:00
Laurent Lalanne
e734e2876b
OP-1660 Disable Apply/Save buttons when Manual Calibration is running, custom message
2014-12-25 14:18:34 +01:00
Laurent Lalanne
0aae4e4d7a
OP-1660 Tell user Manual calibration is running (Start/Stop button change)
2014-12-25 01:30:08 +01:00
Laurent Lalanne
e9582bf55c
OP-1660 Apply special neutral settings for Throttle and FlightMode - Increase Throttle neutral offset to 4%.
2014-12-25 00:14:32 +01:00
James Duley
fea74125fa
OP-1654 Fix linux rpath: Refactored and changed for libs
2014-12-22 14:47:27 +13:00
James Duley
f6c9183dbf
OP-1653 Qt 5.2.1 backward compatibilty: used QStringLiteral for json value
2014-12-19 14:59:41 +13:00
Fredrik Larsson
aba566c43b
Merge remote-tracking branch 'origin/parched/OP-1557_update_qwt' into next
2014-12-19 12:32:23 +11:00
James Duley
cc5786c989
OP-1557 Update Qwt: Updated to 6.1.2
2014-12-19 13:48:09 +13:00
Laurent Lalanne
49a53757f7
OP-1643 Small fixes, typo
2014-12-19 10:15:36 +11:00
Laurent Lalanne
ff97b87765
OP-1643 Updated connection diagram with ground vehicles
2014-12-19 10:15:16 +11:00
Laurent Lalanne
c213e923ca
OP-1643 First commit : Add ground vehicle to setup wizard
2014-12-19 10:14:53 +11:00
m_thread
0a0d6efe6c
Merge remote-tracking branch 'origin/next' into thread/OP-1628_Reboot_Board_In_Wizard
2014-12-16 18:29:27 +01:00
m_thread
35a11d5a71
OP-1628 Uncrustify
2014-12-16 18:26:52 +01:00
m_thread
8d4adeae13
OP-1628 The autoupdater should wait for board to boot and connect before returning.
2014-12-16 14:18:43 +01:00
Laurent Lalanne
eeddcc902d
OP-1648 Embed PT-Sans fonts as Arial font replacement, should give same rendering in all systems
2014-12-14 17:21:17 +01:00
James Duley
ed2371e750
OP-1647 Welcome QML error: removed parent horiz align
2014-12-10 10:30:23 +13:00
James Duley
5ebee4acf0
OP-1646 qml welcome warning: made versionString CONSTANT
2014-12-10 09:50:54 +13:00
m_thread
db22fb7aa7
OP-1628 Added support for 'old' style auto update if board not connected.
2014-12-09 01:15:49 +01:00
m_thread
ff1ad84302
OP-1628 Uncrustify
2014-12-09 00:50:26 +01:00
m_thread
cb1d9586eb
OP-1628 Added timeout to autoupdater. Added exception handling.
2014-12-09 00:48:30 +01:00
m_thread
da62ef0dd6
OP-1628 Initial reboot code.
2014-12-09 00:47:34 +01:00
m_thread
57beb3d36c
OP-1629 Added option to erase when autoupdating formware.
...
Option added to Wizard and Uploader plugin.
2014-12-08 16:36:17 +01:00
m_thread
da0c3917c1
OP-1628 Made Auto update go in to boot loader mode and then update.
...
This removes the need to power-cycle or connect/reconnect the board when
updating firmware.
2014-12-08 15:04:28 +01:00
Fredrik Larsson
69d146988b
Merge remote-tracking branch 'origin/laurent/OP-1620_FixedWing_Vtail_wizard' into next
2014-12-03 17:49:16 +11:00
Fredrik Larsson
16eec9caed
Merge remote-tracking branch 'origin/laurent/OP-1622_Ground_config_tab' into next
2014-12-03 17:49:09 +11:00
Laurent Lalanne
a0311e6522
OP-1543 Fix font used for sat numbers
2014-11-28 22:29:04 +01:00
Alessio Morale
99d73426b8
Uncrustify
2014-11-27 12:05:59 +01:00
Fredrik Larsson
091196a311
Merge remote-tracking branch 'origin/rel-14.10' into next
2014-11-26 07:34:14 +11:00
Laurent Lalanne
01cb489378
Remove QuadH from setup wizard
2014-11-24 00:51:40 +01:00
Fredrik Larsson
eaebe3eb30
Update this with help of FredrikA
2014-11-24 08:56:01 +11:00
Fredrik Larsson
ea5c0db322
Don't translate list items and sort the list
2014-11-24 06:30:54 +11:00
Fredrik Larsson
1687ef7e8f
Merge remote-tracking branch 'origin/rel-14.10' into next
2014-11-23 12:15:32 +11:00
Laurent Lalanne
c097e8928b
OP-1622 Revert Car Throttle (only forward). Use only Curve2 for tank, Customtab display fix
2014-11-22 23:09:59 +01:00
Fredrik Larsson
d334f90157
Use path utils to search for CloudConfigs
2014-11-23 08:13:02 +11:00
Laurent Lalanne
0c72a76b35
OP-1622 Fix Throttle curves and allow forward/reverse for Car and Tank
2014-11-22 20:10:55 +01:00
Fredrik Larsson
af7aac4936
This is better way to do things and it actually works
2014-11-23 03:25:22 +11:00
Fredrik Larsson
676e7f00af
Spilt the Revo case in to a new case, disable the telemtry on Revo only
2014-11-23 03:01:57 +11:00
Fredrik Larsson
32c94d45fe
Merge remote-tracking branch 'origin/hayvosh/OP-1627_Cleanup_DSM' into rel-14.10
2014-11-23 02:34:12 +11:00
Fredrik Larsson
ab07169c7a
Put space between next / skip, don't show skip for flight mode channel as
...
we must have one
2014-11-22 11:04:20 +11:00
Fredrik Larsson
53464c948d
Make wizard match the firmware changes
2014-11-22 08:57:12 +11:00
Fredrik Larsson
ade7088f3d
Make a start on ground side of DSM refactoring for auto procotol selection
2014-11-22 08:34:50 +11:00
Laurent Lalanne
3492e2a67d
OP-1622 Tank : Set default Yaw mixing value to 50
2014-11-21 20:51:14 +01:00
Laurent Lalanne
0872abb5cb
OP-1622 Modified tread for tank
2014-11-21 18:13:03 +01:00
Fredrik Larsson
a45e28afa9
Merge remote-tracking branch 'origin/rel-14.10' into next
2014-11-22 03:39:30 +11:00
Fredrik Larsson
3957240106
OP-1624 Use Aux Mag only on V9, commiting from Fredrik A
2014-11-18 08:06:56 +11:00
Laurent Lalanne
e517e2dc6f
OP-1622 Changes discussed in review
2014-11-17 20:22:39 +01:00
Laurent Lalanne
71f6872dee
OP-1622 Better centering for rear wing
2014-11-17 18:34:54 +01:00
Laurent Lalanne
17eefe6a41
OP-1622 Add a small rear wing to Car frame
2014-11-17 18:30:41 +01:00
Laurent Lalanne
2a294575f2
OP-1622 Added Ground artwork, changed UI. Fix issue with Motorbike tab (typo)
2014-11-17 18:14:01 +01:00
Laurent Lalanne
c1c0c87677
OP-1620 Added Vtail frame to setup Wizard
2014-11-17 00:27:16 +01:00
m_thread
8cf65d5cbe
OP-1611 Uncrustify
2014-11-15 11:07:32 +01:00
m_thread
8a11c588a6
OP-1611 Addressed some review comments and changed logic around plots wanting initial data.
2014-11-15 11:04:19 +01:00
m_thread
6c476d2a58
OP-1611 Added context menu to Scope widget
2014-11-14 14:18:46 +01:00
Alessio Morale
79e5627e29
uncrustify
2014-11-14 01:05:54 +01:00
Fredrik Arvidsson
9f3aad0a1e
Merge remote-tracking branch 'origin/laurent/OP-1605_FWing_normalize_mixers_and_store_mix_values' into rel-14.10
2014-11-11 18:15:07 +01:00
Fredrik Arvidsson
adba295a6c
Merge remote-tracking branch 'origin/skarlsso/OP-1604_radio_wizard_crashes' into rel-14.10
2014-11-11 07:36:08 +01:00
Laurent Lalanne
e31778b7e6
OP-1605 Normalize Mixer values for all frames. Fix aileron mixing (wizard). Fix Vtail aileron mixing + Vtail mixing (config plugin)
...
Mixing values for sliders are now saved for Fixed Wing familly.
2014-11-11 03:30:59 +01:00
Laurent Lalanne
7c8bcb5134
OP-1603 Sliders are not updated fine. Still round / little slider value change but at least works now.
2014-11-10 11:36:47 +01:00
Stefan Karlsson
663a1c0c94
OP-1604 Removed usage of AccessoryDesired in Manual Calibration
...
Manual Calibration doesn't use the AccessoryDesired objects, but turned
up the update rates anyway.
2014-11-09 23:01:34 +01:00
Stefan Karlsson
fd801e3637
OP-1604 Initialize accessoryDesiredObjects the the plugin constructor
2014-11-09 22:54:13 +01:00
Stefan Karlsson
90e0459522
OP-1604 Reinitialize accessoryDesiredObjects if they weren't initialized
...
Only instance 0 of UAVOs is initialized if no board is connected. The
TX Wizard tried to setup accessoryDesired instances 1 and 2 but failed,
causing crashes later in the wizard.
2014-11-09 22:39:05 +01:00
Laurent Lalanne
a13f7cd6be
OP-1603 Same ouput for mixer table (Wizard and Config plugin)
2014-11-08 23:08:51 +01:00
Fredrik Larsson
55e16453c2
Change wording
2014-11-09 07:20:54 +11:00
m_thread
247f08239c
Merge branch 'rel-14.10' of ssh://git.openpilot.org/OpenPilot into rel-14.10
2014-11-07 15:43:20 +01:00
Fredrik Larsson
c648175f18
Use consts, less to change when we mess with this again
2014-11-07 22:33:44 +11:00
Fredrik Larsson
e6b6aedc76
Change speed on Wizard and output.ui for config plugin, this is just to be
...
safe
2014-11-07 22:29:25 +11:00
Fredrik Larsson
cf90eecb35
Update button artwork for other Fredrik
2014-11-07 22:10:30 +11:00
m_thread
9f5fd7dec0
OP-1554 Fixed small but critical bug for multielement fields.
2014-11-07 00:32:38 +01:00
m_thread
c3b5216e3d
OP-1556 Adding support for multiple channels in OutputCalibrationUtil.
2014-11-06 22:32:21 +01:00
