From 9175063b7f4a462dbe8b01e827752bcf47bb87ad Mon Sep 17 00:00:00 2001
From: ElVit <54866762+ElVit@users.noreply.github.com>
Date: Mon, 24 Nov 2025 22:17:48 +0100
Subject: [PATCH] Update commands.cpp

---
 components/panasonic_heatpump/commands.cpp | 254 ++++++++++-----------
 1 file changed, 121 insertions(+), 133 deletions(-)

diff --git a/components/panasonic_heatpump/commands.cpp b/components/panasonic_heatpump/commands.cpp
index 39f9a4c..c372931 100644
--- a/components/panasonic_heatpump/commands.cpp
+++ b/components/panasonic_heatpump/commands.cpp
@@ -1,152 +1,140 @@
 #include "commands.h"
 
+namespace esphome {
+namespace panasonic_heatpump {
+const uint8_t PanasonicCommand::InitialRequest[INIT_REQUEST_SIZE] = {
+    0x31, 0x05, 0x10, 0x01, 0x00, 0x00, 0x00, 0xB9};
+const uint8_t PanasonicCommand::InitialResponse[INIT_RESPONSE_SIZE] = {
+    0x31, 0x30, 0x01, 0x10, 0x1E, 0x6C, 0xC8, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x3C};
+const uint8_t PanasonicCommand::PollingMessage[DATA_MESSAGE_SIZE] = {
+    0x71, 0x6C, 0x01, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x12};
+const uint8_t PanasonicCommand::PollingExtraMessage[DATA_MESSAGE_SIZE] = {
+    0x71, 0x6C, 0x01, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x01};
+const uint8_t PanasonicCommand::CommandMessage[DATA_MESSAGE_SIZE] = {
+    0xF1, 0x6C, 0x01, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x92};
 
-namespace esphome
-{
-  namespace panasonic_heatpump
-  {
-    const uint8_t PanasonicCommand::InitialRequest[INIT_REQUEST_SIZE] = {
-      0x31, 0x05, 0x10, 0x01, 0x00, 0x00, 0x00, 0xB9
-    };
-    const uint8_t PanasonicCommand::InitialResponse[INIT_RESPONSE_SIZE] = {
-      0x31, 0x30, 0x01, 0x10, 0x1E, 0x6C, 0xC8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x3C
-    };
-    const uint8_t PanasonicCommand::PollingMessage[DATA_MESSAGE_SIZE] = {
-      0x71, 0x6C, 0x01, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x12
-    };
-    const uint8_t PanasonicCommand::PollingExtraMessage[DATA_MESSAGE_SIZE] = {
-      0x71, 0x6C, 0x01, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x01
-    };
-    const uint8_t PanasonicCommand::CommandMessage[DATA_MESSAGE_SIZE] = {
-      0xF1, 0x6C, 0x01, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x92
-    };
+uint8_t PanasonicCommand::calcChecksum(std::vector<uint8_t>& data,
+                                       int length) {
+  uint8_t checksum = 0;
+  for (int i = 0; i < length; i++) {
+    checksum += data[i];
+  }
+  checksum = (checksum ^ 0xFF) + 01;
+  return checksum;
+}
 
-    uint8_t PanasonicCommand::calcChecksum(std::vector<uint8_t>& data, int length)
-    {
-      uint8_t checksum = 0;
-      for (int i = 0; i < length; i++)
-      {
-        checksum += data[i];
-      }
-      checksum = (checksum ^ 0xFF) + 01;
-      return checksum;
-    }
+uint8_t PanasonicCommand::setMultiply2(size_t input) { return input * 0b10; }
 
-    uint8_t PanasonicCommand::setMultiply2(size_t input)
-    {
-      return input * 0b10;
-    }
+uint8_t PanasonicCommand::setMultiply4(size_t input) { return input * 0b100; }
 
-    uint8_t PanasonicCommand::setMultiply4(size_t input)
-    {
-      return input * 0b100;
-    }
+uint8_t PanasonicCommand::setPlus1Multiply4(size_t input) {
+  return (input + 1) * 0b100;
+}
 
-    uint8_t PanasonicCommand::setPlus1Multiply4(size_t input)
-    {
-      return (input + 1) * 0b100;
-    }
+uint8_t PanasonicCommand::setPlus1Multiply8(size_t input) {
+  return (input + 1) * 0b1000;
+}
 
-    uint8_t PanasonicCommand::setPlus1Multiply8(size_t input)
-    {
-      return (input + 1) * 0b1000;
-    }
+uint8_t PanasonicCommand::setPlus1Multiply16(size_t input) {
+  return (input + 1) * 0b10000;
+}
 
-    uint8_t PanasonicCommand::setPlus1Multiply16(size_t input)
-    {
-      return (input + 1) * 0b10000;
-    }
+uint8_t PanasonicCommand::setPlus1Multiply64(size_t input) {
+  return (input + 1) * 0b1000000;
+}
 
-    uint8_t PanasonicCommand::setPlus1Multiply64(size_t input)
-    {
-      return (input + 1) * 0b1000000;
-    }
+uint8_t PanasonicCommand::setPlus1(size_t input) { return input + 1; }
 
-    uint8_t PanasonicCommand::setPlus1(size_t input)
-    {
-      return input + 1;
-    }
+uint8_t PanasonicCommand::setPlus128(size_t input) {
+  return input + 0b10000000;
+}
 
-    uint8_t PanasonicCommand::setPlus128(size_t input)
-    {
-      return input + 0b10000000;
-    }
+uint8_t PanasonicCommand::setOperationMode(size_t input) {
+  switch (input) {
+    case 0:
+      return 0b100001;  // 0x21 = tank
+    case 1:
+      return 0b010010;  // 0x12 = heat
+    case 2:
+      return 0b100010;  // 0x22 = heat+tank
+    case 3:
+      return 0b010011;  // 0x13 = cool
+    case 4:
+      return 0b100011;  // 0x23 = cool+tank
+    case 5:
+      return 0b011000;  // 0x18 = auto
+    case 6:
+      return 0b101000;  // 0x28 = auto+tank
+    case 7:
+      return 0b011001;  // 0x19 = auto-heat
+    case 8:
+      return 0b101001;  // 0x29 = auto-heat+tank
+    case 9:
+      return 0b011010;  // 0x1A = auto-cool
+    case 10:
+      return 0b101010;  // 0x2A = auto-cool+tank
+    default:
+      return 0;  // do nothing
+  }
+}
 
-    uint8_t PanasonicCommand::setOperationMode(size_t input)
-    {
-      switch (input)
-      {
-        case 0:  return 0b100001; // 0x21 = tank
-        case 1:  return 0b010010; // 0x12 = heat
-        case 2:  return 0b100010; // 0x22 = heat+tank
-        case 3:  return 0b010011; // 0x13 = cool
-        case 4:  return 0b100011; // 0x23 = cool+tank
-        case 5:  return 0b011000; // 0x18 = auto
-        case 6:  return 0b101000; // 0x28 = auto+tank
-        case 7:  return 0b011001; // 0x19 = auto-heat
-        case 8:  return 0b101001; // 0x29 = auto-heat+tank
-        case 9:  return 0b011010; // 0x1A = auto-cool
-        case 10: return 0b101010; // 0x2A = auto-cool+tank
-        default: return 0;  // do nothing
-      }
-    }
+// start of optional pcb commands
 
-    //start of optional pcb commands
+uint8_t PanasonicCommand::temp2hex(float temp) {
+  int hextemp = 0;
+  if (temp > 120) {
+    hextemp = 0;
+  } else if (temp < -78) {
+    hextemp = 255;
+  } else {
+    uint8_t Uref = 255;
+    int constant = 3695;
+    int R25 = 6340;
+    uint8_t T25 = 25;
+    int Rf = 6480;
+    float K = 273.15;
+    float RT = R25 * exp(constant * (1 / (temp + K) - 1 / (T25 + K)));
+    hextemp = Uref * (RT / (Rf + RT));
+  }
 
-    uint8_t PanasonicCommand::temp2hex(float temp)
-    {
-      int hextemp = 0;
-      if (temp > 120)
-      {
-        hextemp = 0;
-      }
-      else if (temp < -78)
-      {
-        hextemp = 255;
-      }
-      else
-      {
-        uint8_t Uref = 255;
-        int constant = 3695;
-        int R25 = 6340;
-        uint8_t T25 = 25;
-        int Rf = 6480;
-        float K = 273.15;
-        float RT = R25 * exp(constant * (1 / (temp + K) - 1 / (T25 + K)));
-        hextemp = Uref * (RT / (Rf + RT));
-      }
+  return hextemp;
+}
 
-      return hextemp;
-    }
-
-    uint8_t PanasonicCommand::setByte6(uint8_t byte6, int val, int base, int bit)
-    {
-      return (byte6 & ~(base << bit)) | (val << bit);
-    }
+uint8_t PanasonicCommand::setByte6(uint8_t byte6, int val, int base,
+                                   int bit) {
+  return (byte6 & ~(base << bit)) | (val << bit);
+}
 
 uint8_t PanasonicCommand::setDemandControl(size_t input) {
   switch (input) {