added propeller icon

Author: dakejahl

qgcimages.qrc

@@ -130,6 +130,7 @@
         <file alias="MAVLinkInspector.svg">src/AnalyzeView/MAVLinkInspector.svg</file>
         <file alias="Megaphone.svg">src/UI/toolbar/Images/Megaphone.svg</file>
         <file alias="MotorComponentIcon.svg">src/AutoPilotPlugins/Common/Images/MotorComponentIcon.svg</file>
+        <file alias="PropellerComponentIcon.svg">src/AutoPilotPlugins/Common/Images/PropellerComponentIcon.svg</file>
         <file alias="no-logging-light.svg">src/AutoPilotPlugins/PX4/Images/no-logging-light.svg</file>
         <file alias="no-logging.svg">src/AutoPilotPlugins/PX4/Images/no-logging.svg</file>
         <file alias="ObjectAvoidance.svg">src/AutoPilotPlugins/PX4/Images/ObjectAvoidance.svg</file>

src/AutoPilotPlugins/Common/Images/PropellerComponentIcon.svg

@@ -106,11 +106,11 @@ Item {
             width:              height
             anchors.top:        parent.top
             anchors.bottom:     parent.bottom
-            source:             "/qmlimages/MotorComponentIcon.svg"
+            source:             "/qmlimages/PropellerComponentIcon.svg"
             fillMode:           Image.PreserveAspectFit
             sourceSize.height:  height
             opacity:            (_activeVehicle && _escDataAvailable) ? 1 : 0.5
-            color:              getEscStatusColor()
+            color:              qgcPal.buttonText
         }
 
         Column {
@@ -127,7 +127,7 @@ Item {
             }
 
             QGCLabel {
-                color:          qgcPal.buttonText
+                color:          getEscStatusColor()
                 text:           _escHealthy ? qsTr("OK") : qsTr("ERR")
                 font.pointSize: ScreenTools.smallFontPointSize
             }

src/QmlControls/EscIndicator.qml

@@ -230,18 +230,25 @@ ToolIndicatorPage {
                                 spacing: ScreenTools.defaultFontPixelHeight * 0.1
                                 Layout.bottomMargin: index < Math.min(4, _allMotors.length) - 1 ? ScreenTools.defaultFontPixelHeight * 0.5 : 0
 
-                                QGCLabel {
-                                    text: qsTr("Motor %1").arg(_allMotors[index].id)
-                                    color: qgcPal.text
-                                }
+                                RowLayout {
 
-                                Rectangle {
-                                    Layout.fillWidth: true
-                                    height: ScreenTools.defaultFontPixelHeight * 0.15
-                                    color: _allMotors[index].healthy ? qgcPal.colorGreen : qgcPal.colorRed
-                                    radius: 2
+                                    QGCLabel {
+                                        text: qsTr("Motor %1").arg(_allMotors[index].id)
+                                        color: qgcPal.text
+                                    }
+                                    QGCLabel {
+                                        text: _allMotors[index].healthy ? qsTr("ONLINE") : qsTr("OFFLINE")
+                                        color: _allMotors[index].healthy ? qgcPal.colorGreen : qgcPal.colorRed
+                                    }
                                 }
 
+                                // Rectangle {
+                                //     Layout.fillWidth: true
+                                //     height: ScreenTools.defaultFontPixelHeight * 0.15
+                                //     color: _allMotors[index].healthy ? qgcPal.colorGreen : qgcPal.colorRed
+                                //     radius: 2
+                                // }
+
                                 GridLayout {
                                     Layout.fillWidth: true
                                     columns: 2
@@ -358,7 +365,7 @@ ToolIndicatorPage {
                 visible: !_escDataAvailable
 
                 QGCLabel {
-                    text: qsTr("No ESC data available. ESC status information will be displayed here when the vehicle sends ESC_INFO and ESC_STATUS MAVLink messages.")
+                    text: qsTr("No ESC data available. Requires ESC_INFO and ESC_STATUS MAVLink messages.")
                     wrapMode: Text.WordWrap
                     Layout.fillWidth: true
                 }