temperte mergr

ModbusDemo/Common/ModualAlarm.cs

@@ -9,14 +9,12 @@ using MQTTnet.Client;
 using Newtonsoft.Json;
 namespace ModbusDemo.Common
 {
-    public class ModualAlarm
+    public static class ModualAlarm
     {
         public const ushort usChannelNumber = 8;
         private const string sAlarmTopic = "Witium/WTDS78X/20193261/Alarm";
-        public Hashtable hMqtttAlarmMap = new Hashtable();
-        public bool bErrorHasSend = false;
-        private string sAlarmJson;
-        private string sAlarmJsonPackage;
+        public static string sAlarmJson;
+        public static string sAlarmJsonPackage;
         //private IMqttClient mqttClient = null;
         public enum eAlarmCode : ushort
         {
@@ -26,9 +24,10 @@ namespace ModbusDemo.Common
             ChannelDataRespError = 4,
             ChannelDataChangeError = 8
         }
-        public void vSetAlarmList(ushort usAddress, ushort[] usChannel, ushort[] usChannelAlarmcode,bool bStringIncrease)
+        public static void vSetAlarmList(ushort usAddress, ushort[] usChannel, ushort[] usChannelAlarmcode,bool bStringIncrease)
         {
             ushort i = 0;
+            Hashtable hMqtttAlarmMap = new Hashtable();
             hMqtttAlarmMap.Add("addr", usAddress.ToString());
             string sAlarm = "alm";
             foreach (ushort usdata in usChannelAlarmcode)
@@ -43,9 +42,8 @@ namespace ModbusDemo.Common
                 sAlarmJson += ",";
             }
         }
-        public async Task vPublishAlarmPackageJson(IMqttClient mqttClient)
+        public static async Task vPublishAlarmPackageJson(IMqttClient mqttClient)
         {
-            sAlarmJson = "[" + sAlarmJson  + "]";
             var message = new MqttApplicationMessageBuilder()
                                 .WithTopic(sAlarmTopic)
                                 .WithPayload(sAlarmJson)

ModbusDemo/Modular/modual.cs

@@ -16,21 +16,27 @@ namespace ModbusDemo.Modular
             public double[]  dNowConvertData;
             public double[]  dBeforeConvertData;
         }
+        public enum eX14pSensorChannelType : byte
+        {
+            Normal = 0,
+            Null,
+        }
         public struct psxModualAlarm
         {
             public bool     bDataNotFirstIncreaseOrDecrease;
             public ushort[] usNowAlarmCode;
             public ushort[] usBeforeAlarmCode;
-
         }
         public class pcx14P
         {
             public byte[]                          byModbusID;
             public psx14pData[]                    sX14pDataStruct   = new psx14pData[ModualPoll.byX14pNumber];
             public psxModualAlarm[]                sX14PAlarmStruct  = new psxModualAlarm[ModualPoll.byX14pNumber];
-            public pcx14P(byte[] InitIDlist)
+            public eX14pSensorChannelType[,] eChannelType;
+            public pcx14P(byte[] InitIDlist, eX14pSensorChannelType[,] ChannelType)
             {
-                this.byModbusID = InitIDlist;
+                this.byModbusID   = InitIDlist;
+                this.eChannelType = ChannelType;
                 for (byte i = 0; i < ModualPoll.byX14pNumber; i++)
                 {
                     this.sX14pDataStruct[i].dBeforeConvertData = new double[ModualPoll.byX14pReadDataNumber];
@@ -49,7 +55,7 @@ namespace ModbusDemo.Modular
             Mike_5,
             Mike_6,
             Mike_7,
-            Level,
+            NormalCurrent,
         }
 
         public struct psX18xData