From 13a6eb6b0c4db5a911dc47493b6e28cbbb733cf1 Mon Sep 17 00:00:00 2001 From: nikzori Date: Tue, 28 Jan 2025 09:35:16 +0300 Subject: [PATCH] update --- Datasheet.cs | 2 +- Main.cs | 5 +++++ Model.cs | 1 + README.md | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Datasheet.cs b/Datasheet.cs index f5e372a..2bc9b50 100644 --- a/Datasheet.cs +++ b/Datasheet.cs @@ -206,7 +206,7 @@ namespace Gidrolock_Modbus_Scanner for (int i = 1; i < latestMessage.Data.Length; i += 2) values.Add(latestMessage.Data[i]); 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; diff --git a/Main.cs b/Main.cs index c1a3502..42cd571 100644 --- a/Main.cs +++ b/Main.cs @@ -291,6 +291,7 @@ namespace Gidrolock_Modbus_Scanner d.name = "Standard Wi-Fi RS485"; d.id = 30; d.modelName = "STW485"; + d.firmware = new Entry(RegisterType.Input, 250, 6); d.baudRate = new Entry(RegisterType.Holding, 110); d.valveStatus = new Entry(RegisterType.Coil, 1202); @@ -310,11 +311,15 @@ namespace Gidrolock_Modbus_Scanner break; case DeviceType.Inteli: d.modelName = "Inteli"; + d.id = 26; + d.modelName = "INTELI"; + d.baudRate = new Entry(RegisterType.Holding, 129); break; case DeviceType.PremiumPlus: d.name = "Premium Plus Wi-Fi"; d.id = 30; d.modelName = "PRPLS1"; + d.firmware = new Entry(RegisterType.Input, 250, 6); d.baudRate = new Entry(RegisterType.Holding, 110); d.valveStatus = new Entry(RegisterType.Coil, 1202); diff --git a/Model.cs b/Model.cs index 90c03fe..8a1c3bb 100644 --- a/Model.cs +++ b/Model.cs @@ -8,6 +8,7 @@ namespace Gidrolock_Modbus_Scanner public string name; public byte id; public string modelName; + public Entry firmware; public Entry baudRate; public Entry valveStatus; diff --git a/README.md b/README.md index 6b23b01..23cc14e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Gidrolock Modbus Scanner +# Gidrolock Device Configurator Приложение для быстрого и удобного подключения и настройки умных систем защиты от протечек [Gidrolock](https://gidrolock.ru) через протокол Modbus.