rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-09 20:46:07 +01:00
Code Issues Releases Activity
12,660 Commits 5 Branches 8 Tags 266 MiB
f1e1507b06
Commit Graph

485 Commits

Author SHA1 Message Date
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
Laurent Lalanne
aea2adf2df OP-1422 Tricopter_mixers_settings Normalize mixer values saved from Wizard and Config tab. Fix bad values saved previously like -63/64. 2014-08-26 17:07:00 +02:00
Laurent Lalanne
458120cce2 OP-1422 Tricopter_mixers_settings : Do the same calc as Gcs and round values so Wizard set same values as Gcs defaults. Little fix for HexaX wizard that set HexaH frame ! 2014-08-26 14:17:24 +02:00
Fredrik Larson
a4d2582cec Move Config plugin for fixed wings back to oly Aileron type per Eric 2014-08-26 12:44:11 +10:00
Fredrik Larson
221dd1308f Create new file for the main fixed wing page, on the fixed wing page we 
need to show the servo types due to the need of knowing how many servos to
calibrate
 2014-08-26 12:13:21 +10:00
Fredrik Larson
9da2b07bee Merge branch 'thread/OP-1222_FW_Wizard' of ssh://git.openpilot.org/OpenPilot into fw_wiz 2014-08-26 11:54:57 +10:00
m_thread
a9dad6f4df OP-1222 Added reversed for servos. Beautification of fixed wing page. 2014-08-26 01:22:35 +02:00
m_thread
73ca58ce0f OP-1222 Disabled reverse. 2014-08-26 00:02:44 +02:00
m_thread
4273f6a1fc Merge branch 'thread/OP-1222_FW_Wizard' of ssh://git.openpilot.org/OpenPilot into thread/OP-1222_FW_Wizard 2014-08-25 23:46:03 +02:00
m_thread
a2af596b56 OP-1222 Changed servo calibarion to contain min, max and center on the same page. 2014-08-25 23:45:46 +02:00
Fredrik Larson
7f0901cdda Create airspeed page 2014-08-25 06:31:52 +10:00
Fredrik Larson
9e93c7ded5 Rename wizard svg file, avoids confusion. TODO: Other duplicate files like 
this that are shared with config and wizards
 2014-08-25 03:21:20 +10:00
m_thread
f494c326de OP-1222 Fixed some groups in svg. 
Removed translation node in svg by regrouping childs.
Fixed fit in view issue in fixedwingpage and some channel setup in outputcalibrationpage.
 2014-08-23 17:50:50 +02:00
Fredrik Larson
cda94b3319 Rename Legacy to Standard, while Legacy for Multis, not so for Fwings an 
Helis.
 2014-08-23 04:30:32 +10:00
Fredrik Larson
169b95fb4d Move FWing ESC setting to use the setter. 2014-08-23 04:12:25 +10:00
Fredrik Larson
e4a4f35178 Summary to not show unknown ESC type fpr FWs, remane legacy ESC to 
standard ESC, summary shows "legacy" still for Multis.

Remaining problems appear to be SVG ID related.
 2014-08-23 02:00:11 +10:00
Fredrik Larson
18c3f8147a Start basics of single Aileron type support, here be dragons and some SVG 
known issues
 2014-08-23 01:01:01 +10:00
Fredrik Larson
9dbd2044c8 Group FW images correctly 2014-08-23 00:17:57 +10:00
Fredrik Larson
a5b8f76345 Update SVG for new output numbers, add standard fixed wig graphic which 
uses single aileron servo
 2014-08-22 11:47:42 +10:00
m_thread
a893f6ff2b OP-1222 Renamed some pages. Added support for both esc and servo types. 2014-08-22 01:40:05 +02:00
m_thread
a7ab68f539 OP-1222 Fixed a 'off-by-one' bug with channels. Fixed some bugs in the configuration plugin regarding fixed wings. 2014-08-21 23:47:18 +02:00
Fredrik Larson
527ec1d15d Add new artwork 2014-08-22 05:51:26 +10:00
Fredrik Larson
6904ce4614 Change buttons, set default to standard servos 2014-08-22 05:50:25 +10:00
Fredrik Larson
ade59ada9e Add servo buttons 2014-08-22 05:16:00 +10:00
m_thread
82a3590da5 OP-1222 Fixed a bug with Actuator settings and banks to use for motors. 2014-08-18 13:14:07 +02:00
m_thread
5354723928 OP-1222 Renamed some files. 
Fixed Wing wizard made only available on Revo
Moved motor for fixed wing to channel 3 since channel 3 got its own timer.
Fixed a crash in config plugin when selecting Fixed Wing.
Added code in outputcalibration in Fixed Wing setup to set min and max values as well as neutral for servos.
Added Controller type Nano.
 2014-08-18 01:20:31 +02:00
Fredrik Larson
137a6e4308 Refactor name of legacy servos, remove PID hard coding from the config 
helper
 2014-08-18 03:47:16 +10:00
Fredrik Larson
00ed28c983 Start adding PID page 2014-08-18 03:43:00 +10:00
Fredrik Larson
a46d5316ec Tooltips 2014-08-18 02:51:49 +10:00
Fredrik Larson
2b6629e03a Change wording, standard servos to analog servos 2014-08-17 23:06:01 +10:00
Fredrik Larson
ea1e95db7b Minor refactroring of a type in a class, change ESC_TYPE and geter / 
serter to be actuator type as we are dealing with servos. Add servos to
enum, remove hard coded min / max for now.
 2014-08-17 22:55:11 +10:00
Fredrik Larson
3fc991fe2c Add the outputpage for fixed wing support 2014-08-17 20:31:57 +10:00
Fredrik Larson
3a4b27df5d Minor formatting of all Wiz pages for consitency 2014-08-17 04:15:11 +10:00
Fredrik Larson
4c242fa2e0 Wording of FW wizard page 2014-08-17 04:01:21 +10:00
Fredrik Larson
741efd9281 Add image 2014-08-17 01:57:15 +10:00
Fredrik Larson
0b147fded5 Minor formatting, add wizard image 2014-08-17 01:41:14 +10:00
Fredrik Larson
dd07ccbec9 Resolve merge conflicts 2014-08-16 14:20:31 +10:00
Fredrik Larson
501441d3fb Merge branch 'next' into kf_hayvosh/OP-1222_FW_Wizard_lets_get_this_finished 
Conflicts:
	ground/openpilotgcs/src/plugins/setupwizard/pages/outputcalibrationpage.cpp
	ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationsource.h
 2014-08-16 12:12:15 +10:00
Stefan Karlsson
49c5c7a3d8 OP-1447 Use smaller steps for the output calibration wizard page slider 2014-08-15 20:03:08 +02:00
Gasté Olivier
dfb21482f4 DSM protocol improvement 
added item in DSM protocol in GCS
 2014-08-08 13:14:39 +02:00
Laurent Lalanne
d2471361bb OP-1063 Multi_config_Hexa_fixes : Uncrustify 2014-07-14 15:59:26 +02:00
Laurent Lalanne
748a522b5d OP-1063 Multi_config_Hexa_fixes : Commented mixer matrix, cleanup. 2014-07-14 15:50:48 +02:00
Laurent Lalanne
c26e33964a OP-1063 Multi_config_Hexa_fixes Added OctoX, define new mixer table for Octo(p) and OctoX. New motor definition for OctoX (NNE, ENE...) Fixes for svg frames. Defined default settings for OctoP/X in setupwizard (but disabled) 2014-07-13 13:58:18 +02:00
Laurent Lalanne
64eb77ed8b OP-1063 Multi_config_Hexa_fixes Svg file : Added HexaX_reverse and fixed gradients 
SetupWizard : Updated Hexa, HexaX and HexaH default values, default
Throttle curve at 90% max
Fixed a previous bug sign in HexaH (and HexaX because previously copied)
: Bug was in M4 Roll and M6 Yaw.
 2014-07-13 10:30:45 +02:00
Laurent Lalanne
748190935d OP-1063 Multi_config_Hexa_fixes : Mixer matrix settings for Hexa, HexaX, HexaH. 
New mixer values (60/40) for Pitch and Roll, read from values stored in board.
Svg fixes
 2014-07-10 16:33:11 +02:00
Laurent Lalanne
a46480a99b OP-1063 Multi_config_Hexa_fixes : Added real HexaX, renamed HexaX > HexaH 
Added artwork in config and wizard svg. Cleanup on svg connection diagram (layers)
DO NOT USE until mixers are fixed
 2014-07-10 06:01:28 +02:00
Kevin Finisterre
58dad5d3a5 Try to set Ilimit Rate... somehow I set Ilimit Attitude instead. Need to sort out. basic idea worked though. 2014-06-12 12:07:03 -04:00
Kevin Finisterre
9aaa764797 work out a method to set some default PIDs... using a setData() call helps!!! 2014-06-12 11:05:46 -04:00
Kevin Finisterre
1bf9f250dc poor attempt to set some default PIDS? make a note to change the modelview ehre as well. 2014-06-12 02:43:38 -04:00
Kevin Finisterre
1f74a78263 Attempt adding in the proper Mixer setting constructs for Elevon setup. 2014-06-11 14:41:42 -04:00
Kevin Finisterre
b9733363b3 some revision control data is misplaced preventing compile 2014-06-11 12:23:33 -04:00
Kevin Finisterre
7558509720 Revert "Fix minor cosmetic issue where vtail model was not rendering in the Configuration screen. Edit the Inkscape Object Properties." 
This reverts commit 11fa414e1a.

Conflicts:
	ground/openpilotgcs/src/plugins/config/images/fixedwing-shapes.svg
	ground/openpilotgcs/src/plugins/setupwizard/pages/fixedwingpage.cpp
 2014-06-08 00:00:43 -04:00
Kevin Finisterre
28246cccbe fix remaining headers 2014-06-07 23:04:12 -04:00
Kevin Finisterre
0bd4e9efa5 Try to fix my Vtail->Elevon naming issue. Attempt to fix Elevon mixer setting defaults 2014-06-07 22:31:42 -04:00
Kevin Finisterre
c2c89bf0f5 Merge remote-tracking branch 'origin/next' into thread/OP-1222_Fixed_Wing_Wizard_Support 
Getting more current code in place.
 2014-06-07 21:24:05 -04:00
Kevin Finisterre
11fa414e1a Fix minor cosmetic issue where vtail model was not rendering in the Configuration screen. Edit the Inkscape Object Properties. 
Likewise adjust fixedwingpage.cpp to be more consistant with the inkscape label. ie 'vtail' vs. 'v-tail'
 2014-05-29 11:51:20 -04:00
Kevin Finisterre
4ebaa6f205 set all the min and max values to 554 and 2400 per the Arduino servo library 
fix some cosmetic errors on the debug output
fix the Vtail mixer setting that caused channel 4 to go crazy due to being undefined. Servo would sit and shake for no reason.
 2014-05-25 16:05:13 -04:00
Kevin Finisterre
4d250ff856 Fix channel indexes to use servoCenterSlider 
Set channelNeutral = 1500 where appropriate for each model type.
Add the missing actuator save for fixed wing!   actSettings->setData(data);
 2014-05-25 15:20:04 -04:00
Philippe Renon
cc1c4db786 Merge branch 'filnet/OP-1174_beautify_uploader_gadget_popups' into next 2014-05-08 00:28:26 +02:00
Philippe Renon
e3e92efc70 OP-1174 uncrustified 2014-05-05 00:05:51 +02:00
Corvus Corax
0509595137 OP-1309 present for Laurent: 3 more Stabilized modes (and a bit of cleanup) 2014-05-03 18:38:45 +02:00
Philippe Renon
1bca36ab8d OP-1174 auto update wizard : removed now (hopefully) uneeded workarounds 2014-05-03 17:42:19 +02:00
Philippe Renon
9573e141aa OP-1174 auto update wizard - error messages are now shown in red 2014-05-02 08:53:40 +02:00
Philippe Renon
fababeeeee OP-1174 wizard upgrade page - made all strings translatable 2014-05-01 23:19:50 +02:00
Philippe Renon
7fef044325 OP-1174 wizard upgrade page - removed now uneeded fix that caused the wizard dialog to flicker 2014-05-01 23:14:35 +02:00
Philippe Renon
e8cb96f90d OP-1174 uploader gadget - removed popup to disconnect when using auto update. 
Fix also applies to vehicule setup wizard autoupdate page
Instead of using a popup that requires user to click Ok, GCS will wait untill all boards are disconnected
This fix induces lots of cleanups.
 2014-05-01 22:48:22 +02:00
Corvus Corax
33acbc4209 OP-1309 added new thrust mode default to setup wizard 2014-04-26 20:57:39 +02:00
Corvus Corax
599661ba18 OP-1309 UAVObject changes, GCS changes and Makefile changes needed for Stabi refactoring 2014-04-26 15:14:40 +02:00
m_thread
cfff73361b Merge branch 'next' into thread/OP-1245_FlightLog_Configuration_And_Control_GUI 2014-03-20 07:25:20 +01:00
Alessio Morale
e407eb8126 Merge branch 'next' of git://git.openpilot.org/OpenPilot into next 2014-03-09 14:38:17 +01:00
Alessio Morale
0b30b79c98 Merge remote-tracking branch 'origin/amorale/OP-1149_gyro_accel_thermal_calibration' into next 
Conflicts:
	ground/openpilotgcs/src/libs/eigen/Eigen/src/Core/util/Memory.h
	ground/openpilotgcs/src/plugins/config/revosensors.ui
	ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp
 2014-03-09 14:38:08 +01:00
Corvus Corax
82a196b8cf Merge branch 'next' into corvuscorax/OP-1216_flight-control-refurbishment 2014-03-08 15:52:45 +01:00
m_thread
4209f1d6b5 Merge remote-tracking branch 'origin/next' into thread/OP-1245_FlightLog_Configuration_And_Control_GUI 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2014-03-08 10:50:32 +01:00
m_thread
0c61fd35c8 OP-1245 Added table with UAVOs. Re-factored some UAVObject code. 2014-03-06 00:41:48 +01:00
m_thread
076e690337 OP-1170 Got rid of more compiler warnings. 
Uncrustified the code.
 2014-03-04 23:45:01 +01:00
m_thread
f306a356f3 OP-1170 got rid of compiler warnings in multiple plugins. 2014-02-26 17:57:45 +01:00
m_thread
a99de5d326 OP-1222 Fixed svg files. Cleaned up and grouped items to work in wizard. 
Removed some translations and simplified some gradients.
Added support for output calibration of Aileron and v-tail wings.
Added comments in the code explaining the various arrays with
indexes and ids in the output configuration page class.
 2014-02-14 00:00:52 +01:00
m_thread
f8e6e8c183 Merge remote-tracking branch 'origin/kfinisterre/FixedWingWizard' into thread/OP-1222_Fixed_Wing_Wizard_Support 
Conflicts:
	ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configfixedwingwidget.h
	ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp
 2014-02-12 12:34:37 +01:00
Corvus Corax
b5a27d05e7 OP-1197 configurable failsafes OP-1219 thrust control OP-1217 separate manualcontrolsettings apart 2014-02-09 19:37:22 +01:00
Alessio Morale
02c7084196 Merge remote-tracking branch 'origin/next' into amorale/OP-1149_gyro_accel_thermal_calibration 
Conflicts:
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
 2014-01-23 01:02:13 +01:00
Alessio Morale
4b5ee1c2fb OP-1149 Changes to GCS to use AccelGyroSettings for bias calculations 2013-12-29 18:58:45 +01:00
Alessio Morale
a340c06b01 OP-1149 Changes to GCS to accounts for UAVO Changes from previous commit 2013-12-26 16:56:54 +01:00
Kevin Finisterre
3862c9cfaa settings still not saving to the board... trying to sort it out. Making sure all necessary codepaths exist in the FixedWing clone of the MultiRotor code for the Wizard. 2013-12-20 02:08:08 -05:00
Kevin Finisterre
33d963d24e prepping to fix refreshWidgetsValues() so that Output & Vehicle screens populate properly after wizard is run. 2013-12-18 16:41:38 -05:00
Kevin Finisterre
b6f0e5e305 Sort out issues with servo vs. motor sliders... finally figure out what wizardIndexes are! per OutputCalibrationPage::setWizardPage() 2013-12-18 15:14:56 -05:00
Kevin Finisterre
9e417f5ee5 Remove some redundant "elevon" stuff for now. Will come back later when proper "elevon + rudder" artwork exists. Currently no different from vtail anyway... 
Enabled proper channel mixing settings inside the FixedWing wizard Output configuration screen. Attempt to set GUIConfigDataUnion to fixedwing
 2013-12-18 12:57:35 -05:00
Kevin Finisterre
6e5e7e4dd3 Work around for a problem caused by lack of elements in the fixed wing SVG for use in the output window. 2013-12-16 20:51:43 -05:00
Kevin Finisterre
82e2c5cf92 Move some code around to accomidate multiple svg images in the output calibration screen. 
Need to fix the SVG to allow for zooming in on specific channel components as we do with the multi rotor screen.

This has some sloppy comments in if for my own debugging purposes.
 2013-12-16 14:29:04 -05:00
Kevin Finisterre
632ffed707 Add the fixed wing plane art to the channel config screen (in progress) 
Begin adding plane art to Output config screen in wizard.
 2013-12-15 21:37:19 -05:00
Kevin Finisterre
604a349d01 Merge branch 'next' into kf_fixes 2013-12-14 17:48:32 -05:00
Kevin Finisterre
2b585a8618 added a case statement for PAGE_FIXEDWING to trigger PAGE_OUTPUT 2013-12-14 16:46:26 -05:00
Philippe Renon
e0115a25b0 OP-1122 OP-1125 cleaned up GCS side uavtalk includes 2013-12-11 22:22:28 +01:00
Fredrik Arvidsson
fbea95e817 OP-1063 Fixed text 2013-12-03 22:03:32 +01:00
Fredrik Arvidsson
336510c3e6 OP-771 Added some descriptive text. 
OP-1059 Fixed typos.
 2013-12-03 20:48:40 +01:00
Kevin Finisterre
0d5e91ee26 I fixed the first screen, now the vtail and aileron models show when slected. For some reason I am unable to move beyond the first wizard screen. 2013-11-25 01:06:07 -05:00
Kevin Finisterre
92c19f2d74 Changed the element id's in one of the SVG files that I incorrectly edited. This prevents the error: 
Could not resolve property : SVGID_1_

Error comes from qsvghandler.cpp or qsvgstyle.cpp in the QT libraries Qt5.2.0//5.2.0-beta1/Src/qtsvg/src/svg/

The fixedwing-shapes.svg and flyingwing-shapes.svg files need modified to prevent the errors caused by qsvgtinydocument.cpp in the QT libraries.

Couldn't find node aileron. Skipping rendering.
Couldn't find node vtail. Skipping rendering.

These errors come from the case statement that was added to updateImageAnd Description() for FixedWingPage

+    switch (type) {
+    case SetupWizard::FIXED_WING_AILERON:
+        elementId = "aileron";
+        break;
+    case SetupWizard::FIXED_WING_VTAIL:
+        elementId = "vtail";
+        break;
+    default:
+        elementId = "";
+        break;
+    }

A similar error needs to be resolved in connectiondiagram.cpp
+            switch (m_configSource->getVehicleSubType()) {
+            case VehicleConfigurationSource::FIXED_WING_AILERON:
+                elementsToShow << "aileron";
+                break;
+            case VehicleConfigurationSource::FIXED_WING_VTAIL:
+                elementsToShow << "vtail";
+                break;
+            default:
+                break;
+            }

Likewise outputcalibrationpage.cpp will need to reverence the elements inside the SVG file properly.
+        m_vehicleElementIds << "fixed-aileron" << "aileron";
+        m_vehicleHighlightElementIndexes << 0 << 1;
...
+        m_vehicleElementIds << "fixed-vtail" << "vtail";
+        m_vehicleHighlightElementIndexes << 0 << 1;

Until these elements are fixed in the SVG files the wizard will not render properly and allow the user to click *next*.
 2013-11-24 17:29:38 -05:00
Kevin Finisterre
721000b279 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next 
This is an attempt I made several months back at enabling the fixed wing wizard. AILERON and VTAIL concepts added where necessary. VehicleConfigurationHelper::setupAileron() and friends are completely wrong, need to be sorted out.

The files that go in setupwiz/resources need to be corrected to show motor direction. Basically need an inverse copy merged into existing images, see multirotor svg files for comparison.

m_vehicleElementIds and m_vehicleHighlightElementIndexes need to be fixed in the SVG files and code appropriately. The ID tags in the sVG files are incrorect. likewise grouping are incorrect. Could use help from someone more profficient in SVG files.

*work in progress*
 2013-11-24 11:14:37 -05:00
Corvus Corax
68a8863fbd uncrustification for ground/openpilotgcs/src/plugins/setupwizard/setupwizardplugin.h 2013-11-16 17:34:42 +01:00
Philippe Renon
f85498e7c5 [OP-1085] Qt5.1.1 - a bit of manual uncrustifying 2013-10-24 00:12:35 +02:00
Philippe Renon
a2ba33f28a [OP-835] Qt 5.1.0 - migrated GCS plugins 2013-09-15 23:37:20 +02:00
Corvus Corax
022f1a1ac0 Merge branch 'next' into corvuscorax/OP-947_stateestimator-module 
Conflicts:
	flight/modules/Attitude/revolution/attitude.c
 2013-06-09 13:49:52 +02:00
Alessio Morale
7e50c00885 OP-990 uncrustification 2013-06-07 10:13:14 +02:00
Corvus Corax
6fdf554d4a Merge branch 'next' into corvuscorax/OP-947_stateestimator-module 
Conflicts:
	flight/modules/Attitude/revolution/attitude.c
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
	shared/uavobjectdefinition/attitudesettings.xml
 2013-06-06 19:25:54 +02:00
Alessio Morale
be999329b9 OP-990 Some fixes to calibration in wizard 
1) zeroes any existing bias prior to calibration.
2) Quick and dirty fix to missing UAVO updates during calibration setup
3) missing resetting of BiasCorrectGyro to true on Revolution after save.
 2013-06-05 22:24:12 +02:00
Philippe Renon
218d197aa8 OP-983 fixed minor spelling issues in GCS 2013-06-02 12:42:15 +02:00
Fredrik Arvidsson
316afefff7 OP-906 Changed defaults for Stabilization settings and Flight modes. 2013-05-27 22:25:17 +02:00
Corvus Corax
49b8e0d699 Merge branch 'next' into corvuscorax/OP-946_refaktor_sensor_and_state 2013-05-20 10:07:55 +02:00
Fredrik Arvidsson
864300d975 OP-893 Added Auto Update functionality to the firmware page. 2013-05-19 23:00:44 +02:00
Sexy Pony
900f643bbd Reformat source code with 'make uncrustify_all' run twice. NO CODE CHANGES 2013-05-19 17:37:30 +03:00
Corvus Corax
f630351c75 Merge branch 'next' ... 2013-05-19 12:17:40 +02:00
Corvus Corax
daf329d8f5 uncrustification (again) 2013-05-19 11:38:18 +02:00
David Ankers
915b7857f6 Changed the word maiden to the word first, easier to read and makes more sense for people that use English as a second language 2013-05-19 14:58:57 +10:00
David Ankers
2abcef1071 Changed aircraft word to controller as per Pablo. 2013-05-19 14:57:40 +10:00
David Ankers
3d2f62f014 Removed the CopterControl wording from the bis calib screen om the wizard, this page will be used for the Revo also 2013-05-19 14:55:39 +10:00
Corvus Corax
5284195c29 Refaktored sensor and state UAVObjects consistently into XXYSensor and XXYState 2013-05-18 19:36:45 +02:00
Corvus Corax
80caceb984 make uncrustify_all;make uncrustify_all; 2013-05-18 14:17:26 +02:00
Fredrik Arvidsson
360dd75d55 OP-816 Added Accel and Gyro bias calibration support for Revolution board. 2013-04-29 15:11:24 +02:00
Fredrik Arvidsson
e1e3183c6d OP-816 Adding Revolution illustration to the connection diagram. 2013-04-27 11:22:08 +02:00
Fredrik Arvidsson
9a9578a2a3 OP-816 Added page for Revolution calibration referring to the configuration plug-in until we get 'our ducks in a row' regarding the Revolution calibration procedure. 2013-04-16 20:40:25 +02:00
Fredrik Arvidsson
66b66ee8f4 OP-816 Re-factoring and removal of warnings. 2013-04-16 19:41:13 +02:00
Fredrik Arvidsson
860077c428 OP-816 Added Revolution specific configuration code to Setup Wizard. 2013-04-11 21:25:38 +02:00
Fredrik Arvidsson
9d53b68ab8 OP-816 Added settings enums for GPS and Revolution Radio modem. 
Added basic hardware settings implementation for Revolution board.
 2013-04-07 11:52:33 +02:00
Fredrik Arvidsson
2cd3485cf6 OP-816 Fixed Revolution identification and Revolution + OPLink firmware auto-update functionality. 2013-03-03 19:33:24 +01:00
a*morale
43f5bf09c2 Changed missing PipX labels for setup wizard 2012-12-02 13:39:03 +02:00
Oleg Semyonov
46533c5a3b [OP-746] Fix text for the "Upgrade" button (it is not used but to be in sync) 2012-11-26 17:51:43 +02:00
Oleg Semyonov
089f4a7915 [OP-746] Fix invalid tooltip for the "Upgrade" button of the Vehicle setup wizard (copy/paste error) 2012-11-26 17:41:35 +02:00
Oleg Semyonov
56dba23d2a Merge branch 'thread/OP-716' into rel-12.10.2 2012-11-21 17:19:45 +02:00
Fredrik Arvidsson
08fd9a8153 OP-686 Added code to disable wizard buttons during firmware upgrade procedure. Re-factored some code and fixed some minor bugs. 2012-11-19 01:29:14 +02:00
Fredrik Arvidsson
1695fda4e2 OP-716 Changed default AccelTau to 0.1. This value seems to be a good value after reading some reports on the forums. 2012-11-17 17:45:10 +01:00
Fredrik Arvidsson
2eeba593db OP-716 Added default TauAccel == 0.15 to wizard. 2012-11-17 10:30:57 +01:00
David Ankers
43e6b38b54 Spelling of Spectrum to Spektrum 2012-11-11 00:31:05 +02:00
Fredrik Arvidsson
dd7b69dbbc Fixed so that the actuator state error message box does not open behind the wizard. Changed the text to be more informative. 2012-10-16 00:37:15 +02:00
Fredrik Arvidsson
e78cd29c5f Changed port assignments when Spectrum Rx is choosen. 2012-10-15 00:06:13 +02:00
Fredrik Arvidsson
173cf041cb Fixed texts in Vehicle Setup Wizard. 
Added new icons for PipX.
Enabled hyper link to esc wiki page on wizard output page.
 2012-10-14 16:46:28 +02:00
PT_Dreamer
d25061ac0a GCS-Hides wizard to display dialog 2012-10-14 01:10:30 +01:00
PT_Dreamer
2b48cf3d90 GCS-Ensure wizard is top window 2012-10-13 18:57:02 +01:00
James Cotton
28d3cdcd7a SetupWizard: Store a flag if the wizard is running to prevent starting two. 
This is still not as good as getting that dialog modal since the user can get
it lost behind the main window.
 2012-10-13 17:48:57 +01:00
James Cotton
b99b221a6d Setup Wizard: Trigger the wizard with show() instead of exec() as using 
exec blocks the main application event loop.
 2012-10-13 17:46:31 +01:00
PT_Dreamer
c99d048eb9 GCS-Wizard 
Be a bit more verbose on one of the board update messages.
 2012-10-11 14:59:18 +01:00
Fredrik Arvidsson
18f2d8e219 Added new button graphix for upgrade button on autoupdate page. Changed the texts slightly to be less offending. ;) 2012-10-11 13:31:02 +02:00
PT_Dreamer
ea3eb984f4 Merge branch 'pt/wiz_autoupdate' of ssh://git.openpilot.org/OpenPilot into pt/wiz_autoupdate 2012-10-10 18:26:28 +01:00
PT_Dreamer
8863601715 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into pt/wiz_autoupdate 2012-10-10 18:22:53 +01:00
zedamota
fb27c5d93c GCS-Fw Auto update - Try to fix win build 2012-10-10 16:36:13 +01:00
Fredrik Arvidsson
befa5da671 Fixed layouts in the setup wizard and made the wizard resizeable. 2012-10-10 00:36:29 +02:00
Fredrik Arvidsson
fc69eaa205 Merge branch 'next' into pt/wiz_layouts 2012-10-09 21:56:27 +02:00
PT_Dreamer
d1b78faeb3 Revert "GCS-Config wizard" 
This reverts commit 4b5c88589c.
 2012-10-09 18:59:01 +01:00
Fredrik Arvidsson
d98c2aacf3 Merge branch 'next' into pt/wiz_layouts 2012-10-09 19:56:04 +02:00
PT_Dreamer
4b5c88589c GCS-Config wizard 
Made the wizard set stab1,2,3 as default flight modes for multis
 2012-10-09 00:16:22 +01:00
Fredrik Arvidsson
c03ac35780 Added functionality for skipping autoupdate page if no firmware is available in resource bundle. 2012-10-07 21:49:07 +02:00
PT_Dreamer
4ef8b78ff8 GCS-Made autouploader fetch fw from fw bundle 
Fw bundle is built with "make package_resource".
This target is a dependency of the package target but needs testing
on the different systems.
If the bundle is not present the build will not fail and
the wizard will jump the autoupdate page (not working FIXME)
 2012-10-06 23:24:21 +01:00
PT_Dreamer
5d24bc55a6 GCS-Created wizard firmware autoupdate page 2012-10-06 01:42:33 +01:00
PT_Dreamer
d9afd58ee2 GCS-Added layouts to new wiz 2012-10-04 15:37:16 +01:00
Fredrik Arvidsson
a47687cff8 OP-39 Added correct dependencies to SetupWizard plugin specification. 
Renamed FlashPage to FlashDance, eeh, no SavePage :)
Removed unnecessary dependency in setupwizard.pro
Fixed a bug with the Next button on the first page.
Fixed a bug with the cancel button on the last page.
 2012-10-02 23:17:56 +02:00
Fredrik Arvidsson
13f10949e8 OP-39 Removed an unnecessary struct declaration. Changed some texts. Removed some empty lines. 2012-10-01 21:50:00 +02:00
Fredrik Arvidsson
eed564a3c4 OP-39 Adding label to indicate when leveling is done in a more clear way. 2012-09-30 14:41:58 +02:00
Fredrik Arvidsson
19875fb70b OP-39 Fixed controller identification bug. Now using telemetry manager to receive notifications about connect/disconnect. 
Changed text on last page in wizard.
 2012-09-30 13:35:35 +02:00
Fredrik Arvidsson
fdec9ce149 OP-39 Fixed a lot of textual stuff. 
Changed layout on some pages to make room for longer texts.
Changed default neutral value for output from 1080 to 1000.
Renamed 'Hexacopter H' to 'Hexacopter X'
 2012-09-29 11:47:16 +02:00
Fredrik Arvidsson
e7e95412e8 OP-39 Fixed Wizard Style so that it looks ok on Mac and Windows 
Changed the output calibration part of the wizard so that it is a part of the wizard flow instead of a separate flow inside one page.
 2012-09-26 00:42:17 +02:00
Fredrik Arvidsson
3ef26a633a OP-39 Moved reboot page to directly after Rx config page. 
Added partial save to support changed hardware settings.
Made it possible to skip leveling procedure.
Changed some texts.
Changed isRebootRequired() criteria.
 2012-09-23 21:58:37 +02:00
Fredrik Arvidsson
5ecf04fb15 OP-39 Restricting connection device to USB when using the wizard. Changed text accordingly. 2012-09-23 14:11:32 +02:00
Fredrik Arvidsson
6eaa2daab1 OP-39 Fixed some layout issues on the output calibration page. 2012-09-22 11:21:12 +02:00
Kevin Vertucio
98db6469f9 copy/content revisions and corrections 
Fixed some corrections missed in SetupWizard

Signed-off-by: Kevin Vertucio <kevin.vertucio@eurorscg.com>
 2012-09-21 07:52:24 -04:00
Kevin Vertucio
7797a99bb1 copy/content revisions and corrections. 
More corrections in SetupWizard plugin

Signed-off-by: Kevin Vertucio <kevin.vertucio@eurorscg.com>
 2012-09-20 21:34:14 -04:00
Fredrik Arvidsson
607497758f OP-39 Changed to one single wizard button on the welcome page. KISS :) 2012-09-20 23:08:09 +02:00
Kevin Vertucio
8f8dd12615 copy revisions and corrections in SetupWizard plugin 
Signed-off-by: Kevin Vertucio <kevin.vertucio@eurorscg.com>
 2012-09-19 10:14:59 -04:00
Fredrik Arvidsson
57169ceeb2 OP-39 Fixed a bug when changing receiver type in wizard. The channel group type was not correctly set in manual control settings. 
Added support in code for all known DSM types (2/X10Bit/X11Bit). Still have to add/create GUI/Icons to enable selection of specific protocol.
Renamed some enums to have better and more correct names.
 2012-09-17 21:40:42 +02:00
Fredrik Arvidsson
30c1523b80 OP-39 Fixed a bug causing output rate for channel 2 and max channel rate for channel 0 to be wrong when configuring a hexacopter. 2012-09-17 20:00:26 +02:00
David Ankers
633286ab73 Grammar change: accidently added and extra extra word. Drifter credit 2012-09-17 22:30:01 +10:00
David Ankers
715aa6543b Fixed a couple of more spelling mistakes spotted by Drifter (Thanks!) 2012-09-17 22:26:21 +10:00
Fredrik Arvidsson
806097fd56 OP-39 Added reboot page to wizard. User needing to reboot should NOT forget it now. 
Added code to invoke Vehicle Setup Wizard and Radio Wizard from Welcome page.
 2012-09-16 23:03:15 +02:00
Fredrik Arvidsson
098c0d43fd OP-39 Hopefully fixed the servo calibration neutral value issue. 2012-09-16 16:21:51 +02:00
Fredrik Arvidsson
bd3d3708eb Merge branch 'next' into thread/OP-39 
Conflicts:
	ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
	ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.cpp
	ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.h
	ground/openpilotgcs/src/plugins/pfdqml/pfdqmlgadget.h
	ground/openpilotgcs/src/plugins/plugins.pro
	ground/openpilotgcs/src/plugins/setupwizard/pages/controllerpage.cpp
	ground/openpilotgcs/src/plugins/setupwizard/pages/controllerpage.h
	ground/openpilotgcs/src/plugins/setupwizard/pages/controllerpage.ui
	ground/openpilotgcs/src/plugins/setupwizard/pages/endpage.cpp
	ground/openpilotgcs/src/plugins/setupwizard/pages/endpage.ui
	ground/openpilotgcs/src/plugins/setupwizard/pages/multipage.cpp
	ground/openpilotgcs/src/plugins/setupwizard/pages/multipage.h
	ground/openpilotgcs/src/plugins/setupwizard/pages/multipage.ui
	ground/openpilotgcs/src/plugins/setupwizard/pages/startpage.ui
	ground/openpilotgcs/src/plugins/setupwizard/pages/vehiclepage.ui
	ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp
	ground/openpilotgcs/src/plugins/setupwizard/setupwizard.h
	ground/openpilotgcs/src/plugins/setupwizard/setupwizard.pro
	ground/openpilotgcs/src/plugins/setupwizard/wizardResources.qrc
 2012-09-16 15:14:47 +02:00
Fredrik Arvidsson
e3b5727dc1 OP-39 Fixed some layout stuff. 2012-09-15 11:06:19 +02:00