1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-10 20:52:11 +01:00

305 Commits

Author SHA1 Message Date
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