modify MQtt Package

ModbusDemo/Modular/ModualPoll.cs

@@ -134,12 +134,14 @@ namespace ModbusDemo.Modular
                     }
                 }
 
-                for (byte j = 0; j < byX18xReadTypeNumber; j++)
+                for (byte j = 0; j < byX18xReadTypeNumber ; j++)
+                {
+                    if (ModbusErrorCode == ModbusComm.eModbusErrorCode.MB_EMASTERNOERR)
                     {
                         switch (cx18x.beChannelType[i, j])
                         {
                             case modual.eX18xSensorChannelType.Weiertai:
-                             cx18x.sX18xDataStruct[i].dNowConvertData[j] = 8- ((double.Parse(sTempString[i][j]) - 4) / 16 * 8);
+                                 cx18x.sX18xDataStruct[i].dNowConvertData[j] = 8 - ((double.Parse(sTempString[i][j]) - 4) / 16 * 8);
                                  break;
                             case modual.eX18xSensorChannelType.Mike_5:
                                  cx18x.sX18xDataStruct[i].dNowConvertData[j] = 5 - ((double.Parse(sTempString[i][j]) - 4) / 16 * 5);
@@ -156,6 +158,11 @@ namespace ModbusDemo.Modular
                             default:
                                  break;
                         }
+                    }
+                    else
+                    {
+                        cx18x.sX18xDataStruct[i].dNowConvertData[j] = 0;
+                    }
                     if (cx18x.sX18xAlarmstruct[i].bDataNotFirstIncreaseOrDecrease == true)
                     {
                         if (cx18x.sX18xDataStruct[i].dNowConvertData[j] - cx18x.sX18xDataStruct[i].dBeforeConvertData[j] >= dX18xMaxJumpData || cx18x.sX18xDataStruct[i].dBeforeConvertData[j] - cx18x.sX18xDataStruct[i].dNowConvertData[j] >= dX18xMaxJumpData)
@@ -238,6 +245,7 @@ namespace ModbusDemo.Modular
                 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());
                 stPollString += JsonConvert.SerializeObject(OneNodeJsonPackage) + ",";
             }
+
             for (sbyte i = 0; i < byX66cNumber; i++)
             {
                 string stIdString = cx66c.byModbusID[i].ToString();
@@ -245,7 +253,7 @@ 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());
-                if (i >= byX66cNumber)
+                if (i >= byX66cNumber -1)
                 {
                     stPollString += JsonConvert.SerializeObject(OneNodeJsonPackage) + "]";
                     return stPollString;