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
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
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
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 c00ea092bcd207f848ee
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
