jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-23 10:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added French Smart Meter Teleinformation

Browse Source
This commit is contained in:
Charles 2020-06-12 16:30:59 +02:00
parent 4afbbca773
commit 9a5f410c46
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tasmota/tasmota_template.h
View File

@ -234,6 +234,8 @@ enum UserSelectablePins {
GPIO_BOILER_OT_TX, // OpenTherm Boiler TX pin GPIO_BOILER_OT_TX, // OpenTherm Boiler TX pin
GPIO_WINDMETER_SPEED, // WindMeter speed counter pin GPIO_WINDMETER_SPEED, // WindMeter speed counter pin
GPIO_BL0940_RX, // BL0940 serial interface GPIO_BL0940_RX, // BL0940 serial interface
GPIO_TELEINFO_RX, // BL0940 serial interface
GPIO_TELEINFO_ENABLE, // BL0940 serial interface
GPIO_SENSOR_END }; GPIO_SENSOR_END };
// Programmer selectable GPIO functionality // Programmer selectable GPIO functionality
@ -324,7 +326,8 @@ 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_TELEINFO_RX "|" D_SENSOR_TELEINFO_ENABLE
; ;
const char kSensorNamesFixed[] PROGMEM = const char kSensorNamesFixed[] PROGMEM =
@ -682,6 +685,11 @@ const uint8_t kGpioNiceList[] PROGMEM = {
#ifdef USE_AS3935 #ifdef USE_AS3935
GPIO_AS3935, GPIO_AS3935,
#endif #endif
#ifdef USE_TELEINFO
GPIO_TELEINFO_RX,
GPIO_TELEINFO_ENABLE,
#endif
}; };
/********************************************************************************************/ /********************************************************************************************/

9
tasmota/tasmota_template_ESP32.h
View File

@ -129,6 +129,8 @@ enum UserSelectablePins {
GPIO_WINDMETER_SPEED, // WindMeter speed counter pin GPIO_WINDMETER_SPEED, // WindMeter speed counter pin
GPIO_KEY1_TC, // Touch pin as button GPIO_KEY1_TC, // Touch pin as button
GPIO_BL0940_RX, // BL0940 serial interface GPIO_BL0940_RX, // BL0940 serial interface
GPIO_TELEINFO_RX, // Teleinfo telemetry data receive pin
GPIO_TELEINFO_ENABLE, // Teleinfo Enable Receive Pin
GPIO_SENSOR_END }; GPIO_SENSOR_END };
enum ProgramSelectablePins { enum ProgramSelectablePins {
@ -218,7 +220,8 @@ const char kSensorNames[] PROGMEM =
D_GPIO_WEBCAM_PSRCS "|" D_GPIO_WEBCAM_PSRCS "|"
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_BUTTON "_tc|" D_SENSOR_WINDMETER_SPEED "|" D_SENSOR_BUTTON "_tc|"
D_SENSOR_BL0940_RX D_SENSOR_BL0940_RX "|"
D_SENSOR_TELEINFO_RX "|" D_SENSOR_TELEINFO_ENABLE
; ;
const char kSensorNamesFixed[] PROGMEM = const char kSensorNamesFixed[] PROGMEM =
@ -523,6 +526,10 @@ const uint16_t kGpioNiceList[] PROGMEM = {
#ifdef USE_AS3935 #ifdef USE_AS3935
AGPIO(GPIO_AS3935), AGPIO(GPIO_AS3935),
#endif #endif
#ifdef USE_TELEINFO
AGPIO(GPIO_TELEINFO_RX),
AGPIO(GPIO_TELEINFO_ENABLE),
#endif
/* /*
#ifndef USE_ADC_VCC #ifndef USE_ADC_VCC
AGPIO(ADC0_INPUT), // Analog input AGPIO(ADC0_INPUT), // Analog input