Commit 405a7717 authored by 王佳伟's avatar 王佳伟

feat:版本号0.7 1080p 增加显示sw

parent a6292f58
...@@ -759,5 +759,5 @@ void switch_951_Color(uint8_t in) ...@@ -759,5 +759,5 @@ void switch_951_Color(uint8_t in)
void init_951(void) void init_951(void)
{ {
switch_951_init(0); switch_951_init(1);
} }
...@@ -385,13 +385,15 @@ void Display_Init(void) ...@@ -385,13 +385,15 @@ void Display_Init(void)
TFT_LCD_Draw_Bmp(0, 0, (uint8_t *)&gImage_BG_test[0]); TFT_LCD_Draw_Bmp(0, 0, (uint8_t *)&gImage_BG_test[0]);
TFT_LCD_Draw_Bmp(0, 0, (uint8_t *)&gImage_BG_test_A[0]); TFT_LCD_Draw_Bmp(0, 0, (uint8_t *)&gImage_BG_test_A[0]);
TFT_LCD_Draw_Bmp(0, 144, (uint8_t *)&gImage_BG_HW_SW[0]); TFT_LCD_Draw_Bmp(0, 144, (uint8_t *)&gImage_BG_HW_SW[0]);
TFT_LCD_Draw_Bmp(95, 272, (uint8_t *)D[28]);
TFT_LCD_Draw_Bmp(116, 272, (uint8_t *)D[32]);
// TFT_LCD_Draw_Bmp( 1, 32, ( uint8_t * )gImage_point_right[tft_switch_switch]);//仪表选择显示 // TFT_LCD_Draw_Bmp( 1, 32, ( uint8_t * )gImage_point_right[tft_switch_switch]);//仪表选择显示
// TFT_LCD_Draw_Bmp( 0, 128, ( uint8_t * )gImage_point_up[display_color_switch]);//纯色界面选择 // TFT_LCD_Draw_Bmp( 0, 128, ( uint8_t * )gImage_point_up[display_color_switch]);//纯色界面选择
ver_Display(0x00, 0x00, 0x00, 0x00, 0x00, 0x00); // 版本号显示,前三个为 ver_Display(0x00, 0x00, 0x00, 0x00, 0x00, 0x00); // 版本号显示,前三个为
ver_Display_A(0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30); ver_Display_A(0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30);
TFT_LCD_Draw_Bmp(18, 272, (uint8_t *)D[0]); TFT_LCD_Draw_Bmp(18, 272, (uint8_t *)D[0]);
TFT_LCD_Draw_Bmp(36, 272, (uint8_t *)&gImage_D_GX9_Y9); TFT_LCD_Draw_Bmp(36, 272, (uint8_t *)&gImage_D_GX9_Y9);
TFT_LCD_Draw_Bmp(54, 272, (uint8_t *)D[6]); TFT_LCD_Draw_Bmp(54, 272, (uint8_t *)D[7]);
TFT_LCD_Draw_Bmp(0, 240, (uint8_t *)gImage_lcd_error[0]); TFT_LCD_Draw_Bmp(0, 240, (uint8_t *)gImage_lcd_error[0]);
TFT_LCD_Draw_Bmp(118, 240, (uint8_t *)gImage_touch_error[0]); TFT_LCD_Draw_Bmp(118, 240, (uint8_t *)gImage_touch_error[0]);
...@@ -545,13 +547,13 @@ void fx12_test_server(void) ...@@ -545,13 +547,13 @@ void fx12_test_server(void)
} }
// lock功能检测 // lock功能检测
if (gpio_get_96751_lock() == 0) //if (gpio_get_96751_lock() == 0)
{ //{
; // ;
// Clear_TOUCH_IRQHandler_flag(); // Clear_TOUCH_IRQHandler_flag();
//TimeStamp_Reset(&lock_time); //TimeStamp_Reset(&lock_time);
//if (lock_flag == 1) //if (lock_flag == 1)
{ // {
//ver_Display(0x00, 0x00, 0x00, 0x00, 0x00, 0x00); //ver_Display(0x00, 0x00, 0x00, 0x00, 0x00, 0x00);
//ver_Display_A(0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30); //ver_Display_A(0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30);
// TFT_LCD_Draw_Bmp(0, 240, (uint8_t *)gImage_lcd_error[0]); // TFT_LCD_Draw_Bmp(0, 240, (uint8_t *)gImage_lcd_error[0]);
...@@ -559,9 +561,9 @@ void fx12_test_server(void) ...@@ -559,9 +561,9 @@ void fx12_test_server(void)
// TFT_LCD_Draw_Bmp(0, 272, (uint8_t *)gImage_bl_error[0]); // TFT_LCD_Draw_Bmp(0, 272, (uint8_t *)gImage_bl_error[0]);
// TFT_LCD_Draw_Bmp(118, 272, (uint8_t *)gImage_power_error[0]); // TFT_LCD_Draw_Bmp(118, 272, (uint8_t *)gImage_power_error[0]);
} // }
//lock_flag = 0; //lock_flag = 0;
} //}
// else // else
// { // {
// if (lock_flag == 0) // if (lock_flag == 0)
...@@ -598,8 +600,11 @@ void fx12_test_server(void) ...@@ -598,8 +600,11 @@ void fx12_test_server(void)
if (TimeStamp_GetCntTime(&detection_time) >= 3000) if (TimeStamp_GetCntTime(&detection_time) >= 3000)
{ {
unsigned char recive_buf[1] = {1}; unsigned char recive_buf[1] = {1};
TimeStamp_Reset(&detection_time); TimeStamp_Reset(&detection_time);
AIM951_i2c_sendreceive(0x07, recive_buf);
AIM951_i2c_sendreceive(0x07,recive_buf);
if (recive_buf[0] != 0x19) if (recive_buf[0] != 0x19)
{ {
version_flag = 0; version_flag = 0;
...@@ -609,7 +614,7 @@ void fx12_test_server(void) ...@@ -609,7 +614,7 @@ void fx12_test_server(void)
TFT_LCD_Draw_Bmp(80, 176, (uint8_t *)D[0]); TFT_LCD_Draw_Bmp(80, 176, (uint8_t *)D[0]);
TFT_LCD_Draw_Bmp(116, 176, (uint8_t *)D[0]); TFT_LCD_Draw_Bmp(116, 176, (uint8_t *)D[0]);
TFT_LCD_Draw_Bmp(152, 176, (uint8_t *)D[0]); TFT_LCD_Draw_Bmp(152, 176, (uint8_t *)D[0]);
TFT_LCD_Draw_Bmp(152,272, (uint8_t *)D[0]);
ver_Display_A(0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30); ver_Display_A(0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30);
} }
else else
...@@ -629,6 +634,7 @@ void fx12_test_server(void) ...@@ -629,6 +634,7 @@ void fx12_test_server(void)
// } // }
// } // }
// 通讯处理 // 通讯处理
if (GET_TOUCH_IRQHandler_flag() == 0) if (GET_TOUCH_IRQHandler_flag() == 0)
{ {
// if (RIIC0_IsBusy() == 0) // if (RIIC0_IsBusy() == 0)
...@@ -641,6 +647,10 @@ void fx12_test_server(void) ...@@ -641,6 +647,10 @@ void fx12_test_server(void)
BSP_Delay_ms(1); BSP_Delay_ms(1);
RIIC0_Master_SendMultiByte_Interrupt(0x34U, send_buff, 7); RIIC0_Master_SendMultiByte_Interrupt(0x34U, send_buff, 7);
} }
else if(touch_buff[0] == 0x4AU)
{
TFT_LCD_Draw_Bmp(152,272, (uint8_t *)D[touch_buff[4]]);
}
else if (touch_buff[0] == 0x4BU) else if (touch_buff[0] == 0x4BU)
{ {
ver_Display(touch_buff[12], ver_Display(touch_buff[12],
......
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