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

include tag in entity_dump unless we're generating it for modbus

Browse Source
This commit is contained in:
proddy
2025-01-20 12:57:00 +01:00
parent 371b198eb6
commit 4a9b74b311
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/generate_csv_and_headers.sh
View File

@@ -31,19 +31,16 @@ const std::initializer_list<Modbus::EntityModbusInfo> Modbus::modbus_register_ma
EOL EOL
# build emsesp for standalone
make clean
make -s ARGS=-DEMSESP_STANDALONE
# Generate Modbus entity parameters # Generate Modbus entity parameters
# One to build the modbus_entity_parameters.hpp header file # One to build the modbus_entity_parameters.hpp header file
# And then run entity_dump test again to create the dump_entities.csv file with the correct modbus counts # And then run entity_dump test again to create the dump_entities.csv file with the correct modbus counts
make clean
make -s ARGS=-DEMSESP_MODBUS
rm -f ./src/core/modbus_entity_parameters.hpp rm -f ./src/core/modbus_entity_parameters.hpp
echo "test entity_dump" | ./emsesp | python3 ./scripts/strip_csv.py | python3 ./scripts/update_modbus_registers.py >./src/core/modbus_entity_parameters.hpp echo "test entity_dump" | ./emsesp | python3 ./scripts/strip_csv.py | python3 ./scripts/update_modbus_registers.py >./src/core/modbus_entity_parameters.hpp
ls -al ./src/core/modbus_entity_parameters.hpp ls -al ./src/core/modbus_entity_parameters.hpp
# dump_entities.csv # dump_entities.csv
make -s ARGS=-DEMSESP_STANDALONE
rm -f ./docs/dump_entities.csv rm -f ./docs/dump_entities.csv
echo "test entity_dump" | ./emsesp | python3 ./scripts/strip_csv.py >./docs/dump_entities.csv echo "test entity_dump" | ./emsesp | python3 ./scripts/strip_csv.py >./docs/dump_entities.csv
ls -al ./docs/dump_entities.csv ls -al ./docs/dump_entities.csv

4
src/core/emsdevice.cpp
View File

@@ -1297,11 +1297,13 @@ void EMSdevice::dump_devicevalue_info() {
Serial.print(product_id_); Serial.print(product_id_);
Serial.print(','); Serial.print(',');
// <tag>/<shortname> // <tag>/<shortname> unless generating for modbus registers - used in scripts/generate_csv_and_headers.sh
#ifndef EMSESP_MODBUS
if (dv.tag > DeviceValueTAG::TAG_DEVICE_DATA) { if (dv.tag > DeviceValueTAG::TAG_DEVICE_DATA) {
Serial.print(tag_to_string(dv.tag)); Serial.print(tag_to_string(dv.tag));
Serial.print('.'); Serial.print('.');
} }
#endif
Serial.print(dv.short_name); Serial.print(dv.short_name);
Serial.print(','); Serial.print(',');