1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-13 20:48:42 +01:00
Commit Graph

7223 Commits

Author SHA1 Message Date
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
77613ddd9e LP-29 uncrustified 2015-12-09 08:27:38 +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
Philippe Renon
71c7ba4d56 LP-183 convert Qml files to use new UAV object syntax 2015-12-02 08:52:37 +01:00
Philippe Renon
0c2f89a33d LP-183 pfd: expose UAVTalk objects to Qml with lower camel case names (systemSettings vs SystemSettings)
it is more compliant to the Qt naming convention
will solve a conflict in the Qml namespace when SystemSetting is both a type and a context value.
use of non compliant name should be discouraged
2015-12-02 08:52:37 +01:00
Philippe Renon
d2121d7e86 LP-183 cleanup uavobject includes 2015-12-02 08:52:37 +01:00
Philippe Renon
0017ce2acf LP-183 generated UAV objects are now more Qt and Qml friendly
use lower camel case for properties and getters
introduce better enums and expose them to Qml
backward compatibilty is preserved for now
2015-12-02 08:52:37 +01:00
Philippe Renon
39d7f932d7 Merged in f5soh/librepilot/laurent/LP-179_Highlight_stabilization_modes (pull request #116)
LP-179 Highlight stabilized mode used
2015-12-01 21:57:38 +01:00
Philippe Renon
0756c0aa76 Merged in f5soh/librepilot/laurent/LP-178_Accessory_mapping (pull request #113)
LP-178 Add Accessory > Output mapping for fixed Wing.
2015-12-01 21:56:46 +01:00
Philippe Renon
7d06944a81 LP-29 remove duplicate osg lib on mac 2015-11-30 22:24:32 +01:00
Laurent Lalanne
ba86b78031 LP-178 Remove QString() 2015-11-29 20:18:27 +01:00
Philippe Renon
35aab3003b LP-29 move common.js one directory up 2015-11-29 20:14:07 +01:00
Philippe Renon
12bfee2df3 LP-29 move common uav related functions to uav.js 2015-11-29 20:13:32 +01:00
Philippe Renon
9b100bea4a Merge remote-tracking branch 'origin/LP-183_more_qml_friendly_gcs_uav_object_generator' into filnet/LP-29_osgearth_integration 2015-11-29 19:38:57 +01:00
Philippe Renon
7cb8a9740a LP-183 remove non existing "AltitudeHoldDesired" 2015-11-29 16:53:59 +01:00
Philippe Renon
e4e4b23600 LP-183 remove backward compatible upper case name used for exposing UAV objects to Qml 2015-11-29 16:53:58 +01:00
Philippe Renon
96088ce831 LP-183 convert Qml files to use new UAV object syntax 2015-11-29 16:53:58 +01:00
Philippe Renon
664891e040 LP-183 pfd: expose UAVTalk objects to Qml with lower camel case names (systemSettings vs SystemSettings)
it is more compliant to the Qt naming convention
will solve a conflict in the Qml namespace when SystemSetting is both a type and a context value.
use of non compliant name should be discouraged
2015-11-29 16:53:57 +01:00
Philippe Renon
287b4ceb5d LP-183 cleanup uavobject includes 2015-11-29 16:53:38 +01:00
Philippe Renon
df350cda44 LP-183 generated UAV objects are now more Qt and Qml friendly
use lower camel case for properties and getters
introduce better enums and expose them to Qml
backward compatibilty is preserved for now
2015-11-29 16:53:33 +01:00
Laurent Lalanne
0f1b662f7b LP-179 Remove border and set background color for comboboxes 2015-11-28 01:03:11 +01:00
Laurent Lalanne
990e7eb3c9 LP-179 Highlight stabilized mode used 2015-11-28 01:03:11 +01:00
James Duley
50d44a3992 LP-187 MSYS2: fix windows header using extern
rather than explicitly redeclaring
2015-11-26 09:03:56 +00:00
Philippe Renon
f1598e0a51 LP-2 remove unused variable 2015-11-25 09:09:55 +00:00
Philippe Renon
b629a7f69f LP-2 remove unused <QtDesigner/QDesignerExportWidget> import that was causing a deprecated warning 2015-11-25 09:09:55 +00:00
Philippe Renon
6d934fc177 LP-2 removed unused classes that fail to link with Qt 5.5 2015-11-25 09:09:55 +00:00
Philippe Renon
2df89769c9 LP-2 fixed compilation errors around usage of isinf() and isnan() 2015-11-25 09:09:55 +00:00
Philippe Renon
e22061cc8e LP-2 fixed warning about unused variable 2015-11-25 09:02:37 +00:00
Laurent Lalanne
bd8f03398e LP-181 Compatible Qt5.4 / Qt5.5 - Added file for javascript functions 2015-11-22 22:27:26 +00:00
Laurent Lalanne
8537443282 LP-181 PFD update works only with Qt5.5 2015-11-22 22:27:26 +00:00
Philippe Renon
bc5e02e3af LP-30 uncrustify 2015-11-21 15:40:30 +01:00
Philippe Renon
5315af05a3 LP-30 fix minor OSGSky date issue 2015-11-21 15:39:34 +01:00
Philippe Renon
b873d37a8f LP-30 global enum cleanup 2015-11-21 15:37:39 +01:00
Philippe Renon
a79fd612ac LP-29 enable FragDepth when using LogarithmicDepthBuffer (fixes heavy z-fighting on the craft model) 2015-11-11 00:24:07 +01:00
Philippe Renon
0a374d2904 LP-29 remove AutoClipPlaneHandler (it is not recommended to use it
See http://forum.osgearth.org/Performance-issue-when-looking-at-horizon-td7588307.html
2015-11-11 00:22:57 +01:00
Philippe Renon
3ee0564421 LP-29 fixed some debug logs 2015-11-07 12:46:16 +01:00
Philippe Renon
859cf0996c LP-29 replace pfd by qml in share copydata.pro 2015-11-07 12:44:21 +01:00
Philippe Renon
bbd214ed31 Merge remote-tracking branch 'upstream/next' into filnet/LP-29_osgearth_integration 2015-11-06 23:21:35 +01:00
Philippe Renon
db926f289d uncrustified 2015-11-06 22:03:37 +01:00
Philippe Renon
3dbdd76225 LP-174 add missing EXPORT to TextBubbleSlider 2015-11-06 22:02:32 +01:00
Philippe Renon
58c880d706 Merge remote-tracking branch 'upstream/next' into filnet/LP-29_osgearth_integration 2015-11-06 09:22:48 +01:00
Lalanne Laurent
077a9bf5cd Merged in f5soh/librepilot/laurent/LP-174_Add_values_to_Rcinput (pull request #109)
LP-174 Add values to RCinput
2015-11-05 18:17:03 +01:00
Lalanne Laurent
8d6b89818f Merged in f5soh/librepilot/laurent/LP-120_Wizard_I2C_mag (pull request #110)
LP-120 Add GPS+I2c mag to wizard
2015-11-05 18:13:51 +01:00
Lalanne Laurent
4e6a67fe82 Merged in f5soh/librepilot/laurent/LP-165_Txpid_acro+_ranges (pull request #102)
LP-165 TxPID Acro+ ranges
2015-11-05 18:12:39 +01:00
Lalanne Laurent
93fc480a2d Merged in f5soh/librepilot/laurent/LP-147_Detect_flight_mode_num (pull request #93)
LP-147 Transmitter wizard : Add flightmode number detection and artwork
2015-11-05 18:11:43 +01:00
Laurent Lalanne
eba2d98f9a LP-160 Set default value for AccelTau - Remove unused const 2015-11-05 17:58:21 +01:00
Laurent Lalanne
96eed683ee LP-165 Set TxPID Acro+ range to 0-100 2015-11-05 17:50:41 +01:00
Laurent Lalanne
6a11bbb6fd LP-178 Add Accessory > Output mapping for fixed Wing.
Two outputs per accessory can be set for spoiler control.
2015-11-05 15:14:45 +01:00
Philippe Renon
783322fd09 Merged in james-duley/librepilot/LP-167_fix_stable_version_check (pull request #105)
LP-167 fix stable version check
2015-11-05 09:34:06 +01:00
Laurent Lalanne
0f4eaf5b24 LP-174 Set Defgroup like others files in directory 2015-11-04 19:06:58 +01:00
Philippe Renon
b0fcfe8ffd LP-29 disable lighting when a map is used 2015-11-03 22:53:24 +01:00
Philippe Renon
c33c3c9b99 LP-29 remove commented out code and other minor cleanups 2015-11-02 21:33:09 +01:00
Philippe Renon
d9a0a3e84a LP-29 simplify resize logic (also fixes some resizing issues) 2015-11-02 21:32:50 +01:00
Laurent Lalanne
06a10fb070 LP-174 Move textbubbleslider to libs/utils, centralize fonts 2015-11-01 16:08:45 +01:00
Laurent Lalanne
7b3a0e504b LP-120 Add conditions for GPS+I2C - SRXL fixes 2015-10-31 15:11:33 +01:00
Laurent Lalanne
89b992176e LP-120 Auxmag wizard initial support 2015-10-31 14:03:59 +01:00
Laurent Lalanne
9eb8f45e0d LP-174 : Add Rcinput value display - UI and style changes, embed font.
All credit for the textbubbleslider files goes to Taulabs and Kenn Sebesta
2015-10-31 12:13:07 +01:00
lilvinz
e68ad5dbd8 TextBubbleSlider: removed QDESIGNER_WIDGET_EXPORT 2015-10-30 19:15:41 +01:00
Kenn Sebesta
e3d2760f83 Added text-bubble slider. This is an extension of QSlider which displays the slider value in the handle. 2015-10-30 18:40:34 +01:00
Fredrik Arvidsson
adae92b675 LP-171 Added code to disable signal from being triggered while stabilisation bank is changed. 2015-10-28 22:50:46 +01:00
Cliff Geerdes
e0a805518f LP-73 uncrustify 2015-10-25 23:59:52 -04:00
James Duley
48e077f265 LP-167 fix stable version check 2015-10-25 18:35:09 +00:00
Cliff Geerdes
d5bdc41fb9 LP-73 finish the merge with next 2015-10-24 13:14:52 -04:00
Cliff Geerdes
911400924e LP-73 convert BoardRotation to int 2015-10-24 12:18:09 -04:00
Philippe Renon
1a5b4a157e LP-29 disable handling of not yet available osgearth debug libraries 2015-10-24 17:05:48 +02:00
Philippe Renon
f80fb8a02b LP-29 move osgearth dependencies form osgearth.pro to new osgearth_dependencies.pri 2015-10-24 17:04:42 +02:00
Philippe Renon
ca03e2f076 Merge remote-tracking branch 'upstream/next' into filnet/LP-29_osgearth_integration 2015-10-24 16:48:45 +02:00
Philippe Renon
06517dcd0b Merged in filnet/librepilot/filnet/LP-29_osgearth_artwork (pull request #68)
LP-29 moved background images one directory up
2015-10-24 16:36:48 +02:00
a*morale
33fd073248 Merge branch 'master' into next 2015-10-21 22:07:09 +02:00
Fredrik Arvidsson
c8b3d046d3 LP-162 Added AccelTau to usage tracking data. 2015-10-21 17:27:58 +02:00
Laurent Lalanne
1c0de087e7 LP-147 Change label to "Flight Modes" 2015-10-19 23:36:25 +02:00
Fredrik Arvidsson
bd476165c0 LP-156 Updated templates. 2015-10-16 21:42:07 +02:00
Lalanne Laurent
eceec3eddc Merged in f5soh/librepilot/laurent/LP-153_HwWidget_typo (pull request #95)
LP-153 Fix typo
2015-10-16 21:33:10 +02:00
Laurent Lalanne
cba54b204f LP-153 Fix typo 2015-10-16 15:15:35 +02:00
Laurent Lalanne
b1078252bb LP-147 Transmitter wizard : Add flightmode number detection and artwork
changes
2015-10-16 01:12:53 +02:00
Stefan Karlsson
6504ce448e LP-155 Workaround failing callback deregistration
Deregistration of hid_device_removal_callback fails because the call to
IOHIDDeviceRegisterRemovalCallback doesn't deregister it as it should.

This causes crashes when hid_device_removal_callback is called after
the read_thread has been shutdown.

This patch works around this problem by:

1) Letting the 'dev' hid_device, so that the callback can safely
   read the struct, even after the read_thread has been shut down
   and the memory should have been freed.

2) Making sure that the two racing callbacks that previously
   called CFRunLoopStop, hid_device_removal_callback and
   perform_signal_callback, now synchronize and make sure
    that CFRunLoopStop is only called once.
2015-10-15 22:11:53 +02:00
Fredrik Arvidsson
aa209dbf8d LP-156 Updated templates. 2015-10-15 21:57:06 +02:00
Stefan Karlsson
295562694b LP-155 Fix OPHID_DEBUG warning 2015-10-15 21:08:49 +02:00
Alessio Morale
1a8bf2cd9e Merged in f5soh/librepilot/laurent/LP-110_Elevon_motor_output4_fix (pull request #89)
LP-110 Elevon frame : Really move motor to Output4
2015-10-09 09:43:02 +02:00
Alessio Morale
33d5a21e9f Merged in paul_jewell/librepilot/LP-142_Fix_remaining_Wiki_links (pull request #88)
LP-142 Fixed remaining OpenPilot Wiki Links
2015-10-09 09:42:49 +02:00
Alessio Morale
a7462f06eb Merged in filnet/librepilot/filnet/LP-139_fix_missing_pfd_svg_warning (pull request #84)
LP-139 fixed erroneous warning about missing pfd.svg
2015-10-09 09:40:38 +02:00
Paul Jewell
ea8d18dffd Fixed remaining OpenPilot Wiki Links 2015-10-07 06:18:47 +01:00
Laurent Lalanne
5ab2f8026c LP-110 Elevon frame : really move motor from output3 to output4 2015-10-06 18:30:58 +02:00
Paul Jewell
919f765189 Added wiki link for stabilization configuration page 2015-10-04 15:00:16 +01:00
Philippe Renon
88dcb62ed6 LP-139 fixed erroneous warning about missing pfd.svg 2015-10-02 22:11:05 +02:00
Cliff Geerdes
92fd745003 LP-135 remove a blank line for code review 2015-09-30 15:31:08 -04:00
physicsboy0709
5f9f298a1d modified: ground/gcs/src/plugins/uploader/op_dfu.cpp 2015-09-29 12:48:21 -04:00
Cliff Geerdes
554a190f78 LP-135 simple port of fix to 15.09 2015-09-29 02:09:18 -04:00
Laurent Lalanne
b7d5405ce1 LP-48 Update translations for rel-15.09 2015-09-27 20:53:01 +02:00
Laurent Lalanne
c9b0bbb4e4 LP-67 Change label and tooltips to EasyTune name 2015-09-27 16:53:12 +02:00
Paul Jewell
bdf89acf22 Fix Google Maps version 2015-09-26 20:00:51 +01:00
a*morale
26559a0934 Merged in paul_jewell/librepilot/revert_usage_disable (pull request #55) 2015-09-24 21:58:51 +02:00
Alessio Morale
fd7455a727 Merged in rbekken/librepilot/usagetracker (pull request #62)
GCS: Add backend for usage tracker.
2015-09-24 21:53:32 +02:00
Fredrik Arvidsson
fab46ba294 Merged in paul_jewell/librepilot/LP102-fix-about-plugin-links (pull request #71)
LP-102 Changed Developer and URL lines to LibrePilot
2015-09-24 07:18:09 +02:00
Paul Jewell
51f9291cf4 Added LP details to pluginspec files for LP modified plugins 2015-09-23 21:53:15 +01:00
Roy Bekken
b6b7adcbdb GCS: Add backend for usagetracker.
Collect statistics about the usage of our software and hardware
     to enable us to make things better for you.
2015-09-23 17:10:01 +02:00
Philippe Renon
67bba60f52 Merged in filnet/librepilot/filnet/LP-125_path_utils_should_return_absolute_pathes (pull request #67)
LP-125 PathUtils now returns absolute pathes again
2015-09-22 15:31:15 +02:00
Philippe Renon
0bb71cd5df LP-125 PathUtils now returns absolute pathes again 2015-09-21 23:12:43 +02:00
Alessio Morale
e068c0026a Merged in alessiomorale/librepilot/amorale/LP-124_rename_txpid_easytune_options (pull request #65)
Amorale/lp 124_rename_txpid_easytune_options
2015-09-21 12:34:54 +02:00
Philippe Renon
53c0c1cb13 LP-29 moved background images one directory up 2015-09-19 18:35:08 +02:00
Alessio Morale
abf40a47eb LP-124 - Fix renamed fields/options in GCS 2015-09-19 15:31:08 +02:00
Philippe Renon
18725597f4 Merge branch 'next' of bitbucket.org:librepilot/librepilot into filnet/LP-29_osgearth_integration
Conflicts:
	artwork/3D Model/boards/coptercontrol/coptercontrol.3ds
	artwork/3D Model/multi/easy_quad/easy_quad_x.3ds
	artwork/3D Model/multi/mikrokopter/mk_l4-me.3ds
	artwork/3D Model/multi/ricoo/ricoo.3ds
	artwork/3D Model/multi/test_quad/test_quad_x.3ds
	ground/gcs/src/share/models/boards/coptercontrol/coptercontrol.3ds
	ground/gcs/src/share/models/multi/easy_quad/easy_quad_x.3ds
	ground/gcs/src/share/models/multi/mikrokopter/mk_l4-me.3ds
	ground/gcs/src/share/models/multi/ricoo/ricoo.3ds
	ground/gcs/src/share/models/multi/test_quad/test_quad_x.3ds
2015-09-19 14:42:38 +02:00
Alessio Morale
1b4ad5c2a1 uncrustification 2015-09-19 12:07:45 +02:00
Paul Jewell
55f3c91e9f Moved question mark to code & added missing define 2015-09-18 06:54:50 +01:00
Paul Jewell
0a45bc6a4e Moved usagetracker defines to usagetracker.pri 2015-09-18 06:18:16 +01:00
Paul Jewell
7a97e5fbbb Moved definition of usagetracker url to top level Makefile 2015-09-16 22:00:09 +01:00
Paul Jewell
1a6ff50d20 Made usage tracker fully functional, with LP URL 2015-09-16 22:00:09 +01:00
Philippe Renon
24a5bdfa49 Merge remote-tracking branch 'origin/next' into filnet/LP-29_osgearth_integration
Conflicts:
	ground/gcs/src/libs/osgearth/copydata.pro
2015-09-16 22:55:54 +02:00
Philippe Renon
3174995dde Merged in filnet/librepilot (pull request #60)
LP-29 osgearth packaging fixes
2015-09-16 22:40:43 +02:00
Philippe Renon
66901c2be7 LP-29 fixed osgearth copydata.pro for mac and linux 2015-09-16 21:19:43 +02:00
Philippe Renon
e743682311 LP-29 moved osg RPATHDIR definition to libs/osgearth/osgearth.pro 2015-09-16 21:19:43 +02:00
Paul Jewell
3961d4a293 Modified GeneralSettings::collectUsageData() to return false 2015-09-16 20:03:00 +01:00
Paul Jewell
3aa7e2bb24 Revert "Merged in paul_jewell/librepilot/LP-53_disable_usage_tracker_plugin (pull request #43)"
This reverts commit c00ea092bc, reversing
changes made to d207f848ee.
2015-09-16 20:03:00 +01:00
Alessio Morale
26289e63ae Merged in m_thread/librepilot/thread/LP-70_CC_Wizard_Restrictions (pull request #61)
Thread/lp 70_cc_wizard_restrictions
2015-09-15 23:22:12 +02:00
Alessio Morale
b8c101f6c7 Merged in f5soh/librepilot/laurent/LP-99_Fix_firmware_path (pull request #57)
LP-99 Fix firmware path not found
2015-09-15 23:21:49 +02:00
Alessio Morale
3e7a53beaf Merged in f5soh/librepilot/laurent/LP-114_Add_accessory_input_channel (pull request #54)
LP-114 Add accessory input channel
2015-09-15 23:21:04 +02:00
Alessio Morale
83b7ed9063 Merged in f5soh/librepilot/laurent/LP-110_Wizard_high_rate_servo_normal_esc (pull request #47)
LP-110 Wizard : Ground and plane motors move to output 4
2015-09-15 23:20:40 +02:00
Fredrik Arvidsson
e8399c9c57 LP-70 Fixed bug. 2015-09-14 23:28:11 +02:00
unknown
e227b7497d LP-70 Added restrictions to CC/CC3D/Nano when configuring OneShot125 2015-09-14 22:41:41 +02:00
Philippe Renon
466f4bb695 LP-29 disabled warnings on mac (mac treats warnings are errors...) 2015-09-14 21:16:34 +02:00
Philippe Renon
506ae69b50 LP-29 restored AutoClipPlaneCullCallback feature 2015-09-13 16:47:40 +02:00
Laurent Lalanne
f8ebb36278 LP-99 Fix firmware path not found 2015-09-13 10:38:24 +02:00
Philippe Renon
e3979b0024 LP-29 moved osg RPATHDIR definition to libs/osgearth/osgearth.pro 2015-09-12 18:19:57 +02:00
Philippe Renon
865e3b3f13 LP-29 fixed osgearth copydata.pro for linux 2015-09-12 18:18:55 +02:00
Philippe Renon
4696378573 LP-29 disabled warnings on mac (mac treats warnings are errors...) 2015-09-12 18:04:16 +02:00
Philippe Renon
41258ac254 LP-29 fixed artwork/models file case that were messed when committing from windows :( 2015-09-12 18:01:38 +02:00
Laurent Lalanne
c65b735d8a LP-114 Allow Accessory display name in Output tab when Accessory is used
in Custom table
2015-09-11 00:04:31 +02:00
Laurent Lalanne
8885180fde LP-114 Add Accessory3 as input - TxWizard and Multirotor Accessory
mapping
2015-09-11 00:04:31 +02:00
Philippe Renon
7a65021190 LP-29 fixed compilation warning 2015-09-05 18:55:43 +02:00
Philippe Renon
7ece271878 LP-29 removed ModelView configurations 2015-09-05 17:08:49 +02:00
Philippe Renon
4a5e4d21b8 LP-29 display plain (non terrain) PFD for now (until osgearth is stabilized on all OSes) 2015-09-05 17:08:28 +02:00
Philippe Renon
b335725aa3 LP-29 WelcomeMode must use QQuickWidget instead of QQuickWindow in order to avoid conflicts with new PFDQml 2015-09-05 16:00:29 +02:00
Philippe Renon
ad83ecca41 LP-29 added EarthView.qml and CubeView.qml 2015-09-05 16:00:29 +02:00
Philippe Renon
edade72b01 LP-29 disabled compilation of modelview and qmlview plugins (will remove plugins later) 2015-09-05 16:00:29 +02:00
Philippe Renon
611738437e LP-29 disabled compilation of glc_lib (will remove lib later) 2015-09-05 16:00:28 +02:00
Philippe Renon
6d2d9961ea LP-29 updated default GCS condiguration to reflect osgearth related changes 2015-09-05 16:00:28 +02:00
Philippe Renon
57c8146a5b LP-29 moved background images to share root 2015-09-05 16:00:27 +02:00
Philippe Renon
10aaafb678 LP-29 added ModelView qml files 2015-09-05 16:00:26 +02:00
Philippe Renon
98eb9b259e LP-29 3D models cleanup (standardized scale and orientation) 2015-09-05 16:00:26 +02:00
Philippe Renon
c60d8efd32 LP-29 added osgearth resources 2015-09-05 16:00:21 +02:00
Philippe Renon
1aa024b007 LP-29 removed old PFD qml files 2015-09-05 16:00:21 +02:00
Philippe Renon
fbdea40501 LP-29 new PFD qml files adding terrain support 2015-09-05 16:00:20 +02:00
Philippe Renon
396b91ffad LP-29 Added terrain related options to PFD
Started turning PFD into a generic qml viewer (replaces ModelView)
Note that PFD has one remaining dependency with osgearth lib but that is temporary
2015-09-05 16:00:20 +02:00
Philippe Renon
882c3d54b1 Merged in filnet/librepilot/filnet/LP-29_osgearth_integration (pull request #48)
LP-29 removed deprecated osgearthview plugin
2015-09-05 15:22:47 +02:00
a*morale
792835c009 Uncrustify 2015-09-05 11:49:43 +02:00
Philippe Renon
b9bb1b46f6 LP-29 removed deprecated osgearthview plugin 2015-09-05 00:26:53 +02:00
Laurent Lalanne
83f31f63ee LP-110 Wizard : Ground and plane motors move to output 4 2015-09-04 18:09:19 +02:00
Alessio Morale
1f09d36638 Merged in f5soh/librepilot/laurent/LP-44_Free_memory_CC3D (pull request #40)
LP-44 Save RAM
2015-09-04 09:47:33 +02:00
Alessio Morale
c46aa40e15 Merged in f5soh/librepilot/laurent/LP-106_Setup_Wizard_Refresh (pull request #42)
LP-106 Setup Wizard Refresh
2015-09-04 09:47:08 +02:00
Alessio Morale
136d8af3a6 Merged in filnet/librepilot/filnet/LP-29_osgearth_integration (pull request #12)
LP-29_osgearth_integration
2015-09-04 09:46:21 +02:00
Alessio Morale
d67a18ff1a Merged in alessiomorale/librepilot/amorale/LP-93_zero_gyro_bias_with_temp_cal (pull request #35)
LP-93 - zero gyro bias after temp calibration
2015-09-04 09:45:40 +02:00
Alessio Morale
529105489d Merged in paul_jewell/librepilot/LP-94-set-up-wiki-link-in-gcs (pull request #38)
Removed openpilot hard coding from wiki buttons in GCS
2015-09-04 09:45:13 +02:00
Laurent Lalanne
69125e8e9d LP-44 Save RAM : Use float UAVO type only when needed. 184bytes saved 2015-09-03 07:26:06 +02:00
Philippe Renon
a7428ed9ad LP-29 uncrustified 2015-08-30 22:16:06 +02:00
Philippe Renon
723ab39d59 LP-29 merged gcsdirs into pathutils and related cleanups 2015-08-30 22:14:58 +02:00
Philippe Renon
7b1c49c8bc LP-29 osgearth copydata is now conditionned by copyosg variable + minor review comments 2015-08-30 21:49:04 +02:00
Philippe Renon
e380620587 LP-29 added LibrePilot copyright 2015-08-30 18:19:45 +02:00
Philippe Renon
13bc18c45f LP-29 added back osg library dir to RPATHDIR 2015-08-29 19:50:59 +02:00
Philippe Renon
1ec5ff4d3e LP-29 removed obsolete osg libraries 2015-08-29 19:45:20 +02:00
Philippe Renon
61626338ff LP-29 fixed erroneous merges 2015-08-29 18:51:48 +02:00
Philippe Renon
955eecf33d Merge remote-tracking branch 'upstream/next' into filnet/LP-29_osgearth_integration
Conflicts:
	ground/gcs/gcs.pri
	ground/gcs/gcs.pro
	ground/gcs/openpilotgcs.pri
	ground/gcs/openpilotgcs.pro
	ground/gcs/src/app/gcs.icns
	ground/gcs/src/app/gcs.ico
	ground/gcs/src/app/librepilotgcs.icns
	ground/gcs/src/app/librepilotgcs.ico
	ground/gcs/src/app/librepilotgcs.rc
	ground/gcs/src/app/openpilotgcs.icns
	ground/gcs/src/library.pri
	ground/gcs/src/openpilotgcslibrary.pri
	ground/gcs/src/openpilotgcsplugin.pri
	ground/gcs/src/plugin.pri
	ground/gcs/src/plugins/config/airframe.ui
	ground/gcs/src/plugins/config/images/calibration/board-dwn.png
	ground/gcs/src/plugins/config/images/calibration/board-enu.png
	ground/gcs/src/plugins/config/images/calibration/board-ned.png
	ground/gcs/src/plugins/config/images/calibration/board-suw.png
	ground/gcs/src/plugins/config/images/calibration/board-swd.png
	ground/gcs/src/plugins/config/images/calibration/board-use.png
	ground/gcs/src/plugins/config/images/calibration/board-wds.png
	ground/gcs/src/plugins/config/images/calibration/empty.png
	ground/gcs/src/plugins/config/images/calibration/plane-dwn.png
	ground/gcs/src/plugins/config/images/calibration/plane-enu.png
	ground/gcs/src/plugins/config/images/calibration/plane-horizontal-rotated.png
	ground/gcs/src/plugins/config/images/calibration/plane-ned.png
	ground/gcs/src/plugins/config/images/calibration/plane-suw.png
	ground/gcs/src/plugins/config/images/calibration/plane-swd.png
	ground/gcs/src/plugins/config/images/calibration/plane-use.png
	ground/gcs/src/plugins/config/images/calibration/plane-wds.png
	ground/gcs/src/plugins/setupwizard/vehicletemplateselectorwidget.ui
	ground/gcs/src/plugins/systemhealth/html/GPS-Error.html
	ground/gcs/src/plugins/systemhealth/html/fr/GPS-Error.html
	ground/gcs/src/share/cloudconfig/custom/whats_this.txt
	ground/gcs/src/share/cloudconfig/fixedwing/SoniModelMako-FixedWing-Elevon-7134e8ae5ce.optmpl
	ground/gcs/src/share/cloudconfig/fixedwing/Toro900-VoilureFixe-Elevon-d4a58d2cd50.optmpl
	ground/gcs/src/share/cloudconfig/fixedwing/whats_this.txt
	ground/gcs/src/share/cloudconfig/helicopter/whats_this.txt
	ground/gcs/src/share/cloudconfig/multirotor/(RACE)FPV260HobbyKin-Multirotor-QuadrocopterX-0482b7a25f7.optmpl
	ground/gcs/src/share/cloudconfig/multirotor/(STOCK)HobbyKingFPV2-Multirotor-QuadrocopterX-0bb44b68883.optmpl
	ground/gcs/src/share/cloudconfig/multirotor/ARRISX-SPEEDFPV250-Unsupported-2cbaaa14a01.optmpl
	ground/gcs/src/share/cloudconfig/multirotor/BlackOutB330-Multirotor-QuadrocopterX-e9980c55302.optmpl
	ground/gcs/src/share/cloudconfig/multirotor/BlackOutMiniH-Multirotor-QuadrocopterX-d415c242154.optmpl
	ground/gcs/src/share/cloudconfig/multirotor/DJIF450-Multirotor-QuadrocopterX-cfa8ec67993.optmpl
	ground/gcs/src/share/cloudconfig/multirotor/DroneframesDRQ250-cf-rc5 Multirotor-QuadrocopterX-425b90123f1.optmpl
	ground/gcs/src/share/cloudconfig/multirotor/DroneframesDRQ430G-revo-rc5Multirotor-QuadrocopterX-fae90503b3f.optmpl
	ground/gcs/src/share/cloudconfig/multirotor/EmaxNighthawk-Multirotor-QuadrocopterX-9a3aa9d9726.optmpl
	ground/gcs/src/share/cloudconfig/multirotor/FlipFPVPro-Multirotor-QuadrocopterX-9eb7b719244.optmpl
	ground/gcs/src/share/cloudconfig/multirotor/FlipFpvPro-Multirotor-QuadrocopterX-c117d151f95.optmpl
	ground/gcs/src/share/cloudconfig/multirotor/FlipSport-Multirotor-QuadrocopterX-c27ae7b79ca.optmpl
	ground/gcs/src/share/cloudconfig/multirotor/FlyingCinemaCinetan-Multirotor-QuadrocopterX-2c3f9181872.optmpl
	ground/gcs/src/share/cloudconfig/multirotor/FlyingCinemaTankitoM-Multirotor-QuadrocopterX-385d9ac9ae1.optmpl
	ground/gcs/src/share/cloudconfig/multirotor/GenericHexa-Multirotor-Hexacopter+-c50a904f4a3.optmpl
	ground/gcs/src/share/cloudconfig/multirotor/GenericHexaH-Multirotor-HexacopterH-6cc3fed9073.optmpl
	ground/gcs/src/share/cloudconfig/multirotor/GenericHexaX-Multirotor-HexacopterX-b3b8c1d2f3c.optmpl
	ground/gcs/src/share/cloudconfig/multirotor/GenericHexaY6-Multirotor-HexacopterY6-0b5dc6bae4f.optmpl
	ground/gcs/src/share/cloudconfig/multirotor/GenericQuad+-Multirotor-Quadrocopter+-a87a4226820.optmpl
	ground/gcs/src/share/cloudconfig/multirotor/GenericQuadX-Multirotor-QuadrocopterX-5fce7315a5b.optmpl
	ground/gcs/src/share/cloudconfig/multirotor/GenericTricopter-Multirotor-Tricopter-5f46bc37c31.optmpl
	ground/gcs/src/share/cloudconfig/multirotor/GuerrillaDronesToadQ-Multirotor-QuadrocopterX-8f838e43432.optmpl
	ground/gcs/src/share/cloudconfig/multirotor/HKingDYS250CarbonFib-Multirotor-QuadrocopterX-969354c51c1.optmpl
	ground/gcs/src/share/cloudconfig/multirotor/HKingDYS320CarbonFib-Multirotor-QuadrocopterX-0b41edda68f.optmpl
	ground/gcs/src/share/cloudconfig/multirotor/HoverThingsFLIPFPV-Multirotor-QuadrocopterX-32bf14a10fc.optmpl
	ground/gcs/src/share/cloudconfig/multirotor/InventorsSparrowRace-Multirotor-QuadrocopterX-314fff867fd.optmpl
	ground/gcs/src/share/cloudconfig/multirotor/QAV250-Multirotor-QuadrocopterX-181dab0df01.optmpl
	ground/gcs/src/share/cloudconfig/multirotor/QAV400-Multirotor-QuadrocopterX-90a90b9fb50.optmpl
	ground/gcs/src/share/cloudconfig/multirotor/QAV500-Multirotor-QuadrocopterX-6da440c4d7c.optmpl
	ground/gcs/src/share/cloudconfig/multirotor/QUADI250-Multirotor-QuadrocopterX-c6c6cfc4cf9.optmpl
	ground/gcs/src/share/cloudconfig/multirotor/RCExplorerV3Tricopte-Multirotor-Tricopter-dcbce3f069c.optmpl
	ground/gcs/src/share/cloudconfig/multirotor/RD290MiniHexfpv-Multirotor-HexacopterX-6587232be1a.optmpl
	ground/gcs/src/share/cloudconfig/multirotor/XhoverMXP230Elite-Multirotor-QuadrocopterX-3b169a4fd1b.optmpl
	ground/gcs/src/share/cloudconfig/multirotor/ZMR250( Attitude mode)-ChineseQAV250-Multirotor-QuadrocopterX-5d318c0526c (1).optmpl
	ground/gcs/src/share/cloudconfig/multirotor/ZMR250(4s race)-Multirotor-QuadrocopterX-fac61e7adb8.optmpl
	ground/gcs/src/share/cloudconfig/multirotor/ZMR250(Race acro +)-Multirotor-QuadrocopterX-895b222d670.optmpl
	ground/gcs/src/share/cloudconfig/multirotor/whats_this.txt
	ground/gcs/src/share/cloudconfig/surface/whats_this.txt
	ground/gcs/src/share/translations/gcs_de.ts
	ground/gcs/src/share/translations/gcs_es.ts
	ground/gcs/src/share/translations/gcs_fr.ts
	ground/gcs/src/share/translations/gcs_ru.ts
	ground/gcs/src/share/translations/gcs_zh_CN.ts
	ground/gcs/src/share/translations/openpilotgcs_de.ts
	ground/gcs/src/share/translations/openpilotgcs_es.ts
	ground/gcs/src/share/translations/openpilotgcs_fr.ts
	ground/gcs/src/share/translations/openpilotgcs_ru.ts
	ground/gcs/src/share/translations/openpilotgcs_zh_CN.ts
	ground/gcs/src/share/vehicletemplates/custom/whats_this.txt
	ground/gcs/src/share/vehicletemplates/fixedwing/SoniModelMako-FixedWing-Elevon-7134e8ae5ce.optmpl
	ground/gcs/src/share/vehicletemplates/fixedwing/Toro900-VoilureFixe-Elevon-d4a58d2cd50.optmpl
	ground/gcs/src/share/vehicletemplates/fixedwing/whats_this.txt
	ground/gcs/src/share/vehicletemplates/helicopter/whats_this.txt
	ground/gcs/src/share/vehicletemplates/multirotor/(RACE)FPV260HobbyKin-Multirotor-QuadrocopterX-0482b7a25f7.optmpl
	ground/gcs/src/share/vehicletemplates/multirotor/(STOCK)HobbyKingFPV2-Multirotor-QuadrocopterX-0bb44b68883.optmpl
	ground/gcs/src/share/vehicletemplates/multirotor/ARRISX-SPEEDFPV250-Unsupported-2cbaaa14a01.optmpl
	ground/gcs/src/share/vehicletemplates/multirotor/BlackOutB330-Multirotor-QuadrocopterX-e9980c55302.optmpl
	ground/gcs/src/share/vehicletemplates/multirotor/BlackOutMiniH-Multirotor-QuadrocopterX-d415c242154.optmpl
	ground/gcs/src/share/vehicletemplates/multirotor/DJIF450-Multirotor-QuadrocopterX-cfa8ec67993.optmpl
	ground/gcs/src/share/vehicletemplates/multirotor/DroneframesDRQ250-cf-rc5 Multirotor-QuadrocopterX-425b90123f1.optmpl
	ground/gcs/src/share/vehicletemplates/multirotor/DroneframesDRQ430G-revo-rc5Multirotor-QuadrocopterX-fae90503b3f.optmpl
	ground/gcs/src/share/vehicletemplates/multirotor/EmaxNighthawk-Multirotor-QuadrocopterX-9a3aa9d9726.optmpl
	ground/gcs/src/share/vehicletemplates/multirotor/FlipFPVPro-Multirotor-QuadrocopterX-9eb7b719244.optmpl
	ground/gcs/src/share/vehicletemplates/multirotor/FlipFpvPro-Multirotor-QuadrocopterX-c117d151f95.optmpl
	ground/gcs/src/share/vehicletemplates/multirotor/FlipSport-Multirotor-QuadrocopterX-c27ae7b79ca.optmpl
	ground/gcs/src/share/vehicletemplates/multirotor/FlyingCinemaCinetan-Multirotor-QuadrocopterX-2c3f9181872.optmpl
	ground/gcs/src/share/vehicletemplates/multirotor/FlyingCinemaTankitoM-Multirotor-QuadrocopterX-385d9ac9ae1.optmpl
	ground/gcs/src/share/vehicletemplates/multirotor/GenericHexa-Multirotor-Hexacopter+-c50a904f4a3.optmpl
	ground/gcs/src/share/vehicletemplates/multirotor/GenericHexaH-Multirotor-HexacopterH-6cc3fed9073.optmpl
	ground/gcs/src/share/vehicletemplates/multirotor/GenericHexaX-Multirotor-HexacopterX-b3b8c1d2f3c.optmpl
	ground/gcs/src/share/vehicletemplates/multirotor/GenericHexaY6-Multirotor-HexacopterY6-0b5dc6bae4f.optmpl
	ground/gcs/src/share/vehicletemplates/multirotor/GenericQuad+-Multirotor-Quadrocopter+-a87a4226820.optmpl
	ground/gcs/src/share/vehicletemplates/multirotor/GenericQuadX-Multirotor-QuadrocopterX-5fce7315a5b.optmpl
	ground/gcs/src/share/vehicletemplates/multirotor/GenericTricopter-Multirotor-Tricopter-5f46bc37c31.optmpl
	ground/gcs/src/share/vehicletemplates/multirotor/GuerrillaDronesToadQ-Multirotor-QuadrocopterX-8f838e43432.optmpl
	ground/gcs/src/share/vehicletemplates/multirotor/HKingDYS250CarbonFib-Multirotor-QuadrocopterX-969354c51c1.optmpl
	ground/gcs/src/share/vehicletemplates/multirotor/HKingDYS320CarbonFib-Multirotor-QuadrocopterX-0b41edda68f.optmpl
	ground/gcs/src/share/vehicletemplates/multirotor/HoverThingsFLIPFPV-Multirotor-QuadrocopterX-32bf14a10fc.optmpl
	ground/gcs/src/share/vehicletemplates/multirotor/InventorsSparrowRace-Multirotor-QuadrocopterX-314fff867fd.optmpl
	ground/gcs/src/share/vehicletemplates/multirotor/QAV250-Multirotor-QuadrocopterX-181dab0df01.optmpl
	ground/gcs/src/share/vehicletemplates/multirotor/QAV400-Multirotor-QuadrocopterX-90a90b9fb50.optmpl
	ground/gcs/src/share/vehicletemplates/multirotor/QAV500-Multirotor-QuadrocopterX-6da440c4d7c.optmpl
	ground/gcs/src/share/vehicletemplates/multirotor/QUADI250-Multirotor-QuadrocopterX-c6c6cfc4cf9.optmpl
	ground/gcs/src/share/vehicletemplates/multirotor/RCExplorerV3Tricopte-Multirotor-Tricopter-dcbce3f069c.optmpl
	ground/gcs/src/share/vehicletemplates/multirotor/RD290MiniHexfpv-Multirotor-HexacopterX-6587232be1a.optmpl
	ground/gcs/src/share/vehicletemplates/multirotor/XhoverMXP230Elite-Multirotor-QuadrocopterX-3b169a4fd1b.optmpl
	ground/gcs/src/share/vehicletemplates/multirotor/ZMR250( Attitude mode)-ChineseQAV250-Multirotor-QuadrocopterX-5d318c0526c (1).optmpl
	ground/gcs/src/share/vehicletemplates/multirotor/ZMR250(4s race)-Multirotor-QuadrocopterX-fac61e7adb8.optmpl
	ground/gcs/src/share/vehicletemplates/multirotor/ZMR250(Race acro +)-Multirotor-QuadrocopterX-895b222d670.optmpl
	ground/gcs/src/share/vehicletemplates/multirotor/whats_this.txt
	ground/openpilotgcs/openpilotgcs.pri
	ground/openpilotgcs/openpilotgcs.pro
	ground/openpilotgcs/src/app/librepilotgcs.icns
	ground/openpilotgcs/src/app/librepilotgcs.ico
	ground/openpilotgcs/src/openpilotgcslibrary.pri
	ground/openpilotgcs/src/openpilotgcsplugin.pri
	ground/openpilotgcs/src/share/cloudconfig/custom/whats_this.txt
	ground/openpilotgcs/src/share/cloudconfig/fixedwing/SoniModelMako-FixedWing-Elevon-7134e8ae5ce.optmpl
	ground/openpilotgcs/src/share/cloudconfig/fixedwing/Toro900-VoilureFixe-Elevon-d4a58d2cd50.optmpl
	ground/openpilotgcs/src/share/cloudconfig/fixedwing/whats_this.txt
	ground/openpilotgcs/src/share/cloudconfig/helicopter/whats_this.txt
	ground/openpilotgcs/src/share/cloudconfig/multirotor/(RACE)FPV260HobbyKin-Multirotor-QuadrocopterX-0482b7a25f7.optmpl
	ground/openpilotgcs/src/share/cloudconfig/multirotor/(STOCK)HobbyKingFPV2-Multirotor-QuadrocopterX-0bb44b68883.optmpl
	ground/openpilotgcs/src/share/cloudconfig/multirotor/ARRISX-SPEEDFPV250-Unsupported-2cbaaa14a01.optmpl
	ground/openpilotgcs/src/share/cloudconfig/multirotor/BlackOutB330-Multirotor-QuadrocopterX-e9980c55302.optmpl
	ground/openpilotgcs/src/share/cloudconfig/multirotor/BlackOutMiniH-Multirotor-QuadrocopterX-d415c242154.optmpl
	ground/openpilotgcs/src/share/cloudconfig/multirotor/DJIF450-Multirotor-QuadrocopterX-cfa8ec67993.optmpl
	ground/openpilotgcs/src/share/cloudconfig/multirotor/DroneframesDRQ250-cf-rc5 Multirotor-QuadrocopterX-425b90123f1.optmpl
	ground/openpilotgcs/src/share/cloudconfig/multirotor/DroneframesDRQ430G-revo-rc5Multirotor-QuadrocopterX-fae90503b3f.optmpl
	ground/openpilotgcs/src/share/cloudconfig/multirotor/EmaxNighthawk-Multirotor-QuadrocopterX-9a3aa9d9726.optmpl
	ground/openpilotgcs/src/share/cloudconfig/multirotor/FlipFPVPro-Multirotor-QuadrocopterX-9eb7b719244.optmpl
	ground/openpilotgcs/src/share/cloudconfig/multirotor/FlipFpvPro-Multirotor-QuadrocopterX-c117d151f95.optmpl
	ground/openpilotgcs/src/share/cloudconfig/multirotor/FlipSport-Multirotor-QuadrocopterX-c27ae7b79ca.optmpl
	ground/openpilotgcs/src/share/cloudconfig/multirotor/FlyingCinemaCinetan-Multirotor-QuadrocopterX-2c3f9181872.optmpl
	ground/openpilotgcs/src/share/cloudconfig/multirotor/FlyingCinemaTankitoM-Multirotor-QuadrocopterX-385d9ac9ae1.optmpl
	ground/openpilotgcs/src/share/cloudconfig/multirotor/GenericHexa-Multirotor-Hexacopter+-c50a904f4a3.optmpl
	ground/openpilotgcs/src/share/cloudconfig/multirotor/GenericHexaH-Multirotor-HexacopterH-6cc3fed9073.optmpl
	ground/openpilotgcs/src/share/cloudconfig/multirotor/GenericHexaX-Multirotor-HexacopterX-b3b8c1d2f3c.optmpl
	ground/openpilotgcs/src/share/cloudconfig/multirotor/GenericHexaY6-Multirotor-HexacopterY6-0b5dc6bae4f.optmpl
	ground/openpilotgcs/src/share/cloudconfig/multirotor/GenericQuad+-Multirotor-Quadrocopter+-a87a4226820.optmpl
	ground/openpilotgcs/src/share/cloudconfig/multirotor/GenericQuadX-Multirotor-QuadrocopterX-5fce7315a5b.optmpl
	ground/openpilotgcs/src/share/cloudconfig/multirotor/GenericTricopter-Multirotor-Tricopter-5f46bc37c31.optmpl
	ground/openpilotgcs/src/share/cloudconfig/multirotor/GuerrillaDronesToadQ-Multirotor-QuadrocopterX-8f838e43432.optmpl
	ground/openpilotgcs/src/share/cloudconfig/multirotor/HKingDYS250CarbonFib-Multirotor-QuadrocopterX-969354c51c1.optmpl
	ground/openpilotgcs/src/share/cloudconfig/multirotor/HKingDYS320CarbonFib-Multirotor-QuadrocopterX-0b41edda68f.optmpl
	ground/openpilotgcs/src/share/cloudconfig/multirotor/HoverThingsFLIPFPV-Multirotor-QuadrocopterX-32bf14a10fc.optmpl
	ground/openpilotgcs/src/share/cloudconfig/multirotor/InventorsSparrowRace-Multirotor-QuadrocopterX-314fff867fd.optmpl
	ground/openpilotgcs/src/share/cloudconfig/multirotor/QAV250-Multirotor-QuadrocopterX-181dab0df01.optmpl
	ground/openpilotgcs/src/share/cloudconfig/multirotor/QAV400-Multirotor-QuadrocopterX-90a90b9fb50.optmpl
	ground/openpilotgcs/src/share/cloudconfig/multirotor/QAV500-Multirotor-QuadrocopterX-6da440c4d7c.optmpl
	ground/openpilotgcs/src/share/cloudconfig/multirotor/QUADI250-Multirotor-QuadrocopterX-c6c6cfc4cf9.optmpl
	ground/openpilotgcs/src/share/cloudconfig/multirotor/RCExplorerV3Tricopte-Multirotor-Tricopter-dcbce3f069c.optmpl
	ground/openpilotgcs/src/share/cloudconfig/multirotor/RD290MiniHexfpv-Multirotor-HexacopterX-6587232be1a.optmpl
	ground/openpilotgcs/src/share/cloudconfig/multirotor/XhoverMXP230Elite-Multirotor-QuadrocopterX-3b169a4fd1b.optmpl
	ground/openpilotgcs/src/share/cloudconfig/multirotor/ZMR250( Attitude mode)-ChineseQAV250-Multirotor-QuadrocopterX-5d318c0526c (1).optmpl
	ground/openpilotgcs/src/share/cloudconfig/multirotor/ZMR250(4s race)-Multirotor-QuadrocopterX-fac61e7adb8.optmpl
	ground/openpilotgcs/src/share/cloudconfig/multirotor/ZMR250(Race acro +)-Multirotor-QuadrocopterX-895b222d670.optmpl
	ground/openpilotgcs/src/share/cloudconfig/multirotor/whats_this.txt
	ground/openpilotgcs/src/share/translations/openpilotgcs_de.ts
	ground/openpilotgcs/src/share/translations/openpilotgcs_es.ts
	ground/openpilotgcs/src/share/translations/openpilotgcs_fr.ts
	ground/openpilotgcs/src/share/translations/openpilotgcs_ru.ts
	ground/openpilotgcs/src/share/translations/openpilotgcs_zh_CN.ts
	make/tools.mk
2015-08-29 17:03:48 +02:00
Philippe Renon
badffb82e3 LP-29 renamed ground/openpilotgcs to gcs 2015-08-29 15:29:51 +02:00
Laurent Lalanne
6b4c5821cd LP-106 Wizard refresh : Add CC3D to connection diagram 2015-08-29 15:00:25 +02:00
Laurent Lalanne
66aab9553e LP-106 Add board picture to wizard controller page - Resize connection
diagram button
2015-08-29 15:00:24 +02:00
Laurent Lalanne
a8bdf53ef8 LP-106 Setup Wizard refresh : Add dual servo setup (dual aileron or
vtail)
2015-08-29 15:00:24 +02:00
Paul Jewell
21702104d1 Commented out code and ui for usage data collection 2015-08-28 19:11:37 +01:00
James Duley
d207f848ee Merged in f5soh/librepilot/laurent/LP-98_SystemHealth_refresh (pull request #36)
LP-98 SystemHealth refresh
2015-08-26 20:07:55 +01:00
Laurent Lalanne
87829b8cb8 LP-98 Add logreplay layer to SystemHealth 2015-08-21 20:58:56 +02:00
Laurent Lalanne
d2ba9ce52a LP-98 Refresh / fix some text in alarms 2015-08-21 20:58:31 +02:00
Alessio Morale
538a137bf6 Merged in f5soh/librepilot/laurent/LP-92_Feed_forward_remove (pull request #33)
Laurent/lp 92_feed_forward_remove
2015-08-21 13:35:10 +02:00
Alessio Morale
43ca4b01af Merged in rbekken/librepilot/copyright_update (pull request #32)
Update all changed files against GIT log with copyright headers consistency.
2015-08-21 13:34:37 +02:00
Alessio Morale
044f1604cd LP-67 - Fix tooltips 2015-08-21 13:00:51 +02:00
Paul Jewell
170d47ad39 Updated Copyright message on changed files 2015-08-19 22:11:08 +01:00
Paul Jewell
c912505798 Removed openpilot hard coding from wiki buttons in GCS 2015-08-19 21:15:32 +01:00
Roy Bekken
ad84547637 Update all changed files against GIT log with copyright headers consistency. 2015-08-19 16:15:58 +02:00
Alessio Morale
08aaaa518b LP-93 - zero gyro bias after temp calibration 2015-08-14 14:22:18 +02:00
Laurent Lalanne
670dbfe9ce LP-92 Remove Feed Forward : flight / ground 2015-08-14 10:54:12 +02:00
Alessio Morale
2f93596c9c LP-67 - Add "Default" buttons 2015-08-14 10:24:20 +02:00
Alessio Morale
b5f8bb75f7 LP-67 - UI cleanup, enable boxes only if appropriate. 2015-08-14 10:24:20 +02:00
Alessio Morale
d7eff39f4c LP-67 - Initial UI 2015-08-14 10:24:18 +02:00
James Duley
faa5d0fb4a Merged in f5soh/librepilot/laurent/LP-3_Artwork_refresh (pull request #27)
Laurent/lp 3_artwork_refresh
2015-08-09 21:23:36 +01:00
James Duley
e36a53485f Merged in rbekken/librepilot/Remove_OP_From_GCS_DIR (pull request #21)
LP-1 - Rebranding
2015-08-09 21:22:01 +01:00
James Duley
03077231dc Merged in rbekken/librepilot/update_fix (pull request #19)
Fix welcome page update link.
2015-08-09 21:20:36 +01:00
James Duley
3769b8a1ae Merged in rbekken/librepilot/bug (pull request #18)
uavobjectgenerator: Fix logic error.
2015-08-09 21:01:58 +01:00
Laurent Lalanne
191f34d3e1 LP-3 Calibration images now transparent so background can be changed 2015-08-08 13:18:42 +02:00
Laurent Lalanne
8562c608e8 LP-3 Refresh artwork : CC3D view for HW tab 2015-08-07 23:50:47 +02:00
Laurent Lalanne
3adda639e1 LP-84 Revonano board name for uploader 2015-08-04 22:52:31 +02:00
Roy Bekken
dcb81a4066 LP-1 - Rebranding
-Remove OP from GCS directory structure; additions.
2015-08-04 16:55:12 +02:00
Roy Bekken
505d0873a5 Fix welcome page update link. 2015-08-03 19:47:04 +02:00
Roy Bekken
003558be45 uavobjectgenerator
- Fix logic error and add description to usage().
- Update Copyright.
2015-08-03 16:10:24 +02:00
LibrePilot Packager
d91edc6ffa renamed librepilotgcs files in app to just gcs
also removed openpilotgcs file in app too.

Change-Id: I097e398e7426e77a284f7588124a6907ae6f5211
2015-08-02 19:37:20 +01:00
LibrePilot Packager
b10fad23b3 LP-1: moved openpilotgcsplugin.pri to plugin.pri
Change-Id: I2959c63fccaaca605c2e2747878b34de5040a9c2
2015-08-02 19:37:11 +01:00
LibrePilot Packager
c02ccfef0a LP-1: moved openpilotgcslibrary.pri to library.pri
Change-Id: Ie4eb9f6f64288e7c4b8d961ad4a2cc6b86e7fde8
2015-08-02 19:36:51 +01:00
LibrePilot Packager
8500c38c3d LP-1: moved openpilotgcs.pri to gcs.pri
Change-Id: I8d3f0a6b7420cef2988cb04b526ca81fc66c5d7c
2015-08-02 19:36:39 +01:00
James Duley
c14cacb043 LP-1 rebranding: move ground/{openpilotgcs => gcs}
and associated pro file.

Change-Id: Icc200217f2db27635c7aa2e5b182f9b273925647
2015-08-02 19:20:02 +01:00
James Duley
50ee70f492 LP-61 addtional make config options: added libbasename & GCS_LIBRARY_BASENAME
Change-Id: Ied2f50b3f87d40ef7fb0bbad0fff4cd0fd9bb8a9
2015-08-02 11:36:42 +01:00
Roy Bekken
c756efbf7f LP-1 - Code Rebranding
Damn You Broken Auto Correct!
2015-07-31 16:51:04 +02:00
alessio morale
58602bebbe Merged in f5soh/librepilot/laurent/LP-65_Heli_tab_refresh (pull request #6)
LP-65 Heli tab : Custom values refreshed - Check unused/duplicate output channels
2015-07-31 14:44:01 +02:00
alessio morale
05494eebcc Merged in f5soh/librepilot/laurent/LP-66_FixedWing_Roll_differential (pull request #9)
LP-66 - Add differential Roll mixing to Fixed Wing frames
2015-07-31 14:38:28 +02:00
alessio morale
582ed4297c Merged in LP-56_split_acroplus_factors (pull request #2)
LP-56 split acroplus factors
2015-07-31 14:34:42 +02:00
James Duley
321c60b34c Merged in paul_jewell/librepilot/LP-58-splash-screen-doesnt-display (pull request #4)
LP-58 - Added processEvents() to display splashscreen promptly
2015-07-30 21:36:54 +01:00
Philippe Renon
14a0c1da12 LP-29 osgearth integration : fixed comment encoding issues in OSGCamera 2015-07-30 21:51:23 +02:00
Roy Bekken
a968e7594d LP-1 – Code Rebranding
Drop prefix for download and tools variables.
2015-07-30 21:47:13 +02:00
Alessio Morale
13f02e7d9d LP-56 - Better txpid option namings, fix tabs-spaces, tooltips. headers, variable namings 2015-07-30 18:23:55 +02:00
Laurent Lalanne
1d11f7c014 LP-65 Changes from review 2015-07-30 17:31:12 +02:00
Laurent Lalanne
50be8730c0 LP-66 Add some channel checking - Fix second rudder for FixedWing 2015-07-30 14:24:57 +02:00
Laurent Lalanne
b0c8cc4385 LP-65 Update copyright headers 2015-07-30 10:13:32 +02:00
Laurent Lalanne
0c1fc1d9a0 LP-66 Remove extra spaces 2015-07-30 10:08:02 +02:00
Roy Bekken
f6116d7349 LP-1 – Code Rebranding
Rename variables for local tools and installation directory.
2015-07-29 14:49:09 +02:00
Laurent Lalanne
d0306f77e8 LP-66 Fixed wing : Roll differential mixing, GUI part 2015-07-29 06:38:10 +02:00
Laurent Lalanne
538e0925a8 LP-65 Heli tab : Custom values refreshed - Check unused/duplicate output channels 2015-07-28 12:24:46 +02:00
Alessio Morale
3490057f69 LP-56 - Add link checkbox for acro+ roll/pitch factors 2015-07-27 23:25:38 +02:00
Alessio Morale
7b3aed3de9 LP-56 - Allows a single txpid instance to handle Roll&Pitch
Also populate combos with current txpid values
2015-07-27 22:45:33 +02:00
Paul Jewell
1f1a22d8be Added processEvents() to display splashscreen promptly 2015-07-26 22:51:26 +01:00
Alessio Morale
383a4731c7 LP-56 - UI support 2015-07-25 12:02:58 +02:00
Alessio Morale
e01798d1ed LP-41 - Add support for ccache
- explicitly define QMAKE_CC & CXX as "ccache <compiler>"
- use ccache for uavobjectgenerator
- Handle CCACHE setting with configuration options

To enable ccache you need to configure it like
  make CCACHE=/path/to/ccache config_append
2015-07-22 20:40:43 +02:00
a*morale
2422706ba4 Merge pull request #47 from parched/qt5_5_compilation_fix
Fixed missing QDataStream includes to make compilation on qt 5.5 work
2015-07-20 23:09:15 +02:00
a*morale
6f41779c80 Merge pull request #49 from f5soh/laurent/LP-48_Update_rebranding_strings_translations
Laurent/lp 48 update rebranding strings translations
2015-07-20 23:06:50 +02:00
Philippe Renon
9d97cbad1c LP-29 osgearth integration : upgrade to osg 3.4-rc5 and osgearth 2.7rc2 2015-07-20 23:05:41 +02:00
Laurent Lalanne
b5a0c81196 LP-51 Fix merge issue for Revo / Revonano HW config display 2015-07-20 01:33:47 +02:00
Laurent Lalanne
9d4a075d97 LP-48 Small changes 2015-07-20 00:30:10 +02:00
Philippe Renon
3be5120d18 LP-29 osgearth integration : fixed unused parameter errors on osx 2015-07-20 00:00:32 +02:00
Laurent Lalanne
f0cc2a0c15 LP-48 changes from review (2) + Missing changes 2015-07-19 23:45:44 +02:00
Laurent Lalanne
ac9c7f7502 LP-48 Changes from review. Tks James. 2015-07-19 22:27:16 +02:00
Laurent Lalanne
e66a0b26fc LP-48 French translation update 2015-07-19 21:21:02 +02:00
Laurent Lalanne
71bb81a999 LP-48 Update strings 2015-07-19 21:19:54 +02:00
James Duley
a61773e3af Fixed missing QDataStream includes to make compilation on qt 5.5 work 2015-07-20 03:44:45 +12:00
a*morale
1d0ac6667f Merge pull request #31 from skarlsso/skarlsso/LP-26_update_welcome_page_plugin
skarlsso/LP-26_update_welcome_page_plugin
2015-07-19 14:08:31 +02:00
Stefan Karlsson
ce026c227a LP-26 Update Websites links 2015-07-19 13:54:23 +02:00
Stefan Karlsson
ec8590d17d LP-26 Fix spelling 2015-07-19 13:33:14 +02:00
Stefan Karlsson
d81ae88e2e LP-26 Change "OpenPilot Websites" to "Websites" 2015-07-19 13:32:16 +02:00
a*morale
67b2d0ec50 Merge pull request #35 from paul-jewell/menu_item_change4
Removed OpenPilot reference in About Menu
2015-07-19 13:17:39 +02:00
a*morale
f15c3baab1 Merge pull request #27 from m-thread/m-thread/LP-16_Vehicle_Templates_Enhancements
LP-16 Vehicle templates enhancements
2015-07-19 13:04:52 +02:00
Alessio Morale
b18ac301fb Merge branch 'laurent/LP05-CC_Wizard_Artwork' of git://github.com/f5soh/LibrePilot into AlessioMorale-amorale/LP05-Readd_CC_rebased 2015-07-19 12:59:56 +02:00
Alessio Morale
18bc25aac6 Merge branch 'amorale/LP05-Readd_CC_rebased' of https://github.com/AlessioMorale/LibrePilot into AlessioMorale-amorale/LP05-Readd_CC_rebased
Conflicts:
	ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp
2015-07-19 12:59:50 +02:00
Philippe Renon
727924ea85 LP-29 osgearth integration : added osgearth library (provides Qml items) 2015-07-17 22:55:25 +02:00
Philippe Renon
884ef19631 LP-29 osgearth integration : new quickwidgetproxy to easily switch between QQuickView and QQuickWidget 2015-07-17 22:43:42 +02:00
Philippe Renon
0cdf0c0681 LP-29 osgearth integration : added utility to get common GCS directories 2015-07-17 22:40:27 +02:00
Paul Jewell
d4d8a6fa5c Removed OpenPilot reference in About Menu 2015-07-16 23:25:32 +01:00
Stefan Karlsson
b26391d585 LP-26 Show forum news on the welcome page 2015-07-16 19:32:30 +02:00
Stefan Karlsson
abcf2edd56 LP-26 Show GitHub commits on the welcome page 2015-07-16 19:30:38 +02:00
m_thread
23abeef9f9 LP-16 Updated whats_this.txt files. 2015-07-16 16:57:13 +02:00
m_thread
4918f61054 LP-16 Uncrustified. 2015-07-16 16:53:29 +02:00
m_thread
fd3eaa2fef LP-16 Buttons not shown when widget is in Wizard. 2015-07-16 16:48:34 +02:00
m_thread
ba8b01cc6b Merge branch 'next' into m-thread/LP-16_Vehicle_Templates_Enhancements 2015-07-16 14:28:51 +02:00
m_thread
ad1c033cad LP-16 Added code for adding/importing template to local storage. 2015-07-16 12:53:06 +02:00
m_thread
9b7e5b3ae2 LP-16 Fixed small errors. 2015-07-16 11:23:32 +02:00
a*morale
01a56796c3 Merge pull request #17 from f5soh/laurent/LP-03_Artwork_icons_splashscreen
Laurent/lp 03 artwork icons splashscreen
2015-07-16 11:18:29 +02:00
Laurent Lalanne
ef6b664ac8 LP-05 Add CC artwork for connection-diagram 2015-07-16 10:31:43 +02:00
a*morale
feee18134e Merge pull request #15 from skarlsso/skarlsso/LP-10_cleanup_build_warnings_on_osx
Skarlsso/lp 10 cleanup build warnings on osx
2015-07-16 09:27:16 +02:00
Alessio Morale
5e9a034e6e LP-5 - Uncrustification 2015-07-15 22:53:48 +02:00
m_thread
72938ec954 LP-16 Added code to delete 'local' vehicle templates. 2015-07-15 15:34:15 +02:00
m_thread
da6b0715f7 LP-16 Updated code to use new vehicle template path and extension. 2015-07-15 10:30:36 +02:00
m_thread
c193b53d3a LP-16 Moved vehicle template files. 2015-07-15 10:29:43 +02:00
Paul Jewell
ca8c7b6b96 Modified comments to remove openpilotgcs 2015-07-15 08:04:33 +01:00
a*morale
81ea0b9232 LP-5 Fix revert issue 2015-07-15 00:07:51 +02:00
a*morale
dd6c6054e9 Revert "OP-1810 FOC"
This reverts commit 92e50c2ead.

Conflicts:
	Makefile
	ground/openpilotgcs/src/plugins/config/config.pro
	ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp
	ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
	ground/openpilotgcs/src/plugins/setupwizard/pages/escpage.cpp
	ground/openpilotgcs/src/plugins/setupwizard/resources/connection-diagrams.svg
	ground/openpilotgcs/src/plugins/uavobjectutil/devicedescriptorstruct.h
2015-07-15 00:07:50 +02:00
Laurent Lalanne
b6ef1e2256 LP-03 Refine OSX icons - OSX installer background 2015-07-14 22:56:00 +02:00
Stefan Karlsson
aea3fccf7b LP-10 Uncrustify 2015-07-13 12:51:49 +02:00
Stefan Karlsson
f3b091ebc9 LP-10 Use Q_UNUSED for unused parameters 2015-07-13 12:50:40 +02:00
Laurent Lalanne
50828e3dd4 LP-03 Missing new Osx icon 2015-07-13 12:46:14 +02:00
Laurent Lalanne
154e303bd8 LP-03 Better Win32 icons, OSX icon, Splash Screen text placement and colors 2015-07-13 12:39:20 +02:00
Stefan Karlsson
c5ed56226d LP-10 Update previous abs float fix to use fabs
Previous fix casted the float arguments to ints. Use a fabs instead,
since it gives easier code to read. The beSmooth check was also moved
to further enhance the readability of the code.
2015-07-12 23:54:37 +02:00
Stefan Karlsson
de07c028a9 LP-10 Turn on stricter warnings on OS X 2015-07-12 22:35:00 +02:00
Stefan Karlsson
dc08ca5949 LP-10 Fix missing swith enum value warning 2015-07-12 22:35:00 +02:00
Stefan Karlsson
1861ede9d7 LP-10 Fix unused parameter warnings 2015-07-12 22:34:59 +02:00
Stefan Karlsson
162dde2677 LP-10 Fix unitialized variable warning 2015-07-12 22:34:59 +02:00
Stefan Karlsson
257629dc3e LP-10 Fix signed/unsigned comparison 2015-07-12 22:34:59 +02:00
Stefan Karlsson
f55048eb22 LP-10 Remove unused static function 2015-07-12 22:34:59 +02:00
Stefan Karlsson
1a0f5f1bef LP-10 Fix bugs and warnings in USB_UPLOAD_TOOL 2015-07-12 22:34:59 +02:00
Stefan Karlsson
a28d668758 LP-10 Fix abs warning when floats are used 2015-07-12 22:34:59 +02:00
Stefan Karlsson
e6f88883d0 LP-10 Fix incorrect return type in generalsettings 2015-07-12 22:34:59 +02:00
Stefan Karlsson
e44bafaee5 LP-10 Fix shadowing warning in OPMapGadgetConfiguration 2015-07-12 22:33:38 +02:00
James Duley
e08feb3c46 rename default configuration xml file 2015-07-13 07:11:50 +12:00
James Duley
cc2b2149ef changed default GCS names to not have a vendor 2015-07-13 07:11:49 +12:00
James Duley
b6d42f2da8 Passed ORG_NAME to GCS 2015-07-13 07:11:49 +12:00
James Duley
7a1f330096 fixed stylesheet path hardocding 2015-07-13 03:34:10 +12:00
LibrePilot Packager
8c47b39535 use GetDataPath instead of hardcoding 2015-07-13 01:34:45 +12:00
LibrePilot Packager
77cdbcc351 removed unnecesssary PathUtils class around functions 2015-07-13 01:34:45 +12:00
LibrePilot Packager
1e662d6175 removed openpilotgcs hardcoding from qt.conf 2015-07-13 01:34:32 +12:00
Alessio Morale
0e0e6a1a1c Merge branch 'laurent/LP-03_Artwork_rebranding' of git://github.com/f5soh/LibrePilot into f5soh-laurent/LP-03_Artwork_rebranding
Conflicts:
	package/winx86/openpilotgcs.nsi
2015-07-12 10:39:43 +02:00
LibrePilot Packager
fba69ae07e fix up for files that were missed in share directory move due to rebase 2dee2328d 2015-07-11 14:09:49 +01:00
a*morale
e84ad7abff Merge pull request #7 from parched/OP-1879_remove_openpilot_hardcoding
OP-1879 remove openpilot hardcoding
2015-07-11 14:23:29 +02:00
a*morale
f43b6c890a Merge pull request #8 from parched/OP-1929_broken_package_src
OP-1929 broken package src
2015-07-11 14:22:56 +02:00
James Duley
2dee2328d0 OP-1879: Move ground/openpilotgcs/share/openpilotgcs to ground/openpilotgcs/src/share
This seperates our intermediate build files and files that need to be
installed.
2015-07-09 22:01:46 +01:00
James Duley
4dea2d3d97 OP-1879 remove openpilot hardcoding: added naming variables to top Makefile 2015-07-09 22:01:39 +01:00
James Duley
5474583660 OP-1879 remove openpilot hardcoding: use $$shell_quote where appropraite 2015-07-09 22:01:39 +01:00
James Duley
64cd361666 OP-1879 remove openpilot hardcoding: add GCS_NAME make variable 2015-07-09 22:01:38 +01:00
James Duley
edc949a91b OP-1879 remove openpilot hardcoding: reworked settings to use default app name 2015-07-09 22:01:38 +01:00
James Duley
95d3de7351 OP-1879 remove openpilot hardcoding: use QStandardPaths:CacheLocation for GetStoragePath 2015-07-09 22:01:37 +01:00
James Duley
11beba3369 OP-1879 remove openpilot hardcoding: use GCS_APP_TARGET name for library and data paths 2015-07-09 22:01:37 +01:00
James Duley
d6eb85c5ee OP-1879 remove openpilot hardcoding: remove unused hardcoded cloudconfig path 2015-07-09 22:01:37 +01:00
James Duley
64dc5717f1 OP-1879 remove openpilot hardcoding: use Utils::PathUtils.GetDataPath() instead of hardcoding in main.cpp 2015-07-09 22:01:36 +01:00
James Duley
fc791e87dc OP-1879 remove openpilot hardcoding: use relative paths define from openpilotgcs.pri for data and plugins paths 2015-07-09 22:01:36 +01:00
James Duley
c992daddaf OP-1879 remove openpilot hardcoding: change GCS_APP_PATH on Mac removing pointless bin subdir 2015-07-09 22:01:35 +01:00
James Duley
31cafe1d22 OP-1879 remove openpilot hardcoding: remove wrong and unneeded libexec path 2015-07-09 22:01:35 +01:00
Laurent Lalanne
4ae9bfe3f7 LP-03 About - Splash screen fixes 2015-07-09 21:01:58 +02:00
Laurent Lalanne
a91679b50f LP-03 Splash : Add dark grey background for status text 2015-07-09 11:16:28 +02:00
Laurent Lalanne
7210eda66d LP-03 Installer img and icon - move SplashScreen text 2015-07-09 02:28:09 +02:00
Laurent Lalanne
fa3c4dcd4b LP-03 Missing splash file :) 2015-07-09 00:07:03 +02:00
Laurent Lalanne
b43e533cf6 LP-03 slash name, win32 issue 2015-07-08 23:38:24 +02:00
Laurent Lalanne
c68756a036 LP-03 Artwork rebranding : updated Logos, wizard and config shapes 2015-07-08 20:29:34 +02:00
James Duley
67aaa1fd19 fix usagetracker to compile with qt < 5.4 2015-06-26 08:11:52 +12:00
Corvus Corax
bd9fdba2c5 Merge remote-tracking branch 'origin/rel-15.05' into next 2015-06-23 18:45:04 +02:00
abeck70
28a8a36a56 rel-nano-15.05 Updated cloud configs 2015-06-17 20:17:20 +10:00
Corvus Corax
a41ef23659 Merge branch 'rel-nano-15.05' into corvuscorax/fixedwingautotakeofftest 2015-06-06 12:03:17 +02:00
m_thread
3d5fae2172 REVONANO: Fix for Comboboxes not having options but rather just an integer value that equals the actual selected index.. 2015-06-06 11:23:01 +02:00
abeck70
631c1b2361 Release 15.05 RC7 WhatsNew Update
And uncrustify
2015-06-06 08:00:16 +10:00
Corvus Corax
96f58605ec Merge branch 'rel-nano-15.05' into corvuscorax/fixedwingautotakeofftest 2015-06-05 15:17:35 +02:00
m_thread
9ce00a18f0 REVONANO: Added limit for ComBridge on Nano receiver port.
Fixed Revo Hw config page to handle ComBridge on Receiver port
correctly.
Changed some alignments in GUI.
2015-06-04 22:18:16 +02:00
m_thread
5e5a0e503f REVONANO: Minor bug fix with a combobox not hiding properly. 2015-06-04 21:44:23 +02:00
m_thread
c60a5a5e94 Merge branch 'rel-nano-15.05' of ssh://git.openpilot.org/temp into rel-nano-15.05 2015-06-04 21:26:10 +02:00
m_thread
a871a6f455 REVONANO: Update Nano Hw page to use 'limits safe' combobox code. 2015-06-04 21:25:47 +02:00
m_thread
c4105240c2 REVONANO: Handle limits.
Added code to take limits on options into consideration when dealing
with comboboxes in configtaskwidget controls.
2015-06-04 21:25:01 +02:00
Corvus Corax
ffcd058478 fix flightgear hitl bridge sign issue on velocity down vector 2015-06-04 12:51:47 +02:00
Mathieu Rondonneau
891922db23 OP-1915: Fix google map not appearing. 2015-06-03 16:00:29 -07:00
abeck70
ae26eea363 REVONANO uncrustify 2015-06-02 08:38:27 +10:00
Steve Evans
d41808ecaf Merge branch 'rel-nano-15.05' into steve/OP-1904_Display_current_TxPID_settings_on_OSD 2015-05-30 12:14:47 +01:00
abeck70
2081ab6550 Merge remote-tracking branch 'origin/thread/OP-1901_SRXL_Wizard' into rel-nano-15.05 2015-05-30 19:40:35 +10:00
abeck70
c8ff29c404 Merge remote-tracking branch 'origin/steve/OP-1903_Add_TxPID_controls_for_AttitudeSettings' into rel-nano-15.05 2015-05-30 19:31:46 +10:00
abeck70
3e4c11780e Merge remote-tracking branch 'origin/laurent/OP-1648_PFD_Stabmodes_update' into rel-nano-15.05 2015-05-30 19:27:34 +10:00
Laurent Lalanne
6ddcb26e5e OP-1648 Update PFD with new flightmodes 2015-05-29 19:56:25 +02:00
abeck70
690eaf9cb6 Merge branch 'samguns/OP-xxxx_Limit_PWM_RX_OneShot' into rel-nano-15.05 2015-05-29 21:41:59 +10:00
abeck70
6b2d217efe Merge branch 'samguns/OP-XXXX_wizard_freeze_workaround' into rel-nano-15.05 2015-05-29 21:41:28 +10:00
samguns
3e60dff30b REVONANO Only reboot nano when needed in setup wizard 2015-05-28 23:18:24 +08:00
samguns
edddc0e34f REVONANO Remove unnecessary limits for OneShot/PWMSync in setup wizard 2015-05-28 22:24:41 +08:00
m_thread
3d6a01f0e2 OP-1732 - Fixed timer bank assignments and labels for Revolution
Conflicts:
	ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
2015-05-27 11:18:47 +02:00
m_thread
f23de9b628 Merge remote-tracking branch 'temp/laurent/OP-1901_revonano1505_SRXL_wizard_artwork' into thread/OP-1901_SRXL_Wizard 2015-05-27 08:10:31 +02:00
m_thread
6c850cbfdb OP-1901 Fixed faulty tooltip. 2015-05-27 07:30:58 +02:00
Laurent Lalanne
f4eb368a8f OP-1901 Revo-srxl placement 2015-05-27 07:29:51 +02:00
m_thread
52e56df397 OP-1901 Adding support for SRXL in connection diagram. 2015-05-26 23:36:32 +02:00
m_thread
4db1dd8b19 Merge remote-tracking branch 'temp/laurent/OP-1901_revonano1505_SRXL_wizard_artwork' into thread/OP-1901_SRXL_Wizard 2015-05-26 22:21:39 +02:00
m_thread
924503de48 OP-1901 Adding support for SRXL in vehicle wizard. 2015-05-26 22:20:46 +02:00
Laurent Lalanne
58bbc9324d OP-1901 Revonano1505 SRXL wizard artwork 2015-05-26 21:32:40 +02:00
samguns
68da0d20a2 REVONANO A workaround for freeze in setup wizard 2015-05-26 23:09:25 +08:00
samguns
8551048354 REVONANO 1. Sanity check for PWMSync & OneShot while using PWM receiver. 2. Remove CC in hwsettings.xml 2015-05-26 15:01:01 +08:00
Steve Evans
1cdc1635bd Merge branch 'steve/OP-1903_Add_TxPID_controls_for_AttitudeSettings' into steve/OP-1904_Display_current_TxPID_settings_on_OSD 2015-05-23 22:24:48 +01:00
Steve Evans
df3e0ae3c8 OP-1903 Get default values for attitude attributes 2015-05-23 22:24:20 +01:00
Steve Evans
5a9ee46742 OP-1904 Initial commit 2015-05-23 21:55:19 +01:00
abeck70
e8b09e88e2 Merge branch 'rel-15.05' into next 2015-05-22 22:16:08 +10:00
abeck70
4502bff08c Merge branch 'abeck/OP-1898-VR' into rel-nano-15.05 2015-05-22 21:39:09 +10:00
abeck70
6f2d8d40e3 Merge branch 'rel-15.05' into rel-nano-15.05 2015-05-22 21:38:37 +10:00
abeck70
42b1e12646 HITL segv fix 2015-05-22 21:26:20 +10:00
abeck70
446866f769 OP-1898 Velocity Roam Update tooltips on GPSAssist 2015-05-22 18:56:04 +10:00
abeck70
c0c5cd3d16 OP-1464 uncrustify 2015-05-22 18:36:38 +10:00
abeck70
22b2317732 Merge branch 'theothercliff/OP-1464_Handle_Autobaud_code_for_GPS' into rel-nano-15.05 2015-05-22 18:34:17 +10:00
abeck70
981005e40c Merge branch 'rel-15.05' into rel-nano-15.05 2015-05-21 22:51:45 +10:00
abeck70
b77a7d1116 Merge branch 'rel-15.05' into next 2015-05-21 22:47:39 +10:00
abeck70
f44884f072 REVONANO esc setupwizard nano fix 2015-05-21 22:19:40 +10:00
Cliff Geerdes
ced0d4725b OP-1464 Rename things as requested Implement autodisable as advised by Alessio 2015-05-21 04:37:44 -04:00
samguns
40acc2c7ea OP-1897 Minor change after code review 2015-05-21 09:47:44 +08:00
samguns
501e2e09de OP-1897 Adopt FTT's suggestion that make warning dialog for Ground Vehicle when it's neccesary and omit confusing texts 2015-05-20 15:50:25 +08:00
Cliff Geerdes
55a43d1815 OP-1464 Compile warning discovery Remove AbConfStoreDisable 2015-05-20 01:04:06 -04:00
Cliff Geerdes
244c9e2d5e Merge branch 'rel-15.05' into theothercliff/OP-1464_Handle_Autobaud_code_for_GPS 2015-05-19 21:57:34 -04:00
Cliff Geerdes
de521c9004 OP-1464 tested version with debug still in place 2015-05-19 19:33:31 -04:00
abeck70
2241070d04 Merge branch 'rel-15.05' into rel-nano-15.05 2015-05-20 08:37:44 +10:00
Alessio Morale
a858321add update and cleanup UAVObjects list 2015-05-19 17:33:07 +02:00
Laurent Lalanne
81361af7b6 Rcpanel hot fix (Roll can't move) 2015-05-19 15:21:31 +02:00
abeck70
c14be34551 Merge branch 'rel-15.05' into rel-nano-15.05
Conflicts:
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
2015-05-19 22:24:16 +10:00
abeck70
5b49aa092f Merge branch 'rel-15.05' into next 2015-05-19 22:02:34 +10:00
abeck70
a00ce7a551 Merge branch 'rel-15.05' of ssh://git.openpilot.org/OpenPilot into parched/OP-1853_Ground_build_tidy 2015-05-19 21:53:20 +10:00
abeck70
399bf0470a Merge branch 'rel-15.05' into rel-nano-15.05 2015-05-19 18:25:07 +10:00
abeck70
869bfaaee5 Merge branch 'rel-15.05' into next 2015-05-19 18:20:06 +10:00
abeck70
053bd9ebb7 Map update code review comments 2015-05-19 18:17:21 +10:00
Kevin Finisterre
bf96bfac74 Remove redundant entry 2015-05-19 18:17:21 +10:00
Kevin Finisterre
8f8b2fccfc Add Statkart Topo2 aka... I scratch YOUR back, you scratch mine!
17f68c3be6
2015-05-19 18:17:20 +10:00
Kevin Finisterre
d7fef72b4d disable printing of the image header, was used for debugging only 2015-05-19 18:17:20 +10:00
Kevin Finisterre
f98a9e6319 Depreciate MapsLT map source 2015-05-19 18:17:20 +10:00
Kevin Finisterre
17fa6341c3 Depreciate Yandex maps 2015-05-19 18:17:20 +10:00
Kevin Finisterre
13b0eac79f Depreciate Pergo maps 2015-05-19 18:17:20 +10:00
Kevin Finisterre
361bb26212 attempt to get Pergo Turkish maps working. Still buggy. Unable to search and auto zoom. Initial map render works mostly 2015-05-19 18:17:19 +10:00
Kevin Finisterre
2c3f3f6a49 Attempt to fix ArcGIS_MapsLT_* map types, Successfully fix ArcGIS_ShadedRelief by limiting the max tiles.
Tiles 11, 12 and 13 are invalid here http://server.arcgisonline.com/arcgis/rest/services/World_Shaded_Relief/MapServer
Set maxtiles to 10 for ArcGIS_ShadedRelief map type
2015-05-19 18:17:19 +10:00
Kevin Finisterre
666b63c1d7 Update old mapsurfer interface... mapsurfer.net changed to mapsurfernet.com and was depreciated all together. Use GIScience (Geoinformatics) Research Group, Heidelberg University mirror 2015-05-19 18:17:19 +10:00
Kevin Finisterre
c1cc21da94 Fix SigPacSpainMap & Google*Korea map types 2015-05-19 18:17:19 +10:00
Kevin Finisterre
3a95dd9b78 Fix GoogleMapsKorea, GoogleMapsKoreaHybrid & GoogleMapsKoreaSatellite, Still need to fix the Labels mapset
SSL bug in QT, workaround used in url generation code as well
2015-05-19 18:17:19 +10:00
Kevin Finisterre
01a00ccafd Continue debugging troublesome maps... remove the Dragons from the map!!! https://progress.openpilot.org/browse/OP-392 was more annoying than useful.
Attempt to change HTTP request method to debug failed tile downloads.
2015-05-19 18:17:19 +10:00
Alessio Morale
0034dbf2d2 REVONANO - Fix a missing wizard include file 2015-05-18 22:14:45 +02:00
Laurent Lalanne
28ffaa068f REVONANO Add cloudconfig for Mako flying wing 2015-05-18 21:30:05 +02:00
Laurent Lalanne
7df64ada76 REVONANO - Again with Input 2 - *** PIN4 *** 2015-05-18 21:30:05 +02:00
m_thread
6bc338885e REVONANO Fixed hardware page falsely reporting that it was changed. 2015-05-18 21:30:03 +02:00
m_thread
1e7da5a0e1 REVONANO - Added nano support for bankmodes and rates. 2015-05-18 21:30:03 +02:00
m_thread
300a2c38ca REVONANO - Added limits for receiver port enum on nano. 2015-05-18 21:30:02 +02:00
m_thread
8dfbe69900 REVONANO - Fixed timer bank assignments and labels. 2015-05-18 21:30:02 +02:00
Laurent Lalanne
3acc4243a5 Uncrustify ground 2015-05-18 21:30:00 +02:00
m_thread
a0c82d340b OP-1617 PlotPicker configuration change. 2015-05-18 21:30:00 +02:00
m_thread
4f1ae4c25d OP-1617 Added PlotPicker to get readings in numbers out of scope graphs. 2015-05-18 21:30:00 +02:00
m_thread
28c257292f OP-1659 Added HW config page. 2015-05-18 21:30:00 +02:00
m_thread
bbb0c34411 OP-1659 Updated uploader image 2015-05-18 21:29:59 +02:00
Stefan Karlsson
59570c86b2 Remove QT_STATIC_CONST and QT_STATIC_CONST_IMPL 2015-05-18 21:29:58 +02:00
Stefan Karlsson
532b93ddbf REVONANO - Use Nano picture on the uploader page 2015-05-18 21:29:58 +02:00
Stefan Karlsson
7877798015 REVONANO - Add missing setupwizard setup wizard support of the Nano 2015-05-18 21:29:58 +02:00
Stefan Karlsson
7252fb4207 REVONANO - Fix Auto Upload 2015-05-18 21:29:58 +02:00
Alessio Morale
15e7286078 MPU9K - merge 9k and 6k settings into a single uavo 2015-05-18 21:29:56 +02:00
Mathieu Rondonneau
66b06e4c9a REVONANO - Add MPU9250 support 2015-05-18 21:29:42 +02:00
abeck70
9bfc68ca62 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into kfinisterre/WiresharkPlugin 2015-05-18 23:00:29 +10:00
abeck70
f5547c6cd5 Merge branch 'rel-15.05' of ssh://git.openpilot.org/OpenPilot into kfinisterre/Xplane10_plugin 2015-05-18 17:46:48 +10:00
abeck70
7a61c381c6 Merge branch 'kfinisterre/Xplane10_plugin' of ssh://git.openpilot.org/OpenPilot into kfinisterre/Xplane10_plugin 2015-05-18 17:46:14 +10:00
Kevin Finisterre
266128d5a6 This closes https://progress.openpilot.org/browse/OP-1888 2015-05-17 19:15:45 -04:00
James Duley
5048ece1b7 Merge remote-tracking branch 'dev/next' into parched/OP-1853_Ground_build_tidy_TEST 2015-05-17 22:52:01 +01:00
James Duley
28a42dade6 OP-1853 Ground build tidy: Make consistent uavobjgenerator output dir.
Because on windows its normally different for release and debug
2015-05-17 21:27:16 +01:00
abeck70
add7fe8502 Merge branch 'rel-15.05' of ssh://git.openpilot.org/OpenPilot into laurent/OP-1887_PFD_update 2015-05-17 20:28:54 +10:00
Laurent Lalanne
d4b0541bc9 OP-1337 Translations updates for rel-15.05 2015-05-15 11:13:40 +02:00
Laurent Lalanne
bbe98d1147 OP-1887 Oups, QuadH resurrected... 2015-05-14 17:52:09 +02:00
Laurent Lalanne
3ea01e0fb9 OP-1887 GPS tooltip info : Remove decimals 2015-05-14 14:41:29 +02:00
Laurent Lalanne
888df0cb30 OP-1887 Add Receiver quality 2015-05-14 14:16:42 +02:00
Laurent Lalanne
76b8450333 Merge branch 'next' into laurent/OP-1887_PFD_update 2015-05-14 13:25:24 +02:00
abeck70
f74300c96d Merge branch 'next' into kfinisterre/Xplane10_plugin 2015-05-14 20:46:44 +10:00
Laurent Lalanne
a941a1aa04 OP-1887 Hide bat tooltips when battery panel not displayed 2015-05-14 12:32:41 +02:00
Laurent Lalanne
08536f3a01 Merge branch 'next' into laurent/OP-1887_PFD_update 2015-05-14 11:31:37 +02:00
Laurent Lalanne
5767b3b2dc OP-1887 Missing file, again 2015-05-14 03:01:19 +02:00
Laurent Lalanne
3a49ba6f45 OP-1887 Missing file for tooltips 2015-05-14 02:54:51 +02:00
Laurent Lalanne
10aba62bc8 OP-1887 Add tooltips over links, extended GPS info 2015-05-14 02:48:08 +02:00
Laurent Lalanne
8af77902c2 OP-1887 Hide battery links when battery panel not displayed 2015-05-14 01:00:21 +02:00
Laurent Lalanne
295e0870ef OP-1887 Gps display, 12bars - Add text 2015-05-13 23:39:41 +02:00
Laurent Lalanne
f5160f64b0 OP-1887 New panel behavior, open/close animation 2015-05-13 23:38:58 +02:00
Steve Evans
1771d347bb Merge branch 'steve/OP-1803_s.bus_dropped_frames' into steve/OP-1849_flexio_com_bridge 2015-05-13 20:36:06 +01:00
Steve Evans
fd00cd8210 Merge branch 'next' into steve/OP-1803_s.bus_dropped_frames 2015-05-13 20:29:54 +01:00
James Duley
d7cdc540b0 OP-1853 Ground build tidy: removed now unneeded uavobject-synthetics.pro 2015-05-13 12:47:29 +01:00
James Duley
2610a4c463 OP-1853 Ground build tidy: make the gcs build handle generating its own
UAVOs.
This removes warnings and better handles dependencies to speed up rebuilds
New file uavobjgenerator.pri define a qmake compiler of the
uavobjgenerator
2015-05-13 12:47:28 +01:00
James Duley
5a2806c3c0 OP-1853 Ground build tidy: Remove hardcoded prefix from uavobjgenerator output 2015-05-13 12:47:27 +01:00
James Duley
9d31ca939c OP-1853 Ground build tidy: remove targetPath as not needed.
Could be replaced with builtin $$shell_path but that appears
to be buggy on windows git bash
2015-05-13 12:46:04 +01:00
abeck70
e8c948c45b Merge branch 'next' into kfinisterre/GMapsAndGeoCodeSearchFix 2015-05-13 17:46:05 +10:00
abeck70
3784357a18 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1848r-altvario 2015-05-13 17:33:11 +10:00
abeck70
92e50c2ead OP-1810 FOC
Squashed commit for clean commit as discussed in code review
Uncrustify
2015-05-13 17:19:51 +10:00
Kevin Finisterre
0377c3f333 Work through debugging faulty map rendering. Fix OpenStreetOSM option. 2015-05-12 17:35:16 -04:00
abeck70
3367313432 OP-1848 altvario gcs fix ranges 2015-05-12 22:48:49 +10:00
abeck70
65ecec8af8 OP-1848 altvario ui fix for Ki on altvario 2015-05-12 22:34:18 +10:00
Kevin Finisterre
9fe4fb7216 Remove depreciated Yahoo maps (now uses "Here" - https://developer.here.com/rest-apis which requires an API key we don't have) No desire to implement new Here interface.
Fix Yandex.ru interface to reference Yandex.net
2015-05-10 22:31:48 -04:00
Kevin Finisterre
390a8cccb5 Add search coloring back to the location search. Google Maps should be functional again. Some locations on the extents of map do not render 'North Pole, South Pole, Antarctica, etc.' currently a *non issue* 2015-05-10 16:36:01 -04:00
Kevin Finisterre
38f0a609da Fix Google Map tiles, https://maps.google.com/maps?output=classic is now depreciated. Legacy view temporarily available via https://www.google.com/lochp
Need to update to Google Maps v3 soon. New URL will be https://www.google.com/maps/@0,-0,7z?dg=dbrw&newdg=1 (tile retrieval is completely different)
Fix location search. Updated to v3 Google GeoCoder. CSV is no longer an option for output. Updated to XML parsed output. (needs a more robust parser!)
New Geocode search urls are as follows:
https://maps.googleapis.com/maps/api/geocode/xml?sensor=false&address=california
https://maps.googleapis.com/maps/api/geocode/xml?latlng=0.000000,-0.000000
Need to fix response after SetCurrentPositionByKeywords() all responses shade the box Green currently.
2015-05-10 15:59:08 -04:00
James Duley
7967480c74 OP-1853 Ground build tidy: remove unneeded line in translations.pro 2015-05-10 20:47:50 +12:00
James Duley
f07dddc965 OP-1853 Ground build tidy: remove old vcproj stuff we don't support and wouldn't work anyway 2015-05-10 20:47:50 +12:00
James Duley
e675ae7f7b OP-1853 Ground build tidy: remove old qt stuff from translations.pro 2015-05-10 20:47:50 +12:00
abeck70
d6123c018d Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1848r-altvario 2015-05-09 14:31:57 +10:00
abeck70
78acf10f6b OP-1791 updated warning message 2015-05-08 21:36:39 +10:00
Daniël Koek
549f0c2f60 OP-1852 2015-05-08 21:31:03 +10:00
abeck70
ddefd11b7f Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1848r-altvario 2015-05-07 11:28:24 +10:00
James Duley
d39639ca68 Remove old pro.user file 2015-05-06 18:23:12 +12:00
abeck70
143f09d216 Merge remote-tracking branch 'origin/rel-15.02.02' into next
Conflicts:
	flight/modules/Actuator/actuator.c
2015-05-06 08:35:21 +10:00
abeck70
48f3922a8d OP-1848 altvario fix default stab page 2015-05-05 22:14:18 +10:00
abeck70
a9ad3c5ec1 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1848r-altvario 2015-05-04 08:42:54 +10:00
RS2K
77eacb2294 OP-1835 - Motor Constraints 15.02.02 100% throttle curves default 2015-05-02 17:41:47 -05:00
Laurent Lalanne
93ff480b7a 15.02.02 hotfix for tricopter servo on wizard 2015-05-02 21:02:14 +02:00
Philippe Renon
9a312ef115 uncrustified 2015-05-02 16:46:35 +02:00
Philippe Renon
b4b93bee93 Merge remote-tracking branch 'origin/rvonlehe/OP-1740_UAV0_GetSetFunctionsTakeEnum' into next 2015-05-02 16:34:15 +02:00
abeck70
21c54c3a37 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1848r-altvario 2015-05-01 22:59:36 +10:00
m_thread
b8653d44da Merge branch 'thread/OP-1837_SRXL_Cleanup' into next 2015-05-01 09:46:32 +02:00
Alessio Morale
a76c41a1ef Merge remote-tracking branch 'origin/dwillis/OP-1832' into next 2015-04-29 19:36:17 +02:00
Alessio Morale
3be43d9c9e Merge remote-tracking branch 'origin/samguns/OP-1821_Tricopter_wrong_servo_speed' into rel-15.02.02 2015-04-28 23:47:12 +02:00
Kevin Finisterre
6ee9eda7fb Fix the error "Err Field '0' (actuatorcommand.Channel.0) is signed (FT_INT16) but is being displayed unsigned (BASE_DEC_HEX)"
Stop attempting to display in hex
2015-04-28 15:31:27 -04:00
Kevin Finisterre
d591ec7117 dissector_add() was depreciated and replaced with dissector_add_uint() 2015-04-28 14:49:30 -04:00
Kevin Finisterre
25a91bc5fc Fix some minor issues with the old Wireshark Plugin. It won't compile past Wireshark 1.8 which is way outdated.
added void *data _U_ to the dissecor definition per - https://ask.wireshark.org/questions/22590/dissector-handle
2015-04-28 14:21:37 -04:00
Kevin Finisterre
7f2aeb371b Cosmetic changes to get the X-Plane 10 plugin to compile 2015-04-27 16:10:33 -04:00
Kevin Finisterre
996d8a8f48 Change the plugin names to match inclusion of both X-Plane 9 & 10 2015-04-27 15:47:48 -04:00
Kevin Finisterre
0f9218d3af X-Plane 10 HITL & SITL protocol changes that should have been in place long ago! 2015-04-27 15:45:45 -04:00
samguns
c71d51b093 OP-1751 Modify some improper CN translations 2015-04-27 13:16:17 +08:00
samguns
09a00f8990 Merge branch 'rel-15.02.02' into samguns/zh_CN_GCS 2015-04-27 11:56:25 +08:00
samguns
69b404daa1 OP-1821 Commit bug fix 2015-04-27 08:45:35 +08:00
Richard von Lehe
f3611591e0 Merge branch 'next' into rvonlehe/OP-1740_UAV0_GetSetFunctionsTakeEnum
Conflicts:
	flight/modules/PathFollower/inc/vtollandcontroller.h
	flight/modules/PathFollower/vtollandcontroller.cpp
	flight/modules/PathFollower/vtollandfsm.cpp
2015-04-26 17:45:36 -05:00
Steve Evans
55f2b2fabb OP-1849 Fix GCS HW Settings tab to only display receiver port com-bridge if available 2015-04-26 22:19:51 +01:00
Laurent Lalanne
6e6e2b1b9b OP-1337 Translations : input wizard update 2015-04-26 18:25:56 +02:00
m_thread
b0b1a42aec OP-1837 This change adds support for the Multiplex SRXL v1 and v2 protocols.
Protocol version is autodetected and 12 or 16 channels are supported.
SRXL is available on Flexiport of Revolution board.
2015-04-26 15:04:52 +02:00
Philippe Renon
5b660a1fe0 Merge remote-tracking branch 'origin/filnet/OP-1796_upgrade_gcs_to_qt_5_4_1' into next
Conflicts:
	make/tools.mk
2015-04-25 17:21:33 +02:00
abeck70
45ceada471 OP-1848 altvario ui fixes 2015-04-24 23:34:03 +10:00
abeck70
b9a77d7e85 OP-1848 altvario ui scaling 2015-04-24 22:42:54 +10:00
m_thread
95574494af OP-1848 Updated Ki ranges and scale. 2015-04-24 14:06:47 +02:00
abeck70
57ba5280ef OP-1848 altvario
UI scaling fixes and help text edits.
2015-04-24 17:29:19 +10:00
abeck70
e36ab50040 OP-1838 altvario
Fixes and tidyup.

TODO:
1. Fix UI for sliders
2. Disable vtol tuning on stabi input
3. Altitude loss feedback
2015-04-23 22:49:12 +10:00
abeck70
443b3742cc OP-1848 altvario
1. Build fixes
2. Additional UI components.
2015-04-23 21:54:20 +10:00
abeck70
0d77cd95d9 OP-1848 altvari0
1. build fixes
2. Updated ui to use updated uavo names in altitude settings that align to the naming in vtol settings
3. Moved call the thrust altvario to pre application of PIDs for 3d axes to allow for later coupling.
2015-04-23 21:13:00 +10:00
Steve Evans
79339d677f Merge branch 'steve/OP-1803_s.bus_dropped_frames' into steve/OP-1849_update_minimosd_via_usb 2015-04-21 07:44:50 +01:00
Richard von Lehe
604585f74e OP-1740: GetSet use enums. Need to pack the enums to retain byte compatibility. 2015-04-20 08:31:26 -05:00
Alessio Morale
ab36dcbdee Merge remote-tracking branch 'origin/rel-15.02.02' into next 2015-04-20 14:54:07 +02:00
Alessio Morale
2571db4d96 Merge remote-tracking branch 'origin/laurent/OP-1814_Battery_reset_mAh' into next 2015-04-20 14:29:16 +02:00
abeck70
1e9bd43871 Merge branch 'next' into abeck/OP-1760-autotakeoff-squashed 2015-04-19 17:52:35 +10:00
Philippe Renon
77dfff1dac Merge remote-tracking branch 'origin/samguns/OP-1808_make_flight_mode_optional' into next 2015-04-18 20:13:09 +02:00
Laurent Lalanne
fe04a9b63c OP-1337 French translation update : Usage feedback 2015-04-18 13:55:50 +02:00
Laurent Lalanne
00ac0048ee Merge remote-tracking branch 'origin/laurent/OP-1822_Heli_tab_refresh' into next 2015-04-18 11:33:42 +02:00
abeck70
8490cd2e73 OP-1760 autotakeoff fix pathdesired mode display in pfd 2015-04-18 16:17:46 +10:00
abeck70
71d1757bb0 OP-1760 autotakeoff
Fix the gcs defines for the pathaction modes.
2015-04-17 21:01:38 +10:00
m_thread
ddb2025108 Merge branch 'thread/OP-1777_Usage_statistics' into next 2015-04-17 08:26:02 +02:00
Richard von Lehe
0a7bd475f2 Merge branch 'next' into rvonlehe/OP-1740_UAV0_GetSetFunctionsTakeEnum 2015-04-15 21:59:38 -05:00
Richard von Lehe
ef6cf262d5 OP-1740: GetSet use enums: tidy 2015-04-15 21:57:38 -05:00
James Duley
80f5a83b39 Merge branch 'parched/OP-1792_makefile_tidy' into next 2015-04-16 09:35:04 +12:00
David Ankers
5af7cea3f6 New versions of HK RTF models for cloudconfig 2015-04-13 20:08:23 +10:00
David Ankers
968e4557e1 Upgrade HK CCs 2015-04-13 20:07:27 +10:00
abeck70
a52969a76b OP-1760 Autotakeoff
Squashed commit as code reviews impossible otherwise due to dependencing on OP-1696
2015-04-12 21:39:31 +10:00
James Duley
24defde93b OP-1792 Makefile tidy: fix addCopyDirTarget on windows because directory timestamps are not updated when a file is modified 2015-04-11 23:20:30 +12:00
dwillis
2a08d6aa12 OP-1832 Add getDefaultInstance method to Java UAVObject template 2015-04-11 00:36:26 +01:00
James Duley
5ea8a990df OP-1792 Makefile tidy: removed repeated Qt5OpenGL.dll 2015-04-09 13:01:23 +12:00
James Duley
af06960482 OP-1792 Makefile tidy: set dependencies for copydata by using new
functions addCopyFileTarget and addCopyDirTarget
2015-04-09 13:01:22 +12:00
Richard von Lehe
242d810c37 Merge branch 'next' into rvonlehe/OP-1740_UAV0_GetSetFunctionsTakeEnum 2015-04-08 18:39:56 -05:00
Richard von Lehe
04497a5b77 enums sorted out in code and template, need to merge in latest 2015-04-08 18:38:49 -05:00
samguns
aaf635068d OP-1808 Code change according to review results 2015-04-06 13:10:04 +08:00
Laurent Lalanne
9140ac5be2 OP-1337 French translation : First update for 15.05 2015-04-05 20:42:32 +02:00
Philippe Renon
d9708e79d6 OP-1796 updated PYTHON_DIR to qt-5.4.1 2015-04-05 11:47:59 +02:00
Laurent Lalanne
0b38791b3f OP-1814 Add another reset button on battery panel using "time left" area 2015-04-05 00:54:21 +02:00
Laurent Lalanne
da4dc0e935 OP-1814 Reset consumed energy from PFD 2015-04-05 00:37:20 +02:00
Laurent Lalanne
805ee4e9b5 OP-1822 Check visibility and avoid false error that skip Mixer table to populate 2015-04-04 17:21:38 +02:00
Steve Evans
a0f180d393 OP-1803 Initial commit 2015-04-02 19:09:58 +01:00
samguns
5b76f4f96b OP-1808 1.Make flight mode stick identification to be optional. 2. Refine some code. 2015-03-31 22:54:25 +08:00
James Duley
3a08642b40 OP-1792 Makefile tidy: Fix up the 'copydata.pro's to depend on FORCE, not be FORCE, and be aux template, not subdirs template. 2015-03-31 14:57:43 +13:00
James Duley
c245d18683 Merge remote-tracking branch 'dev/parched/OP-1700_copydata_doubles_if_called_twice' into next 2015-03-30 11:40:22 +13:00
m_thread
81050f557c Uncrustify 2015-03-29 10:51:03 +02:00
Richard von Lehe
69fae1b977 Fix misspelling in function name 2015-03-28 23:27:07 -05:00
m_thread
62bd0115fe OP-1809 Changed Min/Max limits 2015-03-28 15:31:05 +01:00
m_thread
4bd2e889ce Merge remote-tracking branch 'origin/samguns/OP-1781_ground_input_channel_conf' into next 2015-03-28 12:33:24 +01:00
m_thread
32e670b8f0 Merge remote-tracking branch 'origin/next' into thread/OP-1763_CloudConfigs_outside_of_Wizard 2015-03-28 10:47:01 +01:00
Philippe Renon
009faf3559 Merge branch 'filnet/OP-1797_improve_gcs_workspace_layout_reactivity' into next 2015-03-26 21:57:46 +01:00
Philippe Renon
c84849fa4b Merge branch 'filnet/OP_1798_gcs_ophid_is_too_verbose' into next 2015-03-26 21:57:18 +01:00
Richard von Lehe
f00b4a24d8 Merge branch 'next' into rvonlehe/OP-1740_UAV0_GetSetFunctionsTakeEnum 2015-03-25 08:16:22 -05:00
Richard von Lehe
8e236c9954 OP-1740 UAVO_GetSetFunctionsTakeEnum - getting started 2015-03-25 08:03:35 -05:00
samguns
44ab63d696 OP-1781 Add the stash&restore operation vehicle type in systemsettings 2015-03-25 11:07:19 +08:00
Philippe Renon
859f601279 uncrustified 2015-03-22 23:16:17 +01:00
Philippe Renon
0cab4b0016 OP-1798 fixed recently converted OPHID_DEBUG taking argument 2015-03-22 21:04:50 +01:00
Alessio Morale
fbaf39229b Merge remote-tracking branch 'origin/cyr/OP-1739_GNSS' into next 2015-03-22 20:25:51 +01:00
Philippe Renon
0236074de4 OP-1798 moved OPHID_DEBUG_ON define to ophid.pro 2015-03-22 15:47:03 +01:00
Philippe Renon
f8b3e6d3b1 OP-1798 cleaned up ophid.pro 2015-03-22 15:44:29 +01:00
Philippe Renon
a1a225f592 OP-1798 replaced qDebug() with OPHID_DEBUG() 2015-03-22 15:43:17 +01:00
m_thread
234ddf96bc Merge 2015-03-22 09:08:14 +01:00
m_thread
b783d65c18 OP-1763 Removed a very bad key shortcut from Vehicle Setup Wizard.
Removed the word Wizard from tools menu inport/export templates.
2015-03-22 09:06:42 +01:00
m_thread
deeb7c3502 OP-1777 Added some more information from configuration to uploaded data. 2015-03-21 10:14:32 +01:00
m_thread
9a2584fae0 Merge remote-tracking branch 'origin/next' into thread/OP-1777_Usage_statistics 2015-03-21 09:23:56 +01:00
James Duley
5dffb1033f OP-1700 copydata doubles if called twice: reused code for all platforms. Note this may make mixed case directories on windows 2015-03-21 15:35:11 +13:00
James Duley
0e631502d8 OP-1700 copydata doubles if called twice: tidy 2015-03-21 15:26:05 +13:00
James Duley
8261017ec6 OP-1700 copydata doubles if called twice:
Fix by rm -rf directory beforehand
2015-03-21 15:08:37 +13:00
abeck70
a4ea1f008b OP-1696 uncrustify 2015-03-20 21:44:24 +11:00
abeck70
88494e2745 OP-1696 PathFollower rewrite in C++ and Landing Squashed commit of the following:
commit 580cd8addafadc3109b90b1fd183130ea8add7f2
Author: abeck70 <abeck70@icloud.com>
Date:   Fri Mar 20 21:32:33 2015 +1100

    OP-1696 Cleanup and bug fix

    1. Code review cleanup
    2. Fixed gps assist braking - the thrust limits in piddown were not being set.

commit 31ac4494f6e2bc5859f49d1f76f19fe3a4d32862
Author: abeck70 <abeck70@icloud.com>
Date:   Wed Mar 18 08:31:16 2015 +1100

    OP-1696 fix initialisation of down pid control parameters

commit a7bd737459249530bde9546b8247dd45b40dced4
Author: abeck70 <abeck70@icloud.com>
Date:   Tue Mar 17 21:18:38 2015 +1100

    OP-1769 Actuator fix from code review

commit 968172b8fb46c91b2611be4825e17faf2fa13411
Author: abeck70 <abeck70@icloud.com>
Date:   Tue Mar 17 21:01:11 2015 +1100

    OP-1696 fixed ground pathfollower settings xml

commit 721c07b67a87911ed67d0b62aa658cfac6d3eb97
Merge: f556215 be9f4ae
Author: abeck70 <abeck70@icloud.com>
Date:   Tue Mar 17 20:52:01 2015 +1100

    Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1696

commit f556215ddbd5a29b22c2e6124372d74a0d6b9a0f
Author: abeck70 <abeck70@icloud.com>
Date:   Tue Mar 17 20:51:22 2015 +1100

    OP-1696 ground pathfollower fixes

commit 4584b22d6a2d33d3efb1cd11ac46804a5623a236
Author: abeck70 <abeck70@icloud.com>
Date:   Tue Mar 17 18:11:52 2015 +1100

    OP-1696 Ground redesign

    1. Move to new PID loop design
    2. Prototype steering control

commit b70c3373646fa758ae30a59765b8a56df7d2fbeb
Author: abeck70 <abeck70@icloud.com>
Date:   Sun Mar 15 18:42:06 2015 +1100

    OP-1696 ground pathfollower added missing call to update velocity state

commit a282bfb14dffcd486466b60be3100d26c11649ef
Author: abeck70 <abeck70@icloud.com>
Date:   Sun Mar 15 17:22:02 2015 +1100

    OP-1696 ground pathfollower improvements

commit f56ea4f9b101415e32e4464e51e087ee350be969
Author: abeck70 <abeck70@icloud.com>
Date:   Sun Mar 15 07:44:01 2015 +1100

    OP-1696 remove unused PID controller in ground for vertical

commit 6424aa0a84c3718a5a7b51fab1c9e04587d325b8
Author: abeck70 <abeck70@icloud.com>
Date:   Sat Mar 14 21:40:58 2015 +1100

    OP-1696 Initialise vtolemergencyfallback variables

commit 5d6110499bb06fe9b397e09dea5aafe994f03d13
Author: abeck70 <abeck70@icloud.com>
Date:   Sat Mar 14 21:30:21 2015 +1100

    OP-1696 vtolflycontroller segv fixed and uncrustify

commit bef23ea3dc2b5aff5b9b8713802586719b8f68cf
Author: abeck70 <abeck70@icloud.com>
Date:   Sat Mar 14 20:50:05 2015 +1100

    OP-1783 PathPlanner

    Instead of config alarm if no pathplan, simply continue to alarm pathplan, but allow normal arming and flight in other modes.  If pathplan enabled, simply enter position hold.

commit 370f1747209cca7c01c071a43224ad83b04bdd55
Author: abeck70 <abeck70@icloud.com>
Date:   Sat Mar 14 20:48:22 2015 +1100

    OP-1769 Ground code review comment

    1. Remove idx1 < 0 check not needed
    2. Should return abs_input in the corner case that curve is "invalid".

commit 01973c656d783e035ad823c267d3387bf473eebe
Merge: be07d12 5c9b6fa
Author: abeck70 <abeck70@icloud.com>
Date:   Sat Mar 14 12:17:31 2015 +1100

    Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1696

commit be07d125f42b5ca1aabce0f5c0fcf592e8cddf98
Merge: 44afdc7 ad44b31
Author: abeck70 <abeck70@icloud.com>
Date:   Thu Mar 12 21:55:52 2015 +1100

    Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1696

commit 44afdc77987049dc58cdf42e3be88b7eae38de02
Author: abeck70 <abeck70@icloud.com>
Date:   Thu Mar 12 19:35:55 2015 +1100

    OP-1696 fix startup

    Fix initialisation and void use of pios_malloc at startup

commit 962f5f75756883cec6726c0347310d60264f6989
Author: abeck70 <abeck70@icloud.com>
Date:   Thu Mar 12 18:48:04 2015 +1100

    OP-1696 undo changes to make file

commit 7fa71d5c614d492cb4026312672068f92a4bcd3e
Merge: 672732e 5a9cfa6
Author: abeck70 <abeck70@icloud.com>
Date:   Thu Mar 12 18:06:59 2015 +1100

    Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1696

commit 672732e95d555946300ef5093f687f3fa88bfd3a
Author: abeck70 <abeck70@icloud.com>
Date:   Wed Mar 11 12:59:44 2015 +1100

    OP-1696 code review comments

commit 73b295d6515f2489b3b3a61459c975b0c37afe3d
Author: abeck70 <abeck70@icloud.com>
Date:   Wed Mar 11 12:47:24 2015 +1100

    OP-1696 code review comments

commit 524b72f537fe922bf3c4385b418872f13819a5cf
Merge: 6beef01 ba5f395
Author: abeck70 <abeck70@icloud.com>
Date:   Tue Mar 10 23:19:06 2015 +1100

    Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1696

commit 6beef01476d06598652a10de4857e6ae55015417
Merge: 100cf33 8c31f96
Author: abeck70 <abeck70@icloud.com>
Date:   Sat Mar 7 16:50:32 2015 +1100

    Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1696

commit 100cf335d187fe696d3678371b194fc3044a1c7e
Author: Alex Beck <abeck70@icloud.com>
Date:   Thu Mar 5 22:32:30 2015 +1100

    OP-1696 simposix c++ compilation fix

commit 9ebf846d1ec8fef30ffc1204546fc5dc648ec10b
Author: Alex Beck <abeck70@icloud.com>
Date:   Thu Mar 5 21:35:39 2015 +1100

    OP-1696 fix simposix c++ compile of pathfollower

commit a86b4b1db46dba569739587ee57b03460381ebab
Author: abeck70 <abeck70@icloud.com>
Date:   Thu Mar 5 18:03:51 2015 +1100

    OP-1696 resolve linux build issue

commit 1d7695f81293534bc17f69b0fcd9de3876867f6a
Author: abeck70 <abeck70@icloud.com>
Date:   Wed Mar 4 18:10:09 2015 +1100

    OP-1696 Return to Base & Land implemented

    Enabled via FlightModeSettings ReturnToBaseNextCommand = LAND

commit 4e5ca807b18a40ea60c05c1b46f738462595a6b2
Author: abeck70 <abeck70@icloud.com>
Date:   Wed Mar 4 16:38:06 2015 +1100

    OP-1696 reduce memory footprint by only allocating controllers required for a particular frame type

commit 78e8f559cd25ffaeac68b563e25d1ad357205fd6
Author: abeck70 <abeck70@icloud.com>
Date:   Wed Mar 4 13:51:05 2015 +1100

    OP-1696 move fsm initialisation to controller implementations

commit 848c78a84e5c7e11b2da953c9d9549b11fc5b1d8
Author: abeck70 <abeck70@icloud.com>
Date:   Wed Mar 4 13:27:11 2015 +1100

    OP-1696 reduce memory through re-use of pointers to data objects in base class.

commit bc8794601142055942910ba9f938c03c8a3ca547
Merge: 24bc3de 843325d
Author: abeck70 <abeck70@icloud.com>
Date:   Tue Mar 3 22:06:01 2015 +1100

    Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1696

commit 24bc3de6155a74850b17ca7706f6b592923e027c
Author: abeck70 <abeck70@icloud.com>
Date:   Tue Mar 3 17:56:12 2015 +1100

    OP-1696 update gcs path planner options to align to new modes

commit dc659891882ea0624a6436550425c54b347f4101
Author: abeck70 <abeck70@icloud.com>
Date:   Tue Mar 3 13:51:55 2015 +1100

    OP-1696 pathfollower class renaming and uncrustify

commit af19d114b8e0ff23159bdaca37e5f5bf1c1f8beb
Merge: b07c1fd 04f4cd9
Author: abeck70 <abeck70@icloud.com>
Date:   Mon Mar 2 21:47:12 2015 +1100

    Merge branch 'rel-15.02' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1696

commit b07c1fdd0544a555678bc7a8510cd92861f17e46
Author: abeck70 <abeck70@icloud.com>
Date:   Mon Mar 2 21:27:27 2015 +1100

    OP-1696 remainder of changes to integrate drive and fly objectives

commit c824c53cf30889a468ecb25ae3d705fa011b23ba
Merge: b89751c 1102243
Author: abeck70 <abeck70@icloud.com>
Date:   Mon Mar 2 17:06:13 2015 +1100

    Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1696

commit b89751caa5d6dc06e1e20391aa4e12b5484056d4
Author: abeck70 <abeck70@icloud.com>
Date:   Mon Mar 2 17:04:27 2015 +1100

    OP-1696 merge fly and drive pathdesired/action objectives

commit c463132cb7da5cdf9fc5395ae0650b081bc9fb55
Author: abeck70 <abeck70@icloud.com>
Date:   Sun Mar 1 10:25:29 2015 +1100

    OP-1696 merge ground pathfollower and refactored into C++

    commit 6ed504b32f9e502e4f02d50b9e85ba91591417ba
    Merge: bcf245e deafed6
    Author: abeck70 <abeck70@icloud.com>
    Date:   Fri Feb 27 18:12:32 2015 +1100

        Merge branch 'next' into corvuscorax/OP-1642_tank-support

        Conflicts:
        	flight/modules/PathFollower/pathfollower.c
        	shared/uavobjectdefinition/vtolpathfollowersettings.xml

    commit bcf245e08c3348f2e6e5eddceee6d6cc268bdc23
    Author: Corvus Corax <corvuscorax@cybertrench.com>
    Date:   Sat Dec 6 19:45:29 2014 +0100

        OP-1642 added new uavobject to discovery target, too

    commit 6b9e8a7d7dad0739b4ffd2ce7f2f78ed4f597077
    Author: Corvus Corax <corvuscorax@cybertrench.com>
    Date:   Sat Dec 6 17:58:18 2014 +0100

        OP-1642 added very simple path control for ground vehicles

    commit e8d8440e049c06158e7fc542627fac6420abaf65
    Author: Corvus Corax <corvuscorax@cybertrench.com>
    Date:   Sat Dec 6 17:17:09 2014 +0100

        OP-1642 added new settings uavobject for tank path follower

commit 71dd726eb5b52614b417236c22e8a5cc3a487faf
Author: abeck70 <abeck70@icloud.com>
Date:   Fri Feb 27 18:05:10 2015 +1100

    OP-1696 align pathaction to pathdesired

commit 8a88af83be457aafbb63e4f94fad3b1cd54264ca
Author: abeck70 <abeck70@icloud.com>
Date:   Thu Feb 26 08:06:34 2015 +1100

    OP-1696 fixed wing control refactored and compiling

commit fd9850b5e5680f5b422dbc468a94c5ec4b6dd518
Author: abeck70 <abeck70@icloud.com>
Date:   Wed Feb 25 17:47:19 2015 +1100

    OP-1696 Removed vtol stuff from pathfollower.cpp after having replaced it with class impl

commit 9127d8d6d8c345c5bbf8622ce4e5eb76b03d1356
Merge: 4054c73 93fb2d5
Author: abeck70 <abeck70@icloud.com>
Date:   Wed Feb 25 13:09:06 2015 +1100

    Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1696

commit 4054c73ac98b54188a0a5367c5ca913b7fee6a89
Author: abeck70 <abeck70@icloud.com>
Date:   Tue Feb 24 12:29:28 2015 +1100

    OP-1696 fix compile errors

commit b398db3d4de8cd621a059da1f0dbb00868be0fb9
Merge: 94c795a 3e15cac
Author: abeck70 <abeck70@icloud.com>
Date:   Tue Feb 24 12:06:35 2015 +1100

    Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1696

commit 94c795af386cf0f1072a88e99a80cb1080bf85e7
Merge: d2115de 57e0a8b
Author: abeck70 <abeck70@icloud.com>
Date:   Mon Feb 23 17:54:33 2015 +1100

    Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1696

    Conflicts:
    	flight/modules/Sensors/sensors.c
    	make/common-defs.mk

commit d2115dee4e8e9b6a02f7b7700e4715480a56b18f
Author: abeck70 <abeck70@icloud.com>
Date:   Mon Feb 23 14:35:02 2015 +1100

    OP-1696 preliminary checkin for refactor of fly

    TODO:
    1. Finalise and test fly, brake
    2. Remove patfhollower vtol fly
    3. Rename all objects adding vtol in name

commit 95804b1d591d194cce3596187c74cdb2dd0d192f
Merge: 58cebb0 31c1385
Author: abeck70 <abeck70@icloud.com>
Date:   Sat Feb 21 22:10:03 2015 +1100

    Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1696

commit 58cebb0658deaece1555cfa24e50f1b86fd68c96
Author: abeck70 <abeck70@icloud.com>
Date:   Sat Feb 21 22:09:29 2015 +1100

    OP-1696 refactor neutral thrust and add pos hold implementation

commit 2c3cadfef3de9e092bd66bbabc58ac7847aca7e4
Author: abeck70 <abeck70@icloud.com>
Date:   Fri Feb 20 18:32:11 2015 +1100

    OP-1696 start of refactor of braking

commit 991c2124e834f3432f5e34c5c9f4966cb42a7be3
Merge: 1ab5798 db7d605
Author: abeck70 <abeck70@icloud.com>
Date:   Thu Feb 19 12:17:54 2015 +1100

    Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1696

commit 1ab579865f04aeaa5899f5065a983de29074e025
Author: abeck70 <abeck70@icloud.com>
Date:   Wed Feb 18 21:29:01 2015 +1100

    OP-1696 Rewrote velocity roam into new C++ OO architecture

    With use of new PID controller for NE.

commit 03edb049f06bf60054dce36a5b8b301a397284c4
Author: abeck70 <abeck70@icloud.com>
Date:   Wed Feb 18 12:19:17 2015 +1100

    OP-1696 Start of refactoring of VelocityRoam implementation in PathFollower

    Also TODOs:
    1. To support pathplanner, remove all references to FlightStatus object and add more fields to PathDesired
    2. Refactor Braking to use C++
    3. Test and optimise Velocity Roam
    4. Add more config options to Landing. For example disable disarming. And add more setting objects.
    5. Consider moving all landing settings to one object.

commit 1f5dba821d4535a9a14f333efdeec1af5afcc281
Author: abeck70 <abeck70@icloud.com>
Date:   Mon Feb 16 22:51:31 2015 +1100

    OP-1696 Landing tuning

commit 5133956c717fba871dd5700333806e298038a3d0
Author: abeck70 <abeck70@icloud.com>
Date:   Mon Feb 16 21:05:06 2015 +1100

    OP-1696 Landing

    Multiple fixes

commit cf22055ecb8eb7304174c730f249a2332ebc599b
Author: abeck70 <abeck70@icloud.com>
Date:   Sun Feb 15 20:52:29 2015 +1100

    OP-1696 Add PIDStatus debug object

commit bc13d732601e7c7cb48db17f1a75b33cc96c0c34
Author: abeck70 <abeck70@icloud.com>
Date:   Sat Feb 14 15:53:16 2015 +1100

    OP-1696 Landing sanity tested

commit 6e913076c1dfcb8b90153e9eca8acf6c9e51f293
Author: abeck70 <abeck70@icloud.com>
Date:   Sat Feb 14 11:16:06 2015 +1100

    OP-1696 completed refactoring

    1. Completed refactoring of NE and Thrust control
    2. Fixed velocity roam

    TODO Tuning and testing

commit 63b62fbd0ac105029e54163b98c3beebc2d73c3a
Author: abeck70 <abeck70@icloud.com>
Date:   Fri Feb 13 08:54:23 2015 +1100

    OP-1696 New PID Controller and refactoring of PID implementation for thrust management

commit 7474331529477d0badd2ef0d609c84c556be9cec
Author: abeck70 <abeck70@icloud.com>
Date:   Tue Feb 10 16:39:44 2015 +1100

    OP-1696 Landing Refactor Thrust PID Loop for landing

commit 904ab2a9241e40c19da6a1508b4ce5243c75d7a3
Author: abeck70 <abeck70@icloud.com>
Date:   Mon Feb 9 22:13:39 2015 +1100

    OP-1696 Uncrustify

commit b3d30e298d8a0343782a29bc91be6677105b325e
Author: abeck70 <abeck70@icloud.com>
Date:   Mon Feb 9 22:05:05 2015 +1100

    OP-1696 Create new OO design

    Added PathFollowerControl which has an Landing implementation.  The landing implementation runs its own set of PIDs.  And interfaces to the FSM for Landing.

commit 1ffd8d67cf7310c1c18c90f3ba18b08221d185a3
Author: abeck70 <abeck70@icloud.com>
Date:   Sat Feb 7 18:04:42 2015 +1100

    OP-1696 Upgrade arm tools

commit 3df01f97021d13694027b92ba0b13cc9fe70d437
Author: abeck70 <abeck70@icloud.com>
Date:   Fri Feb 6 21:52:38 2015 +1100

    OP-1696 Landing uncrustify and start of refactoring landing to make more use of FSMLand

commit 7a753b65fb69d52c89875b9a182ef5210ee8ef2d
Author: abeck70 <abeck70@icloud.com>
Date:   Fri Feb 6 15:08:29 2015 +1100

    OP-1696 Landing: fix compilation of all exes

commit 692459874acf2b7ae07aa3ab88a2c78a09f26ee6
Author: abeck70 <abeck70@icloud.com>
Date:   Fri Feb 6 14:45:06 2015 +1100

    OP-1696 Landing startup fixes

commit 9851f29b9238a969efd0110f01a4fad6bdbc5a5d
Author: abeck70 <abeck70@icloud.com>
Date:   Fri Feb 6 10:21:52 2015 +1100

    OP-1696 Landing pathfollower CPP refactoring

commit 9b3a54d41f14f07cd0d78426026d12ae9ac4e5b5
Author: abeck70 <abeck70@icloud.com>
Date:   Wed Feb 4 13:02:44 2015 +1100

    OP-1696 Moved to FSMLand class and fixed CPP problems

    1. Additional methods, compile options, and need to have main as a cpp to solve various link issues when using static constructors but to avoid adding unnecessary libs.

commit 7ebe739bfdb4e0f598f4408c1488f01bc033c044
Author: abeck70 <abeck70@icloud.com>
Date:   Tue Feb 3 22:17:08 2015 +1100

    OP-1696 Initial Landing prototype

    Proof of concept. To be refactored into C++

commit 11d6754b9766efb76cc1cd57e9894badaf33ef2d
Author: abeck70 <abeck70@icloud.com>
Date:   Tue Feb 3 22:13:10 2015 +1100

    OP-1696 CPP Enablement

    revo c++
    Enable optional revo C++ support:
    1. Set USE_CXX to enable compliation and linkage of C++ source code
    2. Disables rtti and exceptions
    3. operator new and delete call pios malloc/free
    4. Static constructor invocation supported
2015-03-20 21:42:20 +11:00
samguns
1811b5f1fd OP-1781 Make sure the vehicle type is correct, next step will be acro, heli tests and minor modifications. 2015-03-20 16:23:26 +08:00
Philippe Renon
b11bec1b5b OP-1798 fixed unused args warnings in ophid 2015-03-19 22:25:32 +01:00
Philippe Renon
9631018320 OP-1798 reduced verbosity of ophid gcs plugin 2015-03-19 09:08:24 +01:00
Philippe Renon
306960fd2e OP-1797 avoid unparenting gadgets when splitting/unsplitting/closing a gadget (see Jira for details) 2015-03-19 09:03:12 +01:00
Philippe Renon
505801c3a5 OP-1797 avoid redundant calls to loadConfiguration when setting a configuration on a gadget 2015-03-19 08:57:37 +01:00
samguns
f806a9d3f2 1. Revise according to review results. 2. Force one flight mode if 2CH ground vehicle was confirmed. 2015-03-19 15:06:22 +08:00
samguns
30a40140be OP-1781 Minor changes according to review results. Leave the stick don't move and 1 flight mode issues to tomorrow 2015-03-18 23:00:17 +08:00
m_thread
1e1b97bd77 OP-1763 Added function to save template in default location. 2015-03-18 11:51:06 +01:00
samguns
8b1e7dee58 OP-1781 Uncrustify code 2015-03-18 15:47:10 +08:00
m_thread
48ef30850f OP-1763 Moved and consolidated template folder code. 2015-03-18 08:36:56 +01:00
samguns
97fd54b25d OP-1781 I think it's almost done, ready for a thoroughly test and review 2015-03-18 14:58:46 +08:00
m_thread
8eedfcec49 OP-1763 Added import functionality to the template dialog.
Added new tab and gui with template selector widget to the export
template dialog.
Renamed dialog menu to export/import vehicle wizard settings.
Added code to upload and save template data to board.
2015-03-18 00:32:42 +01:00
m_thread
2b0d357df3 OP-1763 Extracted template selector functionality as a widget for reuse. 2015-03-17 23:13:29 +01:00
m_thread
5b08f02aae Merge remote-tracking branch 'origin/next' into thread/OP-1763_CloudConfigs_outside_of_Wizard 2015-03-17 22:25:10 +01:00
m_thread
52984119f0 OP-1777 Moved Qt include statement. 2015-03-17 22:18:14 +01:00
samguns
22e0b88a8f OP-1781 Add UI stuff and basic definitions 2015-03-17 15:51:06 +08:00
m_thread
4c58675fc3 OP-1777 Adding dependecy to VersionInfo lib. 2015-03-16 21:43:06 +01:00
m_thread
dda065db64 OP-1777 Attempting to fix build issues in Win and Mac builds. 2015-03-16 21:37:46 +01:00
m_thread
e4e3125e72 OP-1777 Uncrustify 2015-03-16 20:41:38 +01:00
m_thread
6a89427aa8 OP-1777 Added handling of network issues.
Changed local time to timezone.
Re-factored some functions.
2015-03-16 20:38:56 +01:00
m_thread
14f2bb6ce9 OP-1777 Added caching of collected data hash to avoid sending duplicate redundant data.
Changed some text.
Changed nag-dialog text to use html for formatting to make it easier to
translate and maintain.
Removed timestamp from hash.
2015-03-16 14:53:37 +01:00
m_thread
d948b1ca1c OP-1777 Added caching of collected data hash. 2015-03-16 14:51:36 +01:00
m_thread
8bf717fec2 OP-1777 Changed some text. 2015-03-16 14:51:04 +01:00
m_thread
efccabfe8f OP-1777 Renamed some parameters. 2015-03-15 23:21:43 +01:00
m_thread
f1e1507b06 OP-1777 Added more settings information.
Re-factored field access code.
Added hash for integrity checks.
2015-03-15 12:18:14 +01:00
abeck70
5c9b6fac29 OP-1769 uncrustify 2015-03-14 12:15:59 +11:00
abeck70
616cd466d2 OP-1769 align tank throttle curve 2015-03-14 10:04:54 +11:00
m_thread
0a87b30572 OP-1777 Fixed a compiler error. 2015-03-13 07:21:27 +01:00
m_thread
daad175c52 OP-1777 Added some board specific settings information. 2015-03-13 00:15:33 +01:00
m_thread
6c8f5a35ed Merge remote-tracking branch 'origin/next' into thread/OP-1777_Usage_statistics 2015-03-12 23:04:14 +01:00
abeck70
ea47436091 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1769-Ground 2015-03-12 22:34:43 +11:00
abeck70
ad44b313fc Release 15.02 Merge branch 'master' into next
Conflicts:
	ground/openpilotgcs/src/plugins/setupwizard/pages/outputcalibrationpage.h
2015-03-12 21:45:00 +11:00
abeck70
d4c4c68131 Release 15.02
Update whatsnew and uncrustify.
2015-03-12 21:33:30 +11:00
abeck70
8defea867b OP-1769 ground support wizard alignment with flight side code
1. Moved to using throttle curve 1 which is meant to be primary for throttle.  Curve1 can support reversible motor mixer so ok.
2. Changed default throttle1 curve to linear 0-1 representing x>0.  For x < 0 the same throttle curve is applied symmetrically to the reverse direction.
3. Allowed in UI both throttle curves to be visible. Throttle curve 2 manually can be used to mix other inputs to affect motor. E.g. slow down in turning.
2015-03-12 08:46:43 +11:00
m_thread
779a1823e2 OP-1777 Changed some encoding. Changed parameter names to be meaningful. 2015-03-11 21:03:32 +01:00
m_thread
a3f9d42146 OP-1777 Adding some text to disclaimer 2015-03-11 14:14:54 +01:00
m_thread
c186a55243 OP-1777 Updated some text. 2015-03-11 13:53:59 +01:00
m_thread
4d780b0ffd OP-1777 Adding disclaimer dialog and setting to hide it. 2015-03-11 13:36:28 +01:00
abeck70
1d7059d4d7 OP-1769 Ground support: Align wizard to flight side code implementation 2015-03-11 22:07:57 +11:00
m_thread
3653457b28 OP-1777 Adding some more info and checking if we should send any usage data at all. 2015-03-11 10:19:28 +01:00