From 57a37c01ea1e46be5dc051e186d0ded5c03f8dc1 Mon Sep 17 00:00:00 2001 From: hanqiangqiang <1364346467@qq.com> Date: Thu, 6 Aug 2026 14:26:13 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=97=A5=E5=BF=97=E4=B8=AD?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Config/PM/PM2/DeviceModelPM2.xml | 358 +++++++++++++++++- .../SicModules/Config/PM/PM2/_ioDefinePM2.xml | 2 +- App/Modules/SicModules/PMs/PMModuleDevice.cs | 31 +- 3 files changed, 368 insertions(+), 23 deletions(-) diff --git a/App/Modules/SicModules/Config/PM/PM2/DeviceModelPM2.xml b/App/Modules/SicModules/Config/PM/PM2/DeviceModelPM2.xml index 9827795..d02e38a 100644 --- a/App/Modules/SicModules/Config/PM/PM2/DeviceModelPM2.xml +++ b/App/Modules/SicModules/Config/PM/PM2/DeviceModelPM2.xml @@ -1,5 +1,359 @@  - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/App/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml b/App/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml index 06452b5..54caf53 100644 --- a/App/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml +++ b/App/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml @@ -753,7 +753,7 @@ - + diff --git a/App/Modules/SicModules/PMs/PMModuleDevice.cs b/App/Modules/SicModules/PMs/PMModuleDevice.cs index 321b645..1afc1d8 100644 --- a/App/Modules/SicModules/PMs/PMModuleDevice.cs +++ b/App/Modules/SicModules/PMs/PMModuleDevice.cs @@ -236,14 +236,10 @@ namespace SicModules.PMs [Tag("Mfc1")] public IoMFC Mfc1 { get; set; } - [Tag("Mfc2")] public IoMFC Mfc2 { get; set; } - [Tag("Mfc3")] public IoMFC Mfc3 { get; set; } [Tag("Mfc4")] public IoMFC Mfc4 { get; set; } - [Tag("Mfc5")] public IoMFC Mfc5 { get; set; } - [Tag("Mfc6")] public IoMFC Mfc6 { get; set; } [Tag("Mfc7")] public IoMFC Mfc7 { get; set; } @@ -290,10 +286,6 @@ namespace SicModules.PMs [Tag("Mfc29")] public IoMFC Mfc29 { get; set; } - [Tag("Mfc30")] public IoMFC Mfc30 { get; set; } - - [Tag("Mfc40")] public IoMFC Mfc40 { get; set; } - [Tag("Mfc31")] public IoMFC Mfc31 { get; set; } [Tag("Mfc32")] public IoMFC Mfc32 { get; set; } @@ -308,26 +300,28 @@ namespace SicModules.PMs [Tag("Mfc38")] public IoMFC Mfc38 { get; set; } + [Tag("Mfc40")] public IoMFC Mfc40 { get; set; } + #endregion MFC #region Pressure - [Tag("Pressure1")] public IoPressure Pressure1 { get; set; } + [Tag("PC1")] public IoPressure Pressure1 { get; set; } - [Tag("Pressure2")] public IoPressure Pressure2 { get; set; } + [Tag("PC2")] public IoPressure Pressure2 { get; set; } - [Tag("Pressure3")] public IoPressure Pressure3 { get; set; } - [Tag("Pressure4")] public IoPressure Pressure4 { get; set; } + [Tag("PC3")] public IoPressure Pressure3 { get; set; } + [Tag("PC4")] public IoPressure Pressure4 { get; set; } - [Tag("Pressure5")] public IoPressure Pressure5 { get; set; } + [Tag("PC5")] public IoPressure Pressure5 { get; set; } - [Tag("Pressure6")] public IoPressure Pressure6 { get; set; } + [Tag("PC6")] public IoPressure Pressure6 { get; set; } - [Tag("Pressure7")] public IoPressure Pressure7 { get; set; } + [Tag("PC7")] public IoPressure Pressure7 { get; set; } - [Tag("Pressure8")] public IoPressure Pressure8 { get; set; } + [Tag("PC8")] public IoPressure Pressure8 { get; set; } - [Tag("Pressure9")] public IoPressure Pressure9 { get; set; } + [Tag("PC9")] public IoPressure Pressure9 { get; set; } [Tag("PT1")] public IoPressure PT1 { get; set; } @@ -491,10 +485,8 @@ namespace SicModules.PMs { var list = new List(); list.Add(Mfc1); - list.Add(Mfc2); list.Add(Mfc3); list.Add(Mfc4); - list.Add(Mfc5); list.Add(Mfc6); list.Add(Mfc7); list.Add(Mfc8); @@ -518,7 +510,6 @@ namespace SicModules.PMs list.Add(Mfc27); list.Add(Mfc28); list.Add(Mfc29); - list.Add(Mfc30); list.Add(Mfc31); list.Add(Mfc32); list.Add(Mfc33);