zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Fixed RC mapping check

QGC4.4
Lorenz Meier 12 years ago
parent
1f76bbed9e
commit
4d5aa0df22
7 changed files with 716 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      files/images/px4/rc/cessna_back.png
  2. BIN
      files/images/px4/rc/cessna_side.png
  3. 674
      files/images/px4/rc/rc_backgrounds.graffle
  4. 2
      qgroundcontrol.qrc
  5. 34
      src/ui/QGCPX4VehicleConfig.cc
  6. 13
      src/ui/QGCPX4VehicleConfig.h
  7. 17
      src/ui/QGCPX4VehicleConfig.ui

BIN
files/images/px4/rc/cessna_back.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 131 KiB

BIN
files/images/px4/rc/cessna_side.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 73 KiB

674
files/images/px4/rc/rc_backgrounds.graffle
Unescape View File

@ -0,0 +1,674 @@ @@ -0,0 +1,674 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>ActiveLayerIndex</key>
<integer>0</integer>
<key>ApplicationVersion</key>
<array>
<string>com.omnigroup.OmniGraffle</string>
<string>139.18.0.187838</string>
</array>
<key>AutoAdjust</key>
<true/>
<key>BackgroundGraphic</key>
<dict>
<key>Bounds</key>
<string>{{0, 0}, {559.28001499176025, 782.8900146484375}}</string>
<key>Class</key>
<string>SolidGraphic</string>
<key>ID</key>
<integer>2</integer>
<key>Style</key>
<dict>
<key>shadow</key>
<dict>
<key>Draws</key>
<string>NO</string>
</dict>
<key>stroke</key>
<dict>
<key>Draws</key>
<string>NO</string>
</dict>
</dict>
</dict>
<key>BaseZoom</key>
<integer>0</integer>
<key>CanvasOrigin</key>
<string>{0, 0}</string>
<key>ColumnAlign</key>
<integer>1</integer>
<key>ColumnSpacing</key>
<real>36</real>
<key>CreationDate</key>
<string>2013-08-23 20:20:16 +0000</string>
<key>Creator</key>
<string>Lorenz</string>
<key>DisplayScale</key>
<string>1 0/72 in = 1 0/72 in</string>
<key>GraphDocumentVersion</key>
<integer>8</integer>
<key>GraphicsList</key>
<array>
<dict>
<key>Bounds</key>
<string>{{188.3818359375, 271.5}, {29, 16}}</string>
<key>Class</key>
<string>ShapedGraphic</string>
<key>FitText</key>
<string>YES</string>
<key>Flow</key>
<string>Resize</string>
<key>FontInfo</key>
<dict>
<key>Color</key>
<dict>
<key>b</key>
<string>0.379293</string>
<key>g</key>
<string>0.379287</string>
<key>r</key>
<string>0.379298</string>
</dict>
<key>Font</key>
<string>Helvetica-Bold</string>
<key>Size</key>
<real>13</real>
</dict>
<key>ID</key>
<integer>38</integer>
<key>Shape</key>
<string>Rectangle</string>
<key>Style</key>
<dict>
<key>fill</key>
<dict>
<key>Draws</key>
<string>NO</string>
</dict>
<key>shadow</key>
<dict>
<key>Draws</key>
<string>NO</string>
</dict>
<key>stroke</key>
<dict>
<key>Draws</key>
<string>NO</string>
</dict>
</dict>
<key>Text</key>
<dict>
<key>Pad</key>
<integer>0</integer>
<key>RTFD</key>
<data>
BAtzdHJlYW10eXBlZIHoA4QBQISEhBJOU0F0dHJpYnV0
ZWRTdHJpbmcAhIQITlNPYmplY3QAhZKEhIQITlNTdHJp
bmcBlIQBKwVyaWdodIaEAmlJAQWShISEDE5TRGljdGlv
bmFyeQCUhAFpA5KElpYHTlNDb2xvcoaShISEB05TQ29s
b3IAlIQBYwKEBGZmZmaD6ujoPoPq6Og+g+ro6D4BhpKE
lpYQTlNQYXJhZ3JhcGhTdHlsZYaShISEEE5TUGFyYWdy
YXBoU3R5bGUAlIQEQ0NAUwIAhISEB05TQXJyYXkAlJkM
koSEhAlOU1RleHRUYWIAlIQCQ2YAHIaShKKhADiGkoSi
oQBUhpKEoqEAcIaShKKhAIGMAIaShKKhAIGoAIaShKKh
AIHEAIaShKKhAIHgAIaShKKhAIH8AIaShKKhAIEYAYaS
hKKhAIE0AYaShKKhAIFQAYaGgQAIhARbMWZdg83MTD2G
koSWlgZOU0ZvbnSGkoSEhAZOU0ZvbnQelJkohAVbNDBj
XQYAAAAeAAAA//5IAGUAbAB2AGUAdABpAGMAYQAtAEIA
bwBsAGQAAACEAWYNmwCbAZsAmwCGhoY=
</data>
<key>Text</key>
<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf390
\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
{\colortbl;\red255\green255\blue255;\red97\green97\blue97;}
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
\f0\b\fs26 \cf2 right}</string>
<key>VerticalPad</key>
<integer>0</integer>
</dict>
<key>Wrap</key>
<string>NO</string>
</dict>
<dict>
<key>Bounds</key>
<string>{{153, 271.5}, {20, 16}}</string>
<key>Class</key>
<string>ShapedGraphic</string>
<key>FitText</key>
<string>YES</string>
<key>Flow</key>
<string>Resize</string>
<key>FontInfo</key>
<dict>
<key>Color</key>
<dict>
<key>b</key>
<string>0.379293</string>
<key>g</key>
<string>0.379287</string>
<key>r</key>
<string>0.379298</string>
</dict>
<key>Font</key>
<string>Helvetica-Bold</string>
<key>Size</key>
<real>13</real>
</dict>
<key>ID</key>
<integer>36</integer>
<key>Shape</key>
<string>Rectangle</string>
<key>Style</key>
<dict>
<key>fill</key>
<dict>
<key>Draws</key>
<string>NO</string>
</dict>
<key>shadow</key>
<dict>
<key>Draws</key>
<string>NO</string>
</dict>
<key>stroke</key>
<dict>
<key>Draws</key>
<string>NO</string>
</dict>
</dict>
<key>Text</key>
<dict>
<key>Pad</key>
<integer>0</integer>
<key>RTFD</key>
<data>
BAtzdHJlYW10eXBlZIHoA4QBQISEhBJOU0F0dHJpYnV0
ZWRTdHJpbmcAhIQITlNPYmplY3QAhZKEhIQITlNTdHJp
bmcBlIQBKwRsZWZ0hoQCaUkBBJKEhIQMTlNEaWN0aW9u
YXJ5AJSEAWkEkoSWlg5OU09yaWdpbmFsRm9udIaShISE
Bk5TRm9udB6UmRyEBVsyOGNdBgAAABQAAAD//kgAZQBs
AHYAZQB0AGkAYwBhAIQBZgyEAWMAnQGdAJ0AhpKElpYQ
TlNQYXJhZ3JhcGhTdHlsZYaShISEF05TTXV0YWJsZVBh
cmFncmFwaFN0eWxlAISEEE5TUGFyYWdyYXBoU3R5bGUA
lIQEQ0NAUwIAhYEACIQEWzFmXYPNzEw9hpKElpYGTlNG
b250hpKEm5kohAVbNDBjXQYAAAAeAAAA//5IAGUAbAB2
AGUAdABpAGMAYQAtAEIAbwBsAGQAAACcDZ0AnQGdAJ0A
hpKElpYHTlNDb2xvcoaShISEB05TQ29sb3IAlJ0ChARm
ZmZmg+ro6D6D6ujoPoPq6Og+AYaGhg==
</data>
<key>Text</key>
<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf390
\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
{\colortbl;\red255\green255\blue255;\red97\green97\blue97;}
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
\f0\b\fs26 \cf2 left}</string>
<key>VerticalPad</key>
<integer>0</integer>
</dict>
<key>Wrap</key>
<string>NO</string>
</dict>
<dict>
<key>Bounds</key>
<string>{{124, 268}, {23, 23}}</string>
<key>Class</key>
<string>ShapedGraphic</string>
<key>ID</key>
<integer>35</integer>
<key>Rotation</key>
<real>180</real>
<key>Shape</key>
<string>HorizontalTriangle</string>
<key>Style</key>
<dict>
<key>fill</key>
<dict>
<key>Color</key>
<dict>
<key>b</key>
<string>0.380387</string>
<key>g</key>
<string>0.380387</string>
<key>r</key>
<string>0.380387</string>
</dict>
</dict>
<key>shadow</key>
<dict>
<key>Draws</key>
<string>NO</string>
</dict>
<key>stroke</key>
<dict>
<key>Draws</key>
<string>NO</string>
</dict>
</dict>
<key>Text</key>
<dict>
<key>VerticalPad</key>
<integer>0</integer>
</dict>
</dict>
<dict>
<key>Bounds</key>
<string>{{224, 268}, {23, 23}}</string>
<key>Class</key>
<string>ShapedGraphic</string>
<key>ID</key>
<integer>34</integer>
<key>Shape</key>
<string>HorizontalTriangle</string>
<key>Style</key>
<dict>
<key>fill</key>
<dict>
<key>Color</key>
<dict>
<key>b</key>
<string>0.380387</string>
<key>g</key>
<string>0.380387</string>
<key>r</key>
<string>0.380387</string>
</dict>
</dict>
<key>shadow</key>
<dict>
<key>Draws</key>
<string>NO</string>
</dict>
<key>stroke</key>
<dict>
<key>Draws</key>
<string>NO</string>
</dict>
</dict>
<key>Text</key>
<dict>
<key>VerticalPad</key>
<integer>0</integer>
</dict>
</dict>
<dict>
<key>Bounds</key>
<string>{{251.99999284744263, 106}, {23, 23}}</string>
<key>Class</key>
<string>ShapedGraphic</string>
<key>ID</key>
<integer>33</integer>
<key>Rotation</key>
<real>270</real>
<key>Shape</key>
<string>HorizontalTriangle</string>
<key>Style</key>
<dict>
<key>fill</key>
<dict>
<key>Color</key>
<dict>
<key>b</key>
<string>0.380387</string>
<key>g</key>
<string>0.380387</string>
<key>r</key>
<string>0.380387</string>
</dict>
</dict>
<key>shadow</key>
<dict>
<key>Draws</key>
<string>NO</string>
</dict>
<key>stroke</key>
<dict>
<key>Draws</key>
<string>NO</string>
</dict>
</dict>
<key>Text</key>
<dict>
<key>VerticalPad</key>
<integer>0</integer>
</dict>
</dict>
<dict>
<key>Bounds</key>
<string>{{167.80909729003906, 160}, {42.381816864013672, 42}}</string>
<key>Class</key>
<string>ShapedGraphic</string>
<key>ID</key>
<integer>32</integer>
<key>Shape</key>
<string>Circle</string>
<key>Style</key>
<dict>
<key>fill</key>
<dict>
<key>Color</key>
<dict>
<key>b</key>
<string>0.379293</string>
<key>g</key>
<string>0.379287</string>
<key>r</key>
<string>0.379298</string>
</dict>
</dict>
<key>shadow</key>
<dict>
<key>Draws</key>
<string>NO</string>
</dict>
<key>stroke</key>
<dict>
<key>Draws</key>
<string>NO</string>
</dict>
</dict>
<key>Text</key>
<dict>
<key>VerticalPad</key>
<integer>0</integer>
</dict>
</dict>
<dict>
<key>Bounds</key>
<string>{{252, 205}, {23, 23}}</string>
<key>Class</key>
<string>ShapedGraphic</string>
<key>ID</key>
<integer>13</integer>
<key>Rotation</key>
<real>90</real>
<key>Shape</key>
<string>HorizontalTriangle</string>
<key>Style</key>
<dict>
<key>fill</key>
<dict>
<key>Color</key>
<dict>
<key>b</key>
<string>0.380387</string>
<key>g</key>
<string>0.380387</string>
<key>r</key>
<string>0.380387</string>
</dict>
</dict>
<key>shadow</key>
<dict>
<key>Draws</key>
<string>NO</string>
</dict>
<key>stroke</key>
<dict>
<key>Draws</key>
<string>NO</string>
</dict>
</dict>
<key>Text</key>
<dict>
<key>VerticalPad</key>
<integer>0</integer>
</dict>
</dict>
<dict>
<key>Bounds</key>
<string>{{171.5, 147.5}, {128, 23}}</string>
<key>Class</key>
<string>ShapedGraphic</string>
<key>ID</key>
<integer>30</integer>
<key>Rotation</key>
<real>90</real>
<key>Shape</key>
<string>Rectangle</string>
<key>Style</key>
<dict>
<key>fill</key>
<dict>
<key>Color</key>
<dict>
<key>b</key>
<string>0.409312</string>
<key>g</key>
<string>0.828576</string>
<key>r</key>
<string>0.468975</string>
</dict>
</dict>
<key>shadow</key>
<dict>
<key>Draws</key>
<string>NO</string>
</dict>
</dict>
</dict>
<dict>
<key>Bounds</key>
<string>{{119, 237}, {128, 23}}</string>
<key>Class</key>
<string>ShapedGraphic</string>
<key>ID</key>
<integer>29</integer>
<key>Shape</key>
<string>Rectangle</string>
<key>Style</key>
<dict>
<key>fill</key>
<dict>
<key>Color</key>
<dict>
<key>b</key>
<string>0.409312</string>
<key>g</key>
<string>0.828576</string>
<key>r</key>
<string>0.468975</string>
</dict>
</dict>
<key>shadow</key>
<dict>
<key>Draws</key>
<string>NO</string>
</dict>
</dict>
</dict>
<dict>
<key>Bounds</key>
<string>{{78, 71}, {222, 220}}</string>
<key>Class</key>
<string>ShapedGraphic</string>
<key>ID</key>
<integer>28</integer>
<key>Shape</key>
<string>Circle</string>
<key>Style</key>
<dict>
<key>fill</key>
<dict>
<key>Color</key>
<dict>
<key>b</key>
<string>0.877468</string>
<key>g</key>
<string>0.877468</string>
<key>r</key>
<string>0.877468</string>
</dict>
</dict>
<key>shadow</key>
<dict>
<key>Draws</key>
<string>NO</string>
</dict>
<key>stroke</key>
<dict>
<key>Draws</key>
<string>NO</string>
</dict>
</dict>
<key>Text</key>
<dict>
<key>VerticalPad</key>
<integer>0</integer>
</dict>
</dict>
</array>
<key>GridInfo</key>
<dict/>
<key>GuidesLocked</key>
<string>NO</string>
<key>GuidesVisible</key>
<string>YES</string>
<key>HPages</key>
<integer>1</integer>
<key>ImageCounter</key>
<integer>1</integer>
<key>KeepToScale</key>
<false/>
<key>Layers</key>
<array>
<dict>
<key>Lock</key>
<string>NO</string>
<key>Name</key>
<string>Ebene 1</string>
<key>Print</key>
<string>YES</string>
<key>View</key>
<string>YES</string>
</dict>
</array>
<key>LayoutInfo</key>
<dict>
<key>Animate</key>
<string>NO</string>
<key>circoMinDist</key>
<real>18</real>
<key>circoSeparation</key>
<real>0.0</real>
<key>layoutEngine</key>
<string>dot</string>
<key>neatoSeparation</key>
<real>0.0</real>
<key>twopiSeparation</key>
<real>0.0</real>
</dict>
<key>LinksVisible</key>
<string>NO</string>
<key>MagnetsVisible</key>
<string>NO</string>
<key>MasterSheets</key>
<array/>
<key>ModificationDate</key>
<string>2013-08-26 18:20:11 +0000</string>
<key>Modifier</key>
<string>Lorenz</string>
<key>NotesVisible</key>
<string>NO</string>
<key>Orientation</key>
<integer>2</integer>
<key>OriginVisible</key>
<string>NO</string>
<key>PageBreaks</key>
<string>YES</string>
<key>PrintInfo</key>
<dict>
<key>NSBottomMargin</key>
<array>
<string>float</string>
<string>41</string>
</array>
<key>NSHorizonalPagination</key>
<array>
<string>coded</string>
<string>BAtzdHJlYW10eXBlZIHoA4QBQISEhAhOU051bWJlcgCEhAdOU1ZhbHVlAISECE5TT2JqZWN0AIWEASqEhAFxlwCG</string>
</array>
<key>NSLeftMargin</key>
<array>
<string>float</string>
<string>18</string>
</array>
<key>NSPaperSize</key>
<array>
<string>size</string>
<string>{595.28001499176025, 841.8900146484375}</string>
</array>
<key>NSPrintReverseOrientation</key>
<array>
<string>int</string>
<string>0</string>
</array>
<key>NSRightMargin</key>
<array>
<string>float</string>
<string>18</string>
</array>
<key>NSTopMargin</key>
<array>
<string>float</string>
<string>18</string>
</array>
</dict>
<key>PrintOnePage</key>
<false/>
<key>ReadOnly</key>
<string>NO</string>
<key>RowAlign</key>
<integer>1</integer>
<key>RowSpacing</key>
<real>36</real>
<key>SheetTitle</key>
<string>Arbeitsfläche 1</string>
<key>SmartAlignmentGuidesActive</key>
<string>YES</string>
<key>SmartDistanceGuidesActive</key>
<string>YES</string>
<key>UniqueID</key>
<integer>1</integer>
<key>UseEntirePage</key>
<false/>
<key>VPages</key>
<integer>1</integer>
<key>WindowInfo</key>
<dict>
<key>CurrentSheet</key>
<integer>0</integer>
<key>ExpandedCanvases</key>
<array/>
<key>Frame</key>
<string>{{76, 4}, {918, 774}}</string>
<key>ListView</key>
<true/>
<key>OutlineWidth</key>
<integer>142</integer>
<key>RightSidebar</key>
<false/>
<key>ShowRuler</key>
<true/>
<key>Sidebar</key>
<true/>
<key>SidebarWidth</key>
<integer>120</integer>
<key>VisibleRegion</key>
<string>{{-112, 0}, {783, 635}}</string>
<key>Zoom</key>
<real>1</real>
<key>ZoomValues</key>
<array>
<array>
<string>Arbeitsfläche 1</string>
<real>1</real>
<real>1</real>
</array>
</array>
</dict>
</dict>
</plist>

2
qgroundcontrol.qrc
Unescape View File

@ -180,6 +180,8 @@ @@ -180,6 +180,8 @@
<file>files/images/px4/menu/plane.png</file>
<file>files/images/px4/menu/remote.png</file>
<file>files/images/px4/menu/cogwheels.png</file>
<file>files/images/px4/rc/cessna_back.png</file>
<file>files/images/px4/rc/cessna_side.png</file>
</qresource>
<qresource prefix="/general">
<file alias="vera.ttf">files/styles/Vera.ttf</file>

34
src/ui/QGCPX4VehicleConfig.cc
Unescape View File

@ -60,6 +60,8 @@ QGCPX4VehicleConfig::QGCPX4VehicleConfig(QWidget *parent) : @@ -60,6 +60,8 @@ QGCPX4VehicleConfig::QGCPX4VehicleConfig(QWidget *parent) :
#ifdef QUPGRADE_SUPPORT
firmwareDialog(NULL),
#endif
planeBack(":/files/images/px4/rc/cessna_back.png"),
planeSide(":/files/images/px4/rc/cessna_side.png"),
ui(new Ui::QGCPX4VehicleConfig)
{
doneLoadingConfig = false;
@ -142,6 +144,15 @@ QGCPX4VehicleConfig::QGCPX4VehicleConfig(QWidget *parent) : @@ -142,6 +144,15 @@ QGCPX4VehicleConfig::QGCPX4VehicleConfig(QWidget *parent) :
connect(ui->advancedCheckBox, SIGNAL(clicked(bool)), ui->advancedGroupBox, SLOT(setVisible(bool)));
ui->advancedGroupBox->setVisible(false);
connect(ui->advancedCheckBox, SIGNAL(clicked(bool)), ui->graphicsView, SLOT(setHidden(bool)));
ui->graphicsView->setScene(&scene);
scene.addPixmap(planeBack);
scene.addPixmap(planeSide);
// XXX hide while WIP
ui->graphicsView->hide();
ui->rcCalibrationButton->setCheckable(true);
connect(ui->rcCalibrationButton, SIGNAL(clicked(bool)), this, SLOT(toggleCalibrationRC(bool)));
@ -209,6 +220,7 @@ QGCPX4VehicleConfig::QGCPX4VehicleConfig(QWidget *parent) : @@ -209,6 +220,7 @@ QGCPX4VehicleConfig::QGCPX4VehicleConfig(QWidget *parent) :
rcMappedMin[i] = 1000;
rcMappedMax[i] = 2000;
rcMappedValue[i] = UINT16_MAX;
rcMappedValueRev[i] = UINT16_MAX;
rcMappedNormalizedValue[i] = 0.0f;
}
@ -217,6 +229,7 @@ QGCPX4VehicleConfig::QGCPX4VehicleConfig(QWidget *parent) : @@ -217,6 +229,7 @@ QGCPX4VehicleConfig::QGCPX4VehicleConfig(QWidget *parent) :
rcMappedMin[i] = 1000;
rcMappedMax[i] = 2000;
rcMappedValue[i] = UINT16_MAX;
rcMappedValueRev[i] = UINT16_MAX;
rcMappedNormalizedValue[i] = 0.0f;
}
@ -1184,13 +1197,12 @@ void QGCPX4VehicleConfig::remoteControlChannelRawChanged(int chan, float fval) @@ -1184,13 +1197,12 @@ void QGCPX4VehicleConfig::remoteControlChannelRawChanged(int chan, float fval)
}
// Raw value
float mappedVal = rcMappedValue[rcToFunctionMapping[chan]];
float deltaRaw = fabsf(fval - rcValue[chan]);
float delta = fabsf(fval - mappedVal);
float delta = fabsf(fval - rcMappedValue[rcToFunctionMapping[chan]]);
if (!configEnabled && !calibrationEnabled &&
(deltaRaw < 12.0f && delta < 12.0f && rcValue[chan] > 800 && rcValue[chan] < 2200))
{
//ignore tiny jitter values
// ignore tiny jitter values
return;
}
else {
@ -1281,17 +1293,13 @@ void QGCPX4VehicleConfig::remoteControlChannelRawChanged(int chan, float fval) @@ -1281,17 +1293,13 @@ void QGCPX4VehicleConfig::remoteControlChannelRawChanged(int chan, float fval)
normalized = (rcRev[chan]) ? -1.0f*normalized : normalized;
// Find correct mapped channel
for (unsigned int i = 0; i < chanCount; i++) {
if (chan == rcMapping[i]) {
rcMappedValue[i] = (rcRev[chan]) ? rcMax[chan] - (fval - rcMin[chan]) : fval;
rcMappedValueRev[rcToFunctionMapping[chan]] = (rcRev[chan]) ? rcMax[chan] - (fval - rcMin[chan]) : fval;
rcMappedValue[rcToFunctionMapping[chan]] = fval;
// Copy min / max
rcMappedMin[i] = rcMin[chan];
rcMappedMax[i] = rcMax[chan];
rcMappedNormalizedValue[i] = normalized;
}
}
// Copy min / max
rcMappedMin[rcToFunctionMapping[chan]] = rcMin[chan];
rcMappedMax[rcToFunctionMapping[chan]] = rcMax[chan];
rcMappedNormalizedValue[rcToFunctionMapping[chan]] = normalized;
if (chan == rcMapping[0]) {
rcRoll = normalized;

13
src/ui/QGCPX4VehicleConfig.h
Unescape View File

@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
#include <QPushButton>
#include <QStringList>
#include <QMessageBox>
#include <QGraphicsScene>
#include "QGCToolWidget.h"
#include "UASInterface.h"
@ -285,10 +286,11 @@ protected: @@ -285,10 +286,11 @@ protected:
float rcScaling[chanMax]; ///< Scaling of channel input to control commands
bool rcRev[chanMax]; ///< Channel reverse
int rcValue[chanMax]; ///< Last values, RAW
float rcValueReversed[chanMax]; ///< Last values, accounted for reverse
float rcMappedMin[chanMappedMax]; ///< Mapped channels in default order
float rcMappedMax[chanMappedMax]; ///< Mapped channels in default order
float rcMappedValue[chanMappedMax]; ///< Mapped channels in default order
int rcValueReversed[chanMax]; ///< Last values, accounted for reverse
int rcMappedMin[chanMappedMax]; ///< Mapped channels in default order
int rcMappedMax[chanMappedMax]; ///< Mapped channels in default order
int rcMappedValue[chanMappedMax]; ///< Mapped channels in default order
int rcMappedValueRev[chanMappedMax];
float rcMappedNormalizedValue[chanMappedMax]; ///< Mapped channels in default order
int channelWanted; ///< During channel assignment search the requested default index
int channelReverseStateWanted;
@ -323,8 +325,11 @@ protected: @@ -323,8 +325,11 @@ protected:
QGCPX4AirframeConfig* px4AirframeConfig;
DialogBare* firmwareDialog;
QPixmap planeBack;
QPixmap planeSide;
QGCPX4SensorCalibration* px4SensorCalibration;
QMessageBox msgBox;
QGraphicsScene scene;
QPushButton* skipActionButton;
private:

17
src/ui/QGCPX4VehicleConfig.ui
Unescape View File

@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@
<item>
<widget class="QStackedWidget" name="stackedWidget">
<property name="currentIndex">
<number>0</number>
<number>1</number>
</property>
<widget class="QWidget" name="firmwareTab">
<layout class="QVBoxLayout" name="firmwareLayout"/>
@ -206,6 +206,9 @@ @@ -206,6 +206,9 @@
</widget>
</item>
<item>
<widget class="QGraphicsView" name="graphicsView"/>
</item>
<item>
<widget class="QGroupBox" name="advancedGroupBox">
<property name="title">
<string>Stick to Channel Mapping and Reverse</string>
@ -819,8 +822,8 @@ @@ -819,8 +822,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>98</width>
<height>28</height>
<width>21</width>
<height>16</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_4">
@ -856,8 +859,8 @@ @@ -856,8 +859,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>98</width>
<height>28</height>
<width>21</width>
<height>16</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_5">
@ -907,8 +910,8 @@ @@ -907,8 +910,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>98</width>
<height>28</height>
<width>16</width>
<height>16</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_7">

Write Preview
Loading…
Cancel
Save