Skip to content

H
haoJin750TFT
Commit c1641f79 authored by 王雅楠's avatar 王雅楠 🍎
Browse files
Options

Merge branch 'dev' of http://tyw-server.synology.me:12345/shihao/haojin750tft into wangyanan

parents 7c05aa3f 38d95a31
Hide whitespace changes
Inline Side-by-side
Showing with 78 additions and 74 deletions
Firmware/Source/Application/BlueTooth.c
View file @ c1641f79
...@@ -10,12 +10,9 @@ uint8_t SetUUIDTimes = 0; ...@@ -10,12 +10,9 @@ uint8_t SetUUIDTimes = 0;
_PICID_Struct PicObj; _PICID_Struct PicObj;
_QRCODE_RECT QRCode_Rect; _QRCODE_RECT QRCode_Rect;
const uint8_t HJBlueToothName[9]= {"HJ750"}; const uint8_t HJBlueToothName[9]= {"HJ750"};
uint8_t UUIDConfigBuf[22] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00}; uint8_t UUIDConfigBuf[22] = {"800082024071700000001"};
// 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00
// uint8_t sjhja[20] = {0};
// uint8_t PhoneName[100] = {0};
// uint8_t BlueConnectStatus;
// ee_uint16_t juasfha;
void TextService(void); void TextService(void);
...@@ -54,9 +51,18 @@ void BlueToothService() ...@@ -54,9 +51,18 @@ void BlueToothService()
Menu_Change_Branch_To_Item(MENU_BRANCH_ANIMATION,MENU_ITEM_MAIN_ITEM); Menu_Change_Branch_To_Item(MENU_BRANCH_ANIMATION,MENU_ITEM_MAIN_ITEM);
} }
SetUUIDData((char *)UUIDConfigBuf, 22); SetUUIDData((char *)UUIDConfigBuf, 22);
if (OTA_Update_Flag == 1)
QRCode_Rect.x = 650; {
QRCode_Rect.y = 210; QRCode_Rect.x = 650;
QRCode_Rect.y = 210;
}
else
{
QRCode_Rect.x = QRCode_X;
QRCode_Rect.y = QRCode_Y;
}
// QRCode_Rect.x = 650;
// QRCode_Rect.y = 210;
QRCode_Rect.height = 240; QRCode_Rect.height = 240;
QRCode_Rect.width = 240; QRCode_Rect.width = 240;
SetScreenType(QRCode_TYPE, QRCode_Rect); SetScreenType(QRCode_TYPE, QRCode_Rect);
...@@ -82,7 +88,7 @@ void BlueToothService() ...@@ -82,7 +88,7 @@ void BlueToothService()
} }
OTA_Update_Count_Open=0; OTA_Update_Count_Open=0;
} }
// SetTaskbarHeight(150); SetTaskbarHeight(150);
SetBlueToothName((uint8_t *)HJBlueToothName, sizeof(HJBlueToothName)); SetBlueToothName((uint8_t *)HJBlueToothName, sizeof(HJBlueToothName));
TextService(); TextService();
......
Firmware/Source/Application/BlueTooth.h
View file @ c1641f79
...@@ -27,8 +27,8 @@ typedef struct { ...@@ -27,8 +27,8 @@ typedef struct {
/*QRCode X Y height Width*/ /*QRCode X Y height Width*/
#define QRCode_X 457 #define QRCode_X 178
#define QRCode_Y 134 #define QRCode_Y 130
#define QRCode_HEIGHT 240 #define QRCode_HEIGHT 240
#define QRCode_WIDTH 240 #define QRCode_WIDTH 240
#define QRCode_TYPE Square_Instrument #define QRCode_TYPE Square_Instrument
......
Firmware/Source/Application/Data_ESpeed.c
View file @ c1641f79
...@@ -289,26 +289,26 @@ void Data_Engine_Speed_Processing_Service ( void ) ...@@ -289,26 +289,26 @@ void Data_Engine_Speed_Processing_Service ( void )
} }
} }
DataESpeedDisp = DataESPeedDamping.Speed; DataESpeedDisp = DataESPeedDamping.Speed;
// //第4步 增加回差 //第4步 增加回差
// if (DataESpeedDisp <= 80) if (DataESpeedDisp <= 80)
// { {
// DataESpeedDisp = DataESPeedDamping.Speed; DataESpeedDisp = DataESPeedDamping.Speed;
// } }
// else else
// { {
// if ( DataESpeedDisp < DataESPeedDamping.Speed ) if ( DataESpeedDisp < DataESPeedDamping.Speed )
// { {
// DataESpeedDisp = DataESPeedDamping.Speed; DataESpeedDisp = DataESPeedDamping.Speed;
// } }
// else else
// { {
// Delta = DataESpeedDisp - DataESPeedDamping.Speed; Delta = DataESpeedDisp - DataESPeedDamping.Speed;
// if ( Delta >= DATA_ESPEED_HYSTERESIS ) if ( Delta >= DATA_ESPEED_HYSTERESIS )
// { {
// DataESpeedDisp = DataESPeedDamping.Speed; DataESpeedDisp = DataESPeedDamping.Speed;
// } }
// } }
// } }
} }
uint8_t Get_EngineValid(void) uint8_t Get_EngineValid(void)
......
Firmware/Source/Application/Data_VSpeed.c
View file @ c1641f79
...@@ -321,12 +321,22 @@ void Data_Vehicle_Speed_Processing_Service(void) ...@@ -321,12 +321,22 @@ void Data_Vehicle_Speed_Processing_Service(void)
} }
// 第3步：生成显示车速 // 第3步：生成显示车速
DataVSpeedHysteresis = DataVSPeedDamping.Speed; if ((DataVSPeedDamping.Speed >= DataVSpeedHysteresis) || (DataVSPeedDamping.Speed < DATA_VSPEED_HYSTERESIS))
{
DataVSpeedHysteresis = DataVSPeedDamping.Speed;
}
else
{
if (DataVSpeedHysteresis - DataVSPeedDamping.Speed >= DATA_VSPEED_HYSTERESIS)
{
DataVSpeedHysteresis = DataVSPeedDamping.Speed;
}
}
VSpeedCal = ( uint32_t )DataVSpeedHysteresis; VSpeedCal = ( uint32_t )DataVSpeedHysteresis;
if ( DataVSpeedValid ) // if ( DataVSpeedValid )
{ // {
VSpeedCal *= 105; VSpeedCal *= 105;
VSpeedCal /= 100; VSpeedCal /= 100;
// if((VSpeedCal % 10) >= 5) // if((VSpeedCal % 10) >= 5)
...@@ -334,11 +344,11 @@ void Data_Vehicle_Speed_Processing_Service(void) ...@@ -334,11 +344,11 @@ void Data_Vehicle_Speed_Processing_Service(void)
// VSpeedCal += 5; /* 四舍五入 */ // VSpeedCal += 5; /* 四舍五入 */
// } // }
DataVSpeedDisp = ( uint16_t )VSpeedCal; DataVSpeedDisp = ( uint16_t )VSpeedCal;
} // }
else // else
{ // {
DataVSpeedDisp = 0; // DataVSpeedDisp = 0;
} // }
} }
/*车速有效位：有效=1，无效=0*/ /*车速有效位：有效=1，无效=0*/
......
Firmware/Source/Component/AMT630H/AMT630H_Datas.c
View file @ c1641f79
...@@ -4232,33 +4232,19 @@ void AMT630H_GUI_BACKGRAND() ...@@ -4232,33 +4232,19 @@ void AMT630H_GUI_BACKGRAND()
{ {
AMT630H_GUI_Trip(Get_Trip_Value(), Get_Dis_Unit()); AMT630H_GUI_Trip(Get_Trip_Value(), Get_Dis_Unit());
} }
if(0) if(VechileSpeed_time < 4)
{ {
VechileSpeed_time++; VechileSpeed_time++;
} }
else else
{ {
VechileSpeed_time = 0; VechileSpeed_time = 0;
VechileSpeed = Get_DispVechileSpeed() / 10; VechileSpeed = Get_DispVechileSpeed() / 10;
} }
if (Get_VechileSpeedValid() == 1) AMT630H_GUI_VSpeed(VechileSpeed);
{
AMT630H_GUI_VSpeed(VechileSpeed);
}
else
{
AMT630H_GUI_VSpeed(0);
}
/*转速*/ /*转速*/
if (Get_EngineValid() == 1) AMT630H_GUI_ESpeed(Get_DispEngineSpeed());
{
AMT630H_GUI_ESpeed(Get_DispEngineSpeed());
}
else
{
AMT630H_GUI_ESpeed(0);
}
} }
...@@ -4484,7 +4470,6 @@ void AMT630H_GUI_DisplayProc(void) ...@@ -4484,7 +4470,6 @@ void AMT630H_GUI_DisplayProc(void)
PackedTransfer_Page(); PackedTransfer_Page();
} }
void AMT630H_GUI_ReadPosittion_Display(void) void AMT630H_GUI_ReadPosittion_Display(void)
{ {
switch (g_u8Cursor_Posittion) switch (g_u8Cursor_Posittion)
...@@ -4654,20 +4639,23 @@ void AMT630H_GUI_ReadPosittion_Display(void) ...@@ -4654,20 +4639,23 @@ void AMT630H_GUI_ReadPosittion_Display(void)
AMT630H_GUI_Phone_Connect_Win(); AMT630H_GUI_Phone_Connect_Win();
break; break;
case MENU_ITEM_PHONE_CONNECT_APP: case MENU_ITEM_PHONE_CONNECT_APP:
// PicObj.qr_logo_id = Pic_0234;//小数字9 PicObj.qr_logo_id = 0;//Pic_0234 小数字9 EA
// PicObj.main_pic_id = Pic_0382; //大白背景图 PicObj.main_pic_id = Pic_0382; //大白背景图 17E
// PicObj.qr_pic_id = Pic_0479;//小数字0 PicObj.qr_pic_id = Pic_0479;//小数字0 1DF
// PicObj.update_pic_id = Pic_0233;//小数字8 PicObj.update_pic_id = Pic_0233;//小数字8 E9
// PicObj.second_menu = 0; PicObj.second_menu = 0;
// PicObj.navigation_task_id = Pic_0411;//红色小e PicObj.navigation_task_id = Pic_0411;//红色小e 19B
// PackedTransfer_DisplayPhoneMirrorQRcode(1, PicObj); if (GetPhoneMirrorst() == 0)
// SetPagePic(GRAPHICS_PAGE_0, Pic_0001_0_0); { SetPagePic(GRAPHICS_PAGE_0, Pic_0001_0_0);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0476_0_0); SetPagePic(GRAPHICS_PAGE_0, Pic_0476_0_0);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0477_178_130); PackedTransfer_DisplayPhoneMirrorQRcode(1, PicObj);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0234_605_289); }
// SetPagePic(GRAPHICS_PAGE_0, Pic_0479_242_313); else
// SetPagePic(GRAPHICS_PAGE_0, Pic_0411_56_533); {
SetPagePic(GRAPHICS_PAGE_0, Pic_0382_0_0);/*背景图*/ PackedTransfer_DisplayPhoneMirrorQRcode(0, PicObj);
}
SetPagePic(GRAPHICS_PAGE_0, Pic_0479_242_313);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0382_0_0);/*背景图*/
AMT630H_GUI_PhoneConnect_Light(); AMT630H_GUI_PhoneConnect_Light();
AMT630H_GUI_PhoneConnect_TIME(Get_Dis_Hour_Time(), Get_Dis_Minute_Time()); AMT630H_GUI_PhoneConnect_TIME(Get_Dis_Hour_Time(), Get_Dis_Minute_Time());
AMT630H_GUI_PhoneConnect_VSpeed(VechileSpeed); AMT630H_GUI_PhoneConnect_VSpeed(VechileSpeed);
......
Firmware/Source/Component/Key/Key_user.c
View file @ c1641f79
...@@ -147,7 +147,7 @@ void Key_KL30_Init_EXample(void) ...@@ -147,7 +147,7 @@ void Key_KL30_Init_EXample(void)
Key_Parameter_Set_Short_Press_1_Time(50U,2000U); Key_Parameter_Set_Short_Press_1_Time(50U,2000U);
Key_Parameter_Set_Short_Press_2_Time(3000U,6000U); Key_Parameter_Set_Short_Press_2_Time(3000U,6000U);
Key_Parameter_Set_Long_Press_1_Time(7000U); Key_Parameter_Set_Long_Press_1_Time(2000U);
Key_Parameter_Set_Long_Press_2_Time(8000U); Key_Parameter_Set_Long_Press_2_Time(8000U);
Key_Parameter_Set_Long_Press_3_Time(9000U); Key_Parameter_Set_Long_Press_3_Time(9000U);
Key_Parameter_Set_Long_Press_4_Time(10000U); Key_Parameter_Set_Long_Press_4_Time(10000U);
...@@ -163,7 +163,7 @@ void Key_Wakeup_Init_EXample(void) ...@@ -163,7 +163,7 @@ void Key_Wakeup_Init_EXample(void)
Key_Parameter_Set_Short_Press_1_Time(50U,2000U); Key_Parameter_Set_Short_Press_1_Time(50U,2000U);
Key_Parameter_Set_Short_Press_2_Time(3000U,6000U); Key_Parameter_Set_Short_Press_2_Time(3000U,6000U);
Key_Parameter_Set_Long_Press_1_Time(7000U); Key_Parameter_Set_Long_Press_1_Time(2000U);
Key_Parameter_Set_Long_Press_2_Time(8000U); Key_Parameter_Set_Long_Press_2_Time(8000U);
Key_Parameter_Set_Long_Press_3_Time(9000U); Key_Parameter_Set_Long_Press_3_Time(9000U);
Key_Parameter_Set_Long_Press_4_Time(10000U); Key_Parameter_Set_Long_Press_4_Time(10000U);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment