提交修改

MDK-ARM/TestF7.uvoptx

@@ -145,7 +145,7 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>JL2CM3</Key>
-          <Name>-U59518874 -O111 -S1 -ZTIFSpeedSel10000 -A0 -C0 -JU1 -JI-JP0 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(5BA02477) -L00(0) -TO19 -TC10000000 -TP21 -TDS8001 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD20010000 -FC1000 -FN1 -FF0STM32F7x_1024.FLM -FS08000000 -FL0100000 -FP0($$Device:STM32F746VGTx$CMSIS\Flash\STM32F7x_1024.FLM)</Name>
+          <Name>-U59518874 -O111 -S1 -ZTIFSpeedSel10000 -A0 -C0 -JU1 -JI-JP0 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(5BA02477) -L00(0) -TO19 -TC10000000 -TP21 -TDS8001 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO31 -FD20010000 -FC1000 -FN1 -FF0STM32F7x_1024.FLM -FS08000000 -FL0100000 -FP0($$Device:STM32F746VGTx$CMSIS\Flash\STM32F7x_1024.FLM)</Name>
         </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
@@ -355,7 +355,7 @@
 
   <Group>
     <GroupName>Application/User</GroupName>
-    <tvExp>1</tvExp>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>

MDK-ARM/TestF7.uvprojx

@@ -49,7 +49,7 @@
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
           <OutputDirectory>TestF7\</OutputDirectory>
-          <OutputName>kzb09a0_v20201</OutputName>
+          <OutputName>kzb09a0_v20230603_HEX</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
           <CreateHexFile>1</CreateHexFile>

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,20230527};
+uint32_t Version_Soft[8] = {2,2,3,13,1,1,122,20230603};
 
 uint8_t flag_exitReset = 0;	 //终止复位命令
 uint8_t flag_Uart4_Busy = 0; //表明打印机占用了总线，暂停语音播报

Src/TerminalSlave485_jt808.c

@@ -194,10 +194,10 @@ int jt808_Build_Ax_Cmd(uint8_t *pBuf, uint32_t flowID, uint8_t *pEmergencyflag)
 		memcpy(&cang_data_tbak[cang_id],&cang_data[cang_id],sizeof(Struct_Cang));
 	}
 
-	if(memcmp(&tank_data_tbak, &tank_data, sizeof(Struct_Tank))){
-		emergencyflag=0x80;
-	}
-	memcpy(&tank_data_tbak, &tank_data, sizeof(Struct_Tank));
+	//if(memcmp(&tank_data_tbak, &tank_data, sizeof(Struct_Tank))){
+	//	emergencyflag=0x80;
+	//}
+	//memcpy(&tank_data_tbak, &tank_data, sizeof(Struct_Tank));
 	
 	if((overflow_cnt==0) && (overflow_cnt==overflow_cnt_bak))
 	{
@@ -221,6 +221,7 @@ int jt808_Build_Ax_Cmd(uint8_t *pBuf, uint32_t flowID, uint8_t *pEmergencyflag)
 	//防溢流插座
 	pBuf[send_pos++] = 0x22;  
 	pBuf[send_pos++] = overflow_flag;
+	#if 0
 	//门磁
 	pBuf[send_pos++] = 0x21;  
 	pBuf[send_pos++] = 0x01;
@@ -228,7 +229,7 @@ int jt808_Build_Ax_Cmd(uint8_t *pBuf, uint32_t flowID, uint8_t *pEmergencyflag)
 	//人脸授权
 	pBuf[send_pos++] = 0x23;  
 	pBuf[send_pos++] = tank_data_tbak.Facial_Auth;
-	
+	#endif 
 	//61	人孔大盖	开关
 	send_pos += jt808_Build_0x61_ManHole_Big_SW((uint8_t *)pBuf+send_pos);
 	
@@ -248,7 +249,7 @@ int jt808_Build_Ax_Cmd(uint8_t *pBuf, uint32_t flowID, uint8_t *pEmergencyflag)
 	send_pos += jt808_Build_0x6B_Pressure((uint8_t *)pBuf+send_pos);
 
 	//6C	液位
-	send_pos += jt808_Build_0x6C_Level((uint8_t *)pBuf+send_pos);
+	//send_pos += jt808_Build_0x6C_Level((uint8_t *)pBuf+send_pos);
 
 	//6D	仓状态	
 	send_pos += jt808_Build_0x6d_Cang_info((uint8_t *)pBuf+send_pos);