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

Modbus dimmer channel generalization

Browse Source 
Example:
  "items": { "modbusdev":[4,[96,0,0,255]] }

Note: this config example available at URL http://lazyhome.ru/de-ad-be-ef-fe-07.config.json - so just set mac address of device by command “mac de:ad:be:ef:fe:07” for test.

Item notation: 
4 - Modbus dimmer item type

Param1: = 96 - Decimal address of modbus device
Param2: = 0 - Modbus register to write (and read while polling)
Param3: = 0 - mask (optional. Default value “-1”  - see below for explanations)
Param4:= 255 - Maximum Value for scaling MQTT input value to register value  (Optional. Default MaxValue 0x3f. It is equivalent of “100" on input.  If value == 0 - no scaling)

Mask:
if mask == 1 - Value comes to most significant byte of 16 bit register word, another byte = 0xff
if mask == 0 - Value comes to least significant byte of 16 bit register word, another byte = 0xff
any other mask - put Value as 16 bit word without any modification
if mask == -1 (or parameter omitted) - no register polling
This commit is contained in:
Andrey Klimov
2018-05-06 17:45:29 +03:00
committed by GitHub
parent 7db3033de3
commit b7331beab4
1 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
lighthub/item.cpp
View File

@@ -121,8 +121,10 @@ void Item::setCmd(uint8_t cmd) {
int Item::getArg(short n) //Return arg int or first array element if Arg is array int Item::getArg(short n) //Return arg int or first array element if Arg is array
{ {
if (!itemArg) return -1; if (!itemArg) return -1;
if (itemArg->type == aJson_Int) return itemArg->valueint; if (itemArg->type == aJson_Int){
else if (itemArg->type == aJson_Array) return aJson.getArrayItem(itemArg, n)->valueint; if (!n) return itemArg->valueint; else return -1;
}
if ((itemArg->type == aJson_Array) && ( n < aJson.getArraySize(itemArg))) return aJson.getArrayItem(itemArg, n)->valueint;
else return -2; else return -2;
} }
@@ -456,13 +458,16 @@ int Item::Ctrl(short cmd, short n, int *Parameters, boolean send) {
#ifdef _modbus #ifdef _modbus
case CH_MODBUS: { case CH_MODBUS: {
short numpar=0;
if ((itemArg->type == aJson_Array) && (aJson.getArraySize(itemArg) == 3)) { if ((itemArg->type == aJson_Array) && ((numpar = aJson.getArraySize(itemArg)) >= 2)) {
int _addr = aJson.getArrayItem(itemArg, 0)->valueint; int _addr = aJson.getArrayItem(itemArg, 0)->valueint;
int _reg = aJson.getArrayItem(itemArg, 1)->valueint; int _reg = aJson.getArrayItem(itemArg, 1)->valueint;
int _mask = aJson.getArrayItem(itemArg, 2)->valueint; int _mask = -1;
if (numpar >= 3) _mask = aJson.getArrayItem(itemArg, 2)->valueint;
modbusDimmerSet(_addr, _reg, _mask, map(Par[0], 0, 100, 0, 0x3f)); int _maxval = 0x3f;
if (numpar >=4) _maxval = aJson.getArrayItem(itemArg, 3)->valueint;
if (_maxval) modbusDimmerSet(_addr, _reg, _mask, map(Par[0], 0, 100, 0, _maxval));
else modbusDimmerSet(_addr, _reg, _mask, Par[0]);
} }
break; break;
} }
@@ -833,10 +838,12 @@ int Item::modbusDimmerSet(int addr, uint16_t _reg, int _mask, uint16_t value) {
node.begin(addr, modbusSerial); node.begin(addr, modbusSerial);
if (_mask) { switch (_mask) {
case 1:
value <<= 8; value <<= 8;
value |= (0xff); value |= (0xff);
} else { break;
case 0:
value &= 0xff; value &= 0xff;
value |= (0xff00); value |= (0xff00);
} }
@@ -1022,10 +1029,17 @@ int Item::checkModbusDimmer() {
int Item::checkModbusDimmer(int data) { int Item::checkModbusDimmer(int data) {
short mask = getArg(2); short mask = getArg(2);
if (mask < 0) return 0;
short maxVal = getArg(3);
if (maxVal<=0) maxVal = 0x3f;
int d = data; int d = data;
if (mask) d >>= 8; if (mask == 1) d >>= 8;
d &= 0xff; if (mask == 0 || mask == 1) d &= 0xff;
d = map(d, 0, 0x3f, 0, 100);
if (maxVal) d = map(d, 0, maxVal, 0, 100);
int cmd = getCmd(); int cmd = getCmd();
//Serial.println(d); //Serial.println(d);
if (getVal() != d || d && cmd == CMD_OFF || d && cmd == CMD_HALT) //volume changed or turned on manualy if (getVal() != d || d && cmd == CMD_OFF || d && cmd == CMD_HALT) //volume changed or turned on manualy