Alessio Morale
f69e476ed3
Merge branch 'amorale/OP-1452_comusbbridge_improvements' into next
2014-08-29 20:25: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
99c59f9c3a
Add missing font
2014-08-29 09:31:53 +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
fa1a92ed06
Clean up Milestones, basically to test Bamboo
2014-08-28 16:00:27 +10:00
Fredrik Larson
3edbb71bfd
Merge remote-tracking branch 'origin/parched/OP-1451_udev_change_plugdev_to_uaccess' into next
2014-08-28 09:59:36 +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
Fredrik Larson
8110d92059
Don't need sudo for brew
2014-08-28 04:50:30 +10: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
Alessio Morale
2c99d4172b
Merge branch 'master' into next
2014-08-26 21:34:56 +02:00
Alessio Morale
e9799e6c2e
Merge branch 'rel-14.06.01'
2014-08-26 21:21:22 +02:00
Alessio Morale
805ce3b895
FIx WhatsNEW for release
2014-08-26 21:19:59 +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
10f5d7c531
Merge remote-tracking branch 'origin/skarlsso/OP-922_fix_fw_DEBUG_compile_errors' into next
2014-08-26 01:05:32 +02: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
James Duley
135b5d635e
updated icu from 51 to 52
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
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
Alessio Morale
74a8e6f943
Update WhatsNew for release
2014-08-25 14:03:15 +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
dwillis
6bb4843a22
OP-1453 - remember to schedule QNetworkReply for deletion once we're
...
done with the network response.
2014-08-24 21:30:49 +01:00
Fredrik Larson
c38242f627
Missed a damn space, OCD won't let me leave it as is.
2014-08-25 02:55:19 +10:00
Fredrik Larson
4874bdc120
Mac path fix for Python
2014-08-25 02:49:00 +10:00
dwillis
efeeb705b5
OP-1453 - Add mouse area to new version text that will launch the
...
software download page when clicked.
Strip CR from end of version read from website.
2014-08-24 01:29:33 +01:00
Fredrik Larson
a0fda9a60f
Merge branch 'txpid_typo' into rel-14.06.01
2014-08-24 10:24:24 +10:00
Fredrik Larson
35a6807e63
Merge branch 'txpid_typo' into next
2014-08-24 10:23:14 +10:00
James Duley
7b10fbc5c4
OP-1451 udev change plugdev to uaccess : update in deb too
2014-08-24 12:22:28 +12:00
Laurent Lalanne
ccb97f014c
OP-1241 TxPID_Bank3 : Similar bug while GET data from bank
2014-08-24 02:15:24 +02:00
