Browse Source

采集板,实验一引入的校验机制,恢复其原先状态
20220810_13

xuy 3 years ago
parent
commit
fc22bf58c9
2 changed files with 4 additions and 4 deletions
  1. 1 1
      Core/Src/kzq.c
  2. 3 3
      Core/Src/main.c

+ 1 - 1
Core/Src/kzq.c

@@ -3910,7 +3910,7 @@ uint16_t Tem_SetType(uint8_t* pTx)
 	else
 		return 0;
 }
-uint32_t Version_Soft[8] = {2, 2, 3, 3, 1, 1, 0, 20220809};
+uint32_t Version_Soft[8] = {2, 2, 3, 13, 1, 1, 0, 20220810};
 uint16_t Read_SoftVersion(uint8_t *pTx)
 {
 	int i;

+ 3 - 3
Core/Src/main.c

@@ -42,7 +42,7 @@
 #include "yqhs.h"
 #include "iap.h"
 /* USER CODE END Includes */
-#if 1
+#if 0
 #define IR_ROM1   0x08000000
 #else
 #define IR_ROM1   0x08020000
@@ -2938,11 +2938,11 @@ void StartTask04(void *argument)                                    //
 			pkzq->KZQ_Error++;
 			KZQ_RTerror = 1;
 		}
-		else if(ModbusCRC != ModbusCRC1 && ModbusCRC_lsb != ModbusCRC1)		//УÑéCRC
+		/*else if(ModbusCRC != ModbusCRC1 && ModbusCRC_lsb != ModbusCRC1)		//УÑéCRC
 		{
 			pkzq->KZQ_Error++;
 			KZQ_RTerror = 1;
-		}
+		}*/
 		else
 		{
 			pkzq->KZQ_Error = 0;