Stefan Karlsson
eacf0a1693
Merge branch 'skarlsso/OP-1474-PID_Scaling' into thread/OP-1474-PID_Scaling
...
Conflicts:
shared/uavobjectdefinition/stabilizationsettings.xml
2014-09-10 21:41:40 +02:00
Stefan Karlsson
7afb211330
OP-1474 Revert TPS debugging code
2014-09-10 00:42:40 +02:00
Stefan Karlsson
c0152b7e19
OP-1474 Thrust PID scaling
2014-09-08 00:14:49 +02:00
Fredrik Larrson
849bbfd481
Merge remote-tracking branch 'origin/skarlsso/OP-1455_no_output_from_test_outputs' into next
2014-09-08 04:25:02 +10:00
Fredrik Larrson
b9a2cac03f
Merge remote-tracking branch 'origin/skarlsso/OP-1077_gcs_corrupts_flight_log_files' into next
2014-09-08 04:24:07 +10:00
Fredrik Larrson
11a4a249b8
Merge remote-tracking branch 'origin/skarlsso/OP-1459_workaround_white-box_issue' into next
2014-09-08 02:33:39 +10:00
Fredrik Larrson
d91db0af6f
Revert "Merge remote-tracking branch 'origin/proff/OP-1373_DSMFixes' into next"
...
This reverts commit a39e393274ebfdaf28b5
2014-09-08 02:31:02 +10:00
Fredrik Larrson
a39e393274
Merge remote-tracking branch 'origin/proff/OP-1373_DSMFixes' into next
...
Conflicts:
shared/uavobjectdefinition/hwsettings.xml
2014-09-08 01:54:59 +10:00
Fredrik Larrson
32773c0245
Merge remote-tracking branch 'origin/laurent/OP-1349_GCS_Neutral_Spinboxes_in_Input_and_Output' into next
2014-09-08 01:27:23 +10:00
m_thread
474466ac92
OP-1474 Uncrustify.
2014-09-07 00:23:20 +02:00
m_thread
45ea8015ed
OP-1474 Updated GUI to follow the standard way of handling checked groups.
...
Added missing push buttons to widget list to make then enable/disable correctly.
2014-09-07 00:20:22 +02:00
m_thread
7fb064cf22
OP-1474 Added thrust PID scale curve to stabilization configuration GUI.
2014-09-06 23:53:44 +02:00
Stefan Karlsson
9bfd648879
OP-1077 Prevent GCS flight log corruption when no flight log is chosen
2014-09-03 21:19:15 +02:00
Fredrik Larson
650cbd3b52
Uncrustify
2014-09-03 02:46:26 +10:00
Fredrik Larson
6243cad768
Change mouse pointr type to show this is a link
2014-09-02 23:18:45 +10:00
Corvus Corax
b64326208e
Merge branch 'next' into corvuscorax/OP-1456_struct_to_array_improvement
2014-08-31 18:43:48 +02:00
Alessio Morale
f69e476ed3
Merge branch 'amorale/OP-1452_comusbbridge_improvements' into next
2014-08-29 20:25:29 +02:00
Laurent Lalanne
5f346d81e9
OP-1349_GCS Neutral_Spinboxes_in_Input_and_Output Disable keyboard tracking on inputform spinboxes (min, max, neutral).
2014-08-29 19:45:29 +02:00
Fredrik Larson
d4d1c9c482
Merge remote-tracking branch 'origin/dwillis/OP-1453_VersionCheck' into next
2014-08-29 09:51:18 +10:00
Fredrik Larson
41ecbc3eba
Merge remote-tracking branch 'origin/laurent/OP-1438_VSI_Arc_PFD+Status' into next
2014-08-29 07:00:58 +10:00
Fredrik Larson
8d691f0f48
Merge remote-tracking branch 'origin/laurent/OP-1422_Tricopter_mixers_settings' into next
2014-08-29 06:54:22 +10:00
Fredrik Larson
ed85e026b1
Merge remote-tracking branch 'origin/laurent/OP-1362_make_ts_errors' into next
2014-08-29 06:53:43 +10:00
Fredrik Larson
82c38a0b90
Merge remote-tracking branch 'origin/laurent/OP-868_Text_in_Barographs' into next
2014-08-29 06:52:49 +10:00
Fredrik Larson
6e86b3f157
Merge remote-tracking branch 'origin/parched/OP-1461_fix_copyqt_logic' into next
2014-08-28 09:59:30 +10:00
Fredrik Larson
8c65661e54
Merge remote-tracking branch 'origin/parched/OP-1460_copy_icu_again' into next
2014-08-28 09:59:25 +10:00
Laurent Lalanne
c6fc46403c
OP-1362 make_ts_errors Better fix, replace 0 with NULL and no more 'make ts' error. Tks Filnet
2014-08-28 00:11:46 +02:00
Laurent Lalanne
2202bbc7aa
OP-1362_make_ts_errors : Fix the last real error (filesearch.cpp)
2014-08-27 23:48:51 +02:00
James Duley
21d8159135
OP-1461 fix copyqt logic: renamed variables
2014-08-28 08:56:27 +12:00
Laurent Lalanne
9857ef56dd
OP-1422 Tricopter_mixers_settings : Uncrustify !
2014-08-27 20:38:04 +02:00
Laurent Lalanne
f313bef2e5
OP-1422 Tricopter_mixers_settings Store mixing / sliders values on board - Wizard/Config tab. Tricopter Yaw mixing now applies to servo, 100% default.
2014-08-27 20:33:11 +02:00
Laurent Lalanne
4099507bf6
OP-1422_Tricopter_mixers_settings Wizard : Wrong mixer type for servo (was ReversedMotor). M3/M4 bugfix
2014-08-27 02:24:14 +02:00
Laurent Lalanne
2e5a28c5c3
OP-1362 make_ts_errors : Revert filesearch.cpp changes (compile error). Added Q_OBJECT for xmlconfig.cpp error
2014-08-27 01:35:09 +02:00
Laurent Lalanne
5f3699fbaa
OP-1362 make_ts_errors Fix for 'make ts' errors. Still two errors, with one to fix (xmlconfig.cpp:61: Class 'XmlConfig' lacks Q_OBJECT macro)
2014-08-26 23:30:57 +02:00
Laurent Lalanne
093d06b7a4
OP-868 Text_in_Barographs : Add space in vertical Barograph
2014-08-26 21:54:44 +02:00
Laurent Lalanne
0edf70d0aa
OP-1422_Tricopter_mixers_settings : Uncrustify
2014-08-26 19:31:08 +02:00
Laurent Lalanne
94809de9c4
OP-1422_Tricopter_mixers_settings Ternary operator and include qmath.h in cpp
2014-08-26 19:27:05 +02:00
Laurent Lalanne
aea2adf2df
OP-1422 Tricopter_mixers_settings Normalize mixer values saved from Wizard and Config tab. Fix bad values saved previously like -63/64.
2014-08-26 17:07:00 +02:00
Laurent Lalanne
458120cce2
OP-1422 Tricopter_mixers_settings : Do the same calc as Gcs and round values so Wizard set same values as Gcs defaults. Little fix for HexaX wizard that set HexaH frame !
2014-08-26 14:17:24 +02:00
Alessio Morale
4d0af3b6aa
OP-1452 - fix hwwidget
2014-08-26 05:50:32 +02:00
James Duley
3890c7858f
OP-1461 fix copyqt logic:removed use of environment variable in openpilotgcs.pri
...
and force copy Qt libs when making package
2014-08-26 11:37:41 +12:00
Alessio Morale
5857b302b7
Merge remote-tracking branch 'origin/skarlsso/OP-1447_output_calibration_slider_adjustments' into next
2014-08-26 01:04:35 +02:00
dwillis
3c3c08d2d7
OP-1453 - Modify to get network access manager to remove itself once we
...
receive a response. Also check to see if we can access the network
before connection signals/slots. If the network isn't accessible, just
remove the network access manager instance.
2014-08-25 23:53:22 +01:00
James Duley
1bea84d7c9
added icu libs to be copied again
2014-08-26 10:30:24 +12:00
Philippe Renon
174b9bb611
Merge remote-tracking branch 'origin/parched/OP-1324_fix_build_when_python_isnt_python2' into next
...
Conflicts:
ground/openpilotgcs/src/python.pri
2014-08-26 00:08:53 +02:00
Stefan Karlsson
52420c2ed6
OP-1459 Turn off useOpenGL by default in OPMapGadget
2014-08-25 19:15:03 +02:00
Alessio Morale
7ed3d9f7ad
Merge remote-tracking branch 'origin/laurent/OP-1432_Reverse_all_motors_gui_fix' into next
2014-08-25 14:27:19 +02:00
dwillis
b3f1c0281b
OP-1453 - Remove QNetworkAccessManager when we're done with it. Other
...
minor tweaks arising from review.
2014-08-24 23:50:26 +01:00
dwillis
8230f0915c
OP-1453 - add version_info as dependency to fix Win and OSX builds.
2014-08-24 23:29:27 +01:00
Laurent Lalanne
c4e1400355
OP-1438 VSI_Arc_PFD+Status Info.qml cleanup, added comments.
2014-08-24 23:43:13 +02:00
James Duley
4fa543c925
OP-1324 fixed the mingw version
2014-08-25 09:08:42 +12:00
