diff --git a/Service/Ups/Client/UpsClient.cs b/Service/Ups/Client/UpsClient.cs index 7bd1023..6a20511 100644 --- a/Service/Ups/Client/UpsClient.cs +++ b/Service/Ups/Client/UpsClient.cs @@ -24,6 +24,26 @@ public class UpsClient: ModbusTcpMaster //TODO::加解码方式 ByteSeq = EndingConst.ByteSeq.BA; WordSeq= EndingConst.WordSeq.CD; + + try + { + string hexString01 = "08FD08FD08F708F500000000000013891389138900640064006408FF08F908F70012001700111388138813880027001D003008B008AF08AE00020000000313871387138700000000000000000000000100000000000100000000000000080000000D00FA086908660000000000FA7FF803E8000000000E0E0E0F08AD08AD08AD0876087800000000000000000000000F08B008AF08AE08FD08F708F500040001"; + string hexString02 = "00010909090609030012001800111388138813880027001C00360E100E0F0869086508760874000000000000000008AD08AE08AD00020000000313881388138800000000000008B008AF08AE090A0908090500000000000100000000000100000000000000080000000D00000000000000000000000000000000000000080000000D0000000000000000000000000000000000200020000000000000FFFF000000000270000704C00100FFFF1BFF00807EFF00000001000183440A66000000000000014501AE015A014F014301660166016600000000000001AE0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001003700050029000200370005"; + string hexString03 = "0001000100010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000030000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"; + + byte[] bytes01=Convert.FromHexString(hexString01); + byte[] bytes02=Convert.FromHexString(hexString02); + byte[] bytes03=Convert.FromHexString(hexString03); + + ModbusDecoder.Decode(bytes01, UpsMgr.UpsRemoteComm, EndingConst.ByteSeq.AB, EndingConst.WordSeq.DC); + ModbusDecoder.Decode(bytes03, UpsMgr.UpsTelemetering, EndingConst.ByteSeq.AB, EndingConst.WordSeq.DC); + + } + catch (Exception ex) + { + + } + } private void BatchRead(ModbusTcpMaster master) @@ -32,24 +52,26 @@ public class UpsClient: ModbusTcpMaster ModbusTcpNet _client = new ModbusTcpNet(master.Ip, master.Port, 0x01); OperateResult operateResult = _client.Read("x=3;" + 0, (ushort)81); - //0x03 - var bytes01 = master.BatchReadHolderRegister(0, 81); - if (bytes01 != null) + //0x04 + var bytes02 = master.BatchReadHolderRegister(1, 80); + if (bytes02 != null) { UpsMgr.DataValidityTime = DateTime.Now; - ModbusDecoder.Decode(bytes01, UpsMgr.UpsTelemetering, EndingConst.ByteSeq.AB, + ModbusDecoder.Decode(bytes02, UpsMgr.UpsRemoteComm, EndingConst.ByteSeq.AB, EndingConst.WordSeq.DC); } - //0x04 - var bytes02 = master.BatchReadInputRegister(81, 161); - if (bytes02 != null) + //0x03 + var bytes01 = master.BatchReadHolderRegister(81, 160); + if (bytes01 != null) { UpsMgr.DataValidityTime = DateTime.Now; - ModbusDecoder.Decode(bytes01, UpsMgr.UpsRemoteComm, EndingConst.ByteSeq.AB, + ModbusDecoder.Decode(bytes01, UpsMgr.UpsTelemetering, EndingConst.ByteSeq.AB, EndingConst.WordSeq.DC); } + + } } \ No newline at end of file diff --git a/Service/Ups/Msg/UpsRemoteComm.cs b/Service/Ups/Msg/UpsRemoteComm.cs index e6f2414..89cea15 100644 --- a/Service/Ups/Msg/UpsRemoteComm.cs +++ b/Service/Ups/Msg/UpsRemoteComm.cs @@ -3,7 +3,7 @@ using HybirdFrameworkDriver.ModbusTcpMaster; namespace Service.Ups.Msg; /// -/// 遥信 +/// 遥测 /// public class UpsRemoteComm { @@ -106,7 +106,7 @@ public class UpsRemoteComm public ModbusProperty UnitNBypassVoltA { get; set; } = new(40075, scale: 0.1, round: 1); public ModbusProperty UnitNBypassVoltB { get; set; } = new(40076, scale: 0.1, round: 1); public ModbusProperty UnitNBypassVoltC { get; set; } = new(40077, scale: 0.1, round: 1); - public ModbusProperty UpsSeriesNum { get; set; } = new(40078,start:0,length:6); + //public ModbusProperty UpsSeriesNum { get; set; } = new(40078,start:0,length:6); public ModbusProperty Reserve12 { get; set; } = new(40079); public ModbusProperty ProtocolVersion1 { get; set; } = new(40080); diff --git a/Service/Ups/Msg/UpsTelemetering.cs b/Service/Ups/Msg/UpsTelemetering.cs index e2ebf95..c1b4533 100644 --- a/Service/Ups/Msg/UpsTelemetering.cs +++ b/Service/Ups/Msg/UpsTelemetering.cs @@ -3,184 +3,184 @@ using HybirdFrameworkDriver.ModbusTcpMaster; namespace Service.Ups.Msg; /// -/// 遥测 +/// 遥信 /// public class UpsTelemetering { - public ModbusProperty LoadOnSource { get; set; } = new(40081); - public ModbusProperty BatteryStatus { get; set; } = new(40082); - public ModbusProperty BatteryConnStatus { get; set; } = new(40083); - public ModbusProperty MaintanCbStatus { get; set; } = new(40084); - public ModbusProperty Epo { get; set; } = new(40085); - public ModbusProperty InvertorReadyCapscity { get; set; } = new(40086); - public ModbusProperty GeneratorInput { get; set; } = new(40087); - public ModbusProperty InputFail { get; set; } = new(40088); - public ModbusProperty BypassSequenceFail { get; set; } = new(40089); - - public ModbusProperty BypassVoltFail { get; set; } = new(40090); - public ModbusProperty BYpassFail { get; set; } = new(40091); - public ModbusProperty BypassOverLoad { get; set; } = new(40092); - public ModbusProperty BypassOverLoadTimeout { get; set; } = new(40093); - public ModbusProperty BypassUntrack { get; set; } = new(40094); - public ModbusProperty TxTimeLimit { get; set; } = new(40095); - public ModbusProperty OutputShorted { get; set; } = new(40096); - public ModbusProperty BatteryEod { get; set; } = new(40097); - public ModbusProperty BatteryTestBegin { get; set; } = new(40098); - public ModbusProperty BatteryTestResult { get; set; } = new(40099); - - public ModbusProperty BatteryManualTest { get; set; } = new(40100); - public ModbusProperty BatteryMaintainResult { get; set; } = new(40101); - public ModbusProperty StopTest { get; set; } = new(40102); - public ModbusProperty FaultClear { get; set; } = new(40103); - public ModbusProperty HislogClear { get; set; } = new(40104); - public ModbusProperty OnUpsInhibited { get; set; } = new(40105); - public ModbusProperty ManualTxBypass { get; set; } = new(40106); - public ModbusProperty BatteryVoltLow { get; set; } = new(40107); - public ModbusProperty BatteryReverse { get; set; } = new(40108); - public ModbusProperty RecStatus { get; set; } = new(40109); - - public ModbusProperty InputNeutralLost { get; set; } = new(40110); - public ModbusProperty BypassFanFail { get; set; } = new(40111); - public ModbusProperty LostNxRedundant { get; set; } = new(40112); - public ModbusProperty EodSystemInhibited { get; set; } = new(40113); - public ModbusProperty CtWeldReserve { get; set; } = new(40114); - public ModbusProperty Elector { get; set; } = new(40115); - public ModbusProperty Reserve116 { get; set; } = new(40116); - public ModbusProperty Reserve117 { get; set; } = new(40117); - public ModbusProperty IntegratedAlarm { get; set; } = new(40118); - public ModbusProperty FristModuleOnlineFlagBit { get; set; } = new(40119); - - public ModbusProperty SecondModuleOnlineFlagBit { get; set; } = new(40120); - - public ModbusProperty Unit1Pull { get; set; } = new(40121); - public ModbusProperty Unit1RecFail { get; set; } = new(40122); - public ModbusProperty Unit1InvFail { get; set; } = new(40123); - public ModbusProperty Unit1RecOverTemp { get; set; } = new(40124); - public ModbusProperty Unit1FanFail { get; set; } = new(40125); - public ModbusProperty Unit1IvnOverLoad { get; set; } = new(40126); - public ModbusProperty Unit1IvnOverLoadTimeOut { get; set; } = new(40127); - public ModbusProperty Unit1IvnOverTemp { get; set; } = new(40128); - public ModbusProperty Unit1IvnProtect { get; set; } = new(40129); - public ModbusProperty Unit1ManualShutdown { get; set; } = new(40130); - public ModbusProperty Reserve131 { get; set; } = new(40131); - public ModbusProperty Reserve132 { get; set; } = new(40132); - - public ModbusProperty Unit2Pull { get; set; } = new(40133); - public ModbusProperty Unit2RecFail { get; set; } = new(40134); - public ModbusProperty Unit2InvFail { get; set; } = new(40135); - public ModbusProperty Unit2RecOverTemp { get; set; } = new(40136); - public ModbusProperty Unit2FanFail { get; set; } = new(40137); - public ModbusProperty Unit2IvnOverLoad { get; set; } = new(40138); - public ModbusProperty Unit2IvnOverLoadTimeOut { get; set; } = new(40139); - public ModbusProperty Unit2IvnOverTemp { get; set; } = new(40140); - public ModbusProperty Unit2IvnProtect { get; set; } = new(40141); - public ModbusProperty Unit2ManualShutdown { get; set; } = new(40142); - public ModbusProperty Reserve143 { get; set; } = new(40143); - public ModbusProperty Reserve144 { get; set; } = new(40144); - - public ModbusProperty Unit3Pull { get; set; } = new(40145); - public ModbusProperty Unit3RecFail { get; set; } = new(40146); - public ModbusProperty Unit3InvFail { get; set; } = new(40147); - public ModbusProperty Unit3RecOverTemp { get; set; } = new(40148); - public ModbusProperty Unit3FanFail { get; set; } = new(40149); - public ModbusProperty Unit3IvnOverLoad { get; set; } = new(40150); - public ModbusProperty Unit3IvnOverLoadTimeOut { get; set; } = new(40151); - public ModbusProperty Unit3IvnOverTemp { get; set; } = new(40152); - public ModbusProperty Unit3IvnProtect { get; set; } = new(40153); - public ModbusProperty Unit3ManualShutdown { get; set; } = new(40154); - public ModbusProperty Reserve155 { get; set; } = new(40155); - public ModbusProperty Reserve156 { get; set; } = new(40156); - - public ModbusProperty Unit4Pull { get; set; } = new(40157); - public ModbusProperty Unit4RecFail { get; set; } = new(40158); - public ModbusProperty Unit4InvFail { get; set; } = new(40159); - public ModbusProperty Unit4RecOverTemp { get; set; } = new(40160); - public ModbusProperty Unit4FanFail { get; set; } = new(40161); - public ModbusProperty Unit4IvnOverLoad { get; set; } = new(40162); - public ModbusProperty Unit4IvnOverLoadTimeOut { get; set; } = new(40163); - public ModbusProperty Unit4IvnOverTemp { get; set; } = new(40164); - public ModbusProperty Unit4IvnProtect { get; set; } = new(40165); - public ModbusProperty Unit4ManualShutdown { get; set; } = new(40166); - public ModbusProperty Reserve167 { get; set; } = new(40167); - public ModbusProperty Reserve168 { get; set; } = new(40168); - - public ModbusProperty Unit5Pull { get; set; } = new(40169); - public ModbusProperty Unit5RecFail { get; set; } = new(40170); - public ModbusProperty Unit5InvFail { get; set; } = new(40171); - public ModbusProperty Unit5RecOverTemp { get; set; } = new(40172); - public ModbusProperty Unit5FanFail { get; set; } = new(40173); - public ModbusProperty Unit5IvnOverLoad { get; set; } = new(40174); - public ModbusProperty Unit5IvnOverLoadTimeOut { get; set; } = new(40175); - public ModbusProperty Unit5IvnOverTemp { get; set; } = new(40176); - public ModbusProperty Unit5IvnProtect { get; set; } = new(40177); - public ModbusProperty Unit5ManualShutdown { get; set; } = new(40178); - public ModbusProperty Reserve179 { get; set; } = new(40179); - public ModbusProperty Reserve180 { get; set; } = new(40180); - - public ModbusProperty Unit6Pull { get; set; } = new(40181); - public ModbusProperty Unit6RecFail { get; set; } = new(40182); - public ModbusProperty Unit6InvFail { get; set; } = new(40183); - public ModbusProperty Unit6RecOverTemp { get; set; } = new(40184); - public ModbusProperty Unit6FanFail { get; set; } = new(40185); - public ModbusProperty Unit6IvnOverLoad { get; set; } = new(40186); - public ModbusProperty Unit6IvnOverLoadTimeOut { get; set; } = new(40187); - public ModbusProperty Unit6IvnOverTemp { get; set; } = new(40188); - public ModbusProperty Unit6IvnProtect { get; set; } = new(40189); - public ModbusProperty Unit6ManualShutdown { get; set; } = new(40190); - public ModbusProperty Reserve191 { get; set; } = new(40191); - public ModbusProperty Reserve192 { get; set; } = new(40192); - - public ModbusProperty Unit7Pull { get; set; } = new(40193); - public ModbusProperty Unit7RecFail { get; set; } = new(40194); - public ModbusProperty Unit7InvFail { get; set; } = new(40195); - public ModbusProperty Unit7RecOverTemp { get; set; } = new(40196); - public ModbusProperty Unit7FanFail { get; set; } = new(40197); - public ModbusProperty Unit7IvnOverLoad { get; set; } = new(40198); - public ModbusProperty Unit7IvnOverLoadTimeOut { get; set; } = new(40199); - public ModbusProperty Unit7IvnOverTemp { get; set; } = new(40200); - public ModbusProperty Unit7IvnProtect { get; set; } = new(40201); - public ModbusProperty Unit7ManualShutdown { get; set; } = new(40202); - public ModbusProperty Reserve203 { get; set; } = new(40203); - public ModbusProperty Reserve204 { get; set; } = new(40204); - - public ModbusProperty Unit8Pull { get; set; } = new(40205); - public ModbusProperty Unit8RecFail { get; set; } = new(40206); - public ModbusProperty Unit8InvFail { get; set; } = new(40207); - public ModbusProperty Unit8RecOverTemp { get; set; } = new(40208); - public ModbusProperty Unit8FanFail { get; set; } = new(40209); - public ModbusProperty Unit8IvnOverLoad { get; set; } = new(40210); - public ModbusProperty Unit8IvnOverLoadTimeOut { get; set; } = new(40211); - public ModbusProperty Unit8IvnOverTemp { get; set; } = new(40212); - public ModbusProperty Unit8IvnProtect { get; set; } = new(40213); - public ModbusProperty Unit8ManualShutdown { get; set; } = new(40214); - public ModbusProperty Reserve215 { get; set; } = new(40215); - public ModbusProperty Reserve216 { get; set; } = new(40216); - - public ModbusProperty Unit9Pull { get; set; } = new(40217); - public ModbusProperty Unit9RecFail { get; set; } = new(40218); - public ModbusProperty Unit9InvFail { get; set; } = new(40219); - public ModbusProperty Unit9RecOverTemp { get; set; } = new(40220); - public ModbusProperty Unit9FanFail { get; set; } = new(40221); - public ModbusProperty Unit9IvnOverLoad { get; set; } = new(40222); - public ModbusProperty Unit9IvnOverLoadTimeOut { get; set; } = new(40223); - public ModbusProperty Unit9IvnOverTemp { get; set; } = new(40224); - public ModbusProperty Unit9IvnProtect { get; set; } = new(40225); - public ModbusProperty Unit9ManualShutdown { get; set; } = new(40226); - public ModbusProperty Reserve227 { get; set; } = new(40227); - public ModbusProperty Reserve228 { get; set; } = new(40228); - - public ModbusProperty Unit10Pull { get; set; } = new(40229); - public ModbusProperty Unit10RecFail { get; set; } = new(40230); - public ModbusProperty Unit10InvFail { get; set; } = new(40231); - public ModbusProperty Unit10RecOverTemp { get; set; } = new(40232); - public ModbusProperty Unit10FanFail { get; set; } = new(40233); - public ModbusProperty Unit10IvnOverLoad { get; set; } = new(40234); - public ModbusProperty Unit10IvnOverLoadTimeOut { get; set; } = new(40235); - public ModbusProperty Unit10IvnOverTemp { get; set; } = new(40236); - public ModbusProperty Unit10IvnProtect { get; set; } = new(40237); - public ModbusProperty Unit10ManualShutdown { get; set; } = new(40238); - public ModbusProperty Reserve239 { get; set; } = new(40239); - public ModbusProperty Reserve240 { get; set; } = new(40240); + public ModbusProperty LoadOnSource { get; set; } = new(30081); + public ModbusProperty BatteryStatus { get; set; } = new(30082); + public ModbusProperty BatteryConnStatus { get; set; } = new(30083); + public ModbusProperty MaintanCbStatus { get; set; } = new(30084); + public ModbusProperty Epo { get; set; } = new(30085); + public ModbusProperty InvertorReadyCapscity { get; set; } = new(30086); + public ModbusProperty GeneratorInput { get; set; } = new(30087); + public ModbusProperty InputFail { get; set; } = new(30088); + public ModbusProperty BypassSequenceFail { get; set; } = new(30089); + + public ModbusProperty BypassVoltFail { get; set; } = new(30090); + public ModbusProperty BYpassFail { get; set; } = new(30091); + public ModbusProperty BypassOverLoad { get; set; } = new(30092); + public ModbusProperty BypassOverLoadTimeout { get; set; } = new(30093); + public ModbusProperty BypassUntrack { get; set; } = new(30094); + public ModbusProperty TxTimeLimit { get; set; } = new(30095); + public ModbusProperty OutputShorted { get; set; } = new(30096); + public ModbusProperty BatteryEod { get; set; } = new(30097); + public ModbusProperty BatteryTestBegin { get; set; } = new(30098); + public ModbusProperty BatteryTestResult { get; set; } = new(30099); + + public ModbusProperty BatteryManualTest { get; set; } = new(30100); + public ModbusProperty BatteryMaintainResult { get; set; } = new(30101); + public ModbusProperty StopTest { get; set; } = new(30102); + public ModbusProperty FaultClear { get; set; } = new(30103); + public ModbusProperty HislogClear { get; set; } = new(30104); + public ModbusProperty OnUpsInhibited { get; set; } = new(30105); + public ModbusProperty ManualTxBypass { get; set; } = new(30106); + public ModbusProperty BatteryVoltLow { get; set; } = new(30107); + public ModbusProperty BatteryReverse { get; set; } = new(30108); + public ModbusProperty RecStatus { get; set; } = new(30109); + + public ModbusProperty InputNeutralLost { get; set; } = new(30110); + public ModbusProperty BypassFanFail { get; set; } = new(30111); + public ModbusProperty LostNxRedundant { get; set; } = new(30112); + public ModbusProperty EodSystemInhibited { get; set; } = new(30113); + public ModbusProperty CtWeldReserve { get; set; } = new(30114); + public ModbusProperty Elector { get; set; } = new(30115); + public ModbusProperty Reserve116 { get; set; } = new(30116); + public ModbusProperty Reserve117 { get; set; } = new(30117); + public ModbusProperty IntegratedAlarm { get; set; } = new(30118); + public ModbusProperty FristModuleOnlineFlagBit { get; set; } = new(30119); + + public ModbusProperty SecondModuleOnlineFlagBit { get; set; } = new(30120); + + public ModbusProperty Unit1Pull { get; set; } = new(30121); + public ModbusProperty Unit1RecFail { get; set; } = new(30122); + public ModbusProperty Unit1InvFail { get; set; } = new(30123); + public ModbusProperty Unit1RecOverTemp { get; set; } = new(30124); + public ModbusProperty Unit1FanFail { get; set; } = new(30125); + public ModbusProperty Unit1IvnOverLoad { get; set; } = new(30126); + public ModbusProperty Unit1IvnOverLoadTimeOut { get; set; } = new(30127); + public ModbusProperty Unit1IvnOverTemp { get; set; } = new(30128); + public ModbusProperty Unit1IvnProtect { get; set; } = new(30129); + public ModbusProperty Unit1ManualShutdown { get; set; } = new(30130); + public ModbusProperty Reserve131 { get; set; } = new(30131); + public ModbusProperty Reserve132 { get; set; } = new(30132); + + public ModbusProperty Unit2Pull { get; set; } = new(30133); + public ModbusProperty Unit2RecFail { get; set; } = new(30134); + public ModbusProperty Unit2InvFail { get; set; } = new(30135); + public ModbusProperty Unit2RecOverTemp { get; set; } = new(30136); + public ModbusProperty Unit2FanFail { get; set; } = new(30137); + public ModbusProperty Unit2IvnOverLoad { get; set; } = new(30138); + public ModbusProperty Unit2IvnOverLoadTimeOut { get; set; } = new(30139); + public ModbusProperty Unit2IvnOverTemp { get; set; } = new(30130); + public ModbusProperty Unit2IvnProtect { get; set; } = new(30141); + public ModbusProperty Unit2ManualShutdown { get; set; } = new(30142); + public ModbusProperty Reserve143 { get; set; } = new(30143); + public ModbusProperty Reserve144 { get; set; } = new(30144); + + public ModbusProperty Unit3Pull { get; set; } = new(30145); + public ModbusProperty Unit3RecFail { get; set; } = new(30146); + public ModbusProperty Unit3InvFail { get; set; } = new(30147); + public ModbusProperty Unit3RecOverTemp { get; set; } = new(30148); + public ModbusProperty Unit3FanFail { get; set; } = new(30149); + public ModbusProperty Unit3IvnOverLoad { get; set; } = new(30150); + public ModbusProperty Unit3IvnOverLoadTimeOut { get; set; } = new(30151); + public ModbusProperty Unit3IvnOverTemp { get; set; } = new(30152); + public ModbusProperty Unit3IvnProtect { get; set; } = new(30153); + public ModbusProperty Unit3ManualShutdown { get; set; } = new(30154); + public ModbusProperty Reserve155 { get; set; } = new(30155); + public ModbusProperty Reserve156 { get; set; } = new(30156); + + public ModbusProperty Unit4Pull { get; set; } = new(30157); + public ModbusProperty Unit4RecFail { get; set; } = new(30158); + public ModbusProperty Unit4InvFail { get; set; } = new(30159); + public ModbusProperty Unit4RecOverTemp { get; set; } = new(30160); + public ModbusProperty Unit4FanFail { get; set; } = new(30161); + public ModbusProperty Unit4IvnOverLoad { get; set; } = new(30162); + public ModbusProperty Unit4IvnOverLoadTimeOut { get; set; } = new(30163); + public ModbusProperty Unit4IvnOverTemp { get; set; } = new(30164); + public ModbusProperty Unit4IvnProtect { get; set; } = new(30165); + public ModbusProperty Unit4ManualShutdown { get; set; } = new(30166); + public ModbusProperty Reserve167 { get; set; } = new(30167); + public ModbusProperty Reserve168 { get; set; } = new(30168); + + public ModbusProperty Unit5Pull { get; set; } = new(30169); + public ModbusProperty Unit5RecFail { get; set; } = new(30170); + public ModbusProperty Unit5InvFail { get; set; } = new(30171); + public ModbusProperty Unit5RecOverTemp { get; set; } = new(30172); + public ModbusProperty Unit5FanFail { get; set; } = new(30173); + public ModbusProperty Unit5IvnOverLoad { get; set; } = new(30174); + public ModbusProperty Unit5IvnOverLoadTimeOut { get; set; } = new(30175); + public ModbusProperty Unit5IvnOverTemp { get; set; } = new(30176); + public ModbusProperty Unit5IvnProtect { get; set; } = new(30177); + public ModbusProperty Unit5ManualShutdown { get; set; } = new(30178); + public ModbusProperty Reserve179 { get; set; } = new(30179); + public ModbusProperty Reserve180 { get; set; } = new(30180); + + public ModbusProperty Unit6Pull { get; set; } = new(30181); + public ModbusProperty Unit6RecFail { get; set; } = new(30182); + public ModbusProperty Unit6InvFail { get; set; } = new(30183); + public ModbusProperty Unit6RecOverTemp { get; set; } = new(30184); + public ModbusProperty Unit6FanFail { get; set; } = new(30185); + public ModbusProperty Unit6IvnOverLoad { get; set; } = new(30186); + public ModbusProperty Unit6IvnOverLoadTimeOut { get; set; } = new(30187); + public ModbusProperty Unit6IvnOverTemp { get; set; } = new(30188); + public ModbusProperty Unit6IvnProtect { get; set; } = new(30189); + public ModbusProperty Unit6ManualShutdown { get; set; } = new(30190); + public ModbusProperty Reserve191 { get; set; } = new(30191); + public ModbusProperty Reserve192 { get; set; } = new(30192); + + public ModbusProperty Unit7Pull { get; set; } = new(30193); + public ModbusProperty Unit7RecFail { get; set; } = new(30194); + public ModbusProperty Unit7InvFail { get; set; } = new(30195); + public ModbusProperty Unit7RecOverTemp { get; set; } = new(30196); + public ModbusProperty Unit7FanFail { get; set; } = new(30197); + public ModbusProperty Unit7IvnOverLoad { get; set; } = new(30198); + public ModbusProperty Unit7IvnOverLoadTimeOut { get; set; } = new(30199); + public ModbusProperty Unit7IvnOverTemp { get; set; } = new(30200); + public ModbusProperty Unit7IvnProtect { get; set; } = new(30201); + public ModbusProperty Unit7ManualShutdown { get; set; } = new(30202); + public ModbusProperty Reserve203 { get; set; } = new(30203); + public ModbusProperty Reserve204 { get; set; } = new(30204); + + public ModbusProperty Unit8Pull { get; set; } = new(30205); + public ModbusProperty Unit8RecFail { get; set; } = new(30206); + public ModbusProperty Unit8InvFail { get; set; } = new(30207); + public ModbusProperty Unit8RecOverTemp { get; set; } = new(30208); + public ModbusProperty Unit8FanFail { get; set; } = new(30209); + public ModbusProperty Unit8IvnOverLoad { get; set; } = new(30210); + public ModbusProperty Unit8IvnOverLoadTimeOut { get; set; } = new(30211); + public ModbusProperty Unit8IvnOverTemp { get; set; } = new(30212); + public ModbusProperty Unit8IvnProtect { get; set; } = new(30213); + public ModbusProperty Unit8ManualShutdown { get; set; } = new(30214); + public ModbusProperty Reserve215 { get; set; } = new(30215); + public ModbusProperty Reserve216 { get; set; } = new(30216); + + public ModbusProperty Unit9Pull { get; set; } = new(30217); + public ModbusProperty Unit9RecFail { get; set; } = new(30218); + public ModbusProperty Unit9InvFail { get; set; } = new(30219); + public ModbusProperty Unit9RecOverTemp { get; set; } = new(30220); + public ModbusProperty Unit9FanFail { get; set; } = new(30221); + public ModbusProperty Unit9IvnOverLoad { get; set; } = new(30222); + public ModbusProperty Unit9IvnOverLoadTimeOut { get; set; } = new(30223); + public ModbusProperty Unit9IvnOverTemp { get; set; } = new(30224); + public ModbusProperty Unit9IvnProtect { get; set; } = new(30225); + public ModbusProperty Unit9ManualShutdown { get; set; } = new(30226); + public ModbusProperty Reserve227 { get; set; } = new(30227); + public ModbusProperty Reserve228 { get; set; } = new(30228); + + public ModbusProperty Unit10Pull { get; set; } = new(30229); + public ModbusProperty Unit10RecFail { get; set; } = new(30230); + public ModbusProperty Unit10InvFail { get; set; } = new(30231); + public ModbusProperty Unit10RecOverTemp { get; set; } = new(30232); + public ModbusProperty Unit10FanFail { get; set; } = new(30233); + public ModbusProperty Unit10IvnOverLoad { get; set; } = new(30234); + public ModbusProperty Unit10IvnOverLoadTimeOut { get; set; } = new(30235); + public ModbusProperty Unit10IvnOverTemp { get; set; } = new(30236); + public ModbusProperty Unit10IvnProtect { get; set; } = new(30237); + public ModbusProperty Unit10ManualShutdown { get; set; } = new(30238); + public ModbusProperty Reserve239 { get; set; } = new(30239); + public ModbusProperty Reserve240 { get; set; } = new(30240); diff --git a/WebStarter/Program.cs b/WebStarter/Program.cs index 428f007..b502e09 100644 --- a/WebStarter/Program.cs +++ b/WebStarter/Program.cs @@ -17,6 +17,7 @@ using Service.Execute; using Service.Led; using Service.Padar.Client; using Service.RealTime; +using Service.Ups; using SqlSugar; using SqlSugar.IOC; @@ -188,7 +189,11 @@ if (AppSettingsHelper.GetBool("led", "enable")) AppInfo.Container = app.Services.GetAutofacRoot(); ClientMgr.InitClient(); -//UpsMgr.UpsInit(); +//ups +if (AppSettingsHelper.GetBool("ups", "enable")) +{ + UpsMgr.UpsInit(); +} //TaskInit.Init(); //PadarMgr.InitClient();