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

Add DevicesPresent limit check 

- Increase supported relays and buttons to 32
This commit is contained in:
Theo Arends 2023-02-25 16:44:04 +01:00
parent 1b5c4768d1
commit e927e3307e
21 changed files with 225 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tasmota/include/tasmota.h
View File

@ -52,8 +52,8 @@ const uint8_t MAX_INTERLOCKS = 14; // Max number of interlock groups (u
const uint8_t MAX_SWITCHES = 28; // Max number of switches selectable on GPIO
const uint8_t MAX_KEYS = 28; // Max number of keys or buttons selectable on GPIO
#endif // ESP32
const uint8_t MAX_RELAYS_SET = 28; // Max number of relays
const uint8_t MAX_KEYS_SET = 28; // Max number of keys
const uint8_t MAX_RELAYS_SET = 32; // Max number of relays
const uint8_t MAX_KEYS_SET = 32; // Max number of keys
// Changes to the following MAX_ defines will impact settings layout
const uint8_t MAX_INTERLOCKS_SET = 14; // Max number of interlock groups (MAX_RELAYS_SET / 2)

16
tasmota/tasmota_support/support.ino
View File

@ -757,6 +757,22 @@ bool NewerVersion(char* version_str) {
return (version > VERSION);
}
int32_t UpdateDevicesPresent(int32_t change) {
int32_t difference = 0;
int32_t devices_present = TasmotaGlobal.devices_present; // Between 0 and 32
devices_present += change;
if (devices_present < 0) { // Support down to 0
difference = devices_present;
devices_present = 0;
}
else if (devices_present >= POWER_SIZE) { // Support up to uint32_t as bitmask
difference = devices_present - POWER_SIZE;
devices_present = POWER_SIZE;
}
TasmotaGlobal.devices_present = devices_present;
return difference;
}
char* GetPowerDevice(char* dest, uint32_t idx, size_t size, uint32_t option)
{
strncpy_P(dest, S_RSLT_POWER, size); // POWER

6
tasmota/tasmota_xdrv_driver/xdrv_04_light.ino
View File

@ -1116,17 +1116,17 @@ bool LightModuleInit(void)
#endif // USE_PWM_DIMMER
if (TasmotaGlobal.light_type > LT_BASIC) {
TasmotaGlobal.devices_present++;
UpdateDevicesPresent(1);
}
// post-process for lights
uint32_t pwm_channels = (TasmotaGlobal.light_type & 7) > LST_MAX ? LST_MAX : (TasmotaGlobal.light_type & 7);
if (Settings->flag3.pwm_multi_channels) { // SetOption68 - Enable multi-channels PWM instead of Color PWM
if (0 == pwm_channels) { pwm_channels = 1; }
TasmotaGlobal.devices_present += pwm_channels - 1; // add the pwm channels controls at the end
UpdateDevicesPresent(pwm_channels - 1); // add the pwm channels controls at the end
} else if ((Settings->param[P_RGB_REMAP] & 128) && (LST_RGBW <= pwm_channels)) { // SetOption37
// if RGBW or RGBCW, and SetOption37 >= 128, we manage RGB and W separately, hence adding a device
TasmotaGlobal.devices_present++;
UpdateDevicesPresent(1);
} else {
#ifdef USE_LIGHT_VIRTUAL_CT
initCTRange(pwm_channels);

4
tasmota/tasmota_xdrv_driver/xdrv_13_display.ino
View File

@ -1875,10 +1875,10 @@ void DisplayInitDriver(void) {
for (uint8_t count = 0; count < NUM_GRAPHS; count++) { graph[count] = 0; }
#endif
TasmotaGlobal.devices_present++;
UpdateDevicesPresent(1);
if (!PinUsed(GPIO_BACKLIGHT)) {
if (TasmotaGlobal.light_type && (4 == Settings->display_model)) {
TasmotaGlobal.devices_present--; // Assume PWM channel is used for backlight
UpdateDevicesPresent(-1); // Assume PWM channel is used for backlight
}
}
disp_device = TasmotaGlobal.devices_present;

4
tasmota/tasmota_xdrv_driver/xdrv_16_tuyamcu_v1.ino
View File

@ -1181,13 +1181,13 @@ bool TuyaModuleSelected(void) {
if ((Settings->tuya_fnid_map[i].fnid >= TUYA_MCU_FUNC_REL1 && Settings->tuya_fnid_map[i].fnid <= TUYA_MCU_FUNC_REL8 ) ||
(Settings->tuya_fnid_map[i].fnid >= TUYA_MCU_FUNC_REL1_INV && Settings->tuya_fnid_map[i].fnid <= TUYA_MCU_FUNC_REL8_INV )) {
relaySet = true;
TasmotaGlobal.devices_present++;
UpdateDevicesPresent(1);
}
}
if (!relaySet && TuyaGetDpId(TUYA_MCU_FUNC_DUMMY) == 0) { //by default the first relay is created automatically the dummy let remove it if not needed
TuyaAddMcuFunc(TUYA_MCU_FUNC_REL1, 1);
TasmotaGlobal.devices_present++;
UpdateDevicesPresent(1);
SettingsSaveAll();
}

4
tasmota/tasmota_xdrv_driver/xdrv_16_tuyamcu_v2.ino
View File

@ -1981,13 +1981,13 @@ bool TuyaModuleSelected(void) {
if ((Settings->tuya_fnid_map[i].fnid >= TUYA_MCU_FUNC_REL1 && Settings->tuya_fnid_map[i].fnid <= TUYA_MCU_FUNC_REL8 ) ||
(Settings->tuya_fnid_map[i].fnid >= TUYA_MCU_FUNC_REL1_INV && Settings->tuya_fnid_map[i].fnid <= TUYA_MCU_FUNC_REL8_INV )) {
relaySet = true;
TasmotaGlobal.devices_present++;
UpdateDevicesPresent(1);
}
}
if (!relaySet && TuyaGetDpId(TUYA_MCU_FUNC_DUMMY) == 0) { //by default the first relay is created automatically the dummy let remove it if not needed
TuyaAddMcuFunc(TUYA_MCU_FUNC_REL1, 1);
TasmotaGlobal.devices_present++;
UpdateDevicesPresent(1);
SettingsSaveAll();
}

2
tasmota/tasmota_xdrv_driver/xdrv_18_armtronix_dimmers.ino
View File

@ -86,7 +86,7 @@ void ArmtronixRequestState(void)
bool ArmtronixModuleSelected(void)
{
TasmotaGlobal.devices_present++;
UpdateDevicesPresent(1);
TasmotaGlobal.light_type = LT_SERIAL2;
return true;
}

2
tasmota/tasmota_xdrv_driver/xdrv_19_ps16dz_dimmer.ino
View File

@ -196,7 +196,7 @@ void PS16DZInit(void)
bool PS16DZModuleSelected(void)
{
TasmotaGlobal.devices_present++;
UpdateDevicesPresent(1);
TasmotaGlobal.light_type = LT_SERIAL1;
return true;

9
tasmota/tasmota_xdrv_driver/xdrv_28_pcf8574.ino
View File

@ -148,7 +148,8 @@ void Pcf8574Init(void)
for (uint32_t i = 0; i < sizeof(Pcf8574.pin); i++) {
Pcf8574.pin[i] = 99;
}
TasmotaGlobal.devices_present = TasmotaGlobal.devices_present - Pcf8574.max_connected_ports; // reset no of devices to avoid duplicate ports on duplicate init.
UpdateDevicesPresent(-Pcf8574.max_connected_ports); // reset no of devices to avoid duplicate ports on duplicate init.
Pcf8574.max_connected_ports = 0; // reset no of devices to avoid duplicate ports on duplicate init.
for (uint32_t idx = 0; idx < Pcf8574.max_devices; idx++) { // suport up to 8 boards PCF8574
uint8_t gpio = Pcf8574Read(idx);
@ -173,7 +174,7 @@ void Pcf8574Init(void)
bitWrite(Settings->power, TasmotaGlobal.devices_present, power_state);
}
//else AddLog(LOG_LEVEL_DEBUG, PSTR("PCF: DON'T set power from chip state"));
TasmotaGlobal.devices_present++;
UpdateDevicesPresent(1);
Pcf8574.max_connected_ports++;
}
}
@ -314,7 +315,7 @@ void Pcf8574SaveSettings(void)
count++;
}
if (count <= TasmotaGlobal.devices_present) {
TasmotaGlobal.devices_present = TasmotaGlobal.devices_present - count;
UpdateDevicesPresent(-count);
}
for (byte i = 0; i < 8; i++) {
snprintf_P(stemp, sizeof(stemp), PSTR("i2cs%d"), i+8*idx);
@ -322,7 +323,7 @@ void Pcf8574SaveSettings(void)
byte _value = (!strlen(tmp)) ? 0 : atoi(tmp);
if (_value) {
Settings->pcf8574_config[idx] = Settings->pcf8574_config[idx] | 1 << i;
TasmotaGlobal.devices_present++;
UpdateDevicesPresent(1);
Pcf8574.max_connected_ports++;
} else {
Settings->pcf8574_config[idx] = Settings->pcf8574_config[idx] & ~(1 << i );

2
tasmota/tasmota_xdrv_driver/xdrv_30_exs_dimmer.ino
View File

@ -354,7 +354,7 @@ bool ExsModuleSelected(void)
Settings->flag3.pwm_multi_channels = 1; // SetOption68 - Enable multi-channels PWM instead of Color PWM
SetSeriallog(LOG_LEVEL_NONE);
TasmotaGlobal.devices_present = +2;
UpdateDevicesPresent(2);
TasmotaGlobal.light_type = LT_SERIAL2;
return true;
}

2
tasmota/tasmota_xdrv_driver/xdrv_35_pwm_dimmer.ino
View File

@ -137,7 +137,7 @@ void PWMModulePreInit(void)
first_device_group_is_local = false;
// Back out the changes made in the light module under the assumtion we have a relay or PWM.
TasmotaGlobal.devices_present--;
UpdateDevicesPresent(-1);
TasmotaGlobal.light_type = 0;
}

2
tasmota/tasmota_xdrv_driver/xdrv_37_sonoff_d1.ino
View File

@ -163,7 +163,7 @@ bool SonoffD1ModuleSelected(void)
{
SetSerial(9600, TS_SERIAL_8N1);
TasmotaGlobal.devices_present++;
UpdateDevicesPresent(1);
TasmotaGlobal.light_type = LT_SERIAL1;
return true;

3
tasmota/tasmota_xdrv_driver/xdrv_44_miel_hvac.ino
View File

@ -1085,7 +1085,8 @@ miel_hvac_pre_init(void)
SetSerial(baudrate, TS_SERIAL_8E1);
}
sc->sc_device = TasmotaGlobal.devices_present++; /* claim a POWER device slot */
UpdateDevicesPresent(1); /* claim a POWER device slot */
sc->sc_device = TasmotaGlobal.devices_present;
miel_hvac_sc = sc;
return;

2
tasmota/tasmota_xdrv_driver/xdrv_45_shelly_dimmer.ino
View File

@ -725,7 +725,7 @@ bool ShdSerialInput(void)
bool ShdModuleSelected(void) {
if (PinUsed(GPIO_SHELLY_DIMMER_BOOT0) && PinUsed(GPIO_SHELLY_DIMMER_RST_INV)) {
TasmotaGlobal.devices_present++;
UpdateDevicesPresent(1);
TasmotaGlobal.light_type = LT_SERIAL1;
Shd.present = true;

3
tasmota/tasmota_xdrv_driver/xdrv_53_projector_ctrl.ino
View File

@ -123,7 +123,8 @@ projector_ctrl_pre_init(void)
SetSerial(baudrate, TS_SERIAL_8N1);
}
sc->sc_device = ++(TasmotaGlobal.devices_present); /* claim a POWER device slot */
UpdateDevicesPresent(1); /* claim a POWER device slot */
sc->sc_device = TasmotaGlobal.devices_present;
AddLog(LOG_LEVEL_INFO, PSTR(PROJECTOR_CTRL_LOGNAME ": new RELAY%d, polling serial for Projector status"), sc->sc_device);

3
tasmota/tasmota_xdrv_driver/xdrv_60_shift595.ino
View File

@ -58,7 +58,8 @@ void Shift595Init(void) {
Shift595->first = TasmotaGlobal.devices_present;
Shift595->outputs = Settings->shift595_device_count * 8;
TasmotaGlobal.devices_present += Shift595->outputs;
UpdateDevicesPresent(Shift595->outputs);
Shift595->connected = true;
AddLog(LOG_LEVEL_DEBUG, PSTR("595: Controlling relays POWER%d to POWER%d"), Shift595->first + 1, Shift595->first + Shift595->outputs);
}

2
tasmota/tasmota_xdrv_driver/xdrv_66_tm1638.ino
View File

@ -164,7 +164,7 @@ void TmInit(void) {
digitalWrite(Tm1638.strobe_pin, HIGH);
Tm1638.led_offset = TasmotaGlobal.devices_present;
TasmotaGlobal.devices_present += TM1638_MAX_LEDS;
UpdateDevicesPresent(TM1638_MAX_LEDS);
Tm1638.key_offset = -1;
Tm1638.detected = true;
}

2
tasmota/tasmota_xdrv_driver/xdrv_86_esp32_sonoff_spm.ino
View File

@ -1195,7 +1195,7 @@ void SSPMHandleReceivedData(void) {
TasmotaGlobal.power |= current_state;
Sspm->old_power = TasmotaGlobal.power;
TasmotaGlobal.devices_present += 4;
UpdateDevicesPresent(4);
}
SSPMSendGetOps(Sspm->module_selected -1);
break;

2
tasmota/tasmota_xdrv_driver/xdrv_88_esp32_shelly_pro.ino
View File

@ -372,7 +372,7 @@ void ShellyProPreInit(void) {
}
if (SPro.detected) {
TasmotaGlobal.devices_present += SPro.detected;
UpdateDevicesPresent(SPro.detected); // Shelly Pro 1
SPro.pin_register_cs = Pin(GPIO_SPI_CS);
digitalWrite(SPro.pin_register_cs, (4 == SPro.detected) ? 1 : 0); // Prep 74HC595 rclk

177
tasmota/tasmota_xdrv_driver/xdrv_88_esp32_shelly_pro_v1.ino Normal file
View File

@ -0,0 +1,177 @@
/*
xdrv_88_shelly_pro.ino - Shelly pro family support for Tasmota
Copyright (C) 2022 Theo Arends
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifdef ESP32
#ifdef USE_SPI
#ifdef USE_SHELLY_PRO_V1
/*********************************************************************************************\
* Shelly Pro support
*
* {"NAME":"Shelly Pro 1","GPIO":[0,1,0,1,768,0,0,0,672,704,736,0,0,0,5600,6214,0,0,0,5568,0,0,0,0,0,0,0,0,0,0,0,32,4736,0,160,0],"FLAG":0,"BASE":1,"CMND":"AdcParam1 2,10000,10000,3350"}
* {"NAME":"Shelly Pro 1PM","GPIO":[9568,1,9472,1,768,0,0,0,672,704,736,0,0,0,5600,6214,0,0,0,5568,0,0,0,0,0,0,0,0,3459,0,0,32,4736,0,160,0],"FLAG":0,"BASE":1,"CMND":"AdcParam1 2,10000,10000,3350"}
* {"NAME":"Shelly Pro 2","GPIO":[0,1,0,1,768,0,0,0,672,704,736,0,0,0,5600,6214,0,0,0,5568,0,0,0,0,0,0,0,0,0,0,0,32,4736,4737,160,161],"FLAG":0,"BASE":1,"CMND":"AdcParam1 2,10000,10000,3350;AdcParam2 2,10000,10000,3350"}
* {"NAME":"Shelly Pro 2PM","GPIO":[9568,1,9472,1,768,0,0,0,672,704,736,9569,0,0,5600,6214,0,0,0,5568,0,0,0,0,0,0,0,0,3460,0,0,32,4736,4737,160,161],"FLAG":0,"BASE":1,"CMND":"AdcParam1 2,10000,10000,3350;AdcParam2 2,10000,10000,3350"}
*
* Shelly Pro uses SPI to control one 74HC595 for relays/leds and one ADE7953 (1PM) or two ADE7953 (2PM) for energy monitoring
\*********************************************************************************************/
#define XDRV_88 88
struct SPro {
uint32_t last_update;
uint8_t pin_shift595_rclk;
uint8_t ledlink;
uint8_t power;
bool detected;
} SPro;
void ShellyProUpdate(void) {
// Shelly Pro 595 register
// bit 0 = relay/led 1
// bit 1 = relay/led 2
// bit 2 = wifi led blue
// bit 3 = wifi led green
// bit 4 = wifi led red
// bit 5 - 7 = nc
// OE is connected to Gnd with 470 ohm resistor R62 AND a capacitor C81 to 3V3
// - this inhibits output of signals (also relay state) during power on for a few seconds
uint8_t val = SPro.power | SPro.ledlink;
SPI.beginTransaction(SPISettings(1000000, MSBFIRST, SPI_MODE0));
SPI.transfer(val); // Write 74HC595 shift register
SPI.endTransaction();
// delayMicroseconds(2); // Wait for SPI clock to stop
digitalWrite(SPro.pin_shift595_rclk, 1); // Latch data
delayMicroseconds(1); // Shelly 10mS
digitalWrite(SPro.pin_shift595_rclk, 0);
}
void ShellyProPreInit(void) {
if ((SPI_MOSI_MISO == TasmotaGlobal.spi_enabled) &&
PinUsed(GPIO_SPI_CS) &&
TasmotaGlobal.gpio_optiona.shelly_pro) { // Option_A7
if (PinUsed(GPIO_SWT1) || PinUsed(GPIO_KEY1)) {
UpdateDevicesPresent(1); // Shelly Pro 1
if (PinUsed(GPIO_SWT1, 1) || PinUsed(GPIO_KEY1, 1)) {
UpdateDevicesPresent(1); // Shelly Pro 2
}
SPro.pin_shift595_rclk = Pin(GPIO_SPI_CS);
digitalWrite(SPro.pin_shift595_rclk, 0);
pinMode(SPro.pin_shift595_rclk, OUTPUT);
// Does nothing if SPI is already initiated (by ADE7953) so no harm done
SPI.begin(Pin(GPIO_SPI_CLK), Pin(GPIO_SPI_MISO), Pin(GPIO_SPI_MOSI), -1);
SPro.ledlink = 0x18; // Blue led on - set by first call ShellyProPower()
SPro.detected = true;
}
}
}
void ShellyProInit(void) {
int pin_lan_reset = 5; // GPIO5 = LAN8720 nRST
// delay(30); // (t-purstd) This pin must be brought low for a minimum of 25 mS after power on
digitalWrite(pin_lan_reset, 0);
pinMode(pin_lan_reset, OUTPUT);
delay(1); // (t-rstia) This pin must be brought low for a minimum of 100 uS
digitalWrite(pin_lan_reset, 1);
AddLog(LOG_LEVEL_INFO, PSTR("HDW: Shelly Pro %d%s initialized"),
TasmotaGlobal.devices_present, (PinUsed(GPIO_ADE7953_CS))?"PM":"");
}
void ShellyProPower(void) {
SPro.power = XdrvMailbox.index &3;
ShellyProUpdate();
}
void ShellyProUpdateLedLink(uint32_t ledlink) {
if (ledlink != SPro.ledlink) {
SPro.ledlink = ledlink;
ShellyProUpdate();
}
}
void ShellyProLedLink(void) {
/*
bit 2 = blue, 3 = green, 4 = red
Shelly Pro documentation
- Blue light indicator will be on if in AP mode.
- Red light indicator will be on if in STA mode and not connected to a Wi-Fi network.
- Yellow light indicator will be on if in STA mode and connected to a Wi-Fi network.
- Green light indicator will be on if in STA mode and connected to a Wi-Fi network and to the Shelly Cloud.
- The light indicator will be flashing Red/Blue if OTA update is in progress.
Tasmota behaviour
- Blue light indicator will blink if no wifi or mqtt.
- Green light indicator will be on if in STA mode and connected to a Wi-Fi network.
*/
SPro.last_update = TasmotaGlobal.uptime;
uint32_t ledlink = 0x1C; // All leds off
if (XdrvMailbox.index) {
ledlink &= 0xFB; // Blue blinks if wifi/mqtt lost
}
else if (!TasmotaGlobal.global_state.wifi_down) {
ledlink &= 0xF7; // Green On
}
ShellyProUpdateLedLink(ledlink);
}
void ShellyProLedLinkWifiOff(void) {
/*
bit 2 = blue, 3 = green, 4 = red
- Green light indicator will be on if in STA mode and connected to a Wi-Fi network.
*/
if (SPro.last_update +1 < TasmotaGlobal.uptime) {
ShellyProUpdateLedLink((TasmotaGlobal.global_state.wifi_down) ? 0x1C : 0x14); // Green off if wifi OFF
}
}
/*********************************************************************************************\
* Interface
\*********************************************************************************************/
bool Xdrv88(uint32_t function) {
bool result = false;
if (FUNC_PRE_INIT == function) {
ShellyProPreInit();
} else if (SPro.detected) {
switch (function) {
case FUNC_EVERY_SECOND:
ShellyProLedLinkWifiOff();
break;
case FUNC_SET_POWER:
ShellyProPower();
break;
case FUNC_LED_LINK:
ShellyProLedLink();
break;
case FUNC_INIT:
ShellyProInit();
break;
}
}
return result;
}
#endif // USE_SHELLY_PRO
#endif // USE_SPI
#endif // ESP32

5
tasmota/tasmota_xdrv_driver/xdrv_90_esp32_dingtian_relay.ino
View File

@ -98,10 +98,7 @@ void DingtianInit(void) {
DINGTIAN_SET_OUTPUT(Dingtian->pin_rck, 0);
Dingtian->first = TasmotaGlobal.devices_present;
TasmotaGlobal.devices_present += Dingtian->count;
if (TasmotaGlobal.devices_present > POWER_SIZE) {
TasmotaGlobal.devices_present = POWER_SIZE;
}
UpdateDevicesPresent(Dingtian->count);
AddLog(LOG_LEVEL_DEBUG, PSTR("DNGT: Dingtian relays: POWER%d to POWER%d"), Dingtian->first + 1, TasmotaGlobal.devices_present);
}
}