mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix bistable relays and SO63

This commit is contained in:
Theo Arends 2022-07-09 16:26:13 +02:00
parent cd0f9c7360
commit c9d289822c
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tasmota/include/tasmota_template.h
View File

@ -476,12 +476,10 @@ const uint16_t kGpioNiceList[] PROGMEM = {
#endif #endif
AGPIO(GPIO_REL1) + MAX_RELAYS, // Relays AGPIO(GPIO_REL1) + MAX_RELAYS, // Relays
AGPIO(GPIO_REL1_INV) + MAX_RELAYS, AGPIO(GPIO_REL1_INV) + MAX_RELAYS,
#ifdef USE_BISTABLE_RELAY_SUPPORT #ifdef USE_BISTABLE_RELAY_SUPPORT
AGPIO(GPIO_REL1_BI) + MAX_RELAYS, // Bistable (Latching) two coil relays AGPIO(GPIO_REL1_BI) + MAX_RELAYS, // Bistable (Latching) two coil relays
AGPIO(GPIO_REL1_BI_INV) + MAX_RELAYS, AGPIO(GPIO_REL1_BI_INV) + MAX_RELAYS,
#endif #endif
AGPIO(GPIO_LED1) + MAX_LEDS, // Leds AGPIO(GPIO_LED1) + MAX_LEDS, // Leds
AGPIO(GPIO_LED1_INV) + MAX_LEDS, AGPIO(GPIO_LED1_INV) + MAX_LEDS,
#ifdef USE_COUNTER #ifdef USE_COUNTER

27
tasmota/tasmota_support/support_tasmota.ino
View File

@ -428,6 +428,26 @@ void SetPowerOnState(void)
} }
// Issue #526 and #909 // Issue #526 and #909
#ifdef USE_BISTABLE_RELAY_SUPPORT
uint32_t port = 0;
for (uint32_t i = 0; i < TasmotaGlobal.devices_present; i++) {
#ifdef ESP8266
if (!Settings->flag3.no_power_feedback) { // SetOption63 - Don't scan relay power state at restart - #5594 and #5663
if ((port < MAX_RELAYS) && PinUsed(GPIO_REL1, port)) {
if (bitRead(TasmotaGlobal.rel_bistable, port)) {
port++; // Skip both bistable relays as always 0
} else {
bitWrite(TasmotaGlobal.power, i, digitalRead(Pin(GPIO_REL1, port)) ^ bitRead(TasmotaGlobal.rel_inverted, port));
}
}
port++;
}
#endif // ESP8266
if (bitRead(TasmotaGlobal.power, i) || (POWER_ALL_OFF_PULSETIME_ON == Settings->poweronstate)) {
SetPulseTimer(i % MAX_PULSETIMERS, Settings->pulse_timer[i % MAX_PULSETIMERS]);
}
}
#else // No USE_BISTABLE_RELAY_SUPPORT
for (uint32_t i = 0; i < TasmotaGlobal.devices_present; i++) { for (uint32_t i = 0; i < TasmotaGlobal.devices_present; i++) {
#ifdef ESP8266 #ifdef ESP8266
if (!Settings->flag3.no_power_feedback) { // SetOption63 - Don't scan relay power state at restart - #5594 and #5663 if (!Settings->flag3.no_power_feedback) { // SetOption63 - Don't scan relay power state at restart - #5594 and #5663
@ -440,6 +460,8 @@ void SetPowerOnState(void)
SetPulseTimer(i % MAX_PULSETIMERS, Settings->pulse_timer[i % MAX_PULSETIMERS]); SetPulseTimer(i % MAX_PULSETIMERS, Settings->pulse_timer[i % MAX_PULSETIMERS]);
} }
} }
#endif // USE_BISTABLE_RELAY_SUPPORT
TasmotaGlobal.blink_powersave = TasmotaGlobal.power; TasmotaGlobal.blink_powersave = TasmotaGlobal.power;
#ifdef USE_RULES #ifdef USE_RULES
RulesEvery50ms(); RulesEvery50ms();
@ -2007,7 +2029,6 @@ void GpioInit(void)
bitSet(TasmotaGlobal.rel_inverted, mpin - AGPIO(GPIO_REL1_INV)); bitSet(TasmotaGlobal.rel_inverted, mpin - AGPIO(GPIO_REL1_INV));
mpin -= (AGPIO(GPIO_REL1_INV) - AGPIO(GPIO_REL1)); mpin -= (AGPIO(GPIO_REL1_INV) - AGPIO(GPIO_REL1));
} }
#ifdef USE_BISTABLE_RELAY_SUPPORT #ifdef USE_BISTABLE_RELAY_SUPPORT
else if ((mpin >= AGPIO(GPIO_REL1_BI)) && (mpin < (AGPIO(GPIO_REL1_BI) + MAX_RELAYS))) { else if ((mpin >= AGPIO(GPIO_REL1_BI)) && (mpin < (AGPIO(GPIO_REL1_BI) + MAX_RELAYS))) {
bitSet(TasmotaGlobal.rel_bistable, mpin - AGPIO(GPIO_REL1_BI)); bitSet(TasmotaGlobal.rel_bistable, mpin - AGPIO(GPIO_REL1_BI));
@ -2019,7 +2040,6 @@ void GpioInit(void)
mpin -= (AGPIO(GPIO_REL1_BI_INV) - AGPIO(GPIO_REL1)); mpin -= (AGPIO(GPIO_REL1_BI_INV) - AGPIO(GPIO_REL1));
} }
#endif // USE_BISTABLE_RELAY_SUPPORT #endif // USE_BISTABLE_RELAY_SUPPORT
else if ((mpin >= AGPIO(GPIO_LED1_INV)) && (mpin < (AGPIO(GPIO_LED1_INV) + MAX_LEDS))) { else if ((mpin >= AGPIO(GPIO_LED1_INV)) && (mpin < (AGPIO(GPIO_LED1_INV) + MAX_LEDS))) {
bitSet(TasmotaGlobal.led_inverted, mpin - AGPIO(GPIO_LED1_INV)); bitSet(TasmotaGlobal.led_inverted, mpin - AGPIO(GPIO_LED1_INV));
mpin -= (AGPIO(GPIO_LED1_INV) - AGPIO(GPIO_LED1)); mpin -= (AGPIO(GPIO_LED1_INV) - AGPIO(GPIO_LED1));
@ -2217,7 +2237,6 @@ void GpioInit(void)
#ifdef USE_BISTABLE_RELAY_SUPPORT #ifdef USE_BISTABLE_RELAY_SUPPORT
uint32_t bi_device = 0; uint32_t bi_device = 0;
#endif // USE_BISTABLE_RELAY_SUPPORT #endif // USE_BISTABLE_RELAY_SUPPORT
for (uint32_t i = 0; i < MAX_RELAYS; i++) { for (uint32_t i = 0; i < MAX_RELAYS; i++) {
if (PinUsed(GPIO_REL1, i)) { if (PinUsed(GPIO_REL1, i)) {
TasmotaGlobal.devices_present++; TasmotaGlobal.devices_present++;
@ -2226,14 +2245,12 @@ void GpioInit(void)
if (i &1) { TasmotaGlobal.devices_present--; } if (i &1) { TasmotaGlobal.devices_present--; }
} }
#endif // ESP8266 #endif // ESP8266
#ifdef USE_BISTABLE_RELAY_SUPPORT #ifdef USE_BISTABLE_RELAY_SUPPORT
if (bitRead(TasmotaGlobal.rel_bistable, i)) { if (bitRead(TasmotaGlobal.rel_bistable, i)) {
if (bi_device &1) { TasmotaGlobal.devices_present--; } if (bi_device &1) { TasmotaGlobal.devices_present--; }
bi_device++; bi_device++;
} }
#endif // USE_BISTABLE_RELAY_SUPPORT #endif // USE_BISTABLE_RELAY_SUPPORT
} }
} }