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

One body per static PDU builder; move staging includes to the source file

Browse Source
This commit is contained in:
J. Nick Koston
2026-10-08 08:23:35 -10:00
parent 120b9de474
commit 74173310ca
2 changed files with 19 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/modbus_client/modbus_client.cpp
+19 -24
View File
@@ -1,46 +1,41 @@
#include "modbus_client.h"
#include "esphome/core/hal.h"
#include <array>
namespace esphome::modbus_client {
using modbus::helpers::PduBuffer;
#ifdef USE_ESP8266
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));
return modbus::helpers::create_write_registers_pdu(start, std::span<const uint16_t>(staging.data(), len));
}
PduBuffer static_write_coils_pdu(uint16_t start, const uint8_t *packed, uint16_t count) {
std::array<uint8_t, modbus::packed_bit_bytes(modbus::MAX_NUM_OF_COILS_TO_WRITE)> staging;
const size_t len = modbus::packed_bit_bytes(count);
progmem_memcpy(staging.data(), packed, len);
return modbus::helpers::create_write_coils_pdu(
start, modbus::PackedBits(std::span<const uint8_t>(staging.data(), len), count));
}
PduBuffer static_read_write_registers_pdu(uint16_t read_start, uint16_t read_count, uint16_t write_start,
const uint16_t *values, size_t len) {
std::array<uint16_t, modbus::MAX_NUM_OF_REGISTERS_TO_WRITE_RW> staging;
progmem_memcpy(staging.data(), values, len * sizeof(uint16_t));
return modbus::helpers::create_read_write_multiple_registers_pdu(read_start, read_count, write_start,
std::span<const uint16_t>(staging.data(), len));
}
#else
PduBuffer static_write_registers_pdu(uint16_t start, const uint16_t *values, size_t len) {
values = staging.data();
#endif
return modbus::helpers::create_write_registers_pdu(start, std::span<const uint16_t>(values, len));
}
PduBuffer static_write_coils_pdu(uint16_t start, const uint8_t *packed, uint16_t count) {
return modbus::helpers::create_write_coils_pdu(
start, modbus::PackedBits(std::span<const uint8_t>(packed, modbus::packed_bit_bytes(count)), count));
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();
#endif
return modbus::helpers::create_write_coils_pdu(start,
modbus::PackedBits(std::span<const uint8_t>(packed, len), count));
}
PduBuffer static_read_write_registers_pdu(uint16_t read_start, uint16_t read_count, uint16_t write_start,
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();
#endif
return modbus::helpers::create_read_write_multiple_registers_pdu(read_start, read_count, write_start,
std::span<const uint16_t>(values, len));
}
#endif
} // namespace esphome::modbus_client
esphome/components/modbus_client/modbus_client.h
-2
View File
@@ -3,9 +3,7 @@
#include "esphome/components/modbus/modbus.h"
#include "esphome/components/modbus/modbus_helpers.h"
#include "esphome/core/automation.h"
#include "esphome/core/hal.h"
#include <array>
#include <span>
#include <vector>