This commit is contained in:
nikzori
2025-01-28 09:35:16 +03:00
parent 6514007cdb
commit 13a6eb6b0c
4 changed files with 8 additions and 2 deletions

View File

@@ -206,7 +206,7 @@ namespace Gidrolock_Modbus_Scanner
for (int i = 1; i < latestMessage.Data.Length; i += 2) for (int i = 1; i < latestMessage.Data.Length; i += 2)
values.Add(latestMessage.Data[i]); values.Add(latestMessage.Data[i]);
int add = device.wiredSensors + (device.hasScenarioSensor ? 1 : 0); int add = device.wiredSensors + (device.hasScenarioSensor ? 1 : 0);
for (int i = 0; i < sensorPanel.Controls.Count; i++) for (int i = 0; i < sensorPanel.Controls.Count - add; i++)
{ {
WirelessSensor snsr = sensorPanel.Controls[i + add] as WirelessSensor; WirelessSensor snsr = sensorPanel.Controls[i + add] as WirelessSensor;

View File

@@ -291,6 +291,7 @@ namespace Gidrolock_Modbus_Scanner
d.name = "Standard Wi-Fi RS485"; d.name = "Standard Wi-Fi RS485";
d.id = 30; d.id = 30;
d.modelName = "STW485"; d.modelName = "STW485";
d.firmware = new Entry(RegisterType.Input, 250, 6);
d.baudRate = new Entry(RegisterType.Holding, 110); d.baudRate = new Entry(RegisterType.Holding, 110);
d.valveStatus = new Entry(RegisterType.Coil, 1202); d.valveStatus = new Entry(RegisterType.Coil, 1202);
@@ -310,11 +311,15 @@ namespace Gidrolock_Modbus_Scanner
break; break;
case DeviceType.Inteli: case DeviceType.Inteli:
d.modelName = "Inteli"; d.modelName = "Inteli";
d.id = 26;
d.modelName = "INTELI";
d.baudRate = new Entry(RegisterType.Holding, 129);
break; break;
case DeviceType.PremiumPlus: case DeviceType.PremiumPlus:
d.name = "Premium Plus Wi-Fi"; d.name = "Premium Plus Wi-Fi";
d.id = 30; d.id = 30;
d.modelName = "PRPLS1"; d.modelName = "PRPLS1";
d.firmware = new Entry(RegisterType.Input, 250, 6);
d.baudRate = new Entry(RegisterType.Holding, 110); d.baudRate = new Entry(RegisterType.Holding, 110);
d.valveStatus = new Entry(RegisterType.Coil, 1202); d.valveStatus = new Entry(RegisterType.Coil, 1202);

View File

@@ -8,6 +8,7 @@ namespace Gidrolock_Modbus_Scanner
public string name; public string name;
public byte id; public byte id;
public string modelName; public string modelName;
public Entry firmware;
public Entry baudRate; public Entry baudRate;
public Entry valveStatus; public Entry valveStatus;

View File

@@ -1,4 +1,4 @@
# Gidrolock Modbus Scanner # Gidrolock Device Configurator
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> [Gidrolock](https://gidrolock.ru) <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Modbus. <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> [Gidrolock](https://gidrolock.ru) <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Modbus.