andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-06 07:49:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

add back poll-ack for remote, add F7-02 reply

Browse Source
This commit is contained in:
MichaelDvP
2024-04-15 12:32:23 +02:00
parent 4d400bd7ce
commit c60254b624
2 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/roomcontrol.cpp
View File

@@ -124,9 +124,8 @@ void Roomctrl::send(uint8_t addr) {
type_[hc] = RemoteType::NONE;
}
} else {
// acknowledge every poll, otherwise the master shows error A22-816
// not needed for 15 sec repeat rate, causes incomplete telegrams if poll-ack is sent
// EMSuart::send_poll(addr | EMSbus::ems_mask());
// acknowledge every poll
EMSuart::send_poll(addr | EMSbus::ems_mask());
}
}
@@ -171,6 +170,8 @@ void Roomctrl::check(uint8_t addr, const uint8_t * data, const uint8_t length) {
unknown(addr, data[0], data[2], data[3]);
} else if (length == 8 && data[2] == 0xFF) { // ems+ query
unknown(addr, data[0], data[3], data[5], data[6]);
} else if (data[2] == 0x7F) { // ems+ query with 3 bytes type src dst 7F offset len=FF FF HIGH LOW
replyF7(addr, data[0], data[3], data[5], data[6], data[7], hc);
}
}
@@ -355,6 +356,30 @@ void Roomctrl::ack_write() {
data[0] = TxService::TX_WRITE_SUCCESS;
EMSuart::transmit(data, 1);
}
void Roomctrl::replyF7(uint8_t addr, uint8_t dst, uint8_t offset, uint8_t typehh, uint8_t typeh, uint8_t typel, uint8_t hc) {
uint8_t data[12];
data[0] = addr | EMSbus::ems_mask();
data[1] = dst & 0x7F;
data[2] = 0xF7;
data[3] = offset;
data[4] = typehh;
data[5] = typeh;
data[6] = typel;
if (typehh == 0x02) {
if (type_[hc] == RC200 || type_[hc] == FB10) {
data[7] = 0xFF;
data[8] = 0x01;
} else {
data[7] = 0x0F;
data[8] = 0x00;
}
} else {
data[7] = 0;
data[8] = 0;
}
data[9] = EMSbus::calculate_crc(data, 9); // apppend CRC
EMSuart::transmit(data, 10);
}
int16_t Roomctrl::calc_dew(int16_t temp, uint8_t humi) {
if (humi == EMS_VALUE_UINT_NOTSET || temp == EMS_VALUE_SHORT_NOTSET) {