Merge pull request #5442 from tonhuisman/bugfix/MQTT-state-class-selection

[Bugfix] MQTT StateClass selector stored wrong index

Author: TD-er

src/_P003_Pulse.ino

@@ -68,6 +68,7 @@ boolean Plugin_003(uint8_t function, struct EventStruct *event, String& string)
       dev.PluginStats      = true;
       dev.TaskLogsOwnPeaks = true;
       dev.CustomVTypeVar   = true;
+      dev.MqttStateClass   = true;
       break;
     }
 

src/src/Helpers/_CPlugin_Helper_mqtt.cpp

@@ -471,9 +471,9 @@ const __FlashStringHelper* MQTT_sensor_StateClass(uint8_t index,
   switch (index) {
     case 0: return F("");
     case 1: return display ? F("Measurement") : F("measurement");
-    case 2: return display ? F("Total") : F("total");
-    case 3: return display ? F("Total-increasing") : F("total_increasing");
-    case 4: return display ? F("Measurement-angle") : F("measurement_angle");
+    case 2: return display ? F("Measurement-angle") : F("measurement_angle");
+    case 3: return display ? F("Total") : F("total");
+    case 4: return display ? F("Total-increasing") : F("total_increasing");
   }
   return F("");
 }

src/src/WebServer/DevicesPage.cpp

@@ -1838,9 +1838,9 @@ void devicePage_show_task_values(taskIndex_t taskIndex, deviceIndex_t DeviceInde
     const __FlashStringHelper *stateClasses[] = {
       MQTT_sensor_StateClass(0),
       MQTT_sensor_StateClass(1),
-      MQTT_sensor_StateClass(4),
       MQTT_sensor_StateClass(2),
       MQTT_sensor_StateClass(3),
+      MQTT_sensor_StateClass(4),
     };
     constexpr size_t stateCount = NR_ELEMENTS(stateClasses);
     #endif // if FEATURE_MQTT_STATE_CLASS