andry/lighthub
1
0
Fork 0
mirror of https://github.com/anklimov/lighthub synced 2025-12-07 20:29:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

mass refactoring

Browse Source 
sd_card_code not affects ram and firmware if not enabled
This commit is contained in:
livello
2018-03-30 02:30:10 +03:00
parent ec840f784a
commit a10c948f5a
9 changed files with 398 additions and 602 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lighthub/item.cpp
View File

@@ -35,7 +35,7 @@ e-mail anklimov@gmail.com
#define fmPar SERIAL_8N1
short modbusBusy = 0;
extern aJsonObject *modbusitem;
extern aJsonObject *modbusItem;
int modbusSet(int addr, uint16_t _reg, int _mask, uint16_t value);
@@ -934,12 +934,12 @@ int Item::checkModbus() {
modbusBusy = 0;
// Looking 1 step ahead for modbus item, which uses same register
Item nextItem(modbusitem->next);
if (modbusitem && nextItem.isValid() && nextItem.itemType == CH_MODBUS && nextItem.getArg(0) == addr &&
Item nextItem(modbusItem->next);
if (modbusItem && nextItem.isValid() && nextItem.itemType == CH_MODBUS && nextItem.getArg(0) == addr &&
nextItem.getArg(1) == reg) {
nextItem.checkModbus(data);
modbusitem = modbusitem->next;
if (!modbusitem) modbusitem = items->child;
modbusItem = modbusItem->next;
if (!modbusItem) modbusItem = items->child;
}
}