From f986129c7233532a837bea5cf6a2167d069578c4 Mon Sep 17 00:00:00 2001 From: Yurii Date: Mon, 19 May 2025 23:16:34 +0300 Subject: [PATCH 1/4] fix: set month of date to OT fixed --- src/OpenThermTask.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/OpenThermTask.h b/src/OpenThermTask.h index 9b1d72a..fd95ee1 100644 --- a/src/OpenThermTask.h +++ b/src/OpenThermTask.h @@ -1418,9 +1418,8 @@ protected: } bool setDayAndMonth(const struct tm *ptm) { - const unsigned int request = ((ptm->tm_mon + 1) & 0xFF << 8) - | (ptm->tm_mday & 0xFF); - + const uint8_t month = (ptm->tm_mon + 1) & 0xFF; + const unsigned int request = (month << 8) | (ptm->tm_mday & 0xFF); const unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest( OpenThermRequestType::WRITE_DATA, OpenThermMessageID::Date, From c8e7724da8c5ee8037285956caf6eceed11256fe Mon Sep 17 00:00:00 2001 From: Yurii Date: Mon, 19 May 2025 23:26:44 +0300 Subject: [PATCH 2/4] refactor: cosmetic changes --- src_data/pages/dashboard.html | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src_data/pages/dashboard.html b/src_data/pages/dashboard.html index 93f9a30..3438fcb 100644 --- a/src_data/pages/dashboard.html +++ b/src_data/pages/dashboard.html @@ -261,16 +261,16 @@
dashboard.section.diag - 
Vendor:             
-Member ID:          
-Flags:              
-Type:               
-AppVersion:         
-OT version:         
-Modulation limits:  ... %, curr. max:  %
-Power limits:       ... kW
-Heating limits:     ... 
-DHW limits:         ...
+ 
Vendor:         
+Member ID:      
+Flags:          
+Type:           
+AppVersion:     
+OT version:     
+Modulation:     min: , curr. max:  %
+Power limits:   ... kW
+Heating limits: ... 
+DHW limits:     ...
@@ -508,7 +508,6 @@ setValue('.tempUnit', temperatureUnit(unitSystem)); setValue('.pressureUnit', pressureUnit(unitSystem)); setValue('.volumeUnit', volumeUnit(unitSystem)); - setValue('.sAbsModMax', result.opentherm.maxModulation); } catch (error) { console.log(error); From 655313562dc9cc8fe875d61b11faf8167e69b1c0 Mon Sep 17 00:00:00 2001 From: Yurii Date: Mon, 19 May 2025 23:28:55 +0300 Subject: [PATCH 3/4] fix: typo --- src_data/pages/dashboard.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src_data/pages/dashboard.html b/src_data/pages/dashboard.html index 3438fcb..55bf986 100644 --- a/src_data/pages/dashboard.html +++ b/src_data/pages/dashboard.html @@ -267,7 +267,7 @@ Type: AppVersion: OT version: -Modulation: min: , curr. max: % +Modulation: min: %, curr. max: % Power limits: ... kW Heating limits: ... DHW limits: ... From 0e78e714938ddba7dd9cf29eb4e1181995539522 Mon Sep 17 00:00:00 2001 From: Yurii Date: Mon, 19 May 2025 23:39:15 +0300 Subject: [PATCH 4/4] refactor: more logs --- src/OpenThermTask.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/OpenThermTask.h b/src/OpenThermTask.h index fd95ee1..1fb30ff 100644 --- a/src/OpenThermTask.h +++ b/src/OpenThermTask.h @@ -554,6 +554,9 @@ protected: Sensors::Type::OT_BURNER_STARTS, vars.slave.stats.burnerStarts, Sensors::ValueType::PRIMARY, true, true ); + + } else { + Log.swarningln(FPSTR(L_OT), F("Failed receive burner starts")); } } @@ -566,6 +569,9 @@ protected: Sensors::Type::OT_DHW_BURNER_STARTS, vars.slave.stats.dhwBurnerStarts, Sensors::ValueType::PRIMARY, true, true ); + + } else { + Log.swarningln(FPSTR(L_OT), F("Failed receive DHW burner starts")); } } @@ -578,6 +584,9 @@ protected: Sensors::Type::OT_HEATING_PUMP_STARTS, vars.slave.stats.heatingPumpStarts, Sensors::ValueType::PRIMARY, true, true ); + + } else { + Log.swarningln(FPSTR(L_OT), F("Failed receive heating pump starts")); } } @@ -590,6 +599,9 @@ protected: Sensors::Type::OT_DHW_PUMP_STARTS, vars.slave.stats.dhwPumpStarts, Sensors::ValueType::PRIMARY, true, true ); + + } else { + Log.swarningln(FPSTR(L_OT), F("Failed receive DHW pump starts")); } } @@ -602,6 +614,9 @@ protected: Sensors::Type::OT_BURNER_HOURS, vars.slave.stats.burnerHours, Sensors::ValueType::PRIMARY, true, true ); + + } else { + Log.swarningln(FPSTR(L_OT), F("Failed receive burner hours")); } } @@ -614,6 +629,9 @@ protected: Sensors::Type::OT_DHW_BURNER_HOURS, vars.slave.stats.dhwBurnerHours, Sensors::ValueType::PRIMARY, true, true ); + + } else { + Log.swarningln(FPSTR(L_OT), F("Failed receive DHW burner hours")); } } @@ -626,6 +644,9 @@ protected: Sensors::Type::OT_HEATING_PUMP_HOURS, vars.slave.stats.heatingPumpHours, Sensors::ValueType::PRIMARY, true, true ); + + } else { + Log.swarningln(FPSTR(L_OT), F("Failed receive heating pump hours")); } } @@ -638,6 +659,9 @@ protected: Sensors::Type::OT_DHW_PUMP_HOURS, vars.slave.stats.dhwPumpHours, Sensors::ValueType::PRIMARY, true, true ); + + } else { + Log.swarningln(FPSTR(L_OT), F("Failed receive DHW pump hours")); } }