diff --git a/data/items/modbus.txt b/data/items/modbus.txt new file mode 100644 index 00000000..89ad0d56 --- /dev/null +++ b/data/items/modbus.txt @@ -0,0 +1 @@ +modbus;id;anydata;Modbus;Регистр;order;addr[1];regaddr[0];c[1] \ No newline at end of file diff --git a/data/set.device.json b/data/set.device.json index 9bc61778..ec3613a0 100644 --- a/data/set.device.json +++ b/data/set.device.json @@ -73,7 +73,8 @@ "/set?addItem=bme280-hum": "16.Датчик влажности bme280", "/set?addItem=bme280-press": "17.Датчик давления bme280", "/set?addItem=bmp280-temp": "18.Датчик температуры bmp280", - "/set?addItem=bmp280-press": "19.Датчик давления bmp280" + "/set?addItem=bmp280-press": "19.Датчик давления bmp280", + "/set?addItem=modbus": "20.Прочитать регистр modbus устройства" } }, { diff --git a/include/items/SensorModbusClass.h b/include/items/SensorModbusClass.h index be63c3c8..b42089dc 100644 --- a/include/items/SensorModbusClass.h +++ b/include/items/SensorModbusClass.h @@ -30,6 +30,8 @@ class SensorModbusClass : public SensorConvertingClass { } else { } + value = reqisterValue; + float valueFl = this->correction(key, value); eventGen(key, ""); jsonWriteStr(configLiveJson, key, String(valueFl)); diff --git a/src/items/SensorModbusClass.cpp b/src/items/SensorModbusClass.cpp index 6bf73dc2..821e608b 100644 --- a/src/items/SensorModbusClass.cpp +++ b/src/items/SensorModbusClass.cpp @@ -1,7 +1,7 @@ #include "ItemsCmd.h" #include "items/SensorModbusClass.h" //#ifdef SensorModbusEnabled -//=========================================Модуль ультрозвукового дальномера================================================================== +//=========================================Модуль modbus=================================================================================== //modbus;id;anydata;Сенсоры;Температура;order;addr[1];regaddr[0];c[1] //========================================================================================================================================= SensorModbusClass mySensorModbus;