jeka/OTGateway
1
0
Fork 0
mirror of https://github.com/Laxilef/OTGateway.git synced 2025-12-14 20:24:28 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into new-equitherm

Browse Source
This commit is contained in:
Yurii
2025-05-19 23:45:13 +03:00
parent 5046bc0e8f 0e78e71493
commit 0bb05006f4
2 changed files with 36 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/OpenThermTask.h
View File

@@ -554,6 +554,9 @@ protected:
Sensors::Type::OT_BURNER_STARTS, vars.slave.stats.burnerStarts, Sensors::Type::OT_BURNER_STARTS, vars.slave.stats.burnerStarts,
Sensors::ValueType::PRIMARY, true, true 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::Type::OT_DHW_BURNER_STARTS, vars.slave.stats.dhwBurnerStarts,
Sensors::ValueType::PRIMARY, true, true 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::Type::OT_HEATING_PUMP_STARTS, vars.slave.stats.heatingPumpStarts,
Sensors::ValueType::PRIMARY, true, true 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::Type::OT_DHW_PUMP_STARTS, vars.slave.stats.dhwPumpStarts,
Sensors::ValueType::PRIMARY, true, true 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::Type::OT_BURNER_HOURS, vars.slave.stats.burnerHours,
Sensors::ValueType::PRIMARY, true, true 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::Type::OT_DHW_BURNER_HOURS, vars.slave.stats.dhwBurnerHours,
Sensors::ValueType::PRIMARY, true, true 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::Type::OT_HEATING_PUMP_HOURS, vars.slave.stats.heatingPumpHours,
Sensors::ValueType::PRIMARY, true, true 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::Type::OT_DHW_PUMP_HOURS, vars.slave.stats.dhwPumpHours,
Sensors::ValueType::PRIMARY, true, true Sensors::ValueType::PRIMARY, true, true
); );
} else {
Log.swarningln(FPSTR(L_OT), F("Failed receive DHW pump hours"));
} }
} }
@@ -1418,9 +1442,8 @@ protected:
} }
bool setDayAndMonth(const struct tm *ptm) { bool setDayAndMonth(const struct tm *ptm) {
const unsigned int request = ((ptm->tm_mon + 1) & 0xFF << 8) const uint8_t month = (ptm->tm_mon + 1) & 0xFF;
| (ptm->tm_mday & 0xFF); const unsigned int request = (month << 8) | (ptm->tm_mday & 0xFF);
const unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest( const unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
OpenThermRequestType::WRITE_DATA, OpenThermRequestType::WRITE_DATA,
OpenThermMessageID::Date, OpenThermMessageID::Date,

21
src_data/pages/dashboard.html
View File

@@ -261,16 +261,16 @@
<details> <details>
<summary><b data-i18n>dashboard.section.diag</b></summary> <summary><b data-i18n>dashboard.section.diag</b></summary>
<pre><b>Vendor:</b> <span class="sVendor"></span> <pre><b>Vendor:</b> <span class="sVendor"></span>
<b>Member ID:</b> <span class="sMemberId"></span> <b>Member ID:</b> <span class="sMemberId"></span>
<b>Flags:</b> <span class="sFlags"></span> <b>Flags:</b> <span class="sFlags"></span>
<b>Type:</b> <span class="sType"></span> <b>Type:</b> <span class="sType"></span>
<b>AppVersion:</b> <span class="sAppVersion"></span> <b>AppVersion:</b> <span class="sAppVersion"></span>
<b>OT version:</b> <span class="sProtocolVersion"></span> <b>OT version:</b> <span class="sProtocolVersion"></span>
<b>Modulation limits:</b> <span class="sModMin"></span>...<span class="sAbsModMax"></span> %, curr. max: <span class="sModMax"></span> % <b>Modulation:</b> min: <span class="sModMin"></span> %, curr. max: <span class="sModMax"></span> %
<b>Power limits:</b> <span class="sPowerMin"></span>...<span class="sPowerMax"></span> kW <b>Power limits:</b> <span class="sPowerMin"></span>...<span class="sPowerMax"></span> kW
<b>Heating limits:</b> <span class="sHeatMinTemp"></span>...<span class="sHeatMaxTemp"></span> <span class="tempUnit"></span> <b>Heating limits:</b> <span class="sHeatMinTemp"></span>...<span class="sHeatMaxTemp"></span> <span class="tempUnit"></span>
<b>DHW limits:</b> <span class="sDhwMinTemp"></span>...<span class="sDhwMaxTemp"></span> <span class="tempUnit"></span></pre> <b>DHW limits:</b> <span class="sDhwMinTemp"></span>...<span class="sDhwMaxTemp"></span> <span class="tempUnit"></span></pre>
</details> </details>
</div> </div>
</article> </article>
@@ -508,7 +508,6 @@
setValue('.tempUnit', temperatureUnit(unitSystem)); setValue('.tempUnit', temperatureUnit(unitSystem));
setValue('.pressureUnit', pressureUnit(unitSystem)); setValue('.pressureUnit', pressureUnit(unitSystem));
setValue('.volumeUnit', volumeUnit(unitSystem)); setValue('.volumeUnit', volumeUnit(unitSystem));
setValue('.sAbsModMax', result.opentherm.maxModulation);
} catch (error) { } catch (error) {
console.log(error); console.log(error);