"
diff --git a/HeishaMon/rules.cpp b/HeishaMon/rules.cpp
index e5fdbc32..293e8c7d 100755
--- a/HeishaMon/rules.cpp
+++ b/HeishaMon/rules.cpp
@@ -133,10 +133,10 @@ static int is_variable(char *text, unsigned int *pos, unsigned int size) {
}
if(text[*pos] == '%') {
- if(strnicmp(&text[(*pos)+1], "hour", 4) == 0) {
+ if(size == 5 && strnicmp(&text[(*pos)+1], "hour", 4) == 0) {
return 5;
}
- if(strnicmp(&text[(*pos)+1], "month", 4) == 0) {
+ if(size == 6 && strnicmp(&text[(*pos)+1], "month", 5) == 0) {
return 6;
}
}
@@ -147,7 +147,7 @@ static int is_variable(char *text, unsigned int *pos, unsigned int size) {
cmdStruct cmd;
memcpy_P(&cmd, &commands[x], sizeof(cmd));
size_t len = strlen(cmd.name);
- if(strnicmp(&text[(*pos)+1], cmd.name, len) == 0) {
+ if(size-1 == len && strnicmp(&text[(*pos)+1], cmd.name, len) == 0) {
i = len+1;
match = 1;
break;
@@ -159,7 +159,7 @@ static int is_variable(char *text, unsigned int *pos, unsigned int size) {
optCmdStruct cmd;
memcpy_P(&cmd, &optionalCommands[x], sizeof(cmd));
size_t len = strlen(cmd.name);
- if(strnicmp(&text[(*pos)+1], cmd.name, len) == 0) {
+ if(size-1 == len && strnicmp(&text[(*pos)+1], cmd.name, len) == 0) {
i = len+1;
match = 1;
break;
@@ -172,7 +172,7 @@ static int is_variable(char *text, unsigned int *pos, unsigned int size) {
char cpy[MAX_TOPIC_LEN];
memcpy_P(&cpy, topics[x], MAX_TOPIC_LEN);
size_t len = strlen(cpy);
- if(strnicmp(&text[(*pos)+1], cpy, len) == 0) {
+ if(size-1 == len && strnicmp(&text[(*pos)+1], cpy, len) == 0) {
i = len+1;
match = 1;
break;
@@ -211,7 +211,7 @@ static int is_event(char *text, unsigned int *pos, unsigned int size) {
cmdStruct cmd;
memcpy_P(&cmd, &commands[x], sizeof(cmd));
size_t len = strlen(cmd.name);
- if(strnicmp(&text[(*pos)+1], cmd.name, len) == 0) {
+ if(size-1 == len && strnicmp(&text[(*pos)+1], cmd.name, len) == 0) {
i = len+1;
match = 1;
break;
@@ -223,7 +223,7 @@ static int is_event(char *text, unsigned int *pos, unsigned int size) {
optCmdStruct cmd;
memcpy_P(&cmd, &optionalCommands[x], sizeof(cmd));
size_t len = strlen(cmd.name);
- if(strnicmp(&text[(*pos)+1], cmd.name, len) == 0) {
+ if(size-1 == len && strnicmp(&text[(*pos)+1], cmd.name, len) == 0) {
i = len+1;
match = 1;
break;
@@ -235,7 +235,7 @@ static int is_event(char *text, unsigned int *pos, unsigned int size) {
size_t len = strlen_P(topics[x]);
char cpy[len];
memcpy_P(&cpy, &topics[x], len);
- if(strnicmp(&text[(*pos)+1], cpy, len) == 0) {
+ if(size-1 == len && strnicmp(&text[(*pos)+1], cpy, len) == 0) {
i = len+1;
match = 1;
break;
diff --git a/HeishaMon/src/common/timerqueue.cpp b/HeishaMon/src/common/timerqueue.cpp
index 0ba39352..56b57bdb 100644
--- a/HeishaMon/src/common/timerqueue.cpp
+++ b/HeishaMon/src/common/timerqueue.cpp
@@ -67,7 +67,7 @@ struct timerqueue_t *timerqueue_pop() {
} else {
if((timerqueue = (struct timerqueue_t **)realloc(timerqueue, sizeof(struct timerqueue_t *)*timerqueue_size)) == NULL) {
#ifdef ESP8266
- Serial.printf("Out of memory %s:#%d\n", __FUNCTION__, __LINE__);
+ Serial1.printf("Out of memory %s:#%d\n", __FUNCTION__, __LINE__);
ESP.restart();
exit(-1);
#else
@@ -144,7 +144,7 @@ void timerqueue_insert(int sec, int usec, int nr) {
if((timerqueue = (struct timerqueue_t **)realloc(timerqueue, sizeof(struct timerqueue_t *)*(timerqueue_size+1))) == NULL) {
#ifdef ESP8266
- Serial.printf("Out of memory %s:#%d\n", __FUNCTION__, __LINE__);
+ Serial1.printf("Out of memory %s:#%d\n", __FUNCTION__, __LINE__);
ESP.restart();
exit(-1);
#else
@@ -156,7 +156,7 @@ void timerqueue_insert(int sec, int usec, int nr) {
node = (struct timerqueue_t *)malloc(sizeof(struct timerqueue_t));
if(node == NULL) {
#ifdef ESP8266
- Serial.printf("Out of memory %s:#%d\n", __FUNCTION__, __LINE__);
+ Serial1.printf("Out of memory %s:#%d\n", __FUNCTION__, __LINE__);
ESP.restart();
exit(-1);
#else
@@ -198,7 +198,7 @@ void timerqueue_update(void) {
int nr = timerqueue[a]->nr;
if((calls = (unsigned int *)realloc(calls, (nrcalls+1)*sizeof(int))) == NULL) {
#ifdef ESP8266
- Serial.printf("Out of memory %s:#%d\n", __FUNCTION__, __LINE__);
+ Serial1.printf("Out of memory %s:#%d\n", __FUNCTION__, __LINE__);
ESP.restart();
exit(-1);
#else
diff --git a/HeishaMon/src/rules/function.cpp b/HeishaMon/src/rules/function.cpp
index 20a1a979..6f98ff53 100755
--- a/HeishaMon/src/rules/function.cpp
+++ b/HeishaMon/src/rules/function.cpp
@@ -29,6 +29,8 @@
#include "functions/max.h"
#include "functions/min.h"
#include "functions/coalesce.h"
+#include "functions/ceil.h"
+#include "functions/floor.h"
#include "functions/settimer.h"
#include "functions/isset.h"
#include "functions/round.h"
@@ -36,6 +38,8 @@
struct rule_function_t rule_functions[] = {
{ "max", rule_function_max_callback },
{ "min", rule_function_min_callback },
+ { "ceil", rule_function_ceil_callback },
+ { "floor", rule_function_floor_callback },
{ "coalesce", rule_function_coalesce_callback },
{ "settimer", rule_function_set_timer_callback },
{ "isset", rule_function_isset_callback },
diff --git a/HeishaMon/src/rules/functions/ceil.cpp b/HeishaMon/src/rules/functions/ceil.cpp
new file mode 100755
index 00000000..202ad3d3
--- /dev/null
+++ b/HeishaMon/src/rules/functions/ceil.cpp
@@ -0,0 +1,58 @@
+/*
+ Copyright (C) CurlyMo
+
+ This Source Code Form is subject to the terms of the Mozilla Public
+ License, v. 2.0. If a copy of the MPL was not distributed with this
+ file, You can obtain one at http://mozilla.org/MPL/2.0/.
+*/
+
+#ifdef ESP8266
+ #pragma GCC diagnostic warning "-fpermissive"
+#endif
+
+#include
+#include
+#include
+#include
+
+#include "../function.h"
+#include "../../common/mem.h"
+#include "../rules.h"
+
+int rule_function_ceil_callback(struct rules_t *obj, uint16_t argc, uint16_t *argv, int *ret) {
+/* LCOV_EXCL_START*/
+#ifdef DEBUG
+ printf("%s\n", __FUNCTION__);
+#endif
+/* LCOV_EXCL_STOP*/
+
+ if(argc != 1) {
+ return -1;
+ }
+
+ *ret = obj->varstack.nrbytes;
+
+ unsigned int size = alignedbytes(obj->varstack.nrbytes+sizeof(struct vm_vinteger_t));
+ if((obj->varstack.buffer = (unsigned char *)REALLOC(obj->varstack.buffer, alignedbuffer(size))) == NULL) {
+ OUT_OF_MEMORY /*LCOV_EXCL_LINE*/
+ }
+ struct vm_vinteger_t *out = (struct vm_vinteger_t *)&obj->varstack.buffer[obj->varstack.nrbytes];
+ out->ret = 0;
+ out->type = VINTEGER;
+
+ switch(obj->varstack.buffer[argv[0]]) {
+ case VINTEGER: {
+ struct vm_vinteger_t *val = (struct vm_vinteger_t *)&obj->varstack.buffer[argv[0]];
+ out->value = val->value;
+ } break;
+ case VFLOAT: {
+ struct vm_vfloat_t *val = (struct vm_vfloat_t *)&obj->varstack.buffer[argv[0]];
+ out->value = (int)ceil(val->value);
+ } break;
+ }
+
+ obj->varstack.nrbytes = size;
+ obj->varstack.bufsize = alignedbuffer(size);
+
+ return 0;
+}
diff --git a/HeishaMon/src/rules/functions/ceil.h b/HeishaMon/src/rules/functions/ceil.h
new file mode 100755
index 00000000..ddce66bf
--- /dev/null
+++ b/HeishaMon/src/rules/functions/ceil.h
@@ -0,0 +1,17 @@
+/*
+ Copyright (C) CurlyMo
+
+ This Source Code Form is subject to the terms of the Mozilla Public
+ License, v. 2.0. If a copy of the MPL was not distributed with this
+ file, You can obtain one at http://mozilla.org/MPL/2.0/.
+*/
+
+#ifndef _RULES_CEIL_H_
+#define _RULES_CEIL_H_
+
+#include
+#include "../rules.h"
+
+int rule_function_ceil_callback(struct rules_t *obj, uint16_t argc, uint16_t *argv, int *ret);
+
+#endif
\ No newline at end of file
diff --git a/HeishaMon/src/rules/functions/floor.cpp b/HeishaMon/src/rules/functions/floor.cpp
new file mode 100755
index 00000000..1adff285
--- /dev/null
+++ b/HeishaMon/src/rules/functions/floor.cpp
@@ -0,0 +1,58 @@
+/*
+ Copyright (C) CurlyMo
+
+ This Source Code Form is subject to the terms of the Mozilla Public
+ License, v. 2.0. If a copy of the MPL was not distributed with this
+ file, You can obtain one at http://mozilla.org/MPL/2.0/.
+*/
+
+#ifdef ESP8266
+ #pragma GCC diagnostic warning "-fpermissive"
+#endif
+
+#include
+#include
+#include
+#include
+
+#include "../function.h"
+#include "../../common/mem.h"
+#include "../rules.h"
+
+int rule_function_floor_callback(struct rules_t *obj, uint16_t argc, uint16_t *argv, int *ret) {
+/* LCOV_EXCL_START*/
+#ifdef DEBUG
+ printf("%s\n", __FUNCTION__);
+#endif
+/* LCOV_EXCL_STOP*/
+
+ if(argc != 1) {
+ return -1;
+ }
+
+ *ret = obj->varstack.nrbytes;
+
+ unsigned int size = alignedbytes(obj->varstack.nrbytes+sizeof(struct vm_vinteger_t));
+ if((obj->varstack.buffer = (unsigned char *)REALLOC(obj->varstack.buffer, alignedbuffer(size))) == NULL) {
+ OUT_OF_MEMORY /*LCOV_EXCL_LINE*/
+ }
+ struct vm_vinteger_t *out = (struct vm_vinteger_t *)&obj->varstack.buffer[obj->varstack.nrbytes];
+ out->ret = 0;
+ out->type = VINTEGER;
+
+ switch(obj->varstack.buffer[argv[0]]) {
+ case VINTEGER: {
+ struct vm_vinteger_t *val = (struct vm_vinteger_t *)&obj->varstack.buffer[argv[0]];
+ out->value = val->value;
+ } break;
+ case VFLOAT: {
+ struct vm_vfloat_t *val = (struct vm_vfloat_t *)&obj->varstack.buffer[argv[0]];
+ out->value = (int)floor(val->value);
+ } break;
+ }
+
+ obj->varstack.nrbytes = size;
+ obj->varstack.bufsize = alignedbuffer(size);
+
+ return 0;
+}
diff --git a/HeishaMon/src/rules/functions/floor.h b/HeishaMon/src/rules/functions/floor.h
new file mode 100755
index 00000000..8f2cb287
--- /dev/null
+++ b/HeishaMon/src/rules/functions/floor.h
@@ -0,0 +1,17 @@
+/*
+ Copyright (C) CurlyMo
+
+ This Source Code Form is subject to the terms of the Mozilla Public
+ License, v. 2.0. If a copy of the MPL was not distributed with this
+ file, You can obtain one at http://mozilla.org/MPL/2.0/.
+*/
+
+#ifndef _RULES_FLOOR_H_
+#define _RULES_FLOOR_H_
+
+#include
+#include "../rules.h"
+
+int rule_function_floor_callback(struct rules_t *obj, uint16_t argc, uint16_t *argv, int *ret);
+
+#endif
\ No newline at end of file
diff --git a/HeishaMon/version.h b/HeishaMon/version.h
index c894d221..e8f51d1a 100644
--- a/HeishaMon/version.h
+++ b/HeishaMon/version.h
@@ -1 +1 @@
-static const char* heishamon_version = "3.0";
+static const char* heishamon_version = "3.1";
\ No newline at end of file
diff --git a/HeishaMon/webfunctions.cpp b/HeishaMon/webfunctions.cpp
index 18563d33..d036d7a2 100755
--- a/HeishaMon/webfunctions.cpp
+++ b/HeishaMon/webfunctions.cpp
@@ -527,7 +527,7 @@ int saveSettings(struct webserver_t *client, settingsStruct *heishamonSettings)
client->route = 111;
return 0;
}
-
+
if (reconnectWiFi) {
client->route = 112;
return 0;
@@ -541,11 +541,11 @@ int cacheSettings(struct webserver_t *client, struct arguments_t * args) {
struct websettings_t *tmp = (struct websettings_t *)client->userdata;
while (tmp) {
/*
- * this part is useless as websettings is always NULL at start of a new POST
- * it will only interrate over already POSTed args which are pushed on the list below
- * we only need to find the tail of the list
- * /
- *
+ this part is useless as websettings is always NULL at start of a new POST
+ it will only interrate over already POSTed args which are pushed on the list below
+ we only need to find the tail of the list
+ /
+
if (strcmp(tmp->name.c_str(), (char *)args->name) == 0) {
char *cpy = (char *)malloc(args->len + 1);
memset(cpy, 0, args->len + 1);
@@ -936,6 +936,9 @@ int handleRoot(struct webserver_t *client, float readpercentage, int mqttReconne
char *up = getUptime();
webserver_send_content(client, up, strlen(up));
free(up);
+ if (heishamonSettings->listenonly) {
+ webserver_send_content_P(client, webBodyRootStatusListenOnly, strlen_P(webBodyRootStatusListenOnly));
+ }
} break;
case 5: {
webserver_send_content_P(client, webBodyEndDiv, strlen_P(webBodyEndDiv));
diff --git a/Integrations/Home Assistant/README.md b/Integrations/Home Assistant/README.md
index c6c6520d..89c42831 100644
--- a/Integrations/Home Assistant/README.md
+++ b/Integrations/Home Assistant/README.md
@@ -1,3 +1,9 @@
+## Integration
+
+See https://github.com/kamaradclimber/heishamon-homeassistant/
+
+
+## or using manual declaration of entities
1. Create or copy file heishamon.yaml in directory /config/packages ( if directory not exist , create it)
2. Open file configuration.yaml in directory /config ,and check for lines:
diff --git a/MQTT-Topics.md b/MQTT-Topics.md
index 265bdd76..b4b3d029 100644
--- a/MQTT-Topics.md
+++ b/MQTT-Topics.md
@@ -123,10 +123,19 @@ TOP103 | main/Solar_Off_Delta | solar heating delta off
TOP104 | main/Solar_Frost_Protection | Solar frost protection temp
TOP105 | main/Solar_High_Limit | Solar max temp limit
TOP106 | main/Pump_Flowrate_mode | Settings for pump flow rate (0=DeltaT, 1=Maximum flow, J-series only)
+TOP107 | main/Liquid_Type | Type of liquid in settings (Water / Glycol)
+TOP108 | main/Alt_External_Sensor | If external outdoor sensor is selected
+TOP109 | main/Anti_Freeze_Mode | Is anti freeze mode enabled or disabled
+TOP110 | main/Optional_PCB | If the optional PCB is enabled (if installed)
+TOP111 | main/Z2_Sensor_Settings | Setting of the sensor for zone 2 (water, ext thermostat, int. thermostat or thermistor)
+TOP112 | main/Z1_Sensor_Settings | Setting of the sensor for zone 1 (water, ext thermostat, int. thermostat or thermistor)
+TOP113 | main/Buffer_Tank_Delta | Delta of buffer tank setting in Kelvin
+TOP114 | main/External_Pad_Heater | If the external pad heater is enabled (if installed)
-All Topics realated with state can have also value -1 - unknown - but only in ubnormal situations.
+
+All Topics realated with state can have also value -1 - unknown - but only in abnormal situations.
## Option PCB Topics:
The following topics are actions from the heatpump to the optional pcb (for example, start pump on zone 2). This is only available if you have enable optional pcb emulation.
@@ -176,7 +185,9 @@ SET21 | SetHeaterDelayTime | Set heater start delay time (only J-series) | in mi
SET22 | SetHeaterStartDelta | Set heater start delta T (only J-series) | in kelvin
SET23 | SetHeaterStopDelta | Set heater stop delta T (only J-series) | in kelvin
SET24 | SetMainSchedule | Set weekly schedule | 0=off, 1=on
-
+SET25 | SetAltExternalSensor | Set the alternative external outdoor sensor | 0=disabled, 1=enabled
+SET26 | SetExternalPadHeater | Set the external pad heater | 0=disabled, 1=type-A, 2=type-B
+SET27 | SetBufferDelta | Set buffer tank delta | 0 - 10
*If you operate your heatpump with direct temperature setup: topics ending xxxRequestTemperature will set the absolute target temperature*
diff --git a/ProtocolByteDecrypt.md b/ProtocolByteDecrypt.md
index 81d2219d..c3931f22 100644
--- a/ProtocolByteDecrypt.md
+++ b/ProtocolByteDecrypt.md
@@ -22,12 +22,13 @@
| TOP | 17 | 00 | | 0 byte |
| TOP | 18 | 00 | | 0 byte |
| TOP | 19 | 00 | | 0 byte |
-| TOP | 20 | 19 | 1st Bit = b0 Water , b1 Glycol 3rd & 4th bit = b01 Alternative Sensor Off ,b10 Alternative Sensor On 5rd & 6th bit = b01 Antifreezing Off ,b10 Antifreezing on 7rd & 8th bit = b01 Optional PCB Off ,b10 Optional PCB on | Circulation liquid ,Alternative outdoor temp sensor Anti freezing Optional PCB |
+| TOP107/108/109/110 | 20 | 19 | 1st Bit = b0 Water , b1 Glycol 3rd & 4th bit = b01 Alternative Sensor Off ,b10 Alternative Sensor On 5rd & 6th bit = b01 Antifreezing Off ,b10 Antifreezing on 7rd & 8th bit = b01 Optional PCB Off ,b10 Optional PCB on | Circulation liquid ,Alternative outdoor temp sensor Anti freezing Optional PCB |
+| TOP107/108/109/110 | 20 | 19 | 1st Bit = b0 Water , b1 Glycol 3rd & 4th bit = b01 Alternative Sensor Off ,b10 Alternative Sensor On 5rd & 6th bit = b01 Antifreezing Off ,b10 Antifreezing on 7rd & 8th bit = b01 Optional PCB Off ,b10 Optional PCB on | Circulation liquid ,Alternative outdoor temp sensor Anti freezing Optional PCB |
| TOP | 21 | 15 | (hex) 15 - One Zone and Z1 as room , 19 - One Zone and Z1 as pool, 16 - Two Zones and Z2 as room, 26 - Two Zones ,Z2 as pool| No. of Zones and Zone Destination |
-| TOP | 22 | 11 |First digit -Z2 ,Second digit Z1 (hex) 1 - water temperature,2 - External Thermostat, 3 - Internal Thermostat, , 4 - Thermistor | Zone & sensor settings ( system setup - Installer ) |
+| TOP111+TOP112 | 22 | 11 |First digit -Z2 ,Second digit Z1 (hex) 1 - water temperature,2 - External Thermostat, 3 - Internal Thermostat, , 4 - Thermistor | Zone & sensor settings ( system setup - Installer ) |
| TOP | 23 | 55 | (hex) Off (same for compressor )=55, On=56, External compressor On=95 | External and External compressor Switch |
| TOP99+TOP100+TOP101 | 24 | 16 | 1st & 2nd bit Smart DHW -All-In-One only, 3rd & 4th bit = solar buffer (0b01=no solar, 0b10=solar buffer, 0b11=solar dhw), 5th & 6th bit = buffer installed, 7th & 8th bit = DHW installed|
-| TOP | 25 | 5e | 1st & 2nd bit = 10 3rd & 4th bit = b01 no Pad Heater, b10 - Type A, b11 Type B 5th & 6th bit = b01 - Internal Heater 3kW, b10 - 6kW, b11 - 9kW 7th & 8th bit = b01 DHW Internal Heater , b10 - DHW External Heater | External Pad Heater Power of internal heater DHW heater Internal/External |
+| TOP114 | 25 | 5e | 1st & 2nd bit = 10 3rd & 4th bit = b01 no Pad Heater, b10 - Type A, b11 Type B 5th & 6th bit = b01 - Internal Heater 3kW, b10 - 6kW, b11 - 9kW 7th & 8th bit = b01 DHW Internal Heater , b10 - DHW External Heater | External Pad Heater Power of internal heater DHW heater Internal/External |
| TOP | 26 | 55 | (hex) Biwalent Off=55, Biwalent alternative =56, Biwalent parallel=5A | Biwalent settings |
| TOP | 27 | 05 | SG Ready Control on/off (bit5and6) ,Demand Control on/off (bit7and8) | SG Ready Control, Demand Control |
| TOP76+TOP81 | 28 | 09 | (hex) 09 - Compensation curve heat and direct cool, 05 - both compensation curves , 0a - direct heat and direct cool, 06 - heat direct, cool compensation curve | Operation Setup -Installer -water temperature heating on status and cooling |
@@ -61,7 +62,7 @@
| TOP | 56 | 00 | | 0 byte |
| TOP | 57 | 00 | | 0 byte |
| TOP | 58 | 80 | Convert to DEC-128 | Delta T for Pool [°K] |
-| TOP | 59 | 85 | Convert to DEC-128 | Delta T for buffer tank [°K]|
+| TOP113 | 59 | 85 | Convert to DEC-128 | Delta T for buffer tank [°K]|
| TOP | 60 | 15 | Convert to DEC X-1 | Time set for external heaters 20min-3h, step 5min. |
| TOP102 | 61 | 8a | Convert to DEC-128 | Solar Connection Set delta T for tank ON (DHW or Buffer) |
| TOP103 | 62 | 85 | Convert to DEC-128 | Solar Connection Set delta T for tank OFF (DHW or Buffer)|
@@ -120,9 +121,9 @@
| TOP | 115 | 15 | | ? |
| TOP | 116 | 5a | | ? |
| TOP69 | 117 | 05 | Sterilization on/off (bit5and6) , Z2 active (bit7) ,Z1 active (bit8)| Sterilization status Zone active information (look byte #6) |
-| TOP | 118 | 12 | | ? |
+| TOP | 118 | 12 | | Believed to provide fractional info for TOP5 and TOP6 values |
| TOP | 119 | 12 | | ? |
-| TOP | 120 | 19 | | ? |
+| TOP | 120 | 19 | | Possible 3e/4e bit for backup heater custom menu disable/enable |
| TOP | 121 | 00 | | 0 byte |
| TOP | 122 | 00 | | 0 byte |
| TOP | 123 | 00 | | 0 byte |
@@ -131,16 +132,16 @@
| TOP | 126 | 00 | | 0 byte |
| TOP | 127 | 00 | | 0 byte |
| TOP | 128 | 00 | | 0 byte |
-| TOP | 129 | e2 | | ? |
-| TOP | 130 | ce | | ? |
-| TOP | 131 | 0d | | ? |
+| TOP92 | 129 | e2 | look in HeatPumpType.md | Heat pump model |
+| TOP92 | 130 | ce | look in HeatPumpType.md | Heat pump model |
+| TOP92 | 131 | 0d | look in HeatPumpType.md | Heat pump model |
| TOP92 | 132 | 71 | look in HeatPumpType.md | Heat pump model |
-| TOP | 133 | 81 | | ? |
-| TOP | 134 | 72 | | ? |
-| TOP | 135 | ce | | ? |
-| TOP | 136 | 0c | | ? |
-| TOP | 137 | 92 | | ? |
-| TOP | 138 | 81 | | ? |
+| TOP92 | 133 | 81 | look in HeatPumpType.md | Heat pump model |
+| TOP92 | 134 | 72 | look in HeatPumpType.md | Heat pump model |
+| TOP92 | 135 | ce | look in HeatPumpType.md | Heat pump model |
+| TOP92 | 136 | 0c | look in HeatPumpType.md | Heat pump model |
+| TOP92 | 137 | 92 | look in HeatPumpType.md | Heat pump model |
+| TOP92 | 138 | 81 | look in HeatPumpType.md | Heat pump model |
| TOP56 | 139 | b0 | Convert to DEC-128 | Zone1: Actual (Zone 1) Temperature [°C] |
| TOP57 | 140 | 00 | Convert to DEC-128 | Zone2: Actual (Zone 2) Temperature [°C] |
| TOP10 | 141 | aa | Convert to DEC-128 | Actual DHW Temperature [°C] |
diff --git a/README.md b/README.md
index 0a6646f6..14acb6d0 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ All received data will be sent to different MQTT topics (see below for topic des
You can connect a 1wire network on GPIO4 which will report in seperate MQTT topics (panasonic_heat_pump/1wire/sensorid).
-The software is also able to measure Watt on a S0 port of two kWh meters. You only need to connect GPIO12 and GND to the S0 of one kWh meter and if you need a second kWh meter use GPIO14 and GND. It will report on MQTT topic panasonic_heat_pump/s0/Watt/1 and panasonic_heat_pump/s0/Watt/2 and also in the JSON output. You can replace 'Watt' in the previous topic with 'Watthour' to get consumption counter in WattHour (per mqtt message) or to 'WatthourTotal' to get the total consumption measured in WattHour.
+The software is also able to measure Watt on a S0 port of two kWh meters. You only need to connect GPIO12 and GND to the S0 of one kWh meter and if you need a second kWh meter use GPIO14 and GND. It will report on MQTT topic panasonic_heat_pump/s0/Watt/1 and panasonic_heat_pump/s0/Watt/2 and also in the JSON output. You can replace 'Watt' in the previous topic with 'Watthour' to get consumption counter in WattHour (per mqtt message) or to 'WatthourTotal' to get the total consumption measured in WattHour. To sync the WatthourTotal with your kWh-meter, publish the correct value to MQTT to the panasonic_heat_pump/s0/WattHourTotal/1 or panasonic_heat_pump/s0/WattHourTotal/2 topic with the 'retain' option while heishamon is rebooting. Upon reboot, heishamon reads this value as the last known value to you can sync using this method.
Updating the firmware is as easy as going to the firmware menu and, after authentication with username 'admin' and password 'heisha' (or other provided during setup), uploading the binary there.
@@ -152,6 +152,12 @@ Return boolean true when the input variable is still `NULL` in any other cases i
- `round`
Rounds the input float to the nearest integer.
+- `floor`
+The largest integer value less than or equal to the input float.
+
+- `ceil`
+The smallest integer value greater than or equal to the input float.
+
- `setTimer`
Sets a timer to trigger in X seconds. The first parameter is the timer number and the second parameters the number of seconds before it fires. A timer only fires once so it has to be re-set for recurring events. When a timer triggers it will can the timer event as described above.
diff --git a/binaries/HeishaMon.ino.d1-v1.0.md5 b/binaries/HeishaMon.ino.d1-v1.0.md5
new file mode 100644
index 00000000..03be2c00
--- /dev/null
+++ b/binaries/HeishaMon.ino.d1-v1.0.md5
@@ -0,0 +1 @@
+36ebefae1ba10b3a9630ce178401c0d4
\ No newline at end of file
diff --git a/binaries/HeishaMon.ino.d1-v2.0.md5 b/binaries/HeishaMon.ino.d1-v2.0.md5
new file mode 100644
index 00000000..86f96f55
--- /dev/null
+++ b/binaries/HeishaMon.ino.d1-v2.0.md5
@@ -0,0 +1 @@
+60538140e4d93c29971954feef067ffc
\ No newline at end of file
diff --git a/binaries/HeishaMon.ino.d1-v3.0.md5 b/binaries/HeishaMon.ino.d1-v3.0.md5
new file mode 100644
index 00000000..1e989067
--- /dev/null
+++ b/binaries/HeishaMon.ino.d1-v3.0.md5
@@ -0,0 +1 @@
+872192efa66c91946e0295d5f8140fc5
\ No newline at end of file
diff --git a/binaries/HeishaMon.ino.d1-v3.1.bin b/binaries/HeishaMon.ino.d1-v3.1.bin
new file mode 100644
index 00000000..f58e246c
Binary files /dev/null and b/binaries/HeishaMon.ino.d1-v3.1.bin differ
diff --git a/binaries/HeishaMon.ino.d1-v3.1.md5 b/binaries/HeishaMon.ino.d1-v3.1.md5
new file mode 100644
index 00000000..13e9fb13
--- /dev/null
+++ b/binaries/HeishaMon.ino.d1-v3.1.md5
@@ -0,0 +1 @@
+407c4c45cea30193b450ddfaf4f44ed4
\ No newline at end of file
diff --git a/binaries/README.md b/binaries/README.md
index 4dd867d7..11ab7ea4 100644
--- a/binaries/README.md
+++ b/binaries/README.md
@@ -6,5 +6,5 @@ The LittleFS versions will, after updating to this version, reset your HeishaMon
From version 1.0 some topics are changed so you need to update your automation for this.
The sensors are now in /main/ (before /sdc/) and the commands are expected in /commands/ (before in root topic). Check MQTT-Topics.md for the overview of all topics
-The latest production release is v3.0. If you decide to try out a later development version, you should be able to restore the firmware using a USB-TTL cable as sometimes upgrading to a development versions seems to fail and brick the heishamon pcb.
+The latest production release is v3.1. If you decide to try out a later development version, you should be able to restore the firmware using a USB-TTL cable as sometimes upgrading to a development versions seems to fail and brick the heishamon pcb.