🐞 fix:修改QAC问题，修改了历程库传入的车速和轮胎系数

Firmware/Source/Application/BackLight.c

@@ -9,7 +9,7 @@ Light_uint16_t LightR = 0u;
 Light_uint16_t LightR_Status = 0;
 Light_uint16_t LightR_Status_NCount = 0u;
 Light_uint16_t LightR_Status_DCount = 0u;
-Light_uint16_t NtcDataCount;
+Light_uint8_t NtcDataCount;
 Light_uint16_t NtcData[LIGHT_DATA_NUM] = {0};
 typedef struct
 {
@@ -217,7 +217,7 @@ void BackLight_Get_curDuty(void)
 		wtemp *= 1;
 		wtemp += 700;
 		wtemp /= 10;
-		g_stBL.destFactor = wtemp;
+		g_stBL.destFactor = (uint8_t)wtemp;
 		/* 85°为70%占空比，60°为95%占空比, 1°大概为1% */
 	}
     else if(NTCDegrees <= 880 )
@@ -226,7 +226,7 @@ void BackLight_Get_curDuty(void)
 		wtemp *= 16;
 		wtemp += 200;
 		wtemp /= 10;
-		g_stBL.destFactor = wtemp;
+		g_stBL.destFactor = (uint8_t)wtemp;
 		/* 88°为20%占空比，85°为70%占空比, 1°大概为16.6% */
 	}
     else if(NTCDegrees <= 900 )
@@ -235,7 +235,7 @@ void BackLight_Get_curDuty(void)
 		wtemp *= 5;
 		wtemp += 100;
 		wtemp /= 10;
-		g_stBL.destFactor = wtemp;
+		g_stBL.destFactor = (uint8_t)wtemp;
 		/* 90°为10%占空比，88°为20%占空比, 1°大概为5% */
 	}
     else
@@ -320,7 +320,7 @@ void BackLight_Get_curDuty(void)
 
 #endif
     /* 计算具体应该多少占空比 */
-	g_stBL.u16TftdestDuty = ( uint32_t )(( uint32_t )tftBL * ( uint32_t )g_stBL.curFactor / ( uint32_t )100);
+	g_stBL.u16TftdestDuty = ( uint16_t )(( uint32_t )tftBL * ( uint32_t )g_stBL.curFactor / ( uint32_t )100);
 
     /* 确保目标占空比不小于100 */
 	if(g_stBL.u16TftdestDuty < 100)
@@ -450,7 +450,7 @@ void Data_Light_Res_service(Light_uint8_t deltaTime)//获取光感阻值，并
 /* 背光等级回调函数 */
 Light_uint8_t Backlight_GetPwmLevel(void)
 {
- 	Light_uint8_t Backlight_PwmLevel;
+ 	Light_uint8_t Backlight_PwmLevel = 0;
 
     if(LightR > 0 && LightR <= 400)
     {
@@ -472,6 +472,10 @@ Light_uint8_t Backlight_GetPwmLevel(void)
     {
         Backlight_PwmLevel = 5U;
     }
+    else
+    {
+        Backlight_PwmLevel = 5U;
+    }
     return Backlight_PwmLevel;
 }
 

Firmware/Source/Application/BlueTooth.c

@@ -208,8 +208,8 @@ uint8_t PhoneNumber[40];
 uint8_t LastPhoneNumber[20];
 uint8_t LastBlueToothPhoneName[100];
 uint8_t CurBlueToothPhoneName[100];
-uint8_t BlueToothName[40];
-uint8_t LastBlueToothName[20];
+uint8_t BlueToothName[60];
+uint8_t LastBlueToothName[30];
 uint8_t PhoneNumberTotal[20];
 uint8_t InformationOSVersion[20];
 uint8_t InformationMCUVersion[26];
@@ -291,7 +291,7 @@ void TextService(void)
             {
                 for (uint8_t i = 0; i < sizeof(BlueToothPhoneData.PhoneNumber); i++) 
                 {
-                    PhoneNumber[i * 2] = (uint8_t)(BlueToothPhoneData.PhoneNumber[i]);
+                    PhoneNumber[i * 2] = BlueToothPhoneData.PhoneNumber[i];
                     PhoneNumber[(i * 2) + 1] = 0X00;
                 }
                 memcpy(LastPhoneNumber, BlueToothPhoneData.PhoneNumber, (sizeof(BlueToothPhoneData.PhoneNumber) / sizeof(BlueToothPhoneData.PhoneNumber[0])));

Firmware/Source/Application/BlueTooth.h

@@ -48,7 +48,7 @@ extern _PICID_Struct PicObj;
 extern _QRCODE_RECT QRCode_Rect;
 extern uint8_t PhoneNumber[40];
 extern uint8_t CurBlueToothPhoneName[100];
-extern uint8_t BlueToothName[40];
+extern uint8_t BlueToothName[60];
 extern uint8_t PhoneNumberTotal[20];
 extern uint8_t InformationOSVersion[20];
 extern uint8_t InformationMCUVersion[26];

Firmware/Source/Application/CommonInterface.c

@@ -41,8 +41,7 @@ uint8_t Common_Get_IG_Sts(void)
 
 uint16_t Common_Get_Act_V_Speed(void)
 {
-    uint32_t Act_V_Speed_ODO = Act_V_Speed;
-    return Act_V_Speed_ODO * 1005 / 1000;//需要跑大计测试
+    return Act_V_Speed;//需要跑大计测试
 }
 uint16_t Common_Get_Disp_V_Speed(void)
 {
@@ -51,7 +50,7 @@ uint16_t Common_Get_Disp_V_Speed(void)
 
 uint16_t Common_Get_TireSize(void)
 {
-    return 1u;
+    return 10020ul;
 }
 
 void Common_Set_IG_Sts(COMMON_PowerStatus_t Val)

Firmware/Source/Application/Data_OilPressure.c

@@ -11,7 +11,7 @@ uint16_t g_u16OilData[OIL_DATA_NUM];
 uint8_t g_u8OilDataCount = 0u;
 
 // uint8_t g_u8OILStateInitFlag = 0u;
-uint16_t OilPressureR = 0u; /*滤波后的机油压力电阻，精度0.1*/
+uint32_t OilPressureR = 0u; /*滤波后的机油压力电阻，精度0.1*/
 uint8_t g_u8OilADCompleteFlg = 0u;
 
 void Oil_Pressure_KL30_Init(void)

Firmware/Source/Application/FaultCode.c

@@ -313,14 +313,14 @@ uint32_t Get_Current_FaultCode(void)
 uint8_t Get_Current_Hight_FaultCode(void)
 {
     uint8_t u8FaultHight = 0;
-    u8FaultHight = ((List_Display(&FaultCode_t))&(0xFF00))>>8;
+    u8FaultHight = (uint8_t)(((List_Display(&FaultCode_t))&(0x0000FF00))>>8);
     return u8FaultHight;
 }
 
 uint8_t Get_Current_Mid_FaultCode(void)
 {
     uint8_t u8FaultMid = 0;
-    u8FaultMid = ((List_Display(&FaultCode_t))&(0x00FF));
+    u8FaultMid = (uint8_t)(((List_Display(&FaultCode_t))&(0x000000FF)));
     return u8FaultMid;
 }
 

Firmware/Source/Application/FaultCode.h

@@ -20,7 +20,7 @@ typedef struct __attribute__((aligned(4)))
     uint32_t *code_list;                    //故障码列表
     uint8_t hade;                           //列表头
     uint8_t tail;                           //列表尾
-    uint8_t code_num;                       //获取的故障码数量
+    uint16_t code_num;                       //获取的故障码数量
     uint8_t len;                            //故障码列表最大长度
     uint8_t disp;                           //故障码显示下标
     uint16_t TimeCount;                     //故障码循环显示用的定时器

Firmware/Source/Component/AMT630H/AMT630H_Datas.c

@@ -33,7 +33,7 @@ void AMT630H_GUI_SETTING(void);
 void AMT630H_GUI_Quit(void);
 void AMT630H_GUI_Phone_Connect(void);
 void AMT630H_GUI_Fault_Information(void);
-void AMT630H_GUI_FaultCode(uint8_t FaultCodeLost);
+static void AMT630H_GUI_FaultCode(uint8_t FaultCodeLost);
 void AMT630H_GUI_Language_Information(void);
 void AMT630H_GUI_Unit_Information(void);
 void AMT630H_GUI_Display_Mode_Information(void);
@@ -626,7 +626,7 @@ void AMT630H_GUI_Bluetooth_Information( uint8_t Connect_ON)
         /*蓝牙名称改为字库显示*/
         /* RGB 0    0    0     ---  黑*/
         /* RGB 0XFF 0XFF 0XFF  ---  白*/
-        PackedTransfer_LabelsList( 0x5022,(uint8_t *)BlueToothName, 40);
+        PackedTransfer_LabelsList( 0x5022,(uint8_t *)BlueToothName, 60);
         SetPageText(GRAPHICS_PAGE_0, 0x5022, 570 , 165 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1));
     }
     else if(g_u8Display_Mode == ModeNIGHT)
@@ -671,7 +671,7 @@ void AMT630H_GUI_Bluetooth_Information( uint8_t Connect_ON)
         /*蓝牙名称改为字库显示*/
         /* RGB 0    0    0     ---  白*/
         /* RGB 0XFF 0XFF 0XFF  ---  黑*/
-        PackedTransfer_LabelsList( 0x5022,(uint8_t *)BlueToothName, 40);
+        PackedTransfer_LabelsList( 0x5022,(uint8_t *)BlueToothName, 60);
         SetPageText(GRAPHICS_PAGE_0, 0x5022, 570 , 165 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1));
     }
     if(BlueToothPhoneData.BlueToothSignalSate == BlueTooth_Connection)
@@ -2142,7 +2142,7 @@ void AMT630H_GUI_Bluetooth_Connect_Setting(Menu_Item_en_t select, uint8_t Connec
         /*蓝牙名称改为字库显示*/
         /* RGB 0    0    0     ---  黑*/
         /* RGB 0XFF 0XFF 0XFF  ---  白*/
-        PackedTransfer_LabelsList( 0x5022,(uint8_t *)BlueToothName, 40);
+        PackedTransfer_LabelsList( 0x5022,(uint8_t *)BlueToothName, 60);
         SetPageText(GRAPHICS_PAGE_0, 0x5022, 570 , 165 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1));
     }
     else if(g_u8Display_Mode == ModeNIGHT)
@@ -2215,7 +2215,7 @@ void AMT630H_GUI_Bluetooth_Connect_Setting(Menu_Item_en_t select, uint8_t Connec
         /*蓝牙名称改为字库显示*/
         /* RGB 0    0    0     ---  黑*/
         /* RGB 0XFF 0XFF 0XFF  ---  白*/
-        PackedTransfer_LabelsList( 0x5022,(uint8_t *)BlueToothName, 40);
+        PackedTransfer_LabelsList( 0x5022,(uint8_t *)BlueToothName, 60);
         SetPageText(GRAPHICS_PAGE_0, 0x5022, 570 , 165 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1));
     }
     

Firmware/Source/Component/AMT630H/UartProtocol.h

@@ -456,9 +456,9 @@ typedef struct
     uint8_t BlueToothSignalSate;
 	uint8_t BlueToothPhoneSate;//incall、outcall
 	uint8_t  BlueToothPhoneName[100];
-	char PhoneNumber[20];
+	uint8_t PhoneNumber[20];
     uint16_t PhoneBookTotalCount;
-	char  BlueToothName[30];
+	uint8_t  BlueToothName[30];
     
 }_BlueToothPhoneData;
 typedef struct 

Firmware/Source/Component/Mileage/Services_Mileage_User.c

@@ -54,7 +54,7 @@ void Data_User_Mileage_KL30Init(void)
     Func.Get_Sys_IG_Sts = Common_Get_IG_Sts;
     Func.Get_Act_V_Speed_Valid = Common_Get_Act_V_Speed_Valid;
     Func.Get_Act_V_Speed = Common_Get_Act_V_Speed;
-    Func.Get_TireSize = (void *)0;
+    Func.Get_TireSize = Common_Get_TireSize;
     Func.EEPromWrite_Cbk = Data_User_EEPROM_Write;
     Data_Mileage_KL30_Init(DataMilleageBuf, &MileInit, &Func);
 
@@ -113,7 +113,7 @@ void Data_User_Mileage_WakeupInit(void)
     Func.Get_Sys_IG_Sts = Common_Get_IG_Sts;
     Func.Get_Act_V_Speed_Valid = Common_Get_Act_V_Speed_Valid;
     Func.Get_Act_V_Speed = Common_Get_Act_V_Speed;
-    Func.Get_TireSize = (void *)0;
+    Func.Get_TireSize = Common_Get_TireSize;
     Func.EEPromWrite_Cbk = Data_User_EEPROM_Write; // ��ʱδ����
     Data_Mileage_Wakeup_Init(DataMilleageBuf, &Func);
 

Firmware/Source/Device/Cmsemicon/BAT32A279/RTE/UART/RTE_UART.c

@@ -290,7 +290,7 @@ uint8_t UART_Ch3_Get_TX_Busy_Flag(void)
 uint8_t mwAmt630hSerialSendBuffer[MAX_SERIAL_BUFF_SIZE] = {0};
 uint16_t mwAmt630hSerialDataIndex = 0;
 uint16_t mwAmt630hSerialSendCnts = 0;
-uint16_t mwAmt630hSerialSendFillCnts = 0;
+uint32_t mwAmt630hSerialSendFillCnts = 0;
 uint8_t mwAmt630hSerialSendValid = 0;
 void mwAmt630hUartSendData(uint8_t *data, uint32_t length)
 {
@@ -324,7 +324,7 @@ void mwAmt630hUartSendIsr(void)
 
 void mwAmt630hUartSendDatainit(void)
 {
-    memset(mwAmt630hSerialSendBuffer,00,sizeof(mwAmt630hSerialSendBuffer));
+    memset(mwAmt630hSerialSendBuffer,0,sizeof(mwAmt630hSerialSendBuffer));
     mwAmt630hSerialDataIndex = 0;
     mwAmt630hSerialSendCnts = 0;
     mwAmt630hSerialSendFillCnts = 0;