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

modbus merge

Browse Source
This commit is contained in:
livello
2018-10-18 22:25:33 +03:00
parent 52b94055f7
commit e75813e721
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lighthub/item.cpp
View File

@@ -888,7 +888,11 @@ int Item::VacomSetHeat(int addr, int8_t val, int8_t cmd) {
modbusBusy = 0; modbusBusy = 0;
} }
int Item::modbusDimmerSet(int addr, uint16_t _reg, int _mask, uint16_t value) { int Item::modbusDimmerSet(int addr, uint16_t _reg, int _regType, int _mask, uint16_t value) {
if (_regType != MODBUS_COIL_REG_TYPE || _regType != MODBUS_HOLDING_REG_TYPE) {
}
if (modbusBusy) { if (modbusBusy) {
mb_fail(3, addr, value, 0); mb_fail(3, addr, value, 0);

4
platformio.ini
View File

@@ -9,8 +9,8 @@
; http://docs.platformio.org/page/projectconf.html ; http://docs.platformio.org/page/projectconf.html
[platformio] [platformio]
src_dir = lighthub src_dir = lighthub
;env_default = env_default =
; megaatmega2560 megaatmega2560
; megaatmega2560-net ; megaatmega2560-net
; due ; due
; esp8266 ; esp8266