From 93a38e892c1b4f0096841ccc078deb12c4c195fe Mon Sep 17 00:00:00 2001 From: Charles Date: Mon, 15 Jun 2020 21:52:47 +0200 Subject: [PATCH] @s-hadinger requests before merging PR --- RELEASENOTES.md | 4 ++-- tasmota/tasmota_template.h | 24 ++---------------------- 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 608cb67c9..af9be6756 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -54,8 +54,6 @@ The following binary downloads have been compiled with ESP8266/Arduino library c ### Version 8.3.1.3 -- 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 -- Added Library to be used for decoding Teleinfo (French Metering Smart Meter) - Change IRremoteESP8266 library updated to v2.7.7 - Change Adafruit_SGP30 library from v1.0.3 to v1.2.0 (#8519) - Change Energy JSON Total field from ``"Total":[33.736,11.717,16.978]`` to ``"Total":33.736,"TotalTariff":[11.717,16.978]`` @@ -81,3 +79,5 @@ The following binary downloads have been compiled with ESP8266/Arduino library c - Add initial support for Telegram bot (#8619) - 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 +- 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 +- Added Library to be used for decoding Teleinfo (French Metering Smart Meter) diff --git a/tasmota/tasmota_template.h b/tasmota/tasmota_template.h index a0146aece..dab425f01 100644 --- a/tasmota/tasmota_template.h +++ b/tasmota/tasmota_template.h @@ -778,7 +778,7 @@ enum SupportedModules { SONOFF_S31, ZENGGE_ZF_WF017, SONOFF_POW_R2, SONOFF_IFAN02, BLITZWOLF_BWSHP, SHELLY1, SHELLY2, PHILIPS, NEO_COOLCAM, ESP_SWITCH, OBI, TECKIN, APLIC_WDP303075, TUYA_DIMMER, GOSUND, ARMTRONIX_DIMMERS, SK03_TUYA, PS_16_DZ, TECKIN_US, MANZOKU_EU_4, OBI2, YTF_IR_BRIDGE, DIGOO, KA10, ZX2820, MI_DESK_LAMP, SP10, WAGA, SYF05, SONOFF_L1, - SONOFF_IFAN03, EXS_DIMMER, PWM_DIMMER, SONOFF_D1, DENKY, + SONOFF_IFAN03, EXS_DIMMER, PWM_DIMMER, SONOFF_D1, MAXMODULE}; #define USER_MODULE 255 @@ -791,7 +791,7 @@ const char kModuleNames[] PROGMEM = "Sonoff S31|Zengge WF017|Sonoff Pow R2|Sonoff iFan02|BlitzWolf SHP|Shelly 1|Shelly 2|Xiaomi Philips|Neo Coolcam|ESP Switch|" "OBI Socket|Teckin|AplicWDP303075|Tuya MCU|Gosund SP1 v23|ARMTR Dimmer|SK03 Outdoor|PS-16-DZ|Teckin US|Manzoku strip|" "OBI Socket 2|YTF IR Bridge|Digoo DG-SP202|KA10|Luminea ZX2820|Mi Desk Lamp|SP10|WAGA CHCZ02MB|SYF05|Sonoff L1|" - "Sonoff iFan03|EXS Dimmer|PWM Dimmer|Sonoff D1|Denky (Teleinfo)" + "Sonoff iFan03|EXS Dimmer|PWM Dimmer|Sonoff D1" ; const uint8_t kModuleNiceList[] PROGMEM = { @@ -2174,26 +2174,6 @@ const mytmplt kModules[MAXMODULE] PROGMEM = { GPIO_LED1_INV, // GPIO13 WiFi Blue Led - Link and Power status 0, 0, 0, 0 }, - { // Denky (Teleinfo) Any ESP8266 device - GPIO_WS2812, // GPIO00 WS2812 RGB LED - GPIO_USER, // GPIO01 TX Serial RXD - GPIO_USER, // GPIO02 D4 Wemos DHT Shield - GPIO_TELEINFO_RX, // GPIO03 Smart Meter RX Serial - GPIO_I2C_SDA, // GPIO04 D2 Wemos I2C SDA - GPIO_I2C_SCL, // GPIO05 D1 Wemos I2C SCL - // GPIO06 (SD_CLK Flash) - // GPIO07 (SD_DATA0 Flash QIO/DIO/DOUT) - // GPIO08 (SD_DATA1 Flash QIO/DIO/DOUT) - GPIO_USER, // GPIO09 (SD_DATA2 Flash QIO or ESP8285) - GPIO_USER, // GPIO10 (SD_DATA3 Flash QIO or ESP8285) - // GPIO11 (SD_CMD Flash) - GPIO_USER, // GPIO12 D6 - GPIO_USER, // GPIO13 D7 - GPIO_USER, // GPIO14 D5 - GPIO_USER, // GPIO15 D8 - GPIO_USER, // GPIO16 D0 Wemos Wake - ADC0_USER // ADC0 A0 Analog input - }, { // SONOFF_IFAN03 - Sonoff iFan03 (ESP8285) GPIO_KEY1, // GPIO00 WIFI_KEY0 Button 1 GPIO_TXD, // GPIO01 ESP_TXD Serial RXD connection to P0.5 of RF microcontroller