merge origin

ModbusDemo/Modular/ModualPoll.cs

@@ -444,7 +444,7 @@ namespace ModbusDemo.Modular
         }
         public static void vSend_Actual_Data(byte byModbusID)
         { 
-            string strRes = null;
+            string strRes = "[";
             listDeleteNodesID.Add(byModbusID);
             for (int i = 0; i < ModualPoll.byX18xNumber; i++)
             {
@@ -454,7 +454,7 @@ namespace ModbusDemo.Modular
                     bGet_channel_Value<double> (byModbusID, out dGetData, "d0","d1","d2","d3","d4","d5","d6","d7");
                     string stIdString = byModbusID.ToString();
                      WTDR18X OneNodeJsonPackage = new WTDR18X(stIdString, cx18x.sX18xDataStruct[i].dNowConvertData[0], cx18x.sX18xDataStruct[i].dNowConvertData[1], cx18x.sX18xDataStruct[i].dNowConvertData[2], cx18x.sX18xDataStruct[i].dNowConvertData[3], cx18x.sX18xDataStruct[i].dNowConvertData[4], cx18x.sX18xDataStruct[i].dNowConvertData[5], cx18x.sX18xDataStruct[i].dNowConvertData[6], cx18x.sX18xDataStruct[i].dNowConvertData[7], Form1.GetTimeStamp());
-                    strRes = JsonConvert.SerializeObject(OneNodeJsonPackage);
+                    strRes += JsonConvert.SerializeObject(OneNodeJsonPackage);
                      break;
                 }
             }
@@ -466,7 +466,7 @@ namespace ModbusDemo.Modular
                     double[] dGetData;
                     bGet_channel_Value<double> (byModbusID, out dGetData, "d0","d1","d2","d3","d4");
                     WTDR14P OneNodeJsonPackage = new WTDR14P(stIdString, cx14P.sX14pDataStruct[i].dNowConvertData[0], cx14P.sX14pDataStruct[i].dNowConvertData[1], cx14P.sX14pDataStruct[i].dNowConvertData[2], cx14P.sX14pDataStruct[i].dNowConvertData[3], Form1.GetTimeStamp());
-                    strRes = JsonConvert.SerializeObject(OneNodeJsonPackage);
+                    strRes += JsonConvert.SerializeObject(OneNodeJsonPackage);
                      break;
                 }
             }
@@ -482,7 +482,7 @@ namespace ModbusDemo.Modular
                     InputConvert = cBoolConvertInt.IO(cx78c.sX78cRegStatusStruct[i].bInputRegStatus);
                     OutPutConver = cBoolConvertInt.IO(cx78c.sX78cRegStatusStruct[i].bOutPutRegStatus);
                     WTDR78C OneNodeJsonPackage = new WTDR78C(stIdString, InputConvert[0], InputConvert[1], InputConvert[2], InputConvert[3], InputConvert[4], InputConvert[5], InputConvert[6], InputConvert[7], OutPutConver[0], OutPutConver[1], OutPutConver[2], OutPutConver[3], OutPutConver[4], OutPutConver[5], OutPutConver[6], OutPutConver[7], Form1.GetTimeStamp());
-                    strRes = JsonConvert.SerializeObject(OneNodeJsonPackage);
+                    strRes += JsonConvert.SerializeObject(OneNodeJsonPackage);
                      break;
                 }
             }
@@ -497,10 +497,14 @@ namespace ModbusDemo.Modular
                    int[] sRelayConvert;
                    sRelayConvert = cBoolConvertInt.IO(cx66c.sX66cRegStatusStruct[i].bRegRelayStatus);
                    WTDR66C OneNodeJsonPackage = new WTDR66C(stIdString, sRelayConvert[0], sRelayConvert[1], sRelayConvert[2], sRelayConvert[3], sRelayConvert[4], sRelayConvert[5], Form1.GetTimeStamp());
-                   strRes = JsonConvert.SerializeObject(OneNodeJsonPackage);
+                   strRes += JsonConvert.SerializeObject(OneNodeJsonPackage);
                     break;
                 }
             }
+            if (strRes != "[")
+            { 
+                strRes += "]";
+             }
             Form1.vControlResponseBack(Form1.mqttTopic,strRes);        
         }
         public static bool bGet_channel_Value<T> (byte byModbusID, out T[] ChannnelData, params string[] strChannelList)

ModbusDemo/windows/Form1.cs

@@ -94,7 +94,7 @@ namespace ModbusDemo
         private bool isReconnect = true;
         private void SetMqtt()
         {
-            if (LOCALDEBUG == true)
+            if (LOCALDEBUG == false)
             {
                 mqttIp = "47.101.50.24";
                 mqttClientId = GetTimeStamp() + "sxz";