mirror of
https://github.com/Laxilef/OTGateway.git
synced 2025-12-16 13:14:30 +05:00
feat: added sensor type "OT, Cooling hours"
This commit is contained in:
@@ -305,6 +305,7 @@ protected:
|
|||||||
Sensors::setConnectionStatusByType(Sensors::Type::OT_DHW_BURNER_HOURS, false);
|
Sensors::setConnectionStatusByType(Sensors::Type::OT_DHW_BURNER_HOURS, false);
|
||||||
Sensors::setConnectionStatusByType(Sensors::Type::OT_HEATING_PUMP_HOURS, false);
|
Sensors::setConnectionStatusByType(Sensors::Type::OT_HEATING_PUMP_HOURS, false);
|
||||||
Sensors::setConnectionStatusByType(Sensors::Type::OT_DHW_PUMP_HOURS, false);
|
Sensors::setConnectionStatusByType(Sensors::Type::OT_DHW_PUMP_HOURS, false);
|
||||||
|
Sensors::setConnectionStatusByType(Sensors::Type::OT_COOLING_HOURS, false);
|
||||||
|
|
||||||
this->initialized = false;
|
this->initialized = false;
|
||||||
this->disconnectedTime = millis();
|
this->disconnectedTime = millis();
|
||||||
@@ -677,6 +678,21 @@ protected:
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Update cooling hours
|
||||||
|
if (Sensors::getAmountByType(Sensors::Type::OT_COOLING_HOURS, true)) {
|
||||||
|
if (this->updateCoolingHours()) {
|
||||||
|
Log.snoticeln(FPSTR(L_OT), F("Received cooling hours: %hu"), vars.slave.stats.coolingHours);
|
||||||
|
|
||||||
|
Sensors::setValueByType(
|
||||||
|
Sensors::Type::OT_COOLING_HOURS, vars.slave.stats.coolingHours,
|
||||||
|
Sensors::ValueType::PRIMARY, true, true
|
||||||
|
);
|
||||||
|
|
||||||
|
} else {
|
||||||
|
Log.swarningln(FPSTR(L_OT), F("Failed receive cooling hours"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Auto fault reset
|
// Auto fault reset
|
||||||
if (settings.opentherm.options.autoFaultReset && vars.slave.fault.active && !vars.actions.resetFault) {
|
if (settings.opentherm.options.autoFaultReset && vars.slave.fault.active && !vars.actions.resetFault) {
|
||||||
vars.actions.resetFault = true;
|
vars.actions.resetFault = true;
|
||||||
@@ -2171,6 +2187,25 @@ protected:
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool updateCoolingHours() {
|
||||||
|
const unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
|
||||||
|
OpenThermRequestType::READ_DATA,
|
||||||
|
OpenThermMessageID::CoolingOperationHours,
|
||||||
|
0
|
||||||
|
));
|
||||||
|
|
||||||
|
if (!CustomOpenTherm::isValidResponse(response)) {
|
||||||
|
return false;
|
||||||
|
|
||||||
|
} else if (!CustomOpenTherm::isValidResponseId(response, OpenThermMessageID::CoolingOperationHours)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
vars.slave.stats.coolingHours = CustomOpenTherm::getUInt(response);
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
bool updateModulationLevel() {
|
bool updateModulationLevel() {
|
||||||
const unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
|
const unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
|
||||||
OpenThermRequestType::READ_DATA,
|
OpenThermRequestType::READ_DATA,
|
||||||
|
|||||||
@@ -34,6 +34,7 @@ public:
|
|||||||
OT_DHW_BURNER_HOURS = 24,
|
OT_DHW_BURNER_HOURS = 24,
|
||||||
OT_HEATING_PUMP_HOURS = 25,
|
OT_HEATING_PUMP_HOURS = 25,
|
||||||
OT_DHW_PUMP_HOURS = 26,
|
OT_DHW_PUMP_HOURS = 26,
|
||||||
|
OT_COOLING_HOURS = 27,
|
||||||
|
|
||||||
NTC_10K_TEMP = 50,
|
NTC_10K_TEMP = 50,
|
||||||
DALLAS_TEMP = 51,
|
DALLAS_TEMP = 51,
|
||||||
|
|||||||
@@ -389,6 +389,7 @@ struct Variables {
|
|||||||
uint16_t dhwBurnerStarts = 0;
|
uint16_t dhwBurnerStarts = 0;
|
||||||
uint16_t heatingPumpStarts = 0;
|
uint16_t heatingPumpStarts = 0;
|
||||||
uint16_t dhwPumpStarts = 0;
|
uint16_t dhwPumpStarts = 0;
|
||||||
|
uint16_t coolingHours = 0;
|
||||||
uint16_t burnerHours = 0;
|
uint16_t burnerHours = 0;
|
||||||
uint16_t dhwBurnerHours = 0;
|
uint16_t dhwBurnerHours = 0;
|
||||||
uint16_t heatingPumpHours = 0;
|
uint16_t heatingPumpHours = 0;
|
||||||
|
|||||||
@@ -1932,6 +1932,7 @@ bool jsonToSensorSettings(const uint8_t sensorId, const JsonVariantConst src, Se
|
|||||||
case static_cast<uint8_t>(Sensors::Type::OT_DHW_BURNER_HOURS):
|
case static_cast<uint8_t>(Sensors::Type::OT_DHW_BURNER_HOURS):
|
||||||
case static_cast<uint8_t>(Sensors::Type::OT_HEATING_PUMP_HOURS):
|
case static_cast<uint8_t>(Sensors::Type::OT_HEATING_PUMP_HOURS):
|
||||||
case static_cast<uint8_t>(Sensors::Type::OT_DHW_PUMP_HOURS):
|
case static_cast<uint8_t>(Sensors::Type::OT_DHW_PUMP_HOURS):
|
||||||
|
case static_cast<uint8_t>(Sensors::Type::OT_COOLING_HOURS):
|
||||||
|
|
||||||
case static_cast<uint8_t>(Sensors::Type::NTC_10K_TEMP):
|
case static_cast<uint8_t>(Sensors::Type::NTC_10K_TEMP):
|
||||||
case static_cast<uint8_t>(Sensors::Type::DALLAS_TEMP):
|
case static_cast<uint8_t>(Sensors::Type::DALLAS_TEMP):
|
||||||
|
|||||||
@@ -243,6 +243,7 @@
|
|||||||
"otDhwBurnerHours": "OpenTherm, number of burner operating hours (DHW)",
|
"otDhwBurnerHours": "OpenTherm, number of burner operating hours (DHW)",
|
||||||
"otHeatingPumpHours": "OpenTherm, number of pump operating hours (heating)",
|
"otHeatingPumpHours": "OpenTherm, number of pump operating hours (heating)",
|
||||||
"otDhwPumpHours": "OpenTherm, number of pump operating hours (DHW)",
|
"otDhwPumpHours": "OpenTherm, number of pump operating hours (DHW)",
|
||||||
|
"otCoolingHours": "OpenTherm, number of cooling hours",
|
||||||
|
|
||||||
"ntcTemp": "NTC 传感器",
|
"ntcTemp": "NTC 传感器",
|
||||||
"dallasTemp": "DALLAS 传感器",
|
"dallasTemp": "DALLAS 传感器",
|
||||||
|
|||||||
@@ -243,6 +243,7 @@
|
|||||||
"otDhwBurnerHours": "OpenTherm, number of burner operating hours (DHW)",
|
"otDhwBurnerHours": "OpenTherm, number of burner operating hours (DHW)",
|
||||||
"otHeatingPumpHours": "OpenTherm, number of pump operating hours (heating)",
|
"otHeatingPumpHours": "OpenTherm, number of pump operating hours (heating)",
|
||||||
"otDhwPumpHours": "OpenTherm, number of pump operating hours (DHW)",
|
"otDhwPumpHours": "OpenTherm, number of pump operating hours (DHW)",
|
||||||
|
"otCoolingHours": "OpenTherm, number of cooling hours",
|
||||||
|
|
||||||
"ntcTemp": "NTC sensor",
|
"ntcTemp": "NTC sensor",
|
||||||
"dallasTemp": "DALLAS sensor",
|
"dallasTemp": "DALLAS sensor",
|
||||||
|
|||||||
@@ -243,6 +243,7 @@
|
|||||||
"otDhwBurnerHours": "OpenTherm, numero di ore di funzionamento del bruciatore (ACS)",
|
"otDhwBurnerHours": "OpenTherm, numero di ore di funzionamento del bruciatore (ACS)",
|
||||||
"otHeatingPumpHours": "OpenTherm, numero di ore di funzionamento della pompa (riscaldamento)",
|
"otHeatingPumpHours": "OpenTherm, numero di ore di funzionamento della pompa (riscaldamento)",
|
||||||
"otDhwPumpHours": "OpenTherm, numero di ore di funzionamento della pompa (ACS)",
|
"otDhwPumpHours": "OpenTherm, numero di ore di funzionamento della pompa (ACS)",
|
||||||
|
"otCoolingHours": "OpenTherm, numero di ore di funzionamento della cooling",
|
||||||
|
|
||||||
"ntcTemp": "Sensore NTC",
|
"ntcTemp": "Sensore NTC",
|
||||||
"dallasTemp": "Sensore DALLAS",
|
"dallasTemp": "Sensore DALLAS",
|
||||||
|
|||||||
@@ -222,6 +222,8 @@
|
|||||||
"otDhwBurnerHours": "OpenTherm, aantal branderuren (warm water)",
|
"otDhwBurnerHours": "OpenTherm, aantal branderuren (warm water)",
|
||||||
"otHeatingPumpHours": "OpenTherm, aantal pompuren (verwarming)",
|
"otHeatingPumpHours": "OpenTherm, aantal pompuren (verwarming)",
|
||||||
"otDhwPumpHours": "OpenTherm, aantal pompuren (warm water)",
|
"otDhwPumpHours": "OpenTherm, aantal pompuren (warm water)",
|
||||||
|
"otCoolingHours": "OpenTherm, aantal cooling",
|
||||||
|
|
||||||
"ntcTemp": "NTC-sensor",
|
"ntcTemp": "NTC-sensor",
|
||||||
"dallasTemp": "DALLAS-sensor",
|
"dallasTemp": "DALLAS-sensor",
|
||||||
"bluetooth": "BLE-sensor",
|
"bluetooth": "BLE-sensor",
|
||||||
|
|||||||
@@ -243,6 +243,7 @@
|
|||||||
"otDhwBurnerHours": "OpenTherm, кол-во часов работы горелки (ГВС)",
|
"otDhwBurnerHours": "OpenTherm, кол-во часов работы горелки (ГВС)",
|
||||||
"otHeatingPumpHours": "OpenTherm, кол-во часов работы насоса (отопление)",
|
"otHeatingPumpHours": "OpenTherm, кол-во часов работы насоса (отопление)",
|
||||||
"otDhwPumpHours": "OpenTherm, кол-во часов работы насоса (ГВС)",
|
"otDhwPumpHours": "OpenTherm, кол-во часов работы насоса (ГВС)",
|
||||||
|
"otCoolingHours": "OpenTherm, кол-во часов работы охлаждения",
|
||||||
|
|
||||||
"ntcTemp": "NTC датчик",
|
"ntcTemp": "NTC датчик",
|
||||||
"dallasTemp": "DALLAS датчик",
|
"dallasTemp": "DALLAS датчик",
|
||||||
|
|||||||
@@ -113,6 +113,7 @@
|
|||||||
<option value="24" data-i18n>sensors.types.otDhwBurnerHours</option>
|
<option value="24" data-i18n>sensors.types.otDhwBurnerHours</option>
|
||||||
<option value="25" data-i18n>sensors.types.otHeatingPumpHours</option>
|
<option value="25" data-i18n>sensors.types.otHeatingPumpHours</option>
|
||||||
<option value="26" data-i18n>sensors.types.otDhwPumpHours</option>
|
<option value="26" data-i18n>sensors.types.otDhwPumpHours</option>
|
||||||
|
<option value="27" data-i18n>sensors.types.otCoolingHours</option>
|
||||||
|
|
||||||
<option value="50" data-i18n>sensors.types.ntcTemp</option>
|
<option value="50" data-i18n>sensors.types.ntcTemp</option>
|
||||||
<option value="51" data-i18n>sensors.types.dallasTemp</option>
|
<option value="51" data-i18n>sensors.types.dallasTemp</option>
|
||||||
|
|||||||
Reference in New Issue
Block a user