CZYW-KZB_v20220825_12

* 在DW屏上的显示维度，对首页的【空高（mm）】、【液位（mm）】两处显示值做了 限值处理，即原理上它们的显示值都应该是非负值。 -- 此需求来源于测试
* 修正了一处远程标定入口0x0084，去读取得到的参数不符预期的bug。 -- 0x0084表示的是空高偏移值
* 基于v20220607_12更改，这是来自诸工的最新版本。

MDK-ARM/TestF7.uvoptx

@@ -501,7 +501,7 @@
       <GroupNumber>1</GroupNumber>
       <FileNumber>10</FileNumber>
       <FileType>1</FileType>
-      <tvExp>0</tvExp>
+      <tvExp>1</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
       <PathWithFileName>../Src/main.c</PathWithFileName>

MDK-ARM/TestF7.uvprojx

@@ -50,7 +50,7 @@
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
           <OutputDirectory>TestF7\</OutputDirectory>
-          <OutputName>dzqf-kzb09a0_ZhongLan20211112</OutputName>
+          <OutputName>KZB_2022</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
           <CreateHexFile>1</CreateHexFile>

Src/KeySlave485.c

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

Src/TerminalSlave485.c

@@ -5030,6 +5030,7 @@ int 	Process_CMD_0x39_RemoteCali(uint8_t dataMode)
 				//数据回读
 					FM25L16B_Read_N_Bytes(ADDR_Zero_Of_TankCapacity,T2C_RemoteCaliDat001.PayLoadData,32);
 			 		T2C_RemoteCaliDat001.NumberOfRegs=32;
+					break;
 				case ADDR_RunAn_AlarmThreshold:
 					//湖南润安项目  李伟修改  20211130   压力报警上限、下限、温度上限、下限、温度修正、压力窗口时长、压力正偏门限、负偏门限、压力修正、算法类型等
 

Src/freertos.c

@@ -3140,17 +3140,15 @@ void DisplaySensorInfo(void)
 #else
 //	if(Config_info_all.Config_fun_id&0x80) //Һλ
 	{
-		float disp_level;
-		if((AlarmOfPressureThreshold_Upper>0) && (pT2C_ALL_Sensor_Data_Disp->MoniLiang_Data_Every_Cang[0]<AlarmOfPressureThreshold_Upper))
-		{
-			disp_level=0.0;
-		}
-		else
-		{
-			disp_level=pT2C_ALL_Sensor_Data_Disp->MoniLiang_Data_Every_Cang[0];	
-		}
+		float disp_level, air_high, real_high;
+		
+		real_high = ExpansionRatio[CangNum_tskUart3-1];
+		air_high = real_high - pT2C_ALL_Sensor_Data_Disp->MoniLiang_Data_Every_Cang[0];
+		if(air_high > real_high) air_high = real_high;
+		disp_level = real_high - air_high;
+		
 		Len003 += sprintf((char *)bufTextSensorInfo + Len003, " %5.1f    %5.1f      %.1f",
-					 ExpansionRatio[CangNum_tskUart3-1]-pT2C_ALL_Sensor_Data_Disp->MoniLiang_Data_Every_Cang[0],
+					 air_high,
 					 disp_level,
 					 Zero_Of_LiquidMeter[CangNum_tskUart3-1]);
 	}