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
Philippe Renon
498e77fc02
Merged in filnet/librepilot/filnet/LP-29_osgearth_artwork (pull request #63 )
...
LP-29 artwork cleanup
2015-09-19 12:31:43 +02:00
Alessio Morale
1b4ad5c2a1
uncrustification
2015-09-19 12:07:45 +02:00
Alessio Morale
08e0a580ed
Merged in james-duley/librepilot/LP-113_tool_installer (pull request #49 )
...
LP-113_tool_installer
2015-09-18 20:40:08 +02:00
Philippe Renon
6b1f6cca89
LP-29 artwork cleanup (file names are now lower case + models have consistent scale and orientation)
2015-09-16 23:19:11 +02: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
a*morale
6568495946
hotfix for uninstall related Linux packaging issue
2015-09-16 21:42:03 +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
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
3e22740a67
Merged in paul_jewell/librepilot/LP-116_Add_Uninstall_Target (pull request #56 )
...
Added Linux uninstall target
2015-09-15 23:21:31 +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
Alessio Morale
d67f15713f
Merged in alessiomorale/librepilot/amorale/LP108_mpu6k_fixes (pull request #45 )
...
LP-108 - Fix Temp calculation, get rid of floatin point operations within ISR
2015-09-15 23:20:08 +02:00
James Duley
b1f1c929d7
LP-113 new tool installer: Upgrade gcc-arm-none-eabi to 4.9 2015 q2 update
2015-09-15 00:06:09 +01:00
James Duley
4a3b222192
LP-113 new tool installer: added 7z for windows
2015-09-15 00:06:09 +01:00
James Duley
84880a0b80
LP-113: add new tool install framework
2015-09-15 00:06:09 +01: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
Paul Jewell
27376bb81d
Added Linux uninstall target
...
Simplified earlier changes
added -r option to RM definition
fixed white space
2015-09-12 10:34:48 +01: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
Alessio Morale
d6fa0bbf35
Merged in skarlsso/librepilot/skarlsso/LP-115_TPS_and_Acroplus_settings_bug (pull request #53 )
...
LP-115 Fix TPS and Acroplus settings setup
2015-09-10 23:07:41 +02:00
Stefan Karlsson
a7c592b294
LP-115 Fix TPS and Acroplus settings setup
...
Both TPS and Acroplus had settings initialized in SettingsUpdatedCb.
These values comes from stabSettings.stabBank, which isn't initialzed
when SettingsUpdatedCb is first called.
The patch moves the setup of the affected settings values to
BankUpdatedCb, where other bank specific settings are updated.
2015-09-09 01:27:20 +02:00
Alessio Morale
bc89c79b7d
Merged in skarlsso/librepilot/skarlsso/LP-107_scaleMotor_bug (pull request #46 )
...
skarlsso/lp 107_scalemotor_bug
2015-09-08 15:27:51 +02:00
Philippe Renon
2f8ef99a30
Merged in filnet/librepilot (pull request #52 )
...
LP-29 all_sdk_install will not install osg anymore, instead build_sdk_install will install if OS is windows
2015-09-06 17:18:34 +02:00
Philippe Renon
9b495456e2
LP-29 all_sdk_install will not install osg anymore, instead build_sdk_install will install if OS is windows
2015-09-06 17:10:52 +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
