This commit is contained in:
kislovdm
2025-07-21 21:59:04 +03:00
parent 7c7cd6a198
commit 51438e7bf9
8 changed files with 394 additions and 93 deletions
+19 -5
View File
@@ -16,14 +16,14 @@ esp32:
# Enable logging
#Журналирование
logger:
level: DEBUG #NONE
level: INFO #NONE
baud_rate: 0
# Enable Home Assistant API
api:
# web_server:
# port: 80
web_server:
port: 80
ota:
platform: esphome
@@ -67,11 +67,10 @@ external_components:
path: ./components
saeco_series_6000:
id: saeco_series_6000_component
uart_display: uart_display
uart_mainboard: uart_mainboard
debug: true
#Сенсор в который компонент публикует статус в цифровом виде
state_sensor:
name: Work State
id: idControlSensor
@@ -173,3 +172,18 @@ text_sensor:
id: idErrorCode
icon: mdi:alert-circle-outline
update_interval: never
button:
- platform: template
name: "Отправить три пакета"
on_press:
then:
- lambda: |-
std::vector<std::vector<uint8_t>> pkts = {
{0xAA,0xAA,0xAA,0x90,0x0B,0x0A,0x05,0x03,0x00,0x02,0x00,0x00,0x64,0x00,0x00,0x00,0x39,0xBF,0x5B,0x74,0x55},
};
id(saeco_series_6000_component)->send_packets_to_mainboard(pkts, 50);
#[20:45:34][I][saeco_series_6000:079]: Packet from Display: AA AA AA 93 0A 01 01 57 15 3A ED 55
#[20:45:34][I][saeco_series_6000:079]: Packet from Display: AA AA AA 90 0B 0A 05 03 00 02 00 00 64 00 00 00 39 BF 5B 74 55
#[20:45:35][I][saeco_series_6000:079]: Packet from Display: AA AA AA 91 0C 01 03 42 C0 B0 AD 55"
+52 -2
View File
@@ -2,8 +2,9 @@ DEPENDENCIES = ["uart", "sensor"]
import esphome.codegen as cg
import esphome.config_validation as cv
from esphome.components import uart, sensor
from esphome.components import uart, sensor, button
from esphome.const import CONF_ID, CONF_DEBUG
import esphome.automation as automation
CONF_STATE_SENSOR = "state_sensor"
CONF_B0_STATUS_SENSOR = "b0_status_sensor"
@@ -18,12 +19,14 @@ CONF_PALLET_SENSOR = "pallet_sensor"
CONF_ERROR_CODE_SENSOR = "error_code_sensor"
CONF_GRAIN_TRAY_SENSOR = "grain_tray_sensor"
CONF_STATUS_TEXT_SENSOR = "status_text_sensor"
CONF_PACKETS = "packets"
CONF_SAECO_ID = "saeco_id"
saeco_series_6000_ns = cg.esphome_ns.namespace('saeco_series_6000')
SaecoSeries6000 = saeco_series_6000_ns.class_('SaecoSeries6000', cg.Component)
CONFIG_SCHEMA = cv.Schema({
cv.GenerateID(): cv.declare_id(SaecoSeries6000),
cv.Required(cv.CONF_ID): cv.declare_id(SaecoSeries6000),
cv.Required('uart_display'): cv.use_id(uart.UARTComponent),
cv.Required('uart_mainboard'): cv.use_id(uart.UARTComponent),
cv.Optional(CONF_DEBUG, default=False): cv.boolean,
@@ -46,3 +49,50 @@ def to_code(config):
if CONF_STATE_SENSOR in config:
sens = yield sensor.new_sensor(config[CONF_STATE_SENSOR])
cg.add(var.set_status_sensor(sens))
def validate_packet(value):
if isinstance(value, str):
return [int(x, 16) for x in value.split()]
return [cv.hex_uint8_t(x) for x in value]
SEND_PACKETS_ACTION_SCHEMA = cv.Schema({
cv.Required(CONF_ID): cv.use_id(SaecoSeries6000),
cv.Required(CONF_PACKETS): [cv.All(validate_packet)],
cv.Optional("delay_ms", default=10): cv.positive_int,
})
SendPacketsAction = saeco_series_6000_ns.class_("SendPacketsAction", automation.Action)
@automation.register_action(
"saeco_series_6000.send_packets",
SendPacketsAction,
SEND_PACKETS_ACTION_SCHEMA,
)
def send_packets_to_mainboard_action_to_code(config, action_id, template_arg, args):
var = cg.new_Pvariable(action_id)
parent = yield cg.get_variable(config[CONF_ID])
var.set_parent(parent)
var.set_packets(config[CONF_PACKETS])
var.set_delay_ms(config.get("delay_ms", 10))
return var
SaecoSendPacketsButton = saeco_series_6000_ns.class_("SaecoSendPacketsButton", button.Button, cg.Component)
SAECO_SEND_PACKETS_BUTTON_SCHEMA = button.BUTTON_SCHEMA.extend({
cv.GenerateID(): cv.declare_id(SaecoSendPacketsButton),
cv.Required(CONF_ID): cv.use_id(SaecoSeries6000),
cv.Required(CONF_PACKETS): [cv.All(validate_packet)],
cv.Optional("delay_ms", default=10): cv.positive_int,
}).extend(cv.COMPONENT_SCHEMA)
async def saeco_send_packets_button_to_code(config):
parent = await cg.get_variable(config[CONF_SAECO_ID])
var = cg.new_Pvariable(config["id"])
await cg.register_component(var, config)
await button.register_button(var, config)
cg.add(var.set_parent(parent))
cg.add(var.set_packets(config[CONF_PACKETS]))
cg.add(var.set_delay_ms(config.get("delay_ms", 10)))
return var
button.register_button("saeco_series_6000", saeco_send_packets_button_to_code)
+70
View File
@@ -0,0 +1,70 @@
#include <cstdint>
#include <vector>
#include <cstdio>
#include <cassert>
static const uint8_t BitReverse[256] = {
0x00,0x80,0x40,0xC0,0x20,0xA0,0x60,0xE0,0x10,0x90,0x50,0xD0,0x30,0xB0,0x70,0xF0,
0x08,0x88,0x48,0xC8,0x28,0xA8,0x68,0xE8,0x18,0x98,0x58,0xD8,0x38,0xB8,0x78,0xF8,
0x04,0x84,0x44,0xC4,0x24,0xA4,0x64,0xE4,0x14,0x94,0x54,0xD4,0x34,0xB4,0x74,0xF4,
0x0C,0x8C,0x4C,0xCC,0x2C,0xAC,0x6C,0xEC,0x1C,0x9C,0x5C,0xDC,0x3C,0xBC,0x7C,0xFC,
0x02,0x82,0x42,0xC2,0x22,0xA2,0x62,0xE2,0x12,0x92,0x52,0xD2,0x32,0xB2,0x72,0xF2,
0x0A,0x8A,0x4A,0xCA,0x2A,0xAA,0x6A,0xEA,0x1A,0x9A,0x5A,0xDA,0x3A,0xBA,0x7A,0xFA,
0x06,0x86,0x46,0xC6,0x26,0xA6,0x66,0xE6,0x16,0x96,0x56,0xD6,0x36,0xB6,0x76,0xF6,
0x0E,0x8E,0x4E,0xCE,0x2E,0xAE,0x6E,0xEE,0x1E,0x9E,0x5E,0xDE,0x3E,0xBE,0x7E,0xFE,
0x01,0x81,0x41,0xC1,0x21,0xA1,0x61,0xE1,0x11,0x91,0x51,0xD1,0x31,0xB1,0x71,0xF1,
0x09,0x89,0x49,0xC9,0x29,0xA9,0x69,0xE9,0x19,0x99,0x59,0xD9,0x39,0xB9,0x79,0xF9,
0x05,0x85,0x45,0xC5,0x25,0xA5,0x65,0xE5,0x15,0x95,0x55,0xD5,0x35,0xB5,0x75,0xF5,
0x0D,0x8D,0x4D,0xCD,0x2D,0xAD,0x6D,0xED,0x1D,0x9D,0x5D,0xDD,0x3D,0xBD,0x7D,0xFD,
0x03,0x83,0x43,0xC3,0x23,0xA3,0x63,0xE3,0x13,0x93,0x53,0xD3,0x33,0xB3,0x73,0xF3,
0x0B,0x8B,0x4B,0xCB,0x2B,0xAB,0x6B,0xEB,0x1B,0x9B,0x5B,0xDB,0x3B,0xBB,0x7B,0xFB,
0x07,0x87,0x47,0xC7,0x27,0xA7,0x67,0xE7,0x17,0x97,0x57,0xD7,0x37,0xB7,0x77,0xF7,
0x0F,0x8F,0x4F,0xCF,0x2F,0xAF,0x6F,0xEF,0x1F,0x9F,0x5F,0xDF,0x3F,0xBF,0x7F,0xFF
};
uint32_t calc_crc(const std::vector<uint8_t>& data, size_t start, size_t end) {
uint32_t crc = 0xFFFFFFFF;
const uint32_t POLY = 0x04C11DB7;
if (start >= end) return 0;
uint8_t val = data[start];
((uint8_t*)(&crc))[3] ^= BitReverse[val];
for (uint8_t j = 0; j < 8; j++) {
if (crc & 0x80000000) {
crc = (crc << 1) ^ POLY;
} else {
crc <<= 1;
}
}
for (size_t i = start + 1; i < end; i++) {
uint8_t v = data[i];
((uint8_t*)(&crc))[3] ^= BitReverse[v];
for (uint8_t j = 0; j < 8; j++) {
if (crc & 0x80000000) {
crc = (crc << 1) ^ POLY;
} else {
crc <<= 1;
}
}
}
uint32_t t32 = 0;
((uint8_t*)(&t32))[0] = BitReverse[((uint8_t*)(&crc))[3]];
((uint8_t*)(&t32))[1] = BitReverse[((uint8_t*)(&crc))[2]];
((uint8_t*)(&t32))[2] = BitReverse[((uint8_t*)(&crc))[1]];
((uint8_t*)(&t32))[3] = BitReverse[((uint8_t*)(&crc))[0]];
crc = t32 ^ 0xFFFFFFFF;
return crc;
}
int main() {
// Пример команды (без CRC и 0x55):
std::vector<uint8_t> pkt = {
0xAA,0xAA,0xAA,0x90,0x0B,0x0A,0x05,0x03,0x00,0x02,0x00,0x00,0x64,0x00,0x00,0x00,0x39,0xBF,0x5B,0x74,0x55
};
size_t preamble = 3;
size_t crc_start = preamble;
size_t crc_end = pkt.size() - 5;
uint32_t crc = calc_crc(pkt, crc_start, crc_end);
printf("CRC for test packet: %08X\n", crc);
// assert(crc == 0x????????); // подставьте ожидаемое значение CRC
return 0;
}
@@ -0,0 +1 @@
@@ -68,103 +68,128 @@ void SaecoSeries6000::process_mainboard_byte(uint8_t byte) {
}
}
void SaecoSeries6000::parse_display_packet(const uint8_t* buffer, uint16_t size) {
if (debug_) {
ESP_LOGD(TAG, "parse_display_packet: size=%u", size);
void SaecoSeries6000::update_display_counter_from_packet(const uint8_t* buffer, uint16_t size) {
if (size > 4 && buffer[3] != 0xFF) {
last_display_counter_ = buffer[4];
}
// Здесь больше не парсим B0-пакеты, только debug
}
void SaecoSeries6000::parse_mainboard_packet(const uint8_t* buffer, uint16_t size) {
last_activity_time = millis(); // сбрасываем таймер активности при любом пакете
void SaecoSeries6000::parse_display_packet(const uint8_t* buffer, uint16_t size) {
if (debug_) {
std::vector<char> hex_buffer;
hex_buffer.resize(size * 3 + 1);
for (uint16_t i = 0; i < size; i++) {
sprintf(hex_buffer.data() + i * 3, "%02X ", buffer[i]);
}
ESP_LOGD(TAG, "Packet from Mainboard: %s", hex_buffer.data());
ESP_LOGD(TAG, "parse_mainboard_packet: size=%u", size);
if (size > 4 && buffer[3] != 0xFF){
ESP_LOGI(TAG, "Packet from Display: %s", hex_buffer.data());
}
// Парсим B0
if (size > 4 && buffer[3] == 0xB0) {
// Логика из philips_series_5400.cpp
if (size < 12) return;
}
update_display_counter_from_packet(buffer, size);
// Здесь больше не парсим B0-пакеты, только debug
}
// Разбор пакета B0 (системные статусы кофемашины)
// buffer[6], buffer[7], buffer[9] содержат коды состояния
void SaecoSeries6000::parse_b0_packet(const uint8_t* buffer, uint16_t size) {
if (size < 10) return;
if (buffer[6] == 0x0E) {
if (buffer[9] == 0x00) {
pub_status(20); // "Опорож. контейнер для коф. гущи"
pub_status(20); // 20: "Опорож. контейнер для коф. гущи"
} else {
if ((buffer[9] & 0x40) != 0) {
pub_status(22); // "Воды нет"
pub_status(22); // 22: "Воды нет"
} else {
pub_status(17); // "Вода есть"
pub_status(17); // 17: "Вода есть"
}
if ((buffer[9] & 0x80) != 0) {
pub_status(23); // "Извлечен"
pub_status(23); // 23: "Извлечен контейнер для жмыха"
} else {
pub_status(18); // "Вставлен"
pub_status(18); // 18: "Вставлен контейнер для жмыха"
}
}
} else if (buffer[6] == 0x06) {
pub_status(21); // "Вода есть","Вставлен","Зерна есть","Выберите напиток","Пустой"
pub_status(21); // 21: "Готово/Выберите напиток"
} else if (buffer[6] == 0x0C) {
if (buffer[7] == 0x01) {
pub_status(8); // "Наслаждайтесь"
pub_status(8); // 8: "Наслаждайтесь"
} else if (buffer[7] == 0x02) {
pub_status(15); // "Что-то (07 0C 02)"
pub_status(15); // 15: "Что-то (07 0C 02)"
}
} else if (buffer[6] == 0x07) {
if (buffer[7] == 0x0E) {
pub_status(9); // "Нагрев воды"
pub_status(9); // 9: "Нагрев воды"
} else if (buffer[7] == 0x0D) {
pub_status(10); // "Перемалываем зерна"
pub_status(10); // 10: "Перемалываем зерна"
} else if (buffer[7] == 0x10) {
pub_status(3); // "Наливаем молоко"
pub_status(3); // 3: "Наливаем молоко"
} else if (buffer[7] == 0x11) {
pub_status(4); // "Наливаем кофе"
pub_status(4); // 4: "Наливаем кофе"
} else if (buffer[7] == 0x12) {
pub_status(5); // "Предварительное дозирование"
pub_status(5); // 5: "Предварительное дозирование"
} else if (buffer[7] == 0x13) {
pub_status(6); // "Создание пара для молока"
pub_status(6); // 6: "Создание пара для молока"
} else if (buffer[7] == 0x14) {
pub_status(7); // "Заварочный узел в положение заваривания"
pub_status(7); // 7: "Заварочный узел в положение заваривания"
} else if (buffer[7] == 0x15) {
pub_status(15); // "Наслаждайтесь"
pub_status(15); // 15: "Наслаждайтесь"
}
} else if (buffer[6] == 0x08) {
if (buffer[7] == 0x0E) {
pub_status(14); // "Нагревание"
pub_status(14); // 14: "Нагревание"
} else if (buffer[7] == 0x02) {
pub_status(11); // "Промывка"
pub_status(11); // 11: "Промывка"
} else if (buffer[7] == 0x14) {
pub_status(13); // "Что-то (07 08 14)"
pub_status(13); // 13: "Что-то (07 08 14)"
} else if (buffer[7] == 0x05) {
pub_status(12); // "Зерна закончились"
pub_status(12); // 12: "Зерна закончились"
} else if (buffer[7] == 0x16) {
pub_status(24); // "Удаление накипи стадия 1"
pub_status(24); // 24: "Удаление накипи стадия 1"
} else if (buffer[7] == 0x18) {
pub_status(25); // "Удаление накипи стадия 2"
pub_status(25); // 25: "Удаление накипи стадия 2"
}
} else if (buffer[7] == 0x00) {
if (buffer[6] == 0x01) {
pub_status(1); // "Что-то (07 01 00)"
pub_status(1); // 1: "Что-то (07 01 00)"
} else if (buffer[6] == 0x05) {
pub_status(2); // "Выключено"
pub_status(2); // 2: "Выключено"
}
}
} else if (size > 12 && buffer[3] == 0xB5) {
// Парсим B5 (Error Code)
}
// Разбор пакета B5 (коды ошибок кофемашины)
// buffer[10], buffer[11] содержат коды ошибок
void SaecoSeries6000::parse_b5_packet(const uint8_t* buffer, uint16_t size) {
if (size <= 12) return;
if (buffer[10] == 0x00) {
if (buffer[11] == 0x00) pub_status(30);
else if (buffer[11] == 0x0B) pub_status(31);
else if (buffer[11] == 0xE6) pub_status(32);
else if (buffer[11] == 0x80) pub_status(33);
else if (buffer[11] == 0xCB) pub_status(34);
else if (buffer[11] == 0xFF) pub_status(35);
else if (buffer[11] == 0xA0) pub_status(36);
if (buffer[11] == 0x00) pub_status(30); // 30: "Ошибка 0x00"
else if (buffer[11] == 0x0B) pub_status(31); // 31: "Ошибка 0x0B"
else if (buffer[11] == 0xE6) pub_status(32); // 32: "Ошибка 0xE6"
else if (buffer[11] == 0x80) pub_status(33); // 33: "Ошибка 0x80"
else if (buffer[11] == 0xCB) pub_status(34); // 34: "Ошибка 0xCB"
else if (buffer[11] == 0xFF) pub_status(35); // 35: "Ошибка 0xFF"
else if (buffer[11] == 0xA0) pub_status(36); // 36: "Ошибка 0xA0"
} else if (buffer[10] == 0x01) {
pub_status(37); // "Статус2 0x01"
pub_status(37); // 37: "Статус2 0x01"
}
}
void SaecoSeries6000::parse_mainboard_packet(const uint8_t* buffer, uint16_t size) {
last_activity_time = millis(); // сбрасываем таймер активности при любом пакете
if (debug_) {
// std::vector<char> hex_buffer;
// hex_buffer.resize(size * 3 + 1);
// for (uint16_t i = 0; i < size; i++) {
// sprintf(hex_buffer.data() + i * 3, "%02X ", buffer[i]);
// }
//ESP_LOGD(TAG, "Packet from Mainboard: %s", hex_buffer.data());
//ESP_LOGD(TAG, "parse_mainboard_packet: size=%u", size);
}
// Парсим B0
if (size > 4 && buffer[3] == 0xB0) {
parse_b0_packet(buffer, size);
} else if (size > 12 && buffer[3] == 0xB5) {
parse_b5_packet(buffer, size);
}
}
@@ -181,5 +206,119 @@ void SaecoSeries6000::dump_config() {
ESP_LOGCONFIG(TAG, " Debug mode: %s", ONOFF(this->debug_));
}
void SaecoSeries6000::send_packet_to_mainboard(const std::vector<uint8_t> &data) {
ESP_LOGI(TAG, "Send to Mainboard pressed.");
if (uart_mainboard_ != nullptr) {
for (auto b : data) {
uart_mainboard_->write_byte(b);
}
}
}
const uint8_t SaecoSeries6000::BitReverse[256] = {
0x00,0x80,0x40,0xC0,0x20,0xA0,0x60,0xE0,0x10,0x90,0x50,0xD0,0x30,0xB0,0x70,0xF0,
0x08,0x88,0x48,0xC8,0x28,0xA8,0x68,0xE8,0x18,0x98,0x58,0xD8,0x38,0xB8,0x78,0xF8,
0x04,0x84,0x44,0xC4,0x24,0xA4,0x64,0xE4,0x14,0x94,0x54,0xD4,0x34,0xB4,0x74,0xF4,
0x0C,0x8C,0x4C,0xCC,0x2C,0xAC,0x6C,0xEC,0x1C,0x9C,0x5C,0xDC,0x3C,0xBC,0x7C,0xFC,
0x02,0x82,0x42,0xC2,0x22,0xA2,0x62,0xE2,0x12,0x92,0x52,0xD2,0x32,0xB2,0x72,0xF2,
0x0A,0x8A,0x4A,0xCA,0x2A,0xAA,0x6A,0xEA,0x1A,0x9A,0x5A,0xDA,0x3A,0xBA,0x7A,0xFA,
0x06,0x86,0x46,0xC6,0x26,0xA6,0x66,0xE6,0x16,0x96,0x56,0xD6,0x36,0xB6,0x76,0xF6,
0x0E,0x8E,0x4E,0xCE,0x2E,0xAE,0x6E,0xEE,0x1E,0x9E,0x5E,0xDE,0x3E,0xBE,0x7E,0xFE,
0x01,0x81,0x41,0xC1,0x21,0xA1,0x61,0xE1,0x11,0x91,0x51,0xD1,0x31,0xB1,0x71,0xF1,
0x09,0x89,0x49,0xC9,0x29,0xA9,0x69,0xE9,0x19,0x99,0x59,0xD9,0x39,0xB9,0x79,0xF9,
0x05,0x85,0x45,0xC5,0x25,0xA5,0x65,0xE5,0x15,0x95,0x55,0xD5,0x35,0xB5,0x75,0xF5,
0x0D,0x8D,0x4D,0xCD,0x2D,0xAD,0x6D,0xED,0x1D,0x9D,0x5D,0xDD,0x3D,0xBD,0x7D,0xFD,
0x03,0x83,0x43,0xC3,0x23,0xA3,0x63,0xE3,0x13,0x93,0x53,0xD3,0x33,0xB3,0x73,0xF3,
0x0B,0x8B,0x4B,0xCB,0x2B,0xAB,0x6B,0xEB,0x1B,0x9B,0x5B,0xDB,0x3B,0xBB,0x7B,0xFB,
0x07,0x87,0x47,0xC7,0x27,0xA7,0x67,0xE7,0x17,0x97,0x57,0xD7,0x37,0xB7,0x77,0xF7,
0x0F,0x8F,0x4F,0xCF,0x2F,0xAF,0x6F,0xEF,0x1F,0x9F,0x5F,0xDF,0x3F,0xBF,0x7F,0xFF
};
uint32_t SaecoSeries6000::calc_crc(const std::vector<uint8_t>& data, size_t start, size_t end) {
uint32_t crc = 0xFFFFFFFF;
const uint32_t POLY = 0x04C11DB7;
if (start >= end) return 0;
// start
uint8_t val = data[start];
((uint8_t*)(&crc))[3] ^= BitReverse[val];
for (uint8_t j = 0; j < 8; j++) {
if (crc & 0x80000000) {
crc = (crc << 1) ^ POLY;
} else {
crc <<= 1;
}
}
// остальные байты
for (size_t i = start + 1; i < end; i++) {
uint8_t v = data[i];
((uint8_t*)(&crc))[3] ^= BitReverse[v];
for (uint8_t j = 0; j < 8; j++) {
if (crc & 0x80000000) {
crc = (crc << 1) ^ POLY;
} else {
crc <<= 1;
}
}
}
uint32_t t32 = 0;
((uint8_t*)(&t32))[0] = BitReverse[((uint8_t*)(&crc))[3]];
((uint8_t*)(&t32))[1] = BitReverse[((uint8_t*)(&crc))[2]];
((uint8_t*)(&t32))[2] = BitReverse[((uint8_t*)(&crc))[1]];
((uint8_t*)(&t32))[3] = BitReverse[((uint8_t*)(&crc))[0]];
crc = t32 ^ 0xFFFFFFFF;
return crc;
}
void SaecoSeries6000::send_packets_to_mainboard(const std::vector<std::vector<uint8_t>> &packets, uint32_t delay_ms) {
uint8_t counter = (last_display_counter_ + 1) & 0xFF;
for (size_t i = 0; i < packets.size(); ++i) {
std::vector<uint8_t> pkt = packets[i];
if (pkt.size() > 4) {
pkt[4] = counter;
}
// Логируем пакет ДО пересчёта CRC
{
std::string log_str;
char buf[8];
for (auto b : pkt) {
snprintf(buf, sizeof(buf), "%02X ", b);
log_str += buf;
}
ESP_LOGI(TAG, "Packet before CRC: %s", log_str.c_str());
}
// Пересчёт CRC: ищем преамбулу 0xAA 0xAA 0xAA, считаем CRC по данным между преамбулой и последними 5 байтами
if (pkt.size() > 8) {
size_t preamble = 0;
if (pkt[0] == 0xAA && pkt[1] == 0xAA && pkt[2] == 0xAA) {
preamble = 3;
}
size_t crc_start = preamble;
size_t crc_end = pkt.size() - 5; // не включаем 4 CRC и 0x55
uint32_t crc = calc_crc(pkt, crc_start, crc_end);
// Заменяем последние 4 байта перед 0x55 на новую CRC
pkt[pkt.size()-5] = (crc >> 24) & 0xFF;
pkt[pkt.size()-4] = (crc >> 16) & 0xFF;
pkt[pkt.size()-3] = (crc >> 8) & 0xFF;
pkt[pkt.size()-2] = (crc) & 0xFF;
}
// Логируем пакет ПОСЛЕ пересчёта CRC
{
std::string log_str;
char buf[8];
for (auto b : pkt) {
snprintf(buf, sizeof(buf), "%02X ", b);
log_str += buf;
}
ESP_LOGI(TAG, "Packet after CRC: %s", log_str.c_str());
}
send_packet_to_mainboard(pkt);
counter = (counter + 1) & 0xFF;
delay(delay_ms); // пауза между пакетами
}
last_display_counter_ = (counter - 1) & 0xFF;
}
// Реализация SendPacketsAction полностью в header (saeco_series_6000.h)
} // namespace saeco_series_6000
} // namespace esphome
@@ -3,6 +3,8 @@
#include "esphome/core/component.h"
#include "esphome/components/uart/uart.h"
#include "esphome/components/sensor/sensor.h"
#include "esphome/core/automation.h"
#include "esphome/components/button/button.h"
namespace esphome {
namespace saeco_series_6000 {
@@ -19,6 +21,8 @@ class SaecoSeries6000 : public Component {
void set_status_sensor(sensor::Sensor *sensor) { status_sensor_ = sensor; }
void loop() override;
void dump_config() override;
void send_packet_to_mainboard(const std::vector<uint8_t> &data);
void send_packets_to_mainboard(const std::vector<std::vector<uint8_t>> &packets, uint32_t delay_ms = 10);
protected:
uart::UARTComponent *uart_display_;
@@ -39,12 +43,35 @@ class SaecoSeries6000 : public Component {
uint8_t display_sync_count_{0};
uint8_t mainboard_sync_count_{0};
uint8_t last_display_counter_{0};
void update_display_counter_from_packet(const uint8_t* buffer, uint16_t size);
void process_display_byte(uint8_t byte);
void process_mainboard_byte(uint8_t byte);
void parse_display_packet(const uint8_t* buffer, uint16_t size);
void parse_mainboard_packet(const uint8_t* buffer, uint16_t size);
void parse_b0_packet(const uint8_t* buffer, uint16_t size);
void parse_b5_packet(const uint8_t* buffer, uint16_t size);
void pub_status(uint8_t status);
static const uint8_t BitReverse[256];
uint32_t calc_crc(const std::vector<uint8_t>& data, size_t start, size_t end);
};
class SaecoSendPacketsButton : public esphome::button::Button, public esphome::Component {
public:
void set_parent(SaecoSeries6000 *parent) { parent_ = parent; }
void set_packets(const std::vector<std::vector<uint8_t>> &packets) { packets_ = packets; }
void set_delay_ms(uint32_t delay_ms) { delay_ms_ = delay_ms; }
void press_action() override {
if (parent_ != nullptr) {
parent_->send_packets_to_mainboard(packets_, delay_ms_);
}
}
private:
SaecoSeries6000 *parent_{nullptr};
std::vector<std::vector<uint8_t>> packets_;
uint32_t delay_ms_{10};
};
} // namespace saeco_series_6000