From 404589c860e6af0a860d5b4324a11c0dc91c30c9 Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Mon, 2 Jan 2023 11:38:08 +0100 Subject: [PATCH] Enable USE_WE517 in tasmota32.bin --- BUILDS.md | 3 ++- tasmota/include/tasmota_configurations.h | 5 +++++ tasmota/include/tasmota_configurations_ESP32.h | 3 ++- tasmota/my_user_config.h | 1 + 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/BUILDS.md b/BUILDS.md index 21c27b038..12802b096 100644 --- a/BUILDS.md +++ b/BUILDS.md @@ -89,7 +89,8 @@ Note: `minimal` variant is not listed as it shouldn't be used outside of the [up | USE_BL09XX | - | x / x | x | x | - | - | | USE_TELEINFO | - | - / - | - | - | - | - | | USE_IEM3000 | - | - / - | - | - | - | - | -| USE_WE517 | - | - / - | - | - | - | - | +| USE_WE517 | - | - / x | - | - | - | - | +| USE_MODBUS_ENERGY | - | - / x | - | - | - | - | | | | | | | | | | USE_ADC_VCC | x | - / - | - | - | x | - | | USE_COUNTER | - | x / x | x | x | - | x | diff --git a/tasmota/include/tasmota_configurations.h b/tasmota/include/tasmota_configurations.h index 57de1b8ab..b787e1dcd 100644 --- a/tasmota/include/tasmota_configurations.h +++ b/tasmota/include/tasmota_configurations.h @@ -219,6 +219,7 @@ //#define USE_LE01MR // Add support for F&F LE-01MR modbus energy meter (+2k code) //#define USE_TELEINFO // Add support for French Energy Provider metering telemetry (+5k2 code, +168 RAM + SmartMeter LinkedList Values RAM) //#define USE_WE517 // Add support for Orno WE517-Modbus energy monitor (+1k code) +//#define USE_MODBUS_ENERGY // Add support for generic modbus energy monitor using a user file in rule space (+5k) #define USE_DHT // Add support for DHT11, AM2301 (DHT21, DHT22, AM2302, AM2321) and SI7021 Temperature and Humidity sensor #define USE_MAX31855 // Add support for MAX31855 K-Type thermocouple sensor using softSPI @@ -325,6 +326,7 @@ #undef USE_TELEINFO // Disable support for French Energy Provider metering telemetry #undef USE_IEM3000 // Disable support for Schneider Electric iEM3000-Modbus series energy monitor (+0k8 code) #undef USE_WE517 // Disable support for Orno WE517-Modbus energy monitor (+1k code) + #undef USE_MODBUS_ENERGY // Disable support for generic modbus energy monitor using a user file in rule space (+5k) #undef USE_BLE_ESP32 // (ESP32 only) Disable support for native BLE on ESP32 - use new driver #undef USE_MI_ESP32 // (ESP32 only) Disable support for ESP32 as a BLE-bridge (+9k2 mem, +292k flash) @@ -437,6 +439,7 @@ #undef USE_TELEINFO // Disable support for French Energy Provider metering telemetry #undef USE_IEM3000 // Disable support for Schneider Electric iEM3000-Modbus series energy monitor (+0k8 code) #undef USE_WE517 // Disable support for Orno WE517-Modbus energy monitor (+1k code) + #undef USE_MODBUS_ENERGY // Disable support for generic modbus energy monitor using a user file in rule space (+5k) //#undef USE_DS18x20 // Disable support for DS18x20 sensors with id sort, single scan and read retry (+1k3 code) @@ -621,6 +624,7 @@ #undef USE_TELEINFO // Disable support for French Energy Provider metering telemetry #undef USE_IEM3000 // Disable support for Schneider Electric iEM3000-Modbus series energy monitor (+0k8 code) #undef USE_WE517 // Disable support for Orno WE517-Modbus energy monitor (+1k code) +#undef USE_MODBUS_ENERGY // Disable support for generic modbus energy monitor using a user file in rule space (+5k) #undef USE_DHT // Disable support for DHT11, AM2301 (DHT21, DHT22, AM2302, AM2321) and SI7021 Temperature and Humidity sensor #undef USE_MAX31855 // Disable MAX31855 K-Type thermocouple sensor using softSPI @@ -775,6 +779,7 @@ #undef USE_IEM3000 // Disable support for Schneider Electric iEM3000-Modbus series energy monitor (+0k8 code) #undef USE_BL6523 // Disable support for BL6523 based energy monitor (+7k code) #undef USE_WE517 // Disable support for Orno WE517-Modbus energy monitor (+1k code) +#undef USE_MODBUS_ENERGY // Disable support for generic modbus energy monitor using a user file in rule space (+5k) #undef USE_DHT // Disable support for DHT11, AM2301 (DHT21, DHT22, AM2302, AM2321) and SI7021 Temperature and Humidity sensor #undef USE_MAX31855 // Disable MAX31855 K-Type thermocouple sensor using softSPI diff --git a/tasmota/include/tasmota_configurations_ESP32.h b/tasmota/include/tasmota_configurations_ESP32.h index 51cbfba49..9360a109c 100644 --- a/tasmota/include/tasmota_configurations_ESP32.h +++ b/tasmota/include/tasmota_configurations_ESP32.h @@ -706,8 +706,9 @@ //#define USE_SOLAX_X1 // Add support for Solax X1 series Modbus log info (+3k1 code) //#define USE_LE01MR // Add support for F&F LE-01MR modbus energy meter (+2k code) //#define USE_TELEINFO // Add support for French Energy Provider metering telemetry (+5k2 code, +168 RAM + SmartMeter LinkedList Values RAM) -//#define USE_WE517 // Add support for Orno WE517-Modbus energy monitor (+1k code) +#define USE_WE517 // Add support for Orno WE517-Modbus energy monitor (+1k code) #define USE_SONOFF_SPM // Add support for ESP32 based Sonoff Smart Stackable Power Meter (+11k code) +#define USE_MODBUS_ENERGY // Add support for generic modbus energy monitor using a user file in rule space (+5k code) #define USE_DHT // Add support for DHT11, AM2301 (DHT21, DHT22, AM2302, AM2321) and SI7021 Temperature and Humidity sensor #define USE_MAX31855 // Add support for MAX31855 K-Type thermocouple sensor using softSPI diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h index 4216d088d..6c6c6f60b 100644 --- a/tasmota/my_user_config.h +++ b/tasmota/my_user_config.h @@ -874,6 +874,7 @@ #define IEM3000_ADDR 1 // iEM3000-Modbus modbus address (default: 0x01) // #define IEM3000_IEM3155 // Compatibility fix for Iem3155 (changes Power and Energy total readout) //#define USE_WE517 // Add support for Orno WE517-Modbus energy monitor (+1k code) +//#define USE_MODBUS_ENERGY // Add support for generic modbus energy monitor using a user file in rule space (+5k) // -- Low level interface devices ----------------- #define USE_DHT // Add support for DHT11, AM2301 (DHT21, DHT22, AM2302, AM2321) and SI7021 Temperature and Humidity sensor (1k6 code)