github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-10-14 02:02:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Leave an over-long set to the builder instead of staging it

Browse Source
This commit is contained in:
J. Nick Koston
2026-10-08 13:51:47 -10:00
parent 74173310ca
commit 1f55052b06
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/modbus_client/modbus_client.cpp
+13 -6
View File
@@ -10,8 +10,11 @@ using modbus::helpers::PduBuffer;
PduBuffer static_write_registers_pdu(uint16_t start, const uint16_t *values, size_t len) {
#ifdef USE_ESP8266
std::array<uint16_t, modbus::MAX_NUM_OF_REGISTERS_TO_WRITE> staging;
progmem_memcpy(staging.data(), values, len * sizeof(uint16_t));
values = staging.data();
// An over-long set is left for the builder to reject
if (len <= staging.size()) {
progmem_memcpy(staging.data(), values, len * sizeof(uint16_t));
values = staging.data();
}
#endif
return modbus::helpers::create_write_registers_pdu(start, std::span<const uint16_t>(values, len));
}
@@ -20,8 +23,10 @@ PduBuffer static_write_coils_pdu(uint16_t start, const uint8_t *packed, uint16_t
const size_t len = modbus::packed_bit_bytes(count);
#ifdef USE_ESP8266
std::array<uint8_t, modbus::packed_bit_bytes(modbus::MAX_NUM_OF_COILS_TO_WRITE)> staging;
progmem_memcpy(staging.data(), packed, len);
packed = staging.data();
if (len <= staging.size()) {
progmem_memcpy(staging.data(), packed, len);
packed = staging.data();
}
#endif
return modbus::helpers::create_write_coils_pdu(start,
modbus::PackedBits(std::span<const uint8_t>(packed, len), count));
@@ -31,8 +36,10 @@ PduBuffer static_read_write_registers_pdu(uint16_t read_start, uint16_t read_cou
const uint16_t *values, size_t len) {
#ifdef USE_ESP8266
std::array<uint16_t, modbus::MAX_NUM_OF_REGISTERS_TO_WRITE_RW> staging;
progmem_memcpy(staging.data(), values, len * sizeof(uint16_t));
values = staging.data();
if (len <= staging.size()) {
progmem_memcpy(staging.data(), values, len * sizeof(uint16_t));
values = staging.data();
}
#endif
return modbus::helpers::create_read_write_multiple_registers_pdu(read_start, read_count, write_start,
std::span<const uint16_t>(values, len));