nikzori/gidrolock-configurator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fixed app crash for Standard Radio

Browse Source
This commit is contained in:
nikzori
2025-06-24 12:05:20 +03:00
parent 8d3773368e
commit a283537d5e
2 changed files with 30 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
Datasheet.cs
View File

@@ -210,34 +210,36 @@ namespace Gidrolock_Modbus_Scanner
}
}
if (device.wspPlusMode != null || device.wspPlusMode.Count > 0)
{
for(int i = 0; i < device.wspPlusMode.Count; i++)
if (device.wspPlusMode != null)
if (device.wspPlusMode.Count > 0)
{
res = PollEntry(device.wspPlusMode[i]);
if (res)
for(int i = 0; i < device.wspPlusMode.Count; i++)
{
bool value = latestMessage.Data[0] > 0x00 ? true : false;
WiredSensor snsr = sensorPanel.Controls[i] as WiredSensor;
snsr.Invoke(new MethodInvoker(delegate { snsr.wspPlusCheckbox.Checked = value; }));
res = PollEntry(device.wspPlusMode[i]);
if (res)
{
bool value = latestMessage.Data[0] > 0x00 ? true : false;
WiredSensor snsr = sensorPanel.Controls[i] as WiredSensor;
snsr.Invoke(new MethodInvoker(delegate { snsr.wspPlusCheckbox.Checked = value; }));
}
}
}
}
if (device.wiredLineBreak != null || device.wiredLineBreak.Count > 0)
{
for (int i = 0; i < device.wiredLineBreak.Count; i++)
if (device.wiredLineBreak != null)
if(device.wiredLineBreak.Count > 0)
{
res = PollEntry(device.wiredLineBreak[i]);
if (res)
for (int i = 0; i < device.wiredLineBreak.Count; i++)
{
bool value = latestMessage.Data[0] > 0x00 ? true : false;
WiredSensor snsr = sensorPanel.Controls[i] as WiredSensor;
snsr.Invoke(new MethodInvoker(delegate { snsr.labelBreak.Text = value ? "Обрыв!" : "ОК"; }));
res = PollEntry(device.wiredLineBreak[i]);
if (res)
{
bool value = latestMessage.Data[0] > 0x00 ? true : false;
WiredSensor snsr = sensorPanel.Controls[i] as WiredSensor;
snsr.Invoke(new MethodInvoker(delegate { snsr.labelBreak.Text = value ? "Обрыв!" : "ОК"; }));
}
}
}
}
res = PollEntry(device.sensorAlarm);
if (res)
@@ -657,14 +659,15 @@ namespace Gidrolock_Modbus_Scanner
labelBreakFluff.Text = "Обрыв:";
labelBreak.Text = "неизвестно";
if (device.wspPlusMode != null || device.wspPlusMode.Count > 0)
{
labelWSPPlusFluff = new Label() { Width = 45, Height = 24, Text = "WSP+:" };
wspPlusCheckbox = new CheckBox() { Width = 20, Height = 14, Margin = Padding.Empty };
if (device.wspPlusMode != null)
if (device.wspPlusMode.Count > 0)
{
labelWSPPlusFluff = new Label() { Width = 45, Height = 24, Text = "WSP+:" };
wspPlusCheckbox = new CheckBox() { Width = 20, Height = 14, Margin = Padding.Empty };
this.Controls.Add(labelWSPPlusFluff);
this.Controls.Add(wspPlusCheckbox);
}
this.Controls.Add(labelWSPPlusFluff);
this.Controls.Add(wspPlusCheckbox);
}
}
}

4
Properties/AssemblyInfo.cs
View File

@@ -30,6 +30,6 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("1.1.0.0")]
[assembly: AssemblyFileVersion("1.1.0.0")]
[assembly: AssemblyVersion("1.1.1.0")]
[assembly: AssemblyFileVersion("1.1.1.0")]
[assembly: NeutralResourcesLanguage("en")]