jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-08-03 07:57:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix ambiguous Tuya set relay option by adding command SetOption41 allowing to control number of virtual relays

Browse Source 
Fix ambiguous Tuya set relay option by adding command SetOption41 allowing to control number of virtual relays (#6039)
This commit is contained in:
Theo Arends 2019-07-08 12:42:46 +02:00
parent e67b27b0a3
commit 86314e24e5
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sonoff/sonoff.h
View File

@ -230,7 +230,7 @@ enum ButtonStates { PRESSED, NOT_PRESSED };
enum Shortcuts { SC_CLEAR, SC_DEFAULT, SC_USER }; enum Shortcuts { SC_CLEAR, SC_DEFAULT, SC_USER };
enum SettingsParmaIndex {P_HOLD_TIME, P_MAX_POWER_RETRY, P_TUYA_DIMMER_ID, P_MDNS_DELAYED_START, P_BOOT_LOOP_OFFSET, P_RGB_REMAP, P_IR_UNKNOW_THRESHOLD, P_CSE7766_INVALID_POWER, P_HOLD_IGNORE, P_MAX_PARAM8}; // Max is PARAM8_SIZE (18) - SetOption32 until SetOption49 enum SettingsParmaIndex {P_HOLD_TIME, P_MAX_POWER_RETRY, P_TUYA_DIMMER_ID, P_MDNS_DELAYED_START, P_BOOT_LOOP_OFFSET, P_RGB_REMAP, P_IR_UNKNOW_THRESHOLD, P_CSE7766_INVALID_POWER, P_HOLD_IGNORE, P_TUYA_RELAYS, P_MAX_PARAM8}; // Max is PARAM8_SIZE (18) - SetOption32 until SetOption49
enum DomoticzSensors {DZ_TEMP, DZ_TEMP_HUM, DZ_TEMP_HUM_BARO, DZ_POWER_ENERGY, DZ_ILLUMINANCE, DZ_COUNT, DZ_VOLTAGE, DZ_CURRENT, DZ_AIRQUALITY, DZ_MAX_SENSORS}; enum DomoticzSensors {DZ_TEMP, DZ_TEMP_HUM, DZ_TEMP_HUM_BARO, DZ_POWER_ENERGY, DZ_ILLUMINANCE, DZ_COUNT, DZ_VOLTAGE, DZ_CURRENT, DZ_AIRQUALITY, DZ_MAX_SENSORS};

10
sonoff/sonoff.ino
View File

@ -850,12 +850,15 @@ void MqttDataHandler(char* topic, uint8_t* data, unsigned int data_len)
param_low = 1; param_low = 1;
param_high = 250; param_high = 250;
break; break;
case P_TUYA_RELAYS:
param_high = 8;
break;
} }
if ((payload >= param_low) && (payload <= param_high)) { if ((payload >= param_low) && (payload <= param_high)) {
Settings.param[pindex] = payload; Settings.param[pindex] = payload;
switch (pindex) { switch (pindex) {
#ifdef USE_LIGHT #ifdef USE_LIGHT
case P_RGB_REMAP: case P_RGB_REMAP:
LightUpdateColorMapping(); LightUpdateColorMapping();
break; break;
#endif #endif
@ -863,6 +866,11 @@ void MqttDataHandler(char* topic, uint8_t* data, unsigned int data_len)
case P_IR_UNKNOW_THRESHOLD: case P_IR_UNKNOW_THRESHOLD:
IrReceiveUpdateThreshold(); IrReceiveUpdateThreshold();
break; break;
#endif
#ifdef USE_TUYA_DIMMER
case P_TUYA_RELAYS:
restart_flag = 2; // Need a restart to update GUI
break;
#endif #endif
} }
} }

2
sonoff/xdrv_16_tuyadimmer.ino
View File

@ -282,7 +282,7 @@ bool TuyaModuleSelected(void)
void TuyaInit(void) void TuyaInit(void)
{ {
devices_present = Settings.param[6] == 0 ? 1 : Settings.param[6]; devices_present += Settings.param[P_TUYA_RELAYS]; // SetOption41 - Add virtual relays if present
if (!Settings.param[P_TUYA_DIMMER_ID]) { if (!Settings.param[P_TUYA_DIMMER_ID]) {
Settings.param[P_TUYA_DIMMER_ID] = TUYA_DIMMER_ID; Settings.param[P_TUYA_DIMMER_ID] = TUYA_DIMMER_ID;
} }