mirror of
https://github.com/arendst/Tasmota.git
synced 2025-07-27 20:56:35 +00:00
take care of Relay1 is not 1st power
This commit is contained in:
parent
b03476ff6f
commit
83a07895f9
@ -99,7 +99,10 @@ void DingtianInit(void) {
|
|||||||
|
|
||||||
Dingtian->first = TasmotaGlobal.devices_present;
|
Dingtian->first = TasmotaGlobal.devices_present;
|
||||||
TasmotaGlobal.devices_present += Dingtian->count;
|
TasmotaGlobal.devices_present += Dingtian->count;
|
||||||
AddLog(LOG_LEVEL_DEBUG, PSTR("DNGT: Dingtian relays: POWER%d to POWER%d"), Dingtian->first + 1, Dingtian->first + Dingtian->count);
|
if (TasGlobal.devices_present > POWER_SIZE) {
|
||||||
|
TasGlobal.devices_present = POWER_SIZE;
|
||||||
|
}
|
||||||
|
AddLog(LOG_LEVEL_DEBUG, PSTR("DNGT: Dingtian relays: POWER%d to POWER%d"), Dingtian->first + 1, TasGlobal.devices_present);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -135,9 +138,9 @@ void DingtianLoop()
|
|||||||
void DingtianSetPower(void)
|
void DingtianSetPower(void)
|
||||||
{
|
{
|
||||||
// store relay status in structure
|
// store relay status in structure
|
||||||
Dingtian->outputs = (XdrvMailbox.index >> Dingtian->first) & ~(0xFFFF << Dingtian->count);
|
Dingtian->outputs = (XdrvMailbox.index >> Dingtian->first) & ~(0xFFFFFFFF << Dingtian->count);
|
||||||
//AddLog(LOG_LEVEL_DEBUG_MORE, PSTR("DNGT: outputs=0x%08X"), Dingtian->outputs);
|
//AddLog(LOG_LEVEL_DEBUG_MORE, PSTR("DNGT: outputs=0x%08X"), Dingtian->outputs);
|
||||||
//DingtianLoop();
|
DingtianLoop();
|
||||||
}
|
}
|
||||||
|
|
||||||
/********************************************************************************************************
|
/********************************************************************************************************
|
||||||
@ -186,8 +189,8 @@ bool Xdrv90(uint8_t function) {
|
|||||||
case FUNC_SET_POWER:
|
case FUNC_SET_POWER:
|
||||||
DingtianSetPower();
|
DingtianSetPower();
|
||||||
break;
|
break;
|
||||||
//case FUNC_EVERY_50_MSECOND:
|
case FUNC_EVERY_50_MSECOND:
|
||||||
case FUNC_EVERY_250_MSECOND:
|
//case FUNC_EVERY_250_MSECOND:
|
||||||
DingtianLoop();
|
DingtianLoop();
|
||||||
break;
|
break;
|
||||||
case FUNC_JSON_APPEND:
|
case FUNC_JSON_APPEND:
|
||||||
@ -198,7 +201,6 @@ bool Xdrv90(uint8_t function) {
|
|||||||
DingtianShow(0);
|
DingtianShow(0);
|
||||||
break;
|
break;
|
||||||
#endif // USE_WEBSERVER
|
#endif // USE_WEBSERVER
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user