Add support for Energy sensor (Denky)

Add support for Energy sensor (Denky) for French Smart Metering meter provided by global Energy Providers
This commit is contained in:
Theo Arends 2020-06-17 15:00:48 +02:00
parent 5730ced6b8
commit 7c785ab056
6 changed files with 15 additions and 21 deletions

View File

@ -81,6 +81,6 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
- Add initial support for Telegram bot (#8619) - Add initial support for Telegram bot (#8619)
- Add support for HP303B Temperature and Pressure sensor by Robert Jaakke (#8638) - Add support for HP303B Temperature and Pressure sensor by Robert Jaakke (#8638)
- Add rule trigger ``System#Init`` to allow early rule execution without wifi and mqtt initialized yet - Add rule trigger ``System#Init`` to allow early rule execution without wifi and mqtt initialized yet
- Created Energy sensor (Denky) for French Smart Metering meter provided by global Energy Providers, need a adaptater. See dedicated full [blog](http://hallard.me/category/tinfo/) about French teleinformation stuff - Add support for Energy sensor (Denky) for French Smart Metering meter provided by global Energy Providers, need a adaptater. See dedicated full [blog](http://hallard.me/category/tinfo/) about French teleinformation stuff
- Added Library to be used for decoding Teleinfo (French Metering Smart Meter) - Add Library to be used for decoding Teleinfo (French Metering Smart Meter)
- Add basic support for ESP32 ethernet adding commands ``Wifi 0/1`` and ``Ethernet 0/1`` both default ON - Add basic support for ESP32 ethernet adding commands ``Wifi 0/1`` and ``Ethernet 0/1`` both default ON

View File

@ -3,6 +3,9 @@
### 8.3.1.6 20200617 ### 8.3.1.6 20200617
- Add command ``Module2`` to configure fallback module on fast reboot (#8464) - Add command ``Module2`` to configure fallback module on fast reboot (#8464)
- Add support for Energy sensor (Denky) for French Smart Metering meter provided by global Energy Providers, need a adaptater. See dedicated full [blog](http://hallard.me/category/tinfo/) about French teleinformation stuff
- Add Library to be used for decoding Teleinfo (French Metering Smart Meter)
### 8.3.1.5 20200616 ### 8.3.1.5 20200616

View File

@ -600,8 +600,6 @@
#define USE_TASMOTA_SLAVE_FLASH_SPEED 57600 // Usually 57600 for 3.3V variants and 115200 for 5V variants #define USE_TASMOTA_SLAVE_FLASH_SPEED 57600 // Usually 57600 for 3.3V variants and 115200 for 5V variants
#define USE_TASMOTA_SLAVE_SERIAL_SPEED 57600 // Depends on the sketch that is running on the Uno/Pro Mini #define USE_TASMOTA_SLAVE_SERIAL_SPEED 57600 // Depends on the sketch that is running on the Uno/Pro Mini
//#define USE_OPENTHERM // Add support for OpenTherm (+15k code) //#define USE_OPENTHERM // Add support for OpenTherm (+15k code)
#define USE_TELEINFO // Add support for Teleinfo via serial RX interface
//#define USE_TELEINFO_STANDARD // Use standard mode (9600 bps) else it's historical mode (1200 bps)
// -- Power monitoring sensors -------------------- // -- Power monitoring sensors --------------------
#define USE_ENERGY_MARGIN_DETECTION // Add support for Energy Margin detection (+1k6 code) #define USE_ENERGY_MARGIN_DETECTION // Add support for Energy Margin detection (+1k6 code)
@ -625,6 +623,8 @@
#define LE01MR_SPEED 9600 // LE-01MR modbus baudrate (default: 9600) #define LE01MR_SPEED 9600 // LE-01MR modbus baudrate (default: 9600)
#define LE01MR_ADDR 1 // LE-01MR modbus address (default: 0x01) #define LE01MR_ADDR 1 // LE-01MR modbus address (default: 0x01)
#define USE_BL0940 // Add support for BL0940 Energy monitor as used in Blitzwolf SHP-10 (+1k6 code) #define USE_BL0940 // Add support for BL0940 Energy monitor as used in Blitzwolf SHP-10 (+1k6 code)
//#define USE_TELEINFO // Add support for Teleinfo via serial RX interface (+5k2 code, +168 RAM + SmartMeter LinkedList Values RAM)
// #define USE_TELEINFO_STANDARD // Use standard mode (9600 bps) else it's historical mode (1200 bps)
// -- Low level interface devices ----------------- // -- Low level interface devices -----------------
#define USE_DHT // Add support for DHT11, AM2301 (DHT21, DHT22, AM2302, AM2321) and SI7021 Temperature and Humidity sensor (1k6 code) #define USE_DHT // Add support for DHT11, AM2301 (DHT21, DHT22, AM2302, AM2321) and SI7021 Temperature and Humidity sensor (1k6 code)

View File

@ -328,7 +328,7 @@ const char kSensorNames[] PROGMEM =
D_SENSOR_AS3935 "|" D_SENSOR_PMS5003_TX "|" D_SENSOR_AS3935 "|" D_SENSOR_PMS5003_TX "|"
D_SENSOR_BOILER_OT_RX "|" D_SENSOR_BOILER_OT_TX "|" D_SENSOR_BOILER_OT_RX "|" D_SENSOR_BOILER_OT_TX "|"
D_SENSOR_WINDMETER_SPEED "|" D_SENSOR_WINDMETER_SPEED "|"
D_SENSOR_BL0940_RX "|" D_SENSOR_BL0940_RX "|"
D_SENSOR_TCP_TXD "|" D_SENSOR_TCP_RXD "|" D_SENSOR_TCP_TXD "|" D_SENSOR_TCP_RXD "|"
D_SENSOR_TELEINFO_RX "|" D_SENSOR_TELEINFO_ENABLE D_SENSOR_TELEINFO_RX "|" D_SENSOR_TELEINFO_ENABLE
; ;
@ -2264,10 +2264,8 @@ const mytmplt kModules[MAXMODULE] PROGMEM = {
GPIO_LED1_INV, // GPIO13 WiFi Blue Led - Link and Power status GPIO_LED1_INV, // GPIO13 WiFi Blue Led - Link and Power status
0, 0, 0, 0 0, 0, 0, 0
} }
}; };
#endif // ESP8266 #endif // ESP8266
#ifdef ESP32 #ifdef ESP32

View File

@ -622,20 +622,14 @@ typedef struct MYTMPLT {
/********************************************************************************************/ /********************************************************************************************/
// Supported hardware modules // Supported hardware modules
enum SupportedModules { enum SupportedModules { WEMOS, ESP32_CAM_AITHINKER, MAXMODULE };
WEMOS, ESP32_CAM_AITHINKER,
MAXMODULE};
#define USER_MODULE 255 #define USER_MODULE 255
const char kModuleNames[] PROGMEM = const char kModuleNames[] PROGMEM = "ESP32-DevKit|ESP32 Cam AiThinker";
"ESP32-DevKit|ESP32 Cam AiThinker";
// Default module settings // Default module settings
const uint8_t kModuleNiceList[MAXMODULE] PROGMEM = { const uint8_t kModuleNiceList[MAXMODULE] PROGMEM = { WEMOS, ESP32_CAM_AITHINKER };
WEMOS,
ESP32_CAM_AITHINKER
};
const mytmplt kModules PROGMEM = const mytmplt kModules PROGMEM =
{ // WEMOS - Espressif ESP32-DevKitC - Any ESP32 device like WeMos and NodeMCU hardware (ESP32) { // WEMOS - Espressif ESP32-DevKitC - Any ESP32 device like WeMos and NodeMCU hardware (ESP32)
@ -690,7 +684,6 @@ const mytmplt kModules PROGMEM =
\*********************************************************************************************/ \*********************************************************************************************/
#endif // ESP32 #endif // ESP32
#endif // _TASMOTA_TEMPLATE_ESP32_H_ #endif // _TASMOTA_TEMPLATE_ESP32_H_

View File

@ -206,7 +206,7 @@ a_features = [[
"USE_IAQ","USE_DISPLAY_SEVENSEG","USE_AS3935","USE_PING", "USE_IAQ","USE_DISPLAY_SEVENSEG","USE_AS3935","USE_PING",
"USE_WINDMETER","USE_OPENTHERM","USE_THERMOSTAT","USE_VEML6075", "USE_WINDMETER","USE_OPENTHERM","USE_THERMOSTAT","USE_VEML6075",
"USE_VEML7700","USE_MCP9808","USE_BL0940","USE_TELEGRAM", "USE_VEML7700","USE_MCP9808","USE_BL0940","USE_TELEGRAM",
"USE_HP303B","USE_TCP_BRIDGE","","", "USE_HP303B","USE_TCP_BRIDGE","USE_TELEINFO","",
"","","","", "","","","",
"","","","", "","","","",
"","","USE_ETHERNET","USE_WEBCAM" "","","USE_ETHERNET","USE_WEBCAM"