1.修复自动风环无法切换到V3

2.添加 IBC 外风 3.添加 44446_v3

1.修复自动风环无法切换到V3
2.添加 IBC 外风 3.添加 44446_v3
c2a1e564 · 潘栩锋 · 6d576437 · c2a1e564 · c2a1e564 · c2a1e564
Commit c2a1e564 authored May 25, 2020 by 潘栩锋 🚴
7 changed files
--- a/Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia.UI.Server/WdSetup.xaml.cs
+++ b/Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia.UI.Server/WdSetup.xaml.cs
@@ -83,8 +83,8 @@ namespace FLY.FeedbackRenZiJia.UI.Server
                    }
                    break;
                default: {
-                        feedback.IsClient = false;
+                        feedback.IsClient = true;
-                        feedback.PLCep = Misc.StringConverter.ToIPEndPoint("192.168.50.60:502");
+                            feedback.PLCep = Misc.StringConverter.ToIPEndPoint("192.168.50.60:502");
                        feedback.Apply();
                    }
                    break;

--- a/Resource/IBC/外风/Generated/plcgroup.json
+++ b/Resource/IBC/外风/Generated/plcgroup.json
+{
+  "Devices": [
+    {
+      "EP": "192.168.50.30:502"
+    }
+  ],
+  "Variables": [
+    {
+      "DeviceIndex": 0,
+      "Mode": "0",
+      "Addr": 64513,
+      "Type": "bool",
+      "Scale": 1.0,
+      "OwnerName": "Item",
+      "PropertyName": "IsInletAirOn"
+    },
+    {
+      "DeviceIndex": 0,
+      "Mode": "4",
+      "Addr": 6120,
+      "Type": "uint16",
+      "Scale": 0.1,
+      "OwnerName": "Item",
+      "PropertyName": "InletAirFreq"
+    },
+    {
+      "DeviceIndex": 0,
+      "Mode": "4",
+      "Addr": 3200,
+      "Type": "uint16",
+      "Scale": 0.1,
+      "OwnerName": "Item",
+      "PropertyName": "InletAirFreqSet"
+    },
+    {
+      "DeviceIndex": 0,
+      "Mode": "0",
+      "Addr": 64514,
+      "Type": "bool",
+      "Scale": 1.0,
+      "OwnerName": "Item",
+      "PropertyName": "IsOutletAirOn"
+    },
+    {
+      "DeviceIndex": 0,
+      "Mode": "4",
+      "Addr": 6220,
+      "Type": "uint16",
+      "Scale": 0.1,
+      "OwnerName": "Item",
+      "PropertyName": "OutletAirFreq"
+    },
+    {
+      "DeviceIndex": 0,
+      "Mode": "4",
+      "Addr": 592,
+      "Type": "uint16",
+      "Scale": 0.1,
+      "OwnerName": "Item",
+      "PropertyName": "OutletAirFreqSet"
+    },
+    {
+      "DeviceIndex": 0,
+      "Mode": "0",
+      "Addr": 99,
+      "Type": "bool",
+      "Scale": 1.0,
+      "OwnerName": "Item",
+      "PropertyName": "IsOutletAirFreqChanged"
+    },
+    {
+      "DeviceIndex": 0,
+      "Mode": "4",
+      "Addr": 668,
+      "Type": "uint16",
+      "Scale": 1.0,
+      "OwnerName": "Item",
+      "PropertyName": "FilmWidth"
+    },
+    {
+      "DeviceIndex": 0,
+      "Mode": "4",
+      "Addr": 230,
+      "Type": "uint16",
+      "Scale": 1.0,
+      "OwnerName": "Item",
+      "PropertyName": "FilmWidthSet"
+    },
+    {
+      "DeviceIndex": 0,
+      "Mode": "0",
+      "Addr": 800,
+      "Type": "bool",
+      "Scale": 1.0,
+      "OwnerName": "Item",
+      "PropertyName": "IsFilmWidthChanged"
+    },
+    {
+      "DeviceIndex": 0,
+      "Mode": "4",
+      "Addr": 340,
+      "Type": "int16",
+      "Scale": 1.0,
+      "OwnerName": "Item",
+      "PropertyName": "ErrorCorrection"
+    },
+    {
+      "DeviceIndex": 0,
+      "Mode": "0",
+      "Addr": 659,
+      "Type": "bool",
+      "Scale": 1.0,
+      "OwnerName": "Item",
+      "PropertyName": "IsIBCAuto"
+    },
+    {
+      "DeviceIndex": 0,
+      "Mode": "0",
+      "Addr": 120,
+      "Type": "bool",
+      "Scale": 1.0,
+      "OwnerName": "Item",
+      "PropertyName": "IsDownOutletAirOn"
+    },
+    {
+      "DeviceIndex": 0,
+      "Mode": "4",
+      "Addr": 380,
+      "Type": "uint16",
+      "Scale": 0.1,
+      "OwnerName": "Item",
+      "PropertyName": "DownOutletAirFreq"
+    },
+    {
+      "DeviceIndex": 0,
+      "Mode": "4",
+      "Addr": 6312,
+      "Type": "uint16",
+      "Scale": 0.1,
+      "OwnerName": "Item",
+      "PropertyName": "DownOutletAirFreqSet"
+    },
+    {
+      "DeviceIndex": 0,
+      "Mode": "4",
+      "Addr": 1140,
+      "Type": "uint16",
+      "Scale": 1.0,
+      "OwnerName": "Item",
+      "PropertyName": "K1"
+    },
+    {
+      "DeviceIndex": 0,
+      "Mode": "4",
+      "Addr": 1142,
+      "Type": "uint16",
+      "Scale": 1.0,
+      "OwnerName": "Item",
+      "PropertyName": "K2"
+    },
+    {
+      "DeviceIndex": 0,
+      "Mode": "4",
+      "Addr": 1144,
+      "Type": "uint16",
+      "Scale": 1.0,
+      "OwnerName": "Item",
+      "PropertyName": "K3"
+    },
+    {
+      "DeviceIndex": 0,
+      "Mode": "4",
+      "Addr": 250,
+      "Type": "float",
+      "Scale": 1.0,
+      "OwnerName": "Item",
+      "PropertyName": "L"
+    },
+    {
+      "DeviceIndex": 0,
+      "Mode": "4",
+      "Addr": 18,
+      "Type": "float",
+      "Scale": 1.0,
+      "OwnerName": "Item",
+      "PropertyName": "BubbleCorrA"
+    },
+    {
+      "DeviceIndex": 0,
+      "Mode": "4",
+      "Addr": 28,
+      "Type": "float",
+      "Scale": 1.0,
+      "OwnerName": "Item",
+      "PropertyName": "BubbleCorrB"
+    },
+    {
+      "DeviceIndex": 0,
+      "Mode": "4",
+      "Addr": 38,
+      "Type": "float",
+      "Scale": 1.0,
+      "OwnerName": "Item",
+      "PropertyName": "BubbleCorrC"
+    },
+    {
+      "DeviceIndex": 0,
+      "Mode": "4",
+      "Addr": 102,
+      "Type": "float",
+      "Scale": 1.0,
+      "OwnerName": "Item",
+      "PropertyName": "BubbleCorrR"
+    },
+    {
+      "DeviceIndex": 0,
+      "Mode": "4",
+      "Addr": 300,
+      "Type": "uint16",
+      "Scale": 0.1,
+      "OwnerName": "Item",
+      "PropertyName": "SampleInterval"
+    },
+    {
+      "DeviceIndex": 0,
+      "Mode": "4",
+      "Addr": 304,
+      "Type": "uint16",
+      "Scale": 1.0,
+      "OwnerName": "Item",
+      "PropertyName": "Area1Set"
+    },
+    {
+      "DeviceIndex": 0,
+      "Mode": "4",
+      "Addr": 1001,
+      "Type": "uint16",
+      "Scale": 1.0,
+      "OwnerName": "Item",
+      "PropertyName": "Area1P"
+    },
+    {
+      "DeviceIndex": 0,
+      "Mode": "4",
+      "Addr": 1002,
+      "Type": "uint16",
+      "Scale": 1.0,
+      "OwnerName": "Item",
+      "PropertyName": "Area1I"
+    },
+    {
+      "DeviceIndex": 0,
+      "Mode": "4",
+      "Addr": 1003,
+      "Type": "uint16",
+      "Scale": 1.0,
+      "OwnerName": "Item",
+      "PropertyName": "Area1D"
+    },
+    {
+      "DeviceIndex": 0,
+      "Mode": "4",
+      "Addr": 1004,
+      "Type": "uint16",
+      "Scale": 1.0,
+      "OwnerName": "Item",
+      "PropertyName": "Area1DI"
+    },
+    {
+      "DeviceIndex": 0,
+      "Mode": "4",
+      "Addr": 2550,
+      "Type": "uint16",
+      "Scale": 0.01,
+      "OwnerName": "Item",
+      "PropertyName": "AdjustFactor"
+    },
+    {
+      "DeviceIndex": 0,
+      "Mode": "4",
+      "Addr": 2050,
+      "Type": "int16",
+      "Scale": 1.0,
+      "OwnerName": "Item",
+      "PropertyName": "PIDResult"
+    },
+    {
+      "DeviceIndex": 0,
+      "Mode": "4",
+      "Addr": 2052,
+      "Type": "int16",
+      "Scale": 1.0,
+      "OwnerName": "Item",
+      "PropertyName": "PIDAdjust"
+    },
+    {
+      "DeviceIndex": 0,
+      "Mode": "4",
+      "Addr": 710,
+      "Type": "uint16",
+      "Scale": 1.0,
+      "OwnerName": "Item",
+      "PropertyName": "InletAirVelocity"
+    },
+    {
+      "DeviceIndex": 0,
+      "Mode": "4",
+      "Addr": 712,
+      "Type": "uint16",
+      "Scale": 1.0,
+      "OwnerName": "Item",
+      "PropertyName": "OutletAirVelocity"
+    },
+    {
+      "DeviceIndex": 0,
+      "Mode": "4",
+      "Addr": 306,
+      "Type": "uint16",
+      "Scale": 1.0,
+      "OwnerName": "Item",
+      "PropertyName": "Area2Set"
+    },
+    {
+      "DeviceIndex": 0,
+      "Mode": "4",
+      "Addr": 1201,
+      "Type": "uint16",
+      "Scale": 1.0,
+      "OwnerName": "Item",
+      "PropertyName": "Area2P"
+    },
+    {
+      "DeviceIndex": 0,
+      "Mode": "4",
+      "Addr": 1202,
+      "Type": "uint16",
+      "Scale": 1.0,
+      "OwnerName": "Item",
+      "PropertyName": "Area2I"
+    },
+    {
+      "DeviceIndex": 0,
+      "Mode": "4",
+      "Addr": 1203,
+      "Type": "uint16",
+      "Scale": 1.0,
+      "OwnerName": "Item",
+      "PropertyName": "Area2D"
+    },
+    {
+      "DeviceIndex": 0,
+      "Mode": "4",
+      "Addr": 420,
+      "Type": "float",
+      "Scale": 1.0,
+      "OwnerName": "Item",
+      "PropertyName": "Sensor1DeadZone"
+    },
+    {
+      "DeviceIndex": 0,
+      "Mode": "4",
+      "Addr": 430,
+      "Type": "float",
+      "Scale": 1.0,
+      "OwnerName": "Item",
+      "PropertyName": "Sensor2DeadZone"
+    },
+    {
+      "DeviceIndex": 0,
+      "Mode": "4",
+      "Addr": 440,
+      "Type": "float",
+      "Scale": 1.0,
+      "OwnerName": "Item",
+      "PropertyName": "Sensor3DeadZone"
+    },
+    {
+      "DeviceIndex": 0,
+      "Mode": "4",
+      "Addr": 200,
+      "Type": "float",
+      "Scale": 1.0,
+      "OwnerName": "Item",
+      "PropertyName": "Sensor1Factor"
+    },
+    {
+      "DeviceIndex": 0,
+      "Mode": "4",
+      "Addr": 400,
+      "Type": "float",
+      "Scale": 1.0,
+      "OwnerName": "Item",
+      "PropertyName": "Sensor2Factor"
+    },
+    {
+      "DeviceIndex": 0,
+      "Mode": "4",
+      "Addr": 410,
+      "Type": "float",
+      "Scale": 1.0,
+      "OwnerName": "Item",
+      "PropertyName": "Sensor3Factor"
+    },
+    {
+      "DeviceIndex": 0,
+      "Mode": "1",
+      "Addr": 63496,
+      "Type": "bool",
+      "Scale": 1.0,
+      "OwnerName": "Item",
+      "PropertyName": "IsInletAirMotorError"
+    },
+    {
+      "DeviceIndex": 0,
+      "Mode": "1",
+      "Addr": 63497,
+      "Type": "bool",
+      "Scale": 1.0,
+      "OwnerName": "Item",
+      "PropertyName": "IsOutletAirMotorError"
+    },
+    {
+      "DeviceIndex": 0,
+      "Mode": "0",
+      "Addr": 403,
+      "Type": "bool",
+      "Scale": 1.0,
+      "OwnerName": "Item",
+      "PropertyName": "IsInletAirCommError"
+    },
+    {
+      "DeviceIndex": 0,
+      "Mode": "0",
+      "Addr": 404,
+      "Type": "bool",
+      "Scale": 1.0,
+      "OwnerName": "Item",
+      "PropertyName": "IsOutletAirCommError"
+    }
+  ]
+}
\ No newline at end of file
--- a/Resource/IBC/外风/HMI.zip
+++ b/Resource/IBC/外风/HMI.zip
--- a/Resource/IBC/外风/IBC地址表.xlsx
+++ b/Resource/IBC/外风/IBC地址表.xlsx
--- a/Resource/Resource.zip
+++ b/Resource/Resource.zip
--- a/Resource/称重/设备连接变量表_44446_v3/Generated/plcgroup.json
+++ b/Resource/称重/设备连接变量表_44446_v3/Generated/plcgroup.json
--- a/Resource/称重/设备连接变量表_44446_v3/HMI-44446.xlsx
+++ b/Resource/称重/设备连接变量表_44446_v3/HMI-44446.xlsx