1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-01 09:24:10 +01:00
Commit Graph

236 Commits

Author SHA1 Message Date
Philippe Renon
72c7623a1b Merge remote-tracking branch 'upstream/next' into filnet/LP-29_osgearth_integration
# Conflicts:
#	ground/gcs/src/libs/osgearth/osgearth.pro
2016-01-06 22:16:32 +01:00
Philippe Renon
6b39fc0800 uncrustify 2016-01-04 21:41:45 +01:00
Philippe Renon
f7271df0e5 LP-30 fixed windows debug build 2016-01-04 21:36:38 +01:00
Philippe Renon
cefcacbbcf Merged in filnet/librepilot (pull request #141)
LP-183 fix GCS regression caused by UAVObject generator changes
2015-12-20 20:44:06 +01:00
Philippe Renon
8df41f5863 Merged in f5soh/librepilot/LP-197_Qt-5.5.1_Fr_translation_broken (pull request #137)
LP-197 Broken translation with Qt-5.5.1
2015-12-20 20:43:33 +01:00
Philippe Renon
fa95dfe075 Merged in f5soh/librepilot/LP-200_Remove_Opie (pull request #143)
LP-200 Remove hidden Opie from About dialog
2015-12-20 20:42:33 +01:00
Philippe Renon
886c2ccb47 Merged in leafarB/librepilot (pull request #138)
Next
2015-12-20 20:41:23 +01:00
Philippe Renon
0137460d0b LP-183 promote int8 and uint8 to their 16 bits equivalents
applies only to new Qml friendly properties
int16 will be silently cast to and from int8 !!!
2015-12-20 16:53:00 +01:00
Laurent Lalanne
b011009a47 LP-200 Remove hidden Opie from About dialog 2015-12-20 14:07:42 +01:00
Rafael Bachmann
605374f492 uncrustify 2015-12-19 13:52:25 +01:00
Rafael Bachmann
f5c23ba32d const-correct msgLogfileOpenFailed() 2015-12-19 13:48:54 +01:00
Philippe Renon
1b486aafb2 LP-183 fix GCS regression caused by UAVObject TRUE/FALSE enum case change 2015-12-18 21:35:05 +01:00
Rafael Bachmann
142f8a9578 add logfile name to error message. 2015-12-17 19:12:09 +01:00
Rafael Bachmann
d23824dd0e add error message when opening log file fails 2015-12-17 19:00:14 +01:00
Laurent Lalanne
6c8c643f48 LP-197 Add priority for Gcs translation file use
(Qt-5.5.1 qt_fr.qm file broken)
2015-12-17 17:43:37 +01:00
Lalanne Laurent
3faa8d621a Merged in f5soh/librepilot/LP-191_Txwizard_more_robust (pull request #133)
LP-191 Receiver activity : Increase min range value and allow all Sbus channels scanning.
2015-12-17 16:54:06 +01:00
Philippe Renon
6cac60f32d Merged in filnet/librepilot/shared/LP-2_qt5_5_upgrade (pull request #136)
LP-2_qt5_5_upgrade
2015-12-16 23:01:25 +01:00
Philippe Renon
5f36bad0b2 Merged in f5soh/librepilot/LP-193_Remove_png_warnings (pull request #134)
LP-193 Remove sRGB profiles from png files used on Gcs.
2015-12-16 23:00:41 +01:00
Philippe Renon
e843cac384 LP-2 osgearth copydata.pro: use scope to copy proper libs on linux 32/64 2015-12-14 22:14:22 +01:00
Philippe Renon
0f87f2d740 LP-2 fix copydata.pro for linux 32 using scope
apparently only linux 64 is using the new gstreamer base multimedia backend
linux 32 is still using the previous backend
2015-12-14 22:14:22 +01:00
Alessio Morale
2522f4bd93 Merged in f5soh/librepilot/laurent/LP-160_Set_default_AccelTau (pull request #97)
LP-160 Set default value for AccelTau
2015-12-13 19:12:07 +01:00
Laurent Lalanne
00f6f110cd LP-193 Remove sRGB profiles from png files used on Gcs. 2015-12-10 17:47:48 +01:00
Philippe Renon
95ea26c396 Merge branch 'next' of bitbucket.org:librepilot/librepilot into filnet/LP-29_osgearth_integration
# Conflicts:
#	ground/gcs/src/libs/osgearth/osgearth.pro
2015-12-10 00:17:10 +01:00
Philippe Renon
67b143a73d Merged in filnet/librepilot/shared/LP-2_qt5_5_upgrade (pull request #112)
shared/LP-2_qt5_5_upgrade
2015-12-09 22:04:19 +01:00
Philippe Renon
fabdea9eee LP-29 redirect osg logging to Qt (commented out for now) 2015-12-09 08:35:48 +01:00
Philippe Renon
f62e99b147 LP-29 import common.js from uav.js 2015-12-09 08:33:00 +01:00
Philippe Renon
3e10e89cec LP-29 use QOpenGLWidget in place of depecrated QGLWidget 2015-12-09 08:32:04 +01:00
Philippe Renon
596286604e LP-29 add TODOs 2015-12-09 08:28:11 +01:00
Philippe Renon
531c2dc32b LP-29 remove pfdqmlgadgetwidget hacks 2015-12-09 08:27:25 +01:00
Philippe Renon
26a3df4715 LP-29 remove OSGViewport hack
apparently not necessary anymore
2015-12-09 08:20:44 +01:00
Philippe Renon
7461159c69 LP-29 improve OSGViewport rendering loop
update scene in the Renderer synchronize method
2015-12-09 08:19:55 +01:00
Philippe Renon
f9694acfd1 Merge remote-tracking branch 'upstream/next' into filnet/LP-29_osgearth_integration
# Conflicts:
#	ground/gcs/src/plugins/pfdqml/pfdqmlgadgetwidget.cpp
#	ground/gcs/src/share/qml/pfd/Compass.qml
#	ground/gcs/src/share/qml/pfd/Info.qml
#	ground/gcs/src/share/qml/pfd/Panels.qml
#	ground/gcs/src/share/qml/pfd/VsiScale.qml
#	ground/gcs/src/share/qml/pfd/Warnings.qml
2015-12-08 01:22:12 +01:00
Philippe Renon
783cf7d981 LP-183 removed unused settingsutil (not related to LP-183...) 2015-12-06 12:56:00 +01:00
Philippe Renon
9c4c906765 LP-183 move toLowerCamelCase method to new string utility 2015-12-06 12:22:38 +01:00
Laurent Lalanne
63534e8014 LP-191 Little fix : OPlink has 8 channels 2015-12-04 21:23:33 +01:00
Philippe Renon
a1ac5fb532 LP-29 compile with libc++ on osx to fix issues when linking with osg 2015-12-02 23:16:05 +01:00
Philippe Renon
2f18791a43 LP-29 don't take device pixel ratio into account 2015-12-02 23:09:38 +01:00
Philippe Renon
a4f8380c13 LP-29 silence OSGViewport::createFramebufferObject method 2015-12-02 23:08:49 +01:00
Philippe Renon
57f0320605 LP-183 also alias TakeOffLocation to make things more explicit 2015-12-02 22:18:32 +01:00
Philippe Renon
26a4c027c7 LP-183 drive by bug fixing in Panels.qml and Compass.qml 2015-12-02 22:17:47 +01:00
Philippe Renon
0dc76168a3 LP-2 remove unused windows specific utility method winGetDLLVersion (additionally had compile warnings) 2015-12-02 21:41:19 +01:00
Philippe Renon
b03833e96b LP-2 make some of the code changes backward compatible with Qt 5.4.1 2015-12-02 21:33:45 +01:00
Philippe Renon
8c3d576306 LP-2 add missing linux libraries to GCS copydata.pro 2015-12-02 09:05:14 +01:00
Philippe Renon
a9053ed157 LP-2 remove deprecated Qt5Declarative 2015-12-02 09:05:14 +01:00
Philippe Renon
8c47101562 LP-2 minor osg/Qt cleanup 2015-12-02 09:05:14 +01:00
Philippe Renon
f3b06daf4c LP-2 temporarilly disable glc_lib (and moldeview) as it does not link with Qt 5.5.x 2015-12-02 09:05:14 +01:00
Philippe Renon
d0d3a56292 LP-2 fixed compilation warnings about missing QtInfoMsg in switch/case 2015-12-02 09:05:14 +01:00
Philippe Renon
067261ed3f LP-2 upgraded to Qt 5.5.0 (excluding sdk installer) 2015-12-02 09:05:14 +01:00
Philippe Renon
d33747e065 LP-183 remove non existing "AltitudeHoldDesired" 2015-12-02 08:52:37 +01:00
Philippe Renon
f5953bc68c LP-183 remove backward compatible upper case name used for exposing UAV objects to Qml 2015-12-02 08:52:37 +01:00