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

Update sonoff.ino

This commit is contained in:
Adrian Scillato 2018-04-17 14:04:19 -03:00 committed by GitHub
parent d0dbd8f513
commit 485eab94f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sonoff/sonoff.ino
View File

@ -185,6 +185,7 @@ uint8_t spi_flg = 0; // SPI configured
uint8_t light_type = 0; // Light types
bool pwm_present = false; // Any PWM channel configured with SetOption15 0
boolean mdns_begun = false;
unsigned long features = 0UL;
char my_version[33]; // Composed version string
char my_hostname[33]; // Composed Wifi hostname
@ -1144,8 +1145,8 @@ boolean SendKey(byte key, byte device, byte state)
#endif // USE_RULES
}
#ifdef USE_KNX
KNX_Send_Button_Power(key, device, state);
#endif
KnxSendButtonPower(key, device, state);
#endif // USE_KNX
return result;
}
@ -1197,8 +1198,8 @@ void ExecuteCommandPower(byte device, byte state)
DomoticzUpdatePowerState(device);
#endif // USE_DOMOTICZ
#ifdef USE_KNX
KNX_Update_Power_State(device, power);
#endif // USE_KNX
KnxUpdatePowerState(device, power);
#endif // USE_KNX
if (device <= MAX_PULSETIMERS) {
// pulse_timer[(device -1)] = (power & mask) ? Settings.pulse_timer[(device -1)] : 0;
pulse_timer[(device -1)] = (((POWER_ALL_OFF_PULSETIME_ON == Settings.poweronstate) ? ~power : power) & mask) ? Settings.pulse_timer[(device -1)] : 0;