andry/lighthub
1
0
Fork 0
mirror of https://github.com/anklimov/lighthub synced 2025-12-06 11:49:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

Minimum ON volume for modbus dim, mask type=3 fix

Browse Source
This commit is contained in:
Andrey Klimov
2021-05-08 11:36:18 +03:00
parent d219a594c5
commit 9ae6d9991e
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lighthub/item.cpp
View File

@@ -978,7 +978,18 @@ switch (itemType) {
#ifndef MODBUS_DISABLE
case CH_MODBUS:
if (toExecute) modbusDimmerSet(st);
if (toExecute)
{
int vol;
if (st.getCmd()== CMD_ON && (vol=st.getPercents())<MIN_VOLUME && vol>=0)
{
st.setPercents(INIT_VOLUME);
st.saveItem(this);
SendStatus(SEND_PARAMETERS | SEND_DEFFERED);
};
modbusDimmerSet(st);
}
break;
case CH_VC:
if (toExecute) VacomSetFan(st);
@@ -1521,8 +1532,10 @@ int Item::modbusDimmerSet(int addr, uint16_t _reg, int _regType, int _mask, uint
break;
case 2:
break;
case 3:
value++;
case 3: // Modbus relay
//value++;
if (value) value = 1;
else value = 2;
case 4: //Swap high and low bytes
t = (value & 0xff00) >> 8;
value <<=8;