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

Quick fix to re-instate iFan02 RC

Browse Source 
Quick fix to re-instate iFan02 RC
This commit is contained in:
Theo Arends 2018-06-30 19:09:48 +02:00
parent eb42ec6a1c
commit 8b7645b05d
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sonoff/sonoff.ino
View File

@ -97,8 +97,8 @@ const char kTasmotaCommands[] PROGMEM =
D_CMND_I2CSCAN "|" D_CMND_SERIALSEND "|" D_CMND_BAUDRATE "|" D_CMND_SERIALDELIMITER; D_CMND_I2CSCAN "|" D_CMND_SERIALSEND "|" D_CMND_BAUDRATE "|" D_CMND_SERIALDELIMITER;
//const uint8_t kIFan02Speed[4][3] = {{0,0,0}, {1,0,0}, {1,1,0}, {1,0,1}}; //const uint8_t kIFan02Speed[4][3] = {{0,0,0}, {1,0,0}, {1,1,0}, {1,0,1}};
//const uint8_t kIFan02Speed[4][3] = {{6,6,6}, {7,6,6}, {7,7,6}, {7,6,7}}; const uint8_t kIFan02Speed[4][3] = {{6,6,6}, {7,6,6}, {7,7,6}, {7,6,7}};
const uint8_t kIFan02Speed[4][3] = {{16,16,16}, {17,16,16}, {17,17,16}, {17,16,17}}; //const uint8_t kIFan02Speed[4][3] = {{16,16,16}, {17,16,16}, {17,17,16}, {17,16,17}};
// Global variables // Global variables
unsigned long feature_drv1; // Compiled driver feature map unsigned long feature_drv1; // Compiled driver feature map
@ -1207,6 +1207,7 @@ void ExecuteCommandPower(byte device, byte state, int source)
// ShowSource(source); // ShowSource(source);
/*
if (SONOFF_IFAN02 == Settings.module) { if (SONOFF_IFAN02 == Settings.module) {
if (state > 15) { // Only allow Fanspeed control over relay 2..4 if (state > 15) { // Only allow Fanspeed control over relay 2..4
state -= 10; state -= 10;
@ -1219,7 +1220,7 @@ void ExecuteCommandPower(byte device, byte state, int source)
device = 1; // Only allow user control over light device = 1; // Only allow user control over light
} }
} }
*/
uint8_t publish_power = 1; uint8_t publish_power = 1;
if ((POWER_OFF_NO_STATE == state) || (POWER_ON_NO_STATE == state)) { if ((POWER_OFF_NO_STATE == state) || (POWER_ON_NO_STATE == state)) {
state &= 1; state &= 1;

6
sonoff/xdrv_02_webserver.ino
View File

@ -592,7 +592,11 @@ void HandleAjaxStatusRefresh()
WebGetArg("o", tmp, sizeof(tmp)); WebGetArg("o", tmp, sizeof(tmp));
if (strlen(tmp)) { if (strlen(tmp)) {
ShowWebSource(SRC_WEBGUI); ShowWebSource(SRC_WEBGUI);
ExecuteCommandPower(atoi(tmp), POWER_TOGGLE, SRC_IGNORE); if (SONOFF_IFAN02 == Settings.module) { // QandD
ExecuteCommandPower(1, POWER_TOGGLE, SRC_IGNORE);
} else {
ExecuteCommandPower(atoi(tmp), POWER_TOGGLE, SRC_IGNORE);
}
} }
WebGetArg("d", tmp, sizeof(tmp)); WebGetArg("d", tmp, sizeof(tmp));
if (strlen(tmp)) { if (strlen(tmp)) {