bugfixes, ready to build

dimazdoks · Jul 22, 2024 · 7364805 · 7364805
1 parent 3424694
commit 7364805
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 8 deletions.
diff --git a/qgcimages.qrc b/qgcimages.qrc
@@ -103,7 +103,7 @@
         <file alias="Joystick.png">src/ui/toolbar/Images/Joystick.png</file>
         <file alias="SimpleLight.png">src/ui/toolbar/Images/SimpleLight.png</file>
         <file alias="NightLight.png">src/ui/toolbar/Images/NightLight.png</file>
-        <file alias="Reb.png">src/ui/toolbar/Images/REB_Logo.png</file>
+        <file alias="Reb.png">src/ui/toolbar/Images/Reb.png</file>
         <file alias="SimpleDot.png">src/ui/toolbar/Images/SimpleDot.png</file>
         <file alias="LandMode.svg">src/AutoPilotPlugins/PX4/Images/LandMode.svg</file>
         <file alias="LandModeCopter.svg">src/AutoPilotPlugins/PX4/Images/LandModeCopter.svg</file>

diff --git a/qgroundcontrol.qrc b/qgroundcontrol.qrc
@@ -10,6 +10,8 @@
         <file alias="JoystickIndicator.qml">src/ui/toolbar/JoystickIndicator.qml</file>
 		<file alias="DayLightActions.qml">src/ui/toolbar/DayLightActions.qml</file>
 		<file alias="NightLightActions.qml">src/ui/toolbar/NightLightActions.qml</file>
+        <file alias="RebActions.qml">src/ui/toolbar/RebActions.qml</file>
+		<file alias="UniversalActions.qml">src/ui/toolbar/UniversalActions.qml</file>
         <file alias="LinkIndicator.qml">src/ui/toolbar/LinkIndicator.qml</file>
         <file alias="MainToolBarIndicators.qml">src/ui/toolbar/MainToolBarIndicators.qml</file>
         <file alias="MessageIndicator.qml">src/ui/toolbar/MessageIndicator.qml</file>

diff --git a/src/FirmwarePlugin/FirmwarePlugin.cc b/src/FirmwarePlugin/FirmwarePlugin.cc
@@ -336,6 +336,8 @@ const QVariantList& FirmwarePlugin::toolIndicators(const Vehicle*)
             QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/RemoteIDIndicator.qml")),
             QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/DayLightActions.qml")),
             QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/NightLightActions.qml")),
+            QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/RebActions.qml")),
+            QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/UniversalActions.qml")),
         });
     }
     return _toolIndicatorList;

diff --git a/src/FlightDisplay/GuidedActionsController.qml b/src/FlightDisplay/GuidedActionsController.qml
@@ -632,7 +632,7 @@ Item {
         case actionReb:
              _activeVehicle.setRebEnabled(actionData)
              break
-        case actionReb:
+        case actionUniversal:
              _activeVehicle.setUniversalEnabled(actionData)
              break
         default:

diff --git a/src/Servo/ServoControl.h b/src/Servo/ServoControl.h
@@ -31,8 +31,13 @@ Q_OBJECT
 
     void dayLightEnable(int);
     void dayLightDisable(int);
+    void nightLightEnable(int);
+    void nightLightDisable(int);
     void rebEnable(int);
+    void rebDisable(int);
+    void universalEnable(int);
     void universalDisable(int);
+
 private:
     Vehicle* _vehicle;
 };

diff --git a/src/Vehicle/VehicleServoFactGroup.cc b/src/Vehicle/VehicleServoFactGroup.cc
@@ -22,18 +22,20 @@
 
 const char* VehicleServoFactGroup::_dayLightFactName   = "dayLight";
 const char* VehicleServoFactGroup::_nightLightFactName = "nightLight";
+const char* VehicleServoFactGroup::_rebFactName = "reb contol";
+const char* VehicleServoFactGroup::_universalFactName = "universal control";
 
 VehicleServoFactGroup::VehicleServoFactGroup(QObject* parent)
     : FactGroup(1000, ":/json/Vehicle/ServoStatusFactGroup.json", parent)
     , _dayLightFact   (0, _dayLightFactName,   FactMetaData::valueTypeBool)
     , _nightLightFact (0, _nightLightFactName, FactMetaData::valueTypeBool)
-    , _rebFact (0, _nightLightFactName, FactMetaData::valueTypeBool)
-    , _universalFact (0, _nightLightFactName, FactMetaData::valueTypeBool)
+    , _rebFact (0, _rebFactName, FactMetaData::valueTypeBool)
+    , _universalFact (0, _universalFactName, FactMetaData::valueTypeBool)
 {
     _addFact(&_dayLightFact,   _dayLightFactName);
     _addFact(&_nightLightFact, _nightLightFactName);
-    _addFact(&_rebFact, _nightLightFactName);
-    _addFact(&_universaltFact, _nightLightFactName);
+    _addFact(&_rebFact, _rebFactName);
+    _addFact(&_universalFact, _universalFactName);
 
     // _dayLightFact.setRawValue(false);
     // _nightLightFact.setRawValue(false);
@@ -79,4 +81,4 @@ void VehicleServoFactGroup::_handleServoOutputRaw(mavlink_message_t& message)
     nightLight() -> setRawValue ((_rgChannelvalues[NIGHT_LIGHT_SERVO - 1] > PWM_VALUE) ? true : false);
     reb() -> setRawValue ((_rgChannelvalues[REB_SERVO - 1] > PWM_VALUE) ? true : false);
     universal() -> setRawValue ((_rgChannelvalues[UNIVERSAL_SERVO - 1] > PWM_VALUE) ? true : false);
-}
+}
diff --git a/src/ui/toolbar/Images/REB_Logo.png → src/ui/toolbar/Images/Reb.png b/src/ui/toolbar/Images/REB_Logo.png → src/ui/toolbar/Images/Reb.png
diff --git a/src/ui/toolbar/RebActions.qml b/src/ui/toolbar/RebActions.qml
@@ -37,7 +37,7 @@ Item {
             anchors.top:        parent.top
             anchors.bottom:     parent.bottom
             sourceSize.height:  height
-            source:             "/qmlimages/REB_Logo.png"
+            source:             "/qmlimages/Reb.png"
             fillMode:           Image.PreserveAspectFit
             color: {
                 if (_activeVehicle.servo.dayLight.value) {