Przeglądaj źródła

通过808透传主动上报给平台的A2传感器数据包,原本只支持最大4仓的传感器数据的构造,此次增加到支持5仓;

xuy 2 lat temu
rodzic
commit
9fda3c4307
3 zmienionych plików z 12 dodań i 5 usunięć
  1. 1 1
      Src/KeySlave485.c
  2. 1 1
      Src/TerminalSlave485.c
  3. 10 3
      Src/TerminalSlave485_jt808.c

+ 1 - 1
Src/KeySlave485.c

@@ -38,7 +38,7 @@ uint8_t product_code[20] = "JL-SIMS-CJ-V2.1";				 //
 uint8_t product_ID[20] = "20210730001";						 //产品ID
 
 char Version_software[30] = "KZB09A0_20220210_Temp1";
-uint32_t Version_Soft[8] = {2,2,3,13,1,1,0,20221216};
+uint32_t Version_Soft[8] = {2,2,3,13,1,1,0,20230109};
 
 uint8_t flag_exitReset = 0;	 //终止复位命令
 uint8_t flag_Uart4_Busy = 0; //表明打印机占用了总线,暂停语音播报

+ 1 - 1
Src/TerminalSlave485.c

@@ -958,7 +958,7 @@ int Process_CMD_IAP_Update(void)
   }
   return 0;
 }
-uint8_t  Cang_IO_tbak[4][64];
+uint8_t  Cang_IO_tbak[5][64];
 extern uint8_t  Cang01_IO[64];
 extern uint8_t  Cang02_IO[64];
 extern uint8_t  Cang03_IO[64];

+ 10 - 3
Src/TerminalSlave485_jt808.c

@@ -167,10 +167,17 @@ int jt808_Build_Ax_Cmd(uint8_t *pBuf, uint32_t flowID, uint8_t *pEmergencyflag)
 		}
 		memcpy(Cang_IO_tbak[3],Cang04_IO,64);
 	}
-	
-	if(StoreNumber > 4)
+	if(StoreNumber>4)
+	{
+		if(memcmp(Cang_IO_tbak[4],Cang05_IO,64))
+		{
+			emergencyflag=0x80;
+		}
+		memcpy(Cang_IO_tbak[4],Cang05_IO,64);
+	}
+	if(StoreNumber > 5)
 	{
-		StoreNumber = 4;
+		StoreNumber = 5;
 	}
 	
 	if((overflow_cnt==0) && (overflow_cnt==overflow_cnt_bak))