Merge 7c2059d7c6 into 4457e16a8f

Main

lib/Equitherm/Equitherm.h

@@ -16,14 +16,16 @@ public:
   float Kn = 0.0;
   float Kk = 0.0;
   float Kt = 0.0;
+  float Ke = 1.3;
 
   Equitherm() = default;
 
-  // kn, kk, kt
-  Equitherm(float new_kn, float new_kk, float new_kt) {
+  // kn, kk, kt, Ke
+  Equitherm(float new_kn, float new_kk, float new_kt, float new_ke) {
     Kn = new_kn;
     Kk = new_kk;
     Kt = new_kt;
+    Ke = new_ke;
   }
 
   // лимит выходной величины
@@ -34,7 +36,7 @@ public:
 
   // возвращает новое значение при вызове
   datatype getResult() {
-    datatype output = getResultN() + getResultK() + getResultT();
+    datatype output = getResultN() + Kk + getResultT();
     output = constrain(output, _minOut, _maxOut);		// ограничиваем выход
     return output;
   }
@@ -42,21 +44,16 @@ public:
 private:
   unsigned short _minOut = 20, _maxOut = 90;
 
-  // температура контура отопления в зависимости от наружной температуры
-  datatype getResultN() {
-    float a = (-0.21 * Kn) - 0.06;     // a = -0,21k — 0,06
-    float b = (6.04 * Kn) + 1.98;      // b = 6,04k + 1,98
-    float c = (-5.06 * Kn) + 18.06;    // с = -5,06k + 18,06
-    float x = (-0.2 * outdoorTemp) + 5; // x = -0.2*t1 + 5
-    return (a * x * x) + (b * x) + c;       // Tn = ax2 + bx + c
+  datatype getResultN()
+  {
+    float tempDelta = targetTemp - outdoorTemp,
+          maxPoint = targetTemp - (_maxOut - targetTemp) / Kn,
+          sf = (_maxOut - targetTemp) / pow(targetTemp - maxPoint, 1.0 / Ke),
+          T_rad = targetTemp + sf * (tempDelta >= 0 ? pow(tempDelta, 1.0 / Ke) : -pow(-tempDelta, 1.0 / Ke));
+    return T_rad > _maxOut ? _maxOut : T_rad;
   }
 
-  // поправка на желаемую комнатную температуру
-  datatype getResultK() {
-    return (targetTemp - 20) * Kk;
-  }
-
-  // Расчет поправки (ошибки) термостата
+  // Реакция на разницу с целевой температурой
   datatype getResultT() {
     return constrain((targetTemp - indoorTemp), -3, 3) * Kt;
   }

platformio.ini

@@ -84,7 +84,7 @@ board_build.ldscript = eagle.flash.4m1m.ld
 ;platform_packages = 
 ;  framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.5
 ;  framework-arduinoespressif32-libs @ https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.1/esp32-arduino-libs-idf-release_v5.1-33fbade6.zip
-platform = https://github.com/pioarduino/platform-espressif32/releases/download/53.03.13/platform-espressif32.zip
+platform = https://github.com/pioarduino/platform-espressif32/releases/download/53.03.12/platform-espressif32.zip
 platform_packages =
 board_build.partitions = esp32_partitions.csv
 lib_deps =
@@ -164,10 +164,10 @@ board_build.ldscript = ${esp8266_defaults.board_build.ldscript}
 build_type = ${esp8266_defaults.build_type}
 build_flags = 
 	${esp8266_defaults.build_flags}
-	-D DEFAULT_OT_IN_GPIO=13
-	-D DEFAULT_OT_OUT_GPIO=15
+	-D DEFAULT_OT_IN_GPIO=4
+	-D DEFAULT_OT_OUT_GPIO=5
 	-D DEFAULT_SENSOR_OUTDOOR_GPIO=12
-	-D DEFAULT_SENSOR_INDOOR_GPIO=4
+	-D DEFAULT_SENSOR_INDOOR_GPIO=14
 	-D DEFAULT_STATUS_LED_GPIO=2
 	-D DEFAULT_OT_RX_LED_GPIO=16
 

secrets.default.ini

@@ -14,12 +14,12 @@ ap_password = otgateway123456
 sta_ssid = 
 sta_password = 
 
-portal_login = admin
-portal_password = admin
+portal_login = 
+portal_password = 
 
 mqtt_enabled = false
 mqtt_server = 
 mqtt_port = 1883
 mqtt_user = 
 mqtt_password = 
-mqtt_prefix = opentherm
+mqtt_prefix = otgateway

src/HaHelper.h

@@ -886,6 +886,29 @@ public:
     return this->publish(this->makeConfigTopic(FPSTR(HA_ENTITY_NUMBER), F("equitherm_k_factor")).c_str(), doc);
   }
 
+  bool publishInputEquithermFactorE(bool enabledByDefault = true) {
+    JsonDocument doc;
+    doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
+    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("equitherm_e"));
+    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
+    doc[FPSTR(HA_NAME)] = F("Equitherm Exponent E");
+    doc[FPSTR(HA_ICON)] = F("mdi:alpha-e-circle-outline");
+    doc[FPSTR(HA_STATE_TOPIC)] = this->settingsTopic.c_str();
+    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.equitherm.e_factor|float(0)|round(2) }}");
+    doc[FPSTR(HA_COMMAND_TOPIC)] = this->setSettingsTopic.c_str();
+    doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"equitherm\": {\"e_factor\" : {{ value }}}}");
+    doc[FPSTR(HA_MIN)] = 1;
+    doc[FPSTR(HA_MAX)] = 2;
+    doc[FPSTR(HA_STEP)] = 0.01f;
+    doc[FPSTR(HA_MODE)] = FPSTR(HA_MODE_BOX);
+    doc[FPSTR(HA_EXPIRE_AFTER)] = this->expireAfter;
+    doc.shrinkToFit();
+
+    return this->publish(this->makeConfigTopic(FPSTR(HA_ENTITY_NUMBER), F("equitherm_e_factor")).c_str(), doc);
+  }
+
   bool publishInputEquithermFactorT(bool enabledByDefault = true) {
     JsonDocument doc;
     doc[FPSTR(HA_AVAILABILITY)][0][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();

src/RegulatorTask.h

@@ -172,6 +172,7 @@ protected:
       etRegulator.setLimits(minTemp, maxTemp);
       etRegulator.Kn = settings.equitherm.n_factor;
       etRegulator.Kk = settings.equitherm.k_factor;
+      etRegulator.Ke = settings.equitherm.e_factor;
       etRegulator.targetTemp = targetTemp;
       etRegulator.outdoorTemp = outdoorTemp;
       float etResult = etRegulator.getResult();

src/Settings.h

@@ -137,6 +137,7 @@ struct Settings {
     float n_factor = 0.7f;
     float k_factor = 3.0f;
     float t_factor = 2.0f;
+    float e_factor = 1.3f;
   } equitherm;
 
   struct {

src/strings.h

@@ -73,6 +73,7 @@ const char S_DNS[]                                  PROGMEM = "dns";
 const char S_DT[]                                   PROGMEM = "dt";
 const char S_D_FACTOR[]                             PROGMEM = "d_factor";
 const char S_D_MULTIPLIER[]                         PROGMEM = "d_multiplier";
+const char S_E_FACTOR[]                             PROGMEM = "e_factor";
 const char S_EMERGENCY[]                            PROGMEM = "emergency";
 const char S_ENABLED[]                              PROGMEM = "enabled";
 const char S_ENV[]                                  PROGMEM = "env";

src/utils.h

@@ -502,6 +502,7 @@ void settingsToJson(const Settings& src, JsonVariant dst, bool safe = false) {
   equitherm[FPSTR(S_ENABLED)] = src.equitherm.enabled;
   equitherm[FPSTR(S_N_FACTOR)] = roundf(src.equitherm.n_factor, 3);
   equitherm[FPSTR(S_K_FACTOR)] = roundf(src.equitherm.k_factor, 3);
+  equitherm[FPSTR(S_E_FACTOR)] = roundf(src.equitherm.e_factor, 3);
   equitherm[FPSTR(S_T_FACTOR)] = roundf(src.equitherm.t_factor, 3);
 
   auto pid = dst[FPSTR(S_PID)].to<JsonObject>();
@@ -1100,6 +1101,14 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
     }
   }
 
+  if (!src[FPSTR(S_EQUITHERM)][FPSTR(S_E_FACTOR)].isNull()) {
+    float value = src[FPSTR(S_EQUITHERM)][FPSTR(S_E_FACTOR)].as<float>();
+
+    if (value >= 1 && value <= 2 && fabsf(value - dst.equitherm.e_factor) > 0.0001f) {
+      dst.equitherm.e_factor = roundf(value, 3);
+      changed = true;
+    }
+  }
   if (!src[FPSTR(S_EQUITHERM)][FPSTR(S_T_FACTOR)].isNull()) {
     float value = src[FPSTR(S_EQUITHERM)][FPSTR(S_T_FACTOR)].as<float>();
 

src_data/locales/en.json

@@ -342,9 +342,14 @@
       "equitherm": {
         "n": "N factor",
         "k": "K factor",
+        "e": "Exponent E",
         "t": {
           "title": "T factor",
           "note": "Not used if PID is enabled"
+        },
+        "chart": {
+          "radiatorTemp": "Radiator Temperature (°C)",
+          "outdoorTemp": "Outdoor Temperature (°C)"
         }
       },
 

src_data/locales/it.json

@@ -342,9 +342,14 @@
       "equitherm": {
         "n": "Fattore N",
         "k": "Fattore K",
+        "e": "Esponente E",
         "t": {
           "title": "Fattore T",
           "note": "Non usato se PID è attivato"
+        },
+        "chart": {
+          "radiatorTemp": "Temperatura Del Radiatore (°C)",
+          "outdoorTemp": "Outdoor Temperature (°C)"
         }
       },
 

src_data/locales/ru.json

@@ -342,9 +342,14 @@
       "equitherm": {
         "n": "Коэффициент N",
         "k": "Коэффициент K",
+        "e": "Экспонента E",
         "t": {
           "title": "Коэффициент T",
           "note": "Не используется, если ПИД включен"
+        },
+        "chart": {
+          "radiatorTemp": "Температура радиатора (°C)",
+          "outdoorTemp": "Наружная температура (°C)"
         }
       },
 

src_data/pages/settings.html

@@ -264,6 +264,7 @@
         
         <details>
           <summary><b data-i18n>settings.section.equitherm</b></summary>
+          <canvas id="equithermChart" width="400" height="200"></canvas>
           <div>
             <div id="equitherm-settings-busy" aria-busy="true"></div>
             <form action="/api/settings" id="equitherm-settings" class="hidden">
@@ -285,6 +286,11 @@
                   <input type="number" inputmode="decimal" name="equitherm[k_factor]" min="0" max="10" step="0.01" required>
                 </label>
 
+                <label>
+                  <span data-i18n>settings.equitherm.e</span>
+                  <input type="number" inputmode="decimal" name="equitherm[e_factor]" min="1" max="2" step="0.01" required>
+                </label>
+
                 <label>
                   <span data-i18n>settings.equitherm.t.title</span>
                   <input type="number" inputmode="decimal" name="equitherm[t_factor]" min="0" max="10" step="0.01" required>
@@ -299,6 +305,8 @@
 
         <hr />
 
+
+        
         <details>
           <summary><b data-i18n>settings.section.pid</b></summary>
           <div>
@@ -756,6 +764,7 @@
     </footer>
 
     <script src="/static/app.js?{BUILD_TIME}"></script>
+    <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
     <script>
       document.addEventListener('DOMContentLoaded', async () => {
         const lang = new Lang(document.getElementById('lang'));
@@ -885,6 +894,7 @@
           setCheckboxValue("[name='equitherm[enabled]']", data.equitherm.enabled);
           setInputValue("[name='equitherm[n_factor]']", data.equitherm.n_factor);
           setInputValue("[name='equitherm[k_factor]']", data.equitherm.k_factor);
+          setInputValue("[name='equitherm[e_factor]']", data.equitherm.e_factor);
           setInputValue("[name='equitherm[t_factor]']", data.equitherm.t_factor);
           setBusy('#equitherm-settings-busy', '#equitherm-settings', false);
 
@@ -909,6 +919,9 @@
           setInputValue("[name='pid[deadband][thresholdHigh]']", data.pid.deadband.thresholdHigh);
           setInputValue("[name='pid[deadband][thresholdLow]']", data.pid.deadband.thresholdLow);
           setBusy('#pid-settings-busy', '#pid-settings', false);
+
+
+
         };
 
         try {
@@ -961,6 +974,186 @@
         } catch (error) {
           console.log(error);
         }
+
+        //График
+        let equithermChart;
+
+        async function initChart() {
+          try {
+            const response = await fetch("/api/settings", {
+              cache: "no-cache",
+              credentials: "include"
+            });
+
+            if (!response.ok) {
+              throw new Error('Response not valid');
+            }
+
+            const result = await response.json();
+
+            //График переменные
+            const targetTemp = result?.heating?.target ?? 24;
+            const maxOut = result?.heating?.maxTemp ?? 90;
+            const Kn = result?.equitherm?.n_factor ?? 1;
+            const Ke = result?.equitherm?.e_factor ?? 1.3;
+            const Kk = result?.equitherm?.k_factor ?? 0;
+
+            function calculateTRad(targetTemp, outdoorTemp, maxOut, Kn, Ke, Kk) {
+              let tempDiff = targetTemp - outdoorTemp;
+              if (tempDiff < 0) {
+                tempDiff = 0;
+              }
+              const minOutside = targetTemp - (maxOut - targetTemp) / Kn;
+              let base = targetTemp - minOutside;
+              if (base <= 0) {
+                base = 0.0001;
+              }
+              const c1 = (maxOut - targetTemp) / Math.pow(base, 1.0 / Ke);
+              let T_rad = targetTemp + c1 * Math.pow(tempDiff, 1.0 / Ke) + Kk;
+              return Math.min(T_rad, maxOut);
+            }
+
+            function generateChartData(targetTemp, maxOut, Kn, Ke, Kk) {
+              const outdoorTemps = [];
+              const predictedTRad = [];
+
+              for (let temp = 25; temp >= -30; temp -= 1) {
+                outdoorTemps.push(temp);
+                predictedTRad.push(calculateTRad(targetTemp, temp, maxOut, Kn, Ke, Kk).toFixed(1));
+              }
+              return { outdoorTemps, predictedTRad };
+            }
+
+            // Стартовые данные
+            const { outdoorTemps, predictedTRad } = generateChartData(targetTemp, maxOut, Kn, Ke, Kk);
+
+            // Создаем график
+            const ctx = document.getElementById('equithermChart').getContext('2d');
+            // Create gradient for the line
+            const canvasHeight = ctx.canvas.height;
+            const gradient = ctx.createLinearGradient(0, canvasHeight, 0, 0); // Adjust x1, y1, x2, y2 for direction
+            gradient.addColorStop(0, 'rgba(75, 192, 192, 1)');
+            gradient.addColorStop(0.5, 'rgba(255, 99, 132, 1)');
+
+
+            equithermChart = new Chart(ctx, {
+              type: 'line',
+              data: {
+                labels: outdoorTemps,
+                datasets: [{
+                  label: 'Температура Радиатора (°C)',
+                  borderColor: gradient, // Use gradient instead of solid color
+                  borderWidth: 1,
+                  fill: false,
+                  tension: 0.1,
+                  pointRadius: 2, // Reduce dot size (default is 3)
+                  pointHoverRadius: 4,
+                  data: predictedTRad
+                }]
+              },
+              options: {
+                responsive: true,
+                scales: {
+                  x: {
+                    display: true,
+                    title: {
+                      display: true,
+                      text: 'Наружная температура (°C)'
+                    }
+                  },
+                  y: {
+                    display: true,
+                    title: {
+                      display: true,
+                      text: 'Температура Радиатора (°C)'
+                    }
+                  }
+                }
+              }
+            });
+
+            // Показ формы
+            document.getElementById('equitherm-settings-busy').classList.add('hidden');
+            document.getElementById('equitherm-settings').classList.remove('hidden');
+
+          } catch (error) {
+            console.log(error);
+          }
+        }
+
+        // Обновление графика
+        function updateChart(formData) {
+          if (!equithermChart) return;
+
+          fetch("/api/settings", {
+            cache: "no-cache",
+            credentials: "include"
+          })
+            .then(response => response.json())
+            .then(result => {
+              const targetTemp = result?.heating?.target ?? 24;
+              const maxOut = result?.heating?.maxTemp ?? 90;
+              const Kn = parseFloat(formData.get('equitherm[n_factor]')) || 1;
+              const Ke = parseFloat(formData.get('equitherm[e_factor]')) || 1.3;
+              const Kk = parseFloat(formData.get('equitherm[k_factor]')) || 0;
+
+              function calculateTRad(targetTemp, outdoorTemp, maxOut, Kn, Ke, Kk) {
+                let tempDiff = targetTemp - outdoorTemp;
+                if (tempDiff < 0) {
+                  tempDiff = 0;
+                }
+                const minOutside = targetTemp - (maxOut - targetTemp) / Kn;
+                let base = targetTemp - minOutside;
+                if (base <= 0) {
+                  base = 0.0001;
+                }
+                const c1 = (maxOut - targetTemp) / Math.pow(base, 1.0 / Ke);
+                let T_rad = targetTemp + c1 * Math.pow(tempDiff, 1.0 / Ke) + Kk;
+                return Math.min(T_rad, maxOut);
+              }
+
+              const outdoorTemps = [];
+              const predictedTRad = [];
+              for (let temp = 25; temp >= -30; temp -= 1) {
+                outdoorTemps.push(temp);
+                predictedTRad.push(calculateTRad(targetTemp, temp, maxOut, Kn, Ke, Kk).toFixed(1));
+              }
+
+              equithermChart.data.labels = outdoorTemps;
+              equithermChart.data.datasets[0].data = predictedTRad;
+              equithermChart.update();
+            })
+            .catch(error => console.log(error));
+        }
+
+        // Слушаем отправку
+        const form = document.getElementById('equitherm-settings');
+        form.addEventListener('submit', (e) => {
+
+          const formData = new FormData(form);
+          updateChart(formData);
+        });
+
+        // Слушаем кнопку сохранить
+        const equithermSection = document.querySelector('details');
+        const saveButton = equithermSection.querySelector('button[data-i18n="button.save"]');
+        saveButton.addEventListener('click', () => {
+          const form = document.getElementById('equitherm-settings');
+          const formData = new FormData(form);
+          updateChart(formData);
+        });
+
+        //Следим за изменениями в полях
+        document.querySelectorAll('#equitherm-settings input').forEach(input => {
+          input.addEventListener('change', () => {
+            const form = document.getElementById('equitherm-settings');
+            const formData = new FormData(form);
+            updateChart(formData);
+          });
+        });  
+
+        // инициализируем график
+        initChart(); 
       });
     </script>
   </body>