mirror of
https://github.com/Laxilef/OTGateway.git
synced 2025-12-25 17:43:35 +05:00
Compare commits
3 Commits
d50b70c211
...
77d80225ad
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
77d80225ad | ||
|
|
dc68315166 | ||
|
|
5d0ca68dc0 |
@@ -112,6 +112,27 @@ public:
|
||||
return (byte)id == responseId;
|
||||
}
|
||||
|
||||
static uint8_t getResponseMessageTypeId(unsigned long response) {
|
||||
return (response << 1) >> 29;
|
||||
}
|
||||
|
||||
static const char* getResponseMessageTypeString(unsigned long response) {
|
||||
uint8_t msgType = getResponseMessageTypeId(response);
|
||||
|
||||
switch (msgType) {
|
||||
case (uint8_t) OpenThermMessageType::READ_ACK:
|
||||
case (uint8_t) OpenThermMessageType::WRITE_ACK:
|
||||
case (uint8_t) OpenThermMessageType::DATA_INVALID:
|
||||
case (uint8_t) OpenThermMessageType::UNKNOWN_DATA_ID:
|
||||
return CustomOpenTherm::messageTypeToString(
|
||||
static_cast<OpenThermMessageType>(msgType)
|
||||
);
|
||||
|
||||
default:
|
||||
return "UNKNOWN";
|
||||
}
|
||||
}
|
||||
|
||||
// converters
|
||||
template <class T>
|
||||
static unsigned int toFloat(const T val) {
|
||||
|
||||
@@ -93,8 +93,13 @@ protected:
|
||||
this->instance->setAfterSendRequestCallback([this](unsigned long request, unsigned long response, OpenThermResponseStatus status, byte attempt) {
|
||||
Log.sverboseln(
|
||||
FPSTR(L_OT),
|
||||
F("ID: %4d Request: %8lx Response: %8lx Attempt: %2d Status: %s"),
|
||||
CustomOpenTherm::getDataID(request), request, response, attempt, CustomOpenTherm::statusToString(status)
|
||||
F("ID: %4d Request: %8lx Response: %8lx Msg type: %s Attempt: %2d Status: %s"),
|
||||
CustomOpenTherm::getDataID(request),
|
||||
request,
|
||||
response,
|
||||
CustomOpenTherm::getResponseMessageTypeString(response),
|
||||
attempt,
|
||||
CustomOpenTherm::statusToString(status)
|
||||
);
|
||||
|
||||
if (status == OpenThermResponseStatus::SUCCESS) {
|
||||
@@ -1185,17 +1190,17 @@ protected:
|
||||
|
||||
bool needSetDhwTemp(const float target) {
|
||||
return millis() - this->dhwSetTempTime > this->dhwSetTempInterval
|
||||
|| fabsf(target - vars.slave.dhw.targetTemp) > 0.001f;
|
||||
|| fabsf(target - vars.slave.dhw.targetTemp) > 0.05f;
|
||||
}
|
||||
|
||||
bool needSetHeatingTemp(const float target) {
|
||||
return millis() - this->heatingSetTempTime > this->heatingSetTempInterval
|
||||
|| fabsf(target - vars.slave.heating.targetTemp) > 0.001f;
|
||||
|| fabsf(target - vars.slave.heating.targetTemp) > 0.05f;
|
||||
}
|
||||
|
||||
bool needSetCh2Temp(const float target) {
|
||||
return millis() - this->ch2SetTempTime > this->ch2SetTempInterval
|
||||
|| fabsf(target - vars.slave.ch2.targetTemp) > 0.001f;
|
||||
|| fabsf(target - vars.slave.ch2.targetTemp) > 0.05f;
|
||||
}
|
||||
|
||||
bool updateSlaveConfig() {
|
||||
@@ -1356,7 +1361,7 @@ protected:
|
||||
return CustomOpenTherm::getUInt(response) == request;
|
||||
}
|
||||
|
||||
bool setMaxHeatingTemp(const uint8_t temperature) {
|
||||
bool setMaxHeatingTemp(const float temperature) {
|
||||
const unsigned int request = CustomOpenTherm::temperatureToData(temperature);
|
||||
const unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
|
||||
OpenThermMessageType::WRITE_DATA,
|
||||
|
||||
Reference in New Issue
Block a user