Merge branch 'main' into heatpump/feature/uart-task-handling

components/panasonic_heatpump/README.md

@@ -565,6 +565,8 @@ switch:
       name: "Set External Heat Cool Control"
     set34:
       name: "Set Bivalent Control"
+    error_reset:
+      name: "Error Reset (Restart Heatpump)"
 ```
 
 ### Selects

components/panasonic_heatpump/climate/panasonic_heatpump_climate.cpp

@@ -82,7 +82,7 @@ void PanasonicHeatpumpClimate::control(const climate::ClimateCall& call) {
   }
 
   this->publish_state();
-  this->keep_state_ = 2;
+  this->keep_state_ = KEEP_STATE;
 }
 
 void PanasonicHeatpumpClimate::publish_new_state(const std::vector<uint8_t>& data) {

components/panasonic_heatpump/helpers.cpp

@@ -35,11 +35,7 @@ void PanasonicHelpers::write_uart_log(UartLogDirection direction, const uint8_t*
     return;
 
   logStr += byte_array_to_hex_string(data, length, separator);
-
-  for (size_t i = 0; i < logStr.length(); i += UART_LOG_CHUNK_SIZE) {
-    ESP_LOGI(TAG, "%s %s", msgDir.c_str(), logStr.substr(i, UART_LOG_CHUNK_SIZE).c_str());
-    delay(10);
-  }
+  ESP_LOGI(TAG, "%s %s", msgDir.c_str(), logStr.c_str());
 }
 
 std::string PanasonicHelpers::byte_array_to_hex_string(const std::vector<uint8_t>& data, const char separator) {

components/panasonic_heatpump/helpers.h

@@ -5,10 +5,6 @@
 #include <vector>
 #include <string>
 
-#ifndef UART_LOG_CHUNK_SIZE
-#define UART_LOG_CHUNK_SIZE 120
-#endif
-
 namespace esphome {
 namespace panasonic_heatpump {
 enum UartLogDirection : uint8_t {

components/panasonic_heatpump/number/panasonic_heatpump_number.cpp

@@ -116,7 +116,7 @@ void PanasonicHeatpumpNumber::control(float value) {
   };
 
   this->publish_state(state);
-  this->keep_state_ = 2;
+  this->keep_state_ = KEEP_STATE;
 }
 
 void PanasonicHeatpumpNumber::publish_new_state(const std::vector<uint8_t>& data) {

components/panasonic_heatpump/panasonic_heatpump.h

@@ -12,7 +12,11 @@
 #include "commands.h"
 
 #ifndef PANASONIC_HEATPUMP_VERSION
-#define PANASONIC_HEATPUMP_VERSION "0.0.7-beta.3"
+#define PANASONIC_HEATPUMP_VERSION "0.0.8-beta.2"
+#endif
+
+#ifndef KEEP_STATE
+#define KEEP_STATE 1
 #endif
 
 namespace esphome {

components/panasonic_heatpump/select/panasonic_heatpump_select.cpp

@@ -42,7 +42,7 @@ void PanasonicHeatpumpSelect::control(const std::string& value) {
   };
 
   this->publish_state(value);
-  this->keep_state_ = 2;
+  this->keep_state_ = KEEP_STATE;
 }
 
 void PanasonicHeatpumpSelect::publish_new_state(const std::vector<uint8_t>& data) {

components/panasonic_heatpump/switch/__init__.py

@@ -20,6 +20,7 @@ CONF_SET31 = "set31"  # Set External Error
 CONF_SET32 = "set32"  # Set External Compressor Control
 CONF_SET33 = "set33"  # Set External Heat Cool Control
 CONF_SET34 = "set34"  # Set Bivalent Control
+CONF_ERROR = "error_reset"  # Error Reset (Restart Heatpump)
 
 TYPES = [
     CONF_SET1,
@@ -35,6 +36,7 @@ TYPES = [
     CONF_SET32,
     CONF_SET33,
     CONF_SET34,
+    CONF_ERROR,
 ]
 
 PanasonicHeatpumpSwitch = panasonic_heatpump_ns.class_(
@@ -85,6 +87,9 @@ CONFIG_SCHEMA = cv.Schema(
         cv.Optional(CONF_SET34): switch.switch_schema(
             PanasonicHeatpumpSwitch,
         ),
+        cv.Optional(CONF_ERROR): switch.switch_schema(
+            PanasonicHeatpumpSwitch,
+        ),
     }
 ).extend(cv.COMPONENT_SCHEMA)
 

components/panasonic_heatpump/switch/panasonic_heatpump_switch.cpp

@@ -52,12 +52,15 @@ void PanasonicHeatpumpSwitch::write_state(bool state) {
   case SwitchIds::CONF_SET34:
     this->parent_->set_command_byte(PanasonicCommand::setPlus1(value), 26);
     break;
+  case SwitchIds::CONF_ERROR:
+    this->parent_->set_command_byte(value, 8);
+    break;
   default:
     return;
   };
 
   this->publish_state(state);
-  this->keep_state_ = 2;
+  this->keep_state_ = KEEP_STATE;
 }
 
 void PanasonicHeatpumpSwitch::publish_new_state(const std::vector<uint8_t>& data) {
@@ -130,6 +133,11 @@ void PanasonicHeatpumpSwitch::publish_new_state(const std::vector<uint8_t>& data
     if (this->state == new_state)
       return;
     break;
+  case SwitchIds::CONF_ERROR:
+    new_state = PanasonicDecode::getBinaryState(data[8]);
+    if (this->state == new_state)
+      return;
+    break;
   default:
     return;
   };

components/panasonic_heatpump/switch/panasonic_heatpump_switch.h

@@ -21,6 +21,7 @@ enum SwitchIds : uint8_t {
   CONF_SET32,
   CONF_SET33,
   CONF_SET34,
+  CONF_ERROR,
 };
 
 class PanasonicHeatpumpSwitch : public switch_::Switch,

components/panasonic_heatpump/water_heater/panasonic_heatpump_water_heater.cpp

@@ -40,7 +40,7 @@ void PanasonicHeatpumpWaterHeater::control(const water_heater::WaterHeaterCall&
   };
 
   this->publish_state();
-  this->keep_state_ = 2;
+  this->keep_state_ = KEEP_STATE;
 }
 
 void PanasonicHeatpumpWaterHeater::publish_new_state(const std::vector<uint8_t>& data) {

tests/panasonic_heatpump/test_panasonic_heatpump_full.yaml

@@ -469,6 +469,8 @@ switch:
       name: "Set External Heat Cool Control"
     set34:
       name: "Set Bivalent Control"
+    error_reset:
+      name: "Error Reset (Restart Heatpump)"
 
 # Test climate platform
 climate: