letscontrolit · jfmennedy · Sep 19, 2023 · Sep 19, 2023 · Sep 19, 2023 · Sep 20, 2023
diff --git a/before_deploy b/before_deploy
diff --git a/embed_files.sh b/embed_files.sh
diff --git a/hooks/post-checkout b/hooks/post-checkout
diff --git a/hooks/post-commit b/hooks/post-commit
diff --git a/hooks/post-merge b/hooks/post-merge
diff --git a/lib/LiquidCrystal_I2C/LiquidCrystal_I2C.cpp b/lib/LiquidCrystal_I2C/LiquidCrystal_I2C.cpp
diff --git a/lib/LiquidCrystal_I2C/LiquidCrystal_I2C.h b/lib/LiquidCrystal_I2C/LiquidCrystal_I2C.h
diff --git a/lib/LiquidCrystal_I2C/README.md b/lib/LiquidCrystal_I2C/README.md
diff --git a/lib/LiquidCrystal_I2C/examples/CustomChars/CustomChars.pde b/lib/LiquidCrystal_I2C/examples/CustomChars/CustomChars.pde
diff --git a/lib/LiquidCrystal_I2C/examples/HelloWorld/HelloWorld.pde b/lib/LiquidCrystal_I2C/examples/HelloWorld/HelloWorld.pde
diff --git a/lib/LiquidCrystal_I2C/examples/SerialDisplay/SerialDisplay.pde b/lib/LiquidCrystal_I2C/examples/SerialDisplay/SerialDisplay.pde
diff --git a/lib/LiquidCrystal_I2C/keywords.txt b/lib/LiquidCrystal_I2C/keywords.txt
diff --git a/lib/LiquidCrystal_I2C/library.json b/lib/LiquidCrystal_I2C/library.json
diff --git a/lib/LiquidCrystal_I2C/library.properties b/lib/LiquidCrystal_I2C/library.properties
diff --git a/memanalyzer.py b/memanalyzer.py
diff --git a/patches/check_puya_patch b/patches/check_puya_patch
diff --git a/preflight.sh b/preflight.sh
diff --git a/release b/release
diff --git a/releasebot b/releasebot
diff --git a/src/src/PluginStructs/P093_data_struct.cpp b/src/src/PluginStructs/P093_data_struct.cpp
@@ -78,7 +78,9 @@ bool P093_data_struct::read(String& result) const {
     result += _currentValues.compressorFrequency;
   }
   result += F(",\"temperature\":");
-  result += toString(_currentValues.temperature, 1) + '}';
+  result += toString(_currentValues.temperature, 1);
+  result += F(",\"remoteTemperature\":");
+  result += toString(_currentValues.remoteTemperature, 1) + '}';
 
   return true;
 }
@@ -120,6 +122,9 @@ bool P093_data_struct::plugin_get_config_value(struct EventStruct *event,
   } else
   if (_includeStatus && equals(command, F("compressorfrequency"))) {
     string = _currentValues.compressorFrequency;
+  } else
+  if (equals(command, F("remotetemperature"))) {
+    string = toString(_currentValues.remoteTemperature, 1);
   } else {
     success = false;
   }
@@ -149,6 +154,13 @@ void P093_data_struct::write(const String& command, const String& value) {
     _writeStatus.set(Vane);
   } else if ((equals(command, F("widevane"))) && lookup(value, _mappings.wideVane, _wantedSettings.wideVane)) {
     _writeStatus.set(WideVane);
+  } else if (equals(command, F("remotetemperature"))) {
+   float remotetemperature = 0;
+
+    if (string2float(value, remotetemperature)) {
+      _wantedSettings.remoteTemperature = remotetemperature;
+      _writeStatus.set(RemoteTemperature);
+    }
   }
 
     # undef lookup
@@ -294,6 +306,10 @@ void P093_data_struct::applySettingsLocally() {
   if (_writeStatus.isDirty(WideVane)) {
     _currentValues.wideVane = _wantedSettings.wideVane;
   }
+
+  if (_writeStatus.isDirty(RemoteTemperature)) {
+    _currentValues.remoteTemperature = _wantedSettings.remoteTemperature;
+  }
 }
 
 void P093_data_struct::cancelWaitingAndTransitTo(P093_data_struct::State state) {
@@ -359,6 +375,22 @@ void P093_data_struct::applySettings() {
     packet[7] |= 0x01;
   }
 
+  if (_writeStatus.isDirty(RemoteTemperature)) {
+    packet[5] |= 0x07;
+    if(_wantedSettings.remoteTemperature > 0) {
+      packet[6] |= 0x01;
+      if (_tempMode) {
+        packet[8] = static_cast<uint8_t>(_wantedSettings.remoteTemperature * 2.0f + 128.0f);
+      } else {
+        packet[7] = _wantedSettings.remoteTemperature;
+      }
+    }
+    else {
+      packet[6] |= 0x00;
+      packet[8] |= 0x80; //MHK1 send 80, even though it could be 00, since ControlByte is 00
+    } 
+  }
+
   packet[21] = checkSum(packet, 21);
 
   sendPacket(packet, PACKET_LEN);

diff --git a/src/src/PluginStructs/P093_data_struct.h b/src/src/PluginStructs/P093_data_struct.h
@@ -118,12 +118,13 @@ struct P093_data_struct : public PluginTaskData_base {
     ReadTimeout
   };
 
-  static const uint8_t Temperature = 0x01;
-  static const uint8_t Power       = 0x02;
-  static const uint8_t Mode        = 0x04;
-  static const uint8_t Fan         = 0x08;
-  static const uint8_t Vane        = 0x10;
-  static const uint8_t WideVane    = 0x20;
+  static const uint8_t Temperature        = 0x01;
+  static const uint8_t Power              = 0x02;
+  static const uint8_t Mode               = 0x04;
+  static const uint8_t Fan                = 0x08;
+  static const uint8_t Vane               = 0x10;
+  static const uint8_t WideVane           = 0x20;
+  static const uint8_t RemoteTemperature  = 0x07;
 
   struct WriteStatus {
     WriteStatus() : _flags(0) {}
@@ -158,6 +159,7 @@ struct P093_data_struct : public PluginTaskData_base {
     uint8_t vane;
     uint8_t wideVane;
     float   roomTemperature;
+    float   remoteTemperature;
     bool    operating;
     uint8_t compressorFrequency;
 
@@ -170,6 +172,7 @@ struct P093_data_struct : public PluginTaskData_base {
       vane(0),
       wideVane(0),
       roomTemperature(0),
+      remoteTemperature(0),
       operating(false),
       compressorFrequency(0) {}
 
@@ -182,6 +185,7 @@ struct P093_data_struct : public PluginTaskData_base {
              wideVane != rhs.wideVane ||
              iSee != rhs.iSee ||
              roomTemperature != rhs.roomTemperature ||
+             remoteTemperature != rhs.remoteTemperature ||
              operating != rhs.operating ||
              compressorFrequency != rhs.compressorFrequency;
     }

diff --git a/test/espcli b/test/espcli
diff --git a/test/esptool.py b/test/esptool.py
diff --git a/test/test000.py b/test/test000.py
diff --git a/test/test001.py b/test/test001.py
diff --git a/test/test002.py b/test/test002.py
diff --git a/test/test003.py b/test/test003.py
diff --git a/test/test004.py b/test/test004.py
diff --git a/test/test005.py b/test/test005.py
diff --git a/test/test006.py b/test/test006.py
diff --git a/test/testall b/test/testall
diff --git a/tools/build_ESPeasy.sh b/tools/build_ESPeasy.sh