1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-09 20:46:07 +01:00
Commit Graph

457 Commits

Author SHA1 Message Date
Laurent Lalanne
894d72f66c OP-1556 Bigger window size, Font sizes on all pages 2014-10-27 18:48:15 +01:00
Fredrik Larsson
269fa51c44 Merge remote-tracking branch 'origin/thread/OP-1556_ESC_Range' into rel-14.10 2014-10-28 04:09:03 +11:00
Laurent Lalanne
8f14a942fe Merge branch 'rel-14.10' into thread/OP-1556_ESC_Range 2014-10-27 17:54:28 +01:00
m_thread
9038c89991 OP-1556 Changed ESC calibration procedure slightly.
Added even more warning artwork to ESC calibration to make it even more
explicit. Darwin awards might have lost even a few more poor souls by
this i hope.
2014-10-27 15:24:23 +01:00
Laurent Lalanne
2628a23b28 OP-1577 Svg fixes for output calibration wizard 2014-10-27 13:18:10 +01:00
Fredrik Arvidsson
33dfc59131 Merge branch 'rel-14.10' of ssh://git.openpilot.org/OpenPilot into rel-14.10 2014-10-25 16:41:00 +02:00
Fredrik Arvidsson
beeef0431c Trying to fix mysterious MacOSX build isssue. 2014-10-25 16:40:38 +02:00
Fredrik Larsson
5afb74efd1 Merge remote-tracking branch 'origin/thread/OP-1567_Wizard_fixes' into rel-14.10 2014-10-26 01:03:09 +11:00
Laurent Lalanne
4df7ff56ea Merge branch 'rel-14.10' into laurent/rel-14.10_Translations_updates 2014-10-25 15:16:16 +02:00
Laurent Lalanne
52d926bf54 OP-1337 Special branch for Rel-14.10 translations updates and fixes 2014-10-25 15:06:18 +02:00
Fredrik Arvidsson
7268a676eb OP-1567 Added setting PWM out to 1000us.
At motor neutral calibration stop, first set PWM out to 1000us for 500ms
followed by setting it to 0.
2014-10-25 15:01:25 +02:00
Fredrik Arvidsson
612c3802ec OP-1571 Fixed template export.
User can now choose a place and a name if preferred.
Location will be default location in GCS config dir if it exists,
otherwise in the users home directory.
Added code to handle exort and import/selection of template without
image.
2014-10-25 11:35:05 +02:00
m_thread
0457e22132 Changed safe actuator value for motors to 0 ( for extra safety ). 2014-10-24 16:35:53 +02:00
m_thread
2e7d76cb33 Fixed export dialog for 'cloud' settings export. 2014-10-24 16:24:06 +02:00
Fredrik Larsson
75b9779a87 Merge remote-tracking branch 'origin/thread/OP-1567_Wizard_fixes' into rel-14.10 2014-10-24 03:36:04 +11:00
Fredrik Larsson
52c43c916f Merge remote-tracking branch 'origin/thread/OP-1556_Improve_ESC_Calib' into rel-14.10 2014-10-24 03:35:41 +11:00
Fredrik Larsson
a0f19ea79d Update text for default tuning 2014-10-24 03:15:10 +11:00
Fredrik Larsson
4f42b5227b Logo for defaults 2014-10-24 02:13:32 +11:00
Fredrik Larsson
d76aa509eb Change OK to Export for export tool 2014-10-23 23:10:37 +11:00
m_thread
2ee9e04ff6 OP-1567 Fixed some defaults in wizard.
If CC or CC3D disable GPS.
2014-10-23 12:42:27 +02:00
Fredrik Larsson
77dc919e07 minor text update 2014-10-23 02:26:50 +11:00
Fredrik Larsson
b4d38622a0 The ones that got away 2014-10-23 02:17:14 +11:00
Fredrik Larsson
2053cf000d OP-1559 Wording for GPS page of Wizard 2014-10-23 02:08:52 +11:00
m_thread
c409d75eed OP-1556 Setting ActuatorCommand to 0 after calibration. 2014-10-21 19:51:41 +02:00
Fredrik Larsson
2c986cf53f Merge branch 'rel-14.10' into next 2014-10-21 22:54:33 +11:00
Laurent Lalanne
de5604d7e6 OP-1547 Wrong DSM port in SetupWizard 2014-10-21 12:21:02 +02:00
m_thread
decbcb3ee7 OP-1545 Added GUI to visualize the ESC calibration utput level during calibration. 2014-10-20 14:01:52 +02:00
Laurent Lalanne
0ef448cd1b Merge remote-tracking branch 'origin/next' into laurent/OP-1337_French_translations_updates 2014-10-12 20:54:14 +02:00
Corvus Corax
b01eb1d3e4 uncrustification 2014-10-03 23:14:38 +02:00
m_thread
a7a7d32ec8 OP-1517 Small adjustments. 2014-10-02 21:25:38 +02:00
m_thread
3aed610c36 OP-1512 Changed wording in ESC calibration dialog. 2014-10-02 18:32:10 +02:00
m_thread
9b6f1a7d31 OP-1512 Added security questions to esc setup wizard. 2014-10-01 16:20:42 +02:00
Laurent Lalanne
538452ea02 Merge remote-tracking branch 'origin/next' into laurent/OP-1337_French_translations_updates 2014-10-01 15:41:39 +02:00
m_thread
f6e4e72ec2 OP-1517 Fixed a static declaration issue. 2014-10-01 15:10:22 +02:00
m_thread
2e472ec80c OP-1512 Fixed Platinum GPS setup
Fixed bug with number of mixer channels for fixed wing and octocopters.
2014-10-01 15:06:15 +02:00
m_thread
8123e816b6 OP-1517 Fixed saving of vehicle setup to be performed before output calibration and esc calibration. 2014-10-01 15:05:32 +02:00
m_thread
394df149b6 Merge remote-tracking branch 'origin/next' into thread/OP-1517_FW_Wizard_Fixes 2014-10-01 12:37:58 +02:00
m_thread
cc8c1c75f9 OP-1517 Fixed handling of configuration when sbus needs to use main port and gps is configured.
Enabled platinum gps configuration.
Cleaned up the naming standards in connection diagram svg file.
Re-factored the connection diagram code.
Uncrustified code.
2014-10-01 11:42:11 +02:00
m_thread
7c2968e7ef OP-1512 Use QuadX as default muti vehicle. 2014-09-30 22:27:34 +02:00
m_thread
1a406d00d4 OP-1512 Simplified HTML text 2014-09-30 22:09:41 +02:00
Laurent Lalanne
9760495899 OP-1337 Typo fix (Wizard-fixedwingpage.cpp) - Translations updates 2014-09-30 20:58:11 +02:00
m_thread
be4ae80696 OP-1512 Fixed some magic numbers... 2014-09-30 20:48:20 +02:00
m_thread
9872a95bc3 OP-1512 Fixed issues found in review. 2014-09-30 20:40:54 +02:00
m_thread
ada27f2568 Merge remote-tracking branch 'origin/next' into thread/OP-1512_ESC_Cal
Conflicts:
	ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp
2014-09-30 20:17:26 +02:00
Fredrik Larson
34628cd194 Update rates 2014-09-30 15:40:02 +10:00
Fredrik Larson
4591733008 Add new Buttons to Wizard 2014-09-30 15:37:08 +10:00
Fredrik Larson
e54d7865af Add to resources 2014-09-30 15:24:34 +10:00
Fredrik Larson
8e581a2d18 New buttons 2014-09-30 15:23:05 +10:00
Fredrik Larson
bf145ad76b Name change 2014-09-30 13:16:29 +10:00
m_thread
9f8e0c0f05 OP-1512 Added ESC calibration implementation.
Fixed some minor issues.
2014-09-30 00:39:51 +02:00
Laurent Lalanne
4ab043fb65 OP-1222 Removed Tx wire for Sbus Rx (3 wires) - All wing frames heading top (follow revo red arrow) 2014-09-29 23:56:09 +02:00
Laurent Lalanne
1c7ab99e51 OP-1222 Updated connection-diagram with Vtail frame 2014-09-29 22:58:51 +02:00
Laurent Lalanne
87790711c2 OP-1222 Updated wizard shapes with Vtail frame 2014-09-29 22:35:33 +02:00
Fredrik Larson
ee27357132 Only offer ESC calibration if ESC type and airframe type is correct 2014-09-28 23:25:39 +10:00
Fredrik Larson
488a359d85 add the page 2014-09-28 22:46:01 +10:00
Fredrik Larson
c643abf4fb Add files to the .pro 2014-09-28 15:11:40 +10:00
Fredrik Larson
f487ed3852 Start on ESC Calib page 2014-09-28 15:05:17 +10:00
Fredrik Larson
9cb5c21f23 test on summary page, inform users to not coneect battery yet 2014-09-28 13:01:36 +10:00
m_thread
8d76e6f671 OP-1222 Uncrustified code. 2014-09-25 23:19:50 +02:00
m_thread
b0e337c540 OP-1222 Added UUID to template file for identification.
Implemented the code to apply the template settings.
Fixed tab order in template export dialog.
Extended support for parsing and applying json data in uavobjectmanager.
2014-09-25 23:16:13 +02:00
m_thread
7ab2839b6e OP-1222 Implemented scanning for and reading of optmpl files (json vehicle template files )
and implemented selection gui for the templates.
2014-09-24 15:48:28 +02:00
m_thread
9c0c489e94 OP-1222 Added some constants instead of hard coded values. 2014-09-24 08:26:31 +02:00
m_thread
0d6aabe37b OP-1222 Added generated file name and export to a specific directory.
Added scaling of image to save file size.
Added sanity check of input data to not be empty fields.
2014-09-24 01:06:16 +02:00
m_thread
7bcdff9f2f Merge remote-tracking branch 'origin/next' into thread/OP-1222_FW_Wizard
Conflicts:
	ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp
	ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp
	ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationsource.h
2014-09-23 22:30:49 +02:00
Fredrik Larsson
5bbd6724d6 Merge remote-tracking branch 'origin/skarlsso/OP-1493_discoveryf4bare_support_in_gcs' into next 2014-09-23 21:11:15 +10:00
m_thread
19aa3ed5a3 Merge remote-tracking branch 'origin/next' into thread/OP-1222_FW_Wizard 2014-09-22 23:05:21 +02:00
Fredrik Larson
ec14f81afd Change wording to avoid a common cause of confusion for Futaba and
Spektrum users
2014-09-23 05:54:24 +10:00
m_thread
1a06822e55 OP-1222 Changed name of button to select image for the template. 2014-09-16 23:51:36 +02:00
m_thread
865bbba9ee Merge remote-tracking branch 'origin/laurent/OP-1222_FW_Wizard' into thread/OP-1222_FW_Wizard
Conflicts:
	ground/openpilotgcs/src/plugins/setupwizard/setupwizardplugin.cpp
	ground/openpilotgcs/src/plugins/uavobjects/uavobject.cpp
2014-09-16 23:48:06 +02:00
m_thread
f500f33326 OP-1222 Added vehicle template export function.
Exports vehicle information and image plus selected settings objects to JSon.
Uncrustified.
2014-09-16 23:44:23 +02:00
Laurent Lalanne
b31feb31b3 OP-1222 FW_Wizard Fix : QuadH and HexaH do not load Svg file 2014-09-16 20:41:45 +02:00
Laurent Lalanne
a8f0bb6eb6 OP-1222 Uncrustify 2014-09-16 19:27:18 +02:00
Laurent Lalanne
d0c9e236a1 OP-1222 Fix label for quad-h in connection-diagrams.svg 2014-09-16 19:01:17 +02:00
Laurent Lalanne
bc9e6b24f9 Merge remote-tracking branch 'origin/laurent/OP-1491_HQuad_mixing_values' into laurent/OP-1222_FW_Wizard
Conflicts:
	ground/openpilotgcs/src/plugins/setupwizard/pages/multipage.cpp
	ground/openpilotgcs/src/plugins/setupwizard/resources/connection-diagrams.svg

Conflicts resolved in artwork, same style as FW branch
2014-09-16 18:55:43 +02:00
Laurent Lalanne
4bc89ef638 OP-1491 HQuad_mixing_values : Renamed with quad-h labels, artwork fixes. 2014-09-16 01:47:34 +02:00
Laurent Lalanne
365a9c5026 OP-1491 HQuad_mixing_values : Wizard fixes, should works now 2014-09-16 01:16:45 +02:00
Laurent Lalanne
fb4b9b05cd OP-1491 Artwork fixes + wizard support - work in progress 2014-09-16 00:48:45 +02:00
Stefan Karlsson
09a943f17f OP-1493 Make Vehicle and TX Wizards work with the discoveryf4bare target 2014-09-15 23:43:58 +02:00
m_thread
54b6d74a4d Merge branch 'thread/OP-1222_FW_Wizard' of ssh://git.openpilot.org/OpenPilot into thread/OP-1222_FW_Wizard 2014-09-15 22:54:48 +02:00
m_thread
1c2efe0868 OP-1222 Added JSon serialization code. 2014-09-15 22:46:28 +02:00
Laurent Lalanne
4d81aad85d OP-1222 FW_Wizard : Modified Sbus Rx on MainPort, added Gps for FlexiPort 2014-09-14 18:01:20 +02:00
Fredrik Larrson
d91db0af6f Revert "Merge remote-tracking branch 'origin/proff/OP-1373_DSMFixes' into next"
This reverts commit a39e393274, reversing
changes made to ebfdaf28b5.
2014-09-08 02:31:02 +10:00
Fredrik Larrson
a39e393274 Merge remote-tracking branch 'origin/proff/OP-1373_DSMFixes' into next
Conflicts:
	shared/uavobjectdefinition/hwsettings.xml
2014-09-08 01:54:59 +10:00
Laurent Lalanne
39ef705632 OP-1222 Fix collisions between nmea Gps and fixed wing connectors. 2014-09-07 14:25:46 +02:00
m_thread
7cd46bdeee OP-1222 Fixed handling of conflicting configurations. Config is now invalidated if use goes back and make changes introducing conflicts.
Added more configuration saving logic.
2014-09-07 13:52:28 +02:00
m_thread
1a2bf73969 OP-1222 Added constant for image padding. re-factored the firInView into a function.
Removed old comments.
Fixed background on saved image to be white. Was previous black.
2014-09-07 13:50:41 +02:00
Laurent Lalanne
e9dd37eaf8 OP-1222 Bigger size for wizard window + add margins for connection diagram 2014-09-07 12:24:05 +02:00
m_thread
436646d070 OP-1222 Added configuration code for GPS and Airspeed sensors to the hardware settings section.
Still some ?? since the Platinum GPS support not yet is merged to this branch.
2014-09-07 10:15:09 +02:00
Fredrik Larson
27621f0f75 Fix spelling typeo, make sure npote is visable 2014-09-06 10:35:43 +10:00
Laurent Lalanne
a3c5b85fcd OP-1222 Update : Fix for bad rendering on wiring when sub-groups are used. 2014-09-05 23:50:37 +02:00
Laurent Lalanne
240afd1f2f OP-1222 Artwork : Added airspeed stuff + connectors - Resized all frames 2014-09-05 21:25:12 +02:00
m_thread
73d1217cc7 OP-1222 Added code to handle port conflicts in configuration. 2014-09-05 17:31:41 +02:00
m_thread
1d50f9e949 OP-1222 Added support for gps and airspeedsensors in connection diagram.
Optimized bounding rect handling. Got rid of need for background element.
2014-09-05 17:30:20 +02:00
Fredrik Larson
cefffefd7b Uncrustify 2014-09-05 17:22:59 +10:00
Fredrik Larson
ce64aa2ca7 Add for other airframe types 2014-09-05 17:21:37 +10:00
Fredrik Larson
b1a7f959b5 Initial tuning page 2014-09-05 17:14:27 +10:00
Fredrik Larson
135853d5a1 Add airspeed type selction to summary 2014-09-04 10:59:11 +10:00
Fredrik Larson
e2e437627b Add selected GPS type to summary 2014-09-04 10:40:08 +10:00
Fredrik Larson
6635e5d928 Update names in svg 2014-09-04 10:07:03 +10:00
Fredrik Larson
1b1c9938f3 MS4525DO airspeed sensor support to wizard page 2014-09-04 10:04:38 +10:00
Fredrik Larson
99ec1c727e Aadd new sensor items, airspeed (EagleTree) 2014-09-04 10:03:28 +10:00
Fredrik Larson
c673bea4f0 Start adding new sensor items, estimated 2014-09-04 10:01:54 +10:00
Fredrik Larson
b57ea9cb6c Add new Sensor-shapes from Laurent 2014-09-04 09:58:50 +10:00
Fredrik Larson
7073b7c9fe Remove actual file 2014-09-04 09:57:18 +10:00
Fredrik Larson
91244cd47a Airspeed shapes place holder gone 2014-09-04 09:57:04 +10:00
Fredrik Larson
62b321ffa1 GPS shapes place holder removed from qrc 2014-09-04 09:56:13 +10:00
Fredrik Larson
3fbfd82206 Actualy downfile deleted 2014-09-04 09:55:27 +10:00
Fredrik Larson
4c5afba2aa Actualy Up file deleted 2014-09-04 09:55:05 +10:00
Fredrik Larson
3e6bb1e09d Remove other state from qrc also 2014-09-04 09:54:26 +10:00
Fredrik Larson
769e871f58 Remove old button 2014-09-04 09:54:03 +10:00
Fredrik Larson
c73905b24d Start implimenting new Artwork from Laurent 2014-09-04 09:50:15 +10:00
Laurent Lalanne
8022fbc133 OP-1222 Revert : "No-sensor" icon available if needed. 2014-09-04 00:15:29 +02:00
Laurent Lalanne
b0b475bb60 OP-1222 Removed "No-sensor", polished estimated airspeed with gears 2014-09-04 00:11:00 +02:00
Laurent Lalanne
60f5fa068a OP-1222 connection-diagram.svg file : Added GPS and connectors 2014-09-03 21:41:09 +02:00
Laurent Lalanne
dec4c83b68 OP-1222 Artwork for airspeed and gps sensors 2014-09-03 17:28:38 +02:00
Laurent Lalanne
61e65734b2 Merge branch 'thread/OP-1222_FW_Wizard' of ssh://git.openpilot.org/OpenPilot into laurent/OP-1222_FW_Wizard 2014-09-03 00:44:25 +02:00
m_thread
fdeb1ccfc9 OP-1222 Minor changes in page path code. 2014-09-03 00:31:56 +02:00
m_thread
a36943c616 OP-1222 Added svg for gps shapes. Fixed some spelling errors. 2014-09-03 00:05:47 +02:00
Fredrik Larson
14574832b9 Tidy up text 2014-09-03 07:42:15 +10:00
Fredrik Larson
b93ff6bd89 Make a start on GPS page 2014-09-03 07:16:36 +10:00
Fredrik Larson
afeb464eb6 Add some line breaks 2014-09-03 04:41:49 +10:00
Fredrik Larson
577b38b786 Text for AirSpeed page 2014-09-03 04:31:39 +10:00
Laurent Lalanne
bc70db575d OP-1222 FW_Wizard New artwork for connection diagram button (up/down or hover), added to wizardResources.qrc 2014-09-02 20:22:07 +02:00
Fredrik Larson
acee61b3b1 Skip bias calib on fixed wings 2014-09-03 02:39:18 +10:00
Fredrik Larson
b9f89e39e7 Uncrustify 2014-09-03 02:22:09 +10:00
Fredrik Larson
82a32a5d8e Create airspeed page 2014-09-03 02:19:15 +10:00
m_thread
4bf932d36b OP-1222 Uncrustification. 2014-09-02 16:46:40 +02:00
m_thread
655d02622f OP-1222 Minor ordering adjustments. 2014-09-02 14:01:02 +02:00
m_thread
b61471e8ef OP-1222 Fixed a merge regression. 2014-09-02 13:49:01 +02:00
m_thread
8c841fa5f1 Merge branch 'thread/OP-1222_FW_Wizard' of ssh://git.openpilot.org/OpenPilot into thread/OP-1222_FW_Wizard 2014-09-02 13:46:25 +02:00
m_thread
819e4d6b3b OP-1222 Finished re-factoring vehicle selection pages, 2014-09-02 11:03:52 +02:00
Fredrik Larson
11068197c5 Change motor for engine 2014-09-02 14:29:49 +10:00
Fredrik Larson
7486ba8803 Put channels in order, make outputs match the diagrams, channels now
reflect common fixed wing model conventions
2014-09-02 14:23:26 +10:00
Fredrik Larson
34d8ba608c Change button order in wizard to match the order of the config plugin,
also has two currently support types of airframe first
2014-09-02 13:30:22 +10:00
Fredrik Larson
f21a31cdbe Comment out destructor to fix compile 2014-09-02 12:31:19 +10:00
m_thread
c56980e54e OP-1222 Re-factored and renamed selection page. 2014-09-02 00:10:31 +02:00
m_thread
5586b5b85c Merge remote-tracking branch 'origin/corvuscorax/OP-1222_FW_Wizard' into thread/OP-1222_FW_Wizard 2014-09-01 22:47:15 +02:00
Corvus Corax
daefab99be OP-1222 fixed elevon mixer to be consistent with aileron type (no channel reversals needed), made FW wizzard and config widget create the same type of mixer setup 2014-08-31 20:15:36 +02:00
Corvus Corax
3f9fa97d0f OP-1222 fixed FW elevon wizzard channel assignment to be compatible with config widget 2014-08-31 20:15:20 +02:00
m_thread
4695a60df6 OP-1222 Added base page for selection kind of action. 2014-08-31 14:35:45 +02:00
Laurent Lalanne
c39424d50a OP-1222_FW_Wizard : Finished artwork diagram, cpp file. Wing tips for FW, polished Vtail and all frames in dark gray. 2014-08-29 16:04:28 +02:00
Laurent Lalanne
826048e923 OP-1222 FW_Wizard SVG artwork connection-diagrams.svg Work in progress 2014-08-29 03:47:02 +02:00
Fredrik Arvidsson
5d928725f1 Merge remote-tracking branch 'origin/next' into thread/OP-1222_FW_Wizard
Conflicts:
	ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp
2014-08-29 00:50:08 +02:00
Laurent Lalanne
9857ef56dd OP-1422 Tricopter_mixers_settings : Uncrustify ! 2014-08-27 20:38:04 +02:00
Laurent Lalanne
f313bef2e5 OP-1422 Tricopter_mixers_settings Store mixing / sliders values on board - Wizard/Config tab. Tricopter Yaw mixing now applies to servo, 100% default. 2014-08-27 20:33:11 +02:00
Laurent Lalanne
4099507bf6 OP-1422_Tricopter_mixers_settings Wizard : Wrong mixer type for servo (was ReversedMotor). M3/M4 bugfix 2014-08-27 02:24:14 +02:00
m_thread
a215bca34c OP-1222 Added fixed wings to connection diagram dialog. 2014-08-27 00:30:05 +02:00
m_thread
b31ee46724 OP-1222 Uncrustify 2014-08-26 22:34:58 +02:00
Laurent Lalanne
0edf70d0aa OP-1422_Tricopter_mixers_settings : Uncrustify 2014-08-26 19:31:08 +02:00
Laurent Lalanne
94809de9c4 OP-1422_Tricopter_mixers_settings Ternary operator and include qmath.h in cpp 2014-08-26 19:27:05 +02:00