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

fixes #2148

Browse Source
This commit is contained in:
proddy
2024-10-28 11:13:05 +01:00
parent 65e0ae174a
commit 21acd900e5
8 changed files with 10214 additions and 10299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10196
docs/Modbus-Entity-Registers.md
View File

File diff suppressed because it is too large Load Diff

10196
dump_entities.csv → docs/dump_entities.csv
View File

File diff suppressed because it is too large Load Diff

0
dump_telegrams.csv → docs/dump_telegrams.csv
View File

9
scripts/dump_entities.sh
View File

@@ -1,9 +0,0 @@
#!/bin/sh
# creates an CSV file called "dump_entities.cvs" with all devices and their entities
# run from top folder like `sh ./scripts/dump_entities.sh`
rm -f dump_entities.csv
make clean
make ARGS=-DEMSESP_STANDALONE
echo "test entity_dump" | ./emsesp | python3 ./scripts/strip_csv.py > dump_entities.csv
cat dump_entities.csv

9
scripts/dump_telegrams.sh
View File

@@ -1,9 +0,0 @@
#!/bin/sh
# creates an CSV file called "dump_telegrams.cvs" with all devices and their telegrams
# run from top folder like `sh ./scripts/dump_telegrams.sh`
rm -f dump_telegrams.csv
make clean
make ARGS=-DEMSESP_STANDALONE
echo "test telegram_dump" | ./emsesp | python3 ./scripts/strip_csv.py > dump_telegrams.csv
cat dump_telegrams.csv

7
scripts/generate-modbus-register-doc.sh
View File

@@ -1,7 +0,0 @@
#!/bin/bash
# This is used to build the contents of the `Modbus-Entity-Registers.md` file used in the emsesp.org documentation.
make clean
make ARGS=-DEMSESP_STANDALONE
echo "test entity_dump" | ./emsesp | python3 ./scripts/strip_csv.py | python3 ./scripts/generate-modbus-register-doc.py

32
scripts/generate_csv_and_headers.sh
View File

@@ -37,20 +37,24 @@ EOL
make clean
make ARGS=-DEMSESP_STANDALONE
# dump_entities.csv
rm -f dump_entities.csv
echo "test entity_dump" | ./emsesp | python3 ./scripts/strip_csv.py >dump_entities.csv
ls -al dump_entities.csv
# dump_telegrams.csv
rm -f dump_telegrams.csv
echo "test telegram_dump" | ./emsesp | python3 ./scripts/strip_csv.py >dump_telegrams.csv
ls -al dump_telegrams.csv
# generate ./src/modbus_entity_parameters.hpp
# Generate Modbus entity parameters
# 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
rm -f ./src/modbus_entity_parameters.hpp
cat dump_entities.csv | python3 ./scripts/update_modbus_registers.py >./src/modbus_entity_parameters.hpp
echo "test entity_dump" | ./emsesp | python3 ./scripts/strip_csv.py | python3 ./scripts/update_modbus_registers.py >./src/modbus_entity_parameters.hpp
ls -al ./src/modbus_entity_parameters.hpp
# generate doc - Modbus-Entity-Registers.md used in the emsesp.org documentation.
cat dump_entities.csv | python3 ./scripts/generate-modbus-register-doc.py >./docs/Modbus-Entity-Registers.md
# dump_entities.csv
make ARGS=-DEMSESP_STANDALONE
rm -f ./docs/dump_entities.csv
echo "test entity_dump" | ./emsesp | python3 ./scripts/strip_csv.py >./docs/dump_entities.csv
ls -al ./docs/dump_entities.csv
# dump_telegrams.csv
rm -f ./docs/dump_telegrams.csv
echo "test telegram_dump" | ./emsesp | python3 ./scripts/strip_csv.py >./docs/dump_telegrams.csv
ls -al ./docs/dump_telegrams.csv
# generate doc - Modbus-Entity-Registers.md used in the emsesp.org documentation
rm -f ./docs/Modbus-Entity-Registers.md
cat ./docs/dump_entities.csv | python3 ./scripts/generate-modbus-register-doc.py >./docs/Modbus-Entity-Registers.md

64
scripts/update_modbus_registers.sh
View File

@@ -1,64 +0,0 @@
#!/bin/bash
# Update modbus parameters from entity definitions.
# This script generates c++ code for the modbus parameter definitions.
#
# Run this script from the EMS-ESP32 root directory with the command `bash ./scripts/update_modbus_registers.sh`.
while [[ $# -gt 0 ]]; do
case $1 in
--reset)
RESET=YES
shift
;;
--force)
FORCE=YES
shift
;;
* | -* | --*)
echo "Unknown option $1"
exit 1
;;
esac
done
if [ "$RESET" = "YES" ]; then
if [ "$FORCE" != "YES" ]; then
read -p "Are you sure you want to reset all modbus entity parameters, potentially generating new register mappings? WARNING: This might introduce breaking changes for end users. [yes/no] " CONFIRMATION
if [ "$CONFIRMATION" != "yes" ]; then
echo "Aborted."
exit 1
fi
fi
echo "Resetting modbus configuration"
cat >./src/modbus_entity_parameters.hpp <<EOL
#include "modbus.h"
#include "emsdevice.h"
/*
* This file is auto-generated by the update_modbus_registers.sh script. Do not modify.
*/
// clang-format off
namespace emsesp {
using dt = EMSdevice::DeviceType;
#define REGISTER_MAPPING(device_type, device_value_tag_type, long_name, modbus_register_offset, modbus_register_count) \\
{ device_type, device_value_tag_type, long_name[0], modbus_register_offset, modbus_register_count }
// IMPORTANT: This list MUST be ordered by keys "device_type", "device_value_tag_type" and "modbus_register_offset" in this order.
const std::initializer_list<Modbus::EntityModbusInfo> Modbus::modbus_register_mappings = {};
} // namespace emsesp
// clang-format on
EOL
fi
make clean
make ARGS=-DEMSESP_STANDALONE
echo "test entity_dump" | ./emsesp | python3 ./scripts/strip_csv.py | python3 ./scripts/update_modbus_registers.py >./src/modbus_entity_parameters.hpp
echo "Modbus entity parameters written to ./src/modbus_entity_parameters.hpp."