jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-29 05:36:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prep Zigbee reset GPIO

Browse Source
This commit is contained in:
Theo Arends 2020-07-22 10:07:07 +02:00
parent 0fc41f302e
commit d8c4240656
26 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tasmota/language/bg_BG.h
View File

@ -647,6 +647,7 @@
#define D_SENSOR_OLED_RESET "Нулиране OLED"
#define D_SENSOR_ZIGBEE_TXD "Zigbee Tx"
#define D_SENSOR_ZIGBEE_RXD "Zigbee Rx"
#define D_SENSOR_ZIGBEE_RST "Zigbee Rst"
#define D_SENSOR_SOLAXX1_TX "SolaxX1 Tx"
#define D_SENSOR_SOLAXX1_RX "SolaxX1 Rx"
#define D_SENSOR_IBEACON_TX "iBeacon TX"

1
tasmota/language/cs_CZ.h
View File

@ -647,6 +647,7 @@
#define D_SENSOR_OLED_RESET "OLED Reset"
#define D_SENSOR_ZIGBEE_TXD "Zigbee Tx"
#define D_SENSOR_ZIGBEE_RXD "Zigbee Rx"
#define D_SENSOR_ZIGBEE_RST "Zigbee Rst"
#define D_SENSOR_SOLAXX1_TX "SolaxX1 Tx"
#define D_SENSOR_SOLAXX1_RX "SolaxX1 Rx"
#define D_SENSOR_IBEACON_TX "iBeacon TX"

1
tasmota/language/de_DE.h
View File

@ -647,6 +647,7 @@
#define D_SENSOR_OLED_RESET "OLED Reset"
#define D_SENSOR_ZIGBEE_TXD "Zigbee Tx"
#define D_SENSOR_ZIGBEE_RXD "Zigbee Rx"
#define D_SENSOR_ZIGBEE_RST "Zigbee Rst"
#define D_SENSOR_SOLAXX1_TX "SolaxX1 Tx"
#define D_SENSOR_SOLAXX1_RX "SolaxX1 Rx"
#define D_SENSOR_IBEACON_TX "iBeacon TX"

1
tasmota/language/el_GR.h
View File

@ -647,6 +647,7 @@
#define D_SENSOR_OLED_RESET "OLED Reset"
#define D_SENSOR_ZIGBEE_TXD "Zigbee Tx"
#define D_SENSOR_ZIGBEE_RXD "Zigbee Rx"
#define D_SENSOR_ZIGBEE_RST "Zigbee Rst"
#define D_SENSOR_SOLAXX1_TX "SolaxX1 Tx"
#define D_SENSOR_SOLAXX1_RX "SolaxX1 Rx"
#define D_SENSOR_IBEACON_TX "iBeacon TX"

1
tasmota/language/en_GB.h
View File

@ -647,6 +647,7 @@
#define D_SENSOR_OLED_RESET "OLED Reset"
#define D_SENSOR_ZIGBEE_TXD "Zigbee Tx"
#define D_SENSOR_ZIGBEE_RXD "Zigbee Rx"
#define D_SENSOR_ZIGBEE_RST "Zigbee Rst"
#define D_SENSOR_SOLAXX1_TX "SolaxX1 Tx"
#define D_SENSOR_SOLAXX1_RX "SolaxX1 Rx"
#define D_SENSOR_IBEACON_TX "iBeacon TX"

1
tasmota/language/es_ES.h
View File

@ -647,6 +647,7 @@
#define D_SENSOR_OLED_RESET "OLED Reset"
#define D_SENSOR_ZIGBEE_TXD "Zigbee Tx"
#define D_SENSOR_ZIGBEE_RXD "Zigbee Rx"
#define D_SENSOR_ZIGBEE_RST "Zigbee Rst"
#define D_SENSOR_SOLAXX1_TX "SolaxX1 Tx"
#define D_SENSOR_SOLAXX1_RX "SolaxX1 Rx"
#define D_SENSOR_IBEACON_TX "iBeacon TX"

1
tasmota/language/fr_FR.h
View File

@ -647,6 +647,7 @@
#define D_SENSOR_OLED_RESET "OLED Reset"
#define D_SENSOR_ZIGBEE_TXD "Zigbee TX"
#define D_SENSOR_ZIGBEE_RXD "Zigbee RX"
#define D_SENSOR_ZIGBEE_RST "Zigbee Rst"
#define D_SENSOR_SOLAXX1_TX "SolaxX1 TX"
#define D_SENSOR_SOLAXX1_RX "SolaxX1 RX"
#define D_SENSOR_IBEACON_TX "iBeacon TX"

1
tasmota/language/he_HE.h
View File

@ -647,6 +647,7 @@
#define D_SENSOR_OLED_RESET "OLED Reset"
#define D_SENSOR_ZIGBEE_TXD "Zigbee Tx"
#define D_SENSOR_ZIGBEE_RXD "Zigbee Rx"
#define D_SENSOR_ZIGBEE_RST "Zigbee Rst"
#define D_SENSOR_SOLAXX1_TX "SolaxX1 Tx"
#define D_SENSOR_SOLAXX1_RX "SolaxX1 Rx"
#define D_SENSOR_IBEACON_TX "iBeacon TX"

1
tasmota/language/hu_HU.h
View File

@ -647,6 +647,7 @@
#define D_SENSOR_OLED_RESET "OLED Reset"
#define D_SENSOR_ZIGBEE_TXD "Zigbee Tx"
#define D_SENSOR_ZIGBEE_RXD "Zigbee Rx"
#define D_SENSOR_ZIGBEE_RST "Zigbee Rst"
#define D_SENSOR_SOLAXX1_TX "SolaxX1 Tx"
#define D_SENSOR_SOLAXX1_RX "SolaxX1 Rx"
#define D_SENSOR_IBEACON_TX "iBeacon TX"

1
tasmota/language/it_IT.h
View File

@ -647,6 +647,7 @@
#define D_SENSOR_OLED_RESET "Ripristino OLED"
#define D_SENSOR_ZIGBEE_TXD "Zigbee - TX"
#define D_SENSOR_ZIGBEE_RXD "Zigbee - RX"
#define D_SENSOR_ZIGBEE_RST "Zigbee Rst"
#define D_SENSOR_SOLAXX1_TX "SolaxX1 - TX"
#define D_SENSOR_SOLAXX1_RX "SolaxX1- RX"
#define D_SENSOR_IBEACON_TX "iBeacon - TX"

1
tasmota/language/ko_KO.h
View File

@ -647,6 +647,7 @@
#define D_SENSOR_OLED_RESET "OLED Reset"
#define D_SENSOR_ZIGBEE_TXD "Zigbee Tx"
#define D_SENSOR_ZIGBEE_RXD "Zigbee Rx"
#define D_SENSOR_ZIGBEE_RST "Zigbee Rst"
#define D_SENSOR_SOLAXX1_TX "SolaxX1 Tx"
#define D_SENSOR_SOLAXX1_RX "SolaxX1 Rx"
#define D_SENSOR_IBEACON_TX "iBeacon TX"

1
tasmota/language/nl_NL.h
View File

@ -647,6 +647,7 @@
#define D_SENSOR_OLED_RESET "OLED Reset"
#define D_SENSOR_ZIGBEE_TXD "Zigbee Tx"
#define D_SENSOR_ZIGBEE_RXD "Zigbee Rx"
#define D_SENSOR_ZIGBEE_RST "Zigbee Rst"
#define D_SENSOR_SOLAXX1_TX "SolaxX1 Tx"
#define D_SENSOR_SOLAXX1_RX "SolaxX1 Rx"
#define D_SENSOR_IBEACON_TX "iBeacon TX"

1
tasmota/language/pl_PL.h
View File

@ -647,6 +647,7 @@
#define D_SENSOR_OLED_RESET "OLED Reset"
#define D_SENSOR_ZIGBEE_TXD "Zigbee Tx"
#define D_SENSOR_ZIGBEE_RXD "Zigbee Rx"
#define D_SENSOR_ZIGBEE_RST "Zigbee Rst"
#define D_SENSOR_SOLAXX1_TX "SolaxX1 Tx"
#define D_SENSOR_SOLAXX1_RX "SolaxX1 Rx"
#define D_SENSOR_IBEACON_TX "iBeacon TX"

1
tasmota/language/pt_BR.h
View File

@ -647,6 +647,7 @@
#define D_SENSOR_OLED_RESET "OLED Reset"
#define D_SENSOR_ZIGBEE_TXD "Zigbee Tx"
#define D_SENSOR_ZIGBEE_RXD "Zigbee Rx"
#define D_SENSOR_ZIGBEE_RST "Zigbee Rst"
#define D_SENSOR_SOLAXX1_TX "SolaxX1 Tx"
#define D_SENSOR_SOLAXX1_RX "SolaxX1 Rx"
#define D_SENSOR_IBEACON_TX "iBeacon TX"

1
tasmota/language/pt_PT.h
View File

@ -647,6 +647,7 @@
#define D_SENSOR_OLED_RESET "OLED Reset"
#define D_SENSOR_ZIGBEE_TXD "Zigbee Tx"
#define D_SENSOR_ZIGBEE_RXD "Zigbee Rx"
#define D_SENSOR_ZIGBEE_RST "Zigbee Rst"
#define D_SENSOR_SOLAXX1_TX "SolaxX1 Tx"
#define D_SENSOR_SOLAXX1_RX "SolaxX1 Rx"
#define D_SENSOR_IBEACON_TX "iBeacon TX"

1
tasmota/language/ro_RO.h
View File

@ -647,6 +647,7 @@
#define D_SENSOR_OLED_RESET "OLED Reset"
#define D_SENSOR_ZIGBEE_TXD "Zigbee Tx"
#define D_SENSOR_ZIGBEE_RXD "Zigbee Rx"
#define D_SENSOR_ZIGBEE_RST "Zigbee Rst"
#define D_SENSOR_SOLAXX1_TX "SolaxX1 Tx"
#define D_SENSOR_SOLAXX1_RX "SolaxX1 Rx"
#define D_SENSOR_IBEACON_TX "iBeacon TX"

1
tasmota/language/ru_RU.h
View File

@ -647,6 +647,7 @@
#define D_SENSOR_OLED_RESET "OLED Reset"
#define D_SENSOR_ZIGBEE_TXD "Zigbee Tx"
#define D_SENSOR_ZIGBEE_RXD "Zigbee Rx"
#define D_SENSOR_ZIGBEE_RST "Zigbee Rst"
#define D_SENSOR_SOLAXX1_TX "SolaxX1 Tx"
#define D_SENSOR_SOLAXX1_RX "SolaxX1 Rx"
#define D_SENSOR_IBEACON_TX "iBeacon TX"

1
tasmota/language/sk_SK.h
View File

@ -647,6 +647,7 @@
#define D_SENSOR_OLED_RESET "OLED Reset"
#define D_SENSOR_ZIGBEE_TXD "Zigbee Tx"
#define D_SENSOR_ZIGBEE_RXD "Zigbee Rx"
#define D_SENSOR_ZIGBEE_RST "Zigbee Rst"
#define D_SENSOR_SOLAXX1_TX "SolaxX1 Tx"
#define D_SENSOR_SOLAXX1_RX "SolaxX1 Rx"
#define D_SENSOR_IBEACON_TX "iBeacon TX"

1
tasmota/language/sv_SE.h
View File

@ -647,6 +647,7 @@
#define D_SENSOR_OLED_RESET "OLED Reset"
#define D_SENSOR_ZIGBEE_TXD "Zigbee Tx"
#define D_SENSOR_ZIGBEE_RXD "Zigbee Rx"
#define D_SENSOR_ZIGBEE_RST "Zigbee Rst"
#define D_SENSOR_SOLAXX1_TX "SolaxX1 Tx"
#define D_SENSOR_SOLAXX1_RX "SolaxX1 Rx"
#define D_SENSOR_IBEACON_TX "iBeacon TX"

1
tasmota/language/tr_TR.h
View File

@ -647,6 +647,7 @@
#define D_SENSOR_OLED_RESET "OLED Reset"
#define D_SENSOR_ZIGBEE_TXD "Zigbee Tx"
#define D_SENSOR_ZIGBEE_RXD "Zigbee Rx"
#define D_SENSOR_ZIGBEE_RST "Zigbee Rst"
#define D_SENSOR_SOLAXX1_TX "SolaxX1 Tx"
#define D_SENSOR_SOLAXX1_RX "SolaxX1 Rx"
#define D_SENSOR_IBEACON_TX "iBeacon TX"

1
tasmota/language/uk_UA.h
View File

@ -647,6 +647,7 @@
#define D_SENSOR_OLED_RESET "OLED Reset"
#define D_SENSOR_ZIGBEE_TXD "Zigbee Tx"
#define D_SENSOR_ZIGBEE_RXD "Zigbee Rx"
#define D_SENSOR_ZIGBEE_RST "Zigbee Rst"
#define D_SENSOR_SOLAXX1_TX "SolaxX1 Tx"
#define D_SENSOR_SOLAXX1_RX "SolaxX1 Rx"
#define D_SENSOR_IBEACON_TX "iBeacon TX"

1
tasmota/language/zh_CN.h
View File

@ -647,6 +647,7 @@
#define D_SENSOR_OLED_RESET "OLED Reset"
#define D_SENSOR_ZIGBEE_TXD "Zigbee Tx"
#define D_SENSOR_ZIGBEE_RXD "Zigbee Rx"
#define D_SENSOR_ZIGBEE_RST "Zigbee Rst"
#define D_SENSOR_SOLAXX1_TX "SolaxX1 Tx"
#define D_SENSOR_SOLAXX1_RX "SolaxX1 Rx"
#define D_SENSOR_IBEACON_TX "iBeacon TX"

1
tasmota/language/zh_TW.h
View File

@ -647,6 +647,7 @@
#define D_SENSOR_OLED_RESET "OLED Reset"
#define D_SENSOR_ZIGBEE_TXD "Zigbee Tx"
#define D_SENSOR_ZIGBEE_RXD "Zigbee Rx"
#define D_SENSOR_ZIGBEE_RST "Zigbee Rst"
#define D_SENSOR_SOLAXX1_TX "SolaxX1 Tx"
#define D_SENSOR_SOLAXX1_RX "SolaxX1 Rx"
#define D_SENSOR_IBEACON_TX "iBeacon TX"

5
tasmota/tasmota_template.h
View File

@ -241,6 +241,7 @@ enum UserSelectablePins {
GPIO_LMT01, // LMT01 input counting pin
GPIO_IEM3000_TX, // IEM3000 Serial interface
GPIO_IEM3000_RX, // IEM3000 Serial interface
GPIO_ZIGBEE_RST, // Zigbee reset
GPIO_SENSOR_END };
// Programmer selectable GPIO functionality
@ -335,7 +336,8 @@ const char kSensorNames[] PROGMEM =
D_SENSOR_TCP_TXD "|" D_SENSOR_TCP_RXD "|"
D_SENSOR_TELEINFO_RX "|" D_SENSOR_TELEINFO_ENABLE "|"
D_SENSOR_LMT01_PULSE "|"
D_SENSOR_IEM3000_TX "|" D_SENSOR_IEM3000_RX
D_SENSOR_IEM3000_TX "|" D_SENSOR_IEM3000_RX "|"
D_SENSOR_ZIGBEE_RST
;
const char kSensorNamesFixed[] PROGMEM =
@ -605,6 +607,7 @@ const uint8_t kGpioNiceList[] PROGMEM = {
#ifdef USE_ZIGBEE
GPIO_ZIGBEE_TX, // Zigbee Serial interface
GPIO_ZIGBEE_RX, // Zigbee Serial interface
GPIO_ZIGBEE_RST, // Zigbee reset
#endif
#ifdef USE_MHZ19
GPIO_MHZ_TXD, // MH-Z19 Serial interface

5
tasmota/tasmota_template_ESP32.h
View File

@ -138,6 +138,7 @@ enum UserSelectablePins {
GPIO_TELEINFO_ENABLE, // Teleinfo Enable Receive Pin
GPIO_LMT01, // LMT01 input counting pin
GPIO_IEM3000_TX, GPIO_IEM3000_RX, // IEM3000 Serial interface
GPIO_ZIGBEE_RST, // Zigbee reset
GPIO_SENSOR_END };
enum ProgramSelectablePins {
@ -235,7 +236,8 @@ const char kSensorNames[] PROGMEM =
D_SENSOR_ETH_PHY_POWER "|" D_SENSOR_ETH_PHY_MDC "|" D_SENSOR_ETH_PHY_MDIO "|"
D_SENSOR_TELEINFO_RX "|" D_SENSOR_TELEINFO_ENABLE "|"
D_SENSOR_LMT01_PULSE "|"
D_SENSOR_IEM3000_TX "|" D_SENSOR_IEM3000_RX
D_SENSOR_IEM3000_TX "|" D_SENSOR_IEM3000_RX "|"
D_SENSOR_ZIGBEE_RST
;
const char kSensorNamesFixed[] PROGMEM =
@ -451,6 +453,7 @@ const uint16_t kGpioNiceList[] PROGMEM = {
#ifdef USE_ZIGBEE
AGPIO(GPIO_ZIGBEE_TX), // Zigbee Serial interface
AGPIO(GPIO_ZIGBEE_RX), // Zigbee Serial interface
AGPIO(GPIO_ZIGBEE_RST), // Zigbee reset
#endif
#ifdef USE_MHZ19
AGPIO(GPIO_MHZ_TXD), // MH-Z19 Serial interface

6
tasmota/xdrv_23_zigbee_9_serial.ino
View File

@ -292,6 +292,12 @@ void ZigbeeInitSerial(void)
zigbee_buffer = new SBuffer(ZIGBEE_BUFFER_SIZE);
// AddLog_P2(LOG_LEVEL_INFO, PSTR("ZigbeeInit Mem3 = %d"), ESP_getFreeHeap());
}
if (PinUsed(GPIO_ZIGBEE_RST)) {
pinMode(Pin(GPIO_ZIGBEE_RST), OUTPUT);
digitalWrite(Pin(GPIO_ZIGBEE_RST), 1);
}
zigbee.active = true;
zigbee.init_phase = true; // start the state machine
zigbee.state_machine = true; // start the state machine