Merge mega and fix merge conflict

letscontrolit · Dec 1, 2024 · c6bc9f9 · c6bc9f9
2 parents 8ff6c04 + 4131eb9
commit c6bc9f9
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 15 deletions.
diff --git a/docs/source/Plugin/P049.rst b/docs/source/Plugin/P049.rst
@@ -26,20 +26,29 @@ Used libraries: |P049_usedlibraries|
 Supported hardware
 ------------------
 
-|P049_usedby|
+.. ..|P049_usedby|
+
+MH-Z19B,
+MH-Z19C,
+MH-Z19D,
+MH-Z19E
 
 Sensor
 ^^^^^^
 
 See: :ref:`SerialHelper_page`
 
 
-**TODO**: Complete this documentation...
+Commands available
+^^^^^^^^^^^^^^^^^^
+
+.. include:: P049_commands.repl
 
-.. Commands available
-.. ^^^^^^^^^^^^^^^^^^
+Additional infos can be found here: https://emariete.com/en/sensor-co2-mh-z19b/
 
-.. .. include:: P049_commands.repl
+
+
+**TODO**: Complete this documentation...
 
 .. Events
 .. ~~~~~~

diff --git a/docs/source/Plugin/P049_commands.repl b/docs/source/Plugin/P049_commands.repl
@@ -0,0 +1,24 @@
+.. csv-table::
+        :header: "Command", "Explanation"
+        :widths: 20, 30
+
+        "
+        ``MHZCalibrateZero``
+
+        ``MHZReset``
+
+        ``MHZABCEnable``
+
+        ``MHZABCDisable``
+
+        ","
+        Sets the zero point of the sensor (in this case 400ppm)
+
+        Reset to factory defaults
+
+        Enables automatic baseline calibration 
+
+        Disables automatic baseline calibration
+        "
+
+
diff --git a/docs/source/Reference/Command.rst b/docs/source/Reference/Command.rst
@@ -423,10 +423,10 @@ P048 :ref:`P048_page`
 .. include:: ../Plugin/P048_commands.repl
 
 
-.. P049 :ref:`P049_page`
-.. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+P049 :ref:`P049_page`
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. .. include:: ../Plugin/P049_commands.repl
+.. include:: ../Plugin/P049_commands.repl
 
 
 .. P050 :ref:`P050_page`

diff --git a/src/_C002.cpp b/src/_C002.cpp
@@ -42,9 +42,9 @@ bool CPlugin_002(CPlugin::Function function, struct EventStruct *event, String&
       proto.usesExtCreds = true;
       proto.defaultPort  = 1883;
       proto.usesID       = true;
-      #if FEATURE_MQTT_TLS
-      proto.usesTLS      = true;
-      #endif
+      # if FEATURE_MQTT_TLS
+      proto.usesTLS = true;
+      # endif // if FEATURE_MQTT_TLS
       break;
     }
 
@@ -108,12 +108,12 @@ bool CPlugin_002(CPlugin::Function function, struct EventStruct *event, String&
               bool   mustSendEvent = false;
 
               switch (Settings.getPluginID_for_task(x).value) {
-                case 1:                                             // temp solution, if input switch, update state
+                case 1: // temp solution, if input switch, update state
                 {
-                  action = strformat(F("gpio,%u,%.2f"), x, nvalue); // FIXME tonhuisman: Was: InputSwitchState
+                  action = strformat(F("gpio,%d,%d"), Settings.TaskDevicePin1[x], static_cast<int>(nvalue));
                   break;
                 }
-                case 29:                                            // temp solution, if plugin 029, set gpio
+                case 29: // temp solution, if plugin 029, set gpio
                 {
                   if (switchtype.equalsIgnoreCase(F("dimmer")))
                   {

diff --git a/static/espeasy.js b/static/espeasy.js
@@ -43,6 +43,8 @@ var commonPlugins = [
   "NeoPixel", "NeoPixelAll", "NeoPixelLine", "NeoPixelHSV", "NeoPixelAllHSV", "NeoPixelLineHSV", "NeoPixelBright",
   //P048
   "MotorShieldCmd,DCMotor", "MotorShieldCmd,Stepper",
+  //P049
+  "MHZCalibrateZero", "MHZReset", "MHZABCEnable", "MHZABCDisable",
   //P052
   "Sensair_SetRelay",
   //P053

diff --git a/static/espeasy.min.js b/static/espeasy.min.js