Commit 25be72ae authored by 李梓源's avatar 李梓源

feat:贴图

parent 0f182e6f
...@@ -71,7 +71,7 @@ void Function_Check_Ctrl(uint32_t cmd); ...@@ -71,7 +71,7 @@ void Function_Check_Ctrl(uint32_t cmd);
void MENU_CHECK_STEP_ADD(void) void MENU_CHECK_STEP_ADD(void)
{ {
MENU_CHECK_STEP++; MENU_CHECK_STEP++;
if(MENU_CHECK_STEP > 13) if(MENU_CHECK_STEP > 10)
{ {
MENU_CHECK_STEP = 0; MENU_CHECK_STEP = 0;
} }
...@@ -262,12 +262,12 @@ uint8_t yibiaoshuju[34]; ...@@ -262,12 +262,12 @@ uint8_t yibiaoshuju[34];
// comparestart = 1; // comparestart = 1;
break; break;
case 2: case 2:
POWER_CTRL_KL30 = 0u; //B+ // POWER_CTRL_KL30 = 0u; //B+
POWER_CTRL_KL15 = 0u; //KL15 // POWER_CTRL_KL15 = 0u; //KL15
CAN_Msg_Tx_Enable = 1u; CAN_Msg_Tx_Enable = 1u;
if(MENU_CHECK_STEP == 0) if(MENU_CHECK_STEP == 0)
{ {
Display_Version_Info(1); // Display_Version_Info(1);
} }
else else
{ {
...@@ -559,7 +559,7 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -559,7 +559,7 @@ void Function_Check_Ctrl(uint32_t cmd)
{ {
// MENU_CHECK_STEP = 0; // MENU_CHECK_STEP = 0;
} }
Display_Send_Vspead(MENU_CHECK_STEP);
if ( MENU_BACK != MENU_CHECK_STEP ) if ( MENU_BACK != MENU_CHECK_STEP )
{ {
MENU_BACK = MENU_CHECK_STEP; MENU_BACK = MENU_CHECK_STEP;
...@@ -575,8 +575,8 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -575,8 +575,8 @@ void Function_Check_Ctrl(uint32_t cmd)
} }
else else
{ {
p [ 0 ] = ((MENU_CHECK_STEP ) % 100) / 10; p [ 0 ] = ((MENU_CHECK_STEP + 1) % 100) / 10;
p [ 1 ] = (MENU_CHECK_STEP ) % 10; // 65535 p [ 1 ] = (MENU_CHECK_STEP + 1) % 10; // 65535
p [ 2 ] = 0xff; p [ 2 ] = 0xff;
} }
General_Number_Disp(p, 190, 10);//刷图:报文检测步数 General_Number_Disp(p, 190, 10);//刷图:报文检测步数
...@@ -696,32 +696,48 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -696,32 +696,48 @@ void Function_Check_Ctrl(uint32_t cmd)
} }
case 9: case 9:
{ {
RELAY_VBAT_MCU = 1;
RELAY_DC12V_MCU = 1;
RELAY_KEY_MCU = 1;
ABC_OUT = 0; ABC_OUT = 0;
if(ACCONOFF_delay_3s >= 115)
{
ONE_START = 0;
}
else if (ACCONOFF_delay_3s >=110 && ACCONOFF_delay_3s < 115)
{
ONE_START = 1;
}
else if (ACCONOFF_delay_3s >= 105 && ACCONOFF_delay_3s < 110)
{
ONE_START = 0;
}
else if (ACCONOFF_delay_3s >= 100 && ACCONOFF_delay_3s < 105)
{
ONE_START = 1;
}
else if (ACCONOFF_delay_3s >= 95 && ACCONOFF_delay_3s < 100)
{
ONE_START = 0;
}
else if (ACCONOFF_delay_3s >= 90 && ACCONOFF_delay_3s < 95)
{
ONE_START = 1;
}
else
{
ONE_START = 0;
}
break; break;
} }
case 10: case 10:
{ {
RELAY_VBAT_MCU = 1;
break; RELAY_DC12V_MCU = 1;
} RELAY_KEY_MCU = 0;
case 11:
{
break;
}
case 12:
{
break;
}
case 13:
{
if(Auto_ONOFF == 0)
{
LINE_OUT_NEG_01 = 0;
}
break; break;
} }
default: default:
break; break;
......
...@@ -1511,7 +1511,186 @@ const unsigned char gImage_gImage_zhichisaoma1X6_Y16[]={/*Byte Size458*/ ...@@ -1511,7 +1511,186 @@ const unsigned char gImage_gImage_zhichisaoma1X6_Y16[]={/*Byte Size458*/
0X1cU,0X08U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X3fU,0X3fU,0X00U,0X00U, 0X1cU,0X08U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X3fU,0X3fU,0X00U,0X00U,
0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,}; 0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,};
const unsigned char gImage_Alarm_06_Word0X51_Y261[]={/*Byte Size422*/
140U,24U,
0X80U,0X80U,0X86U,0X9eU,0XbcU,0Xf8U,0Xb0U,0X80U,0X80U,0XffU,0XffU,0X80U,0Xa0U,0Xf0U,0XfcU,0X9eU,
0X8eU,0X84U,0X80U,0X00U,0X30U,0X30U,0X30U,0XffU,0XffU,0X30U,0X30U,0X7cU,0XfcU,0XccU,0XecU,0XefU,
0X2fU,0X2fU,0X6cU,0XecU,0XccU,0XbcU,0X3cU,0X00U,0X00U,0Xc0U,0Xc0U,0Xc0U,0Xc0U,0Xc0U,0Xc0U,0Xc0U,
0Xf8U,0XffU,0XffU,0Xc0U,0Xc0U,0Xc0U,0Xc0U,0Xc0U,0Xc0U,0Xc0U,0Xc0U,0X00U,0X00U,0Xf0U,0Xf0U,0X00U,
0XffU,0XffU,0Xe0U,0Xf0U,0X7cU,0X0cU,0X0cU,0X0cU,0X0cU,0X0cU,0XfcU,0XfcU,0X0cU,0X0cU,0X0cU,0X0cU,
0X00U,0X06U,0Xf6U,0Xf6U,0X06U,0X06U,0X06U,0X06U,0X06U,0X06U,0X06U,0X06U,0X06U,0X06U,0XfeU,0XfeU,
0X00U,0X00U,0X00U,0X00U,0X00U,0X30U,0X30U,0X30U,0XffU,0XffU,0X30U,0X30U,0X3cU,0X0cU,0X0cU,0X0cU,
0X0cU,0X0cU,0XfcU,0XfcU,0X0cU,0X0cU,0X0cU,0X0cU,0X00U,0X06U,0X06U,0X06U,0X06U,0XfeU,0XfeU,0X06U,
0X06U,0X06U,0X06U,0X06U,0XfeU,0XfeU,0X06U,0X06U,0X06U,0X06U,0X00U,0X00U,0X01U,0X01U,0X01U,0X81U,
0Xc1U,0Xf9U,0XffU,0X3fU,0X01U,0X01U,0X01U,0XffU,0XffU,0X01U,0X01U,0X01U,0X81U,0Xc1U,0X81U,0X00U,
0X1cU,0X1cU,0X1cU,0XffU,0XffU,0X06U,0X06U,0X0fU,0X0fU,0X0dU,0X0dU,0X0cU,0XfcU,0XfcU,0X0cU,0X0cU,
0X0dU,0X0fU,0X01U,0X00U,0X00U,0X00U,0X00U,0X80U,0Xc0U,0Xe0U,0Xf0U,0X7eU,0X3fU,0X0fU,0X0fU,0X3fU,
0X7cU,0Xf0U,0Xe0U,0Xc0U,0X80U,0X00U,0X00U,0X00U,0X02U,0X03U,0Xc3U,0XfeU,0XffU,0X7fU,0Xf1U,0Xe1U,
0Xc0U,0X00U,0X00U,0X00U,0X00U,0X00U,0XffU,0XffU,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0XffU,0XffU,
0X83U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X07U,0X07U,0Xf0U,0Xf0U,0Xe0U,0X00U,
0X04U,0X1cU,0X1cU,0X0eU,0XffU,0XffU,0X06U,0X07U,0X07U,0X00U,0X00U,0X00U,0X00U,0X00U,0XffU,0XffU,
0X00U,0X00U,0X00U,0X00U,0X03U,0X03U,0X83U,0Xc3U,0XfbU,0XffU,0X3fU,0X03U,0X03U,0X03U,0X03U,0X03U,
0XffU,0XffU,0X03U,0X03U,0X03U,0X03U,0X03U,0X00U,0X03U,0X07U,0X07U,0X03U,0X03U,0X01U,0X00U,0X00U,
0X00U,0X00U,0X00U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X00U,0X02U,0X06U,0X06U,0X07U,
0X03U,0X00U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,
0X02U,0X07U,0X07U,0X03U,0X03U,0X01U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X01U,0X03U,
0X07U,0X07U,0X07U,0X00U,0X02U,0X07U,0X07U,0X03U,0X00U,0X00U,0X00U,0X01U,0X00U,0X00U,0X06U,0X06U,
0X06U,0X06U,0X07U,0X07U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X01U,0X03U,0X03U,0X03U,0X03U,0X03U,
0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X00U,0X00U,0X00U,0X02U,0X06U,0X06U,
0X07U,0X07U,0X00U,0X00U,0X00U,0X00U,0X07U,0X07U,0X07U,0X07U,0X07U,0X03U,0X00U,0X00U,0X00U,0X00U,
0X02U,0X07U,0X07U,0X03U,0X01U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X07U,0X07U,0X00U,0X00U,
0X00U,0X00U,0X00U,0X00U,};
const unsigned char gImage_Alarm_07_Word0X51_Y261[]={/*Byte Size422*/
140U,24U,
0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X30U,0X30U,0X30U,0XffU,0XffU,0X30U,
0Xb0U,0Xf0U,0Xf0U,0XfeU,0X3eU,0X06U,0X06U,0X06U,0XfeU,0XfeU,0Xc0U,0Xc0U,0Xc0U,0X00U,0X80U,0XffU,
0XffU,0XfbU,0XfbU,0XfbU,0XfbU,0XfbU,0XfbU,0XffU,0XffU,0Xb0U,0X30U,0X38U,0X1cU,0X9eU,0XcfU,0Xc7U,
0Xc0U,0X00U,0X00U,0Xf0U,0Xf0U,0X00U,0XffU,0XffU,0Xe0U,0Xf0U,0X7cU,0X0cU,0X0cU,0X0cU,0X0cU,0X0cU,
0XfcU,0XfcU,0X0cU,0X0cU,0X0cU,0X0cU,0X00U,0X06U,0Xf6U,0Xf6U,0X06U,0X06U,0X06U,0X06U,0X06U,0X06U,
0X06U,0X06U,0X06U,0X06U,0XfeU,0XfeU,0X00U,0X00U,0X00U,0X00U,0X00U,0X30U,0X30U,0X30U,0XffU,0XffU,
0X30U,0X30U,0X3cU,0X0cU,0X0cU,0X0cU,0X0cU,0X0cU,0XfcU,0XfcU,0X0cU,0X0cU,0X0cU,0X0cU,0X00U,0X06U,
0X06U,0X06U,0X06U,0XfeU,0XfeU,0X06U,0X06U,0X06U,0X06U,0X06U,0XfeU,0XfeU,0X06U,0X06U,0X06U,0X06U,
0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,
0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X1cU,0X1cU,0X0cU,0XffU,0XffU,0X0eU,0X06U,0X07U,0X1fU,0XbeU,
0Xf6U,0Xe6U,0Xe6U,0Xf6U,0XfeU,0X3eU,0X1eU,0X06U,0X00U,0X00U,0X01U,0Xc1U,0XffU,0XffU,0X37U,0Xf7U,
0Xf7U,0X77U,0XffU,0XffU,0X3fU,0X05U,0X0eU,0X8eU,0Xc7U,0Xe3U,0Xf3U,0X79U,0X10U,0X00U,0X02U,0X03U,
0Xc3U,0XfeU,0XffU,0X7fU,0Xf1U,0Xe1U,0Xc0U,0X00U,0X00U,0X00U,0X00U,0X00U,0XffU,0XffU,0X00U,0X00U,
0X00U,0X00U,0X00U,0X00U,0XffU,0XffU,0X83U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,
0X07U,0X07U,0Xf0U,0Xf0U,0Xe0U,0X00U,0X04U,0X1cU,0X1cU,0X0eU,0XffU,0XffU,0X06U,0X07U,0X07U,0X00U,
0X00U,0X00U,0X00U,0X00U,0XffU,0XffU,0X00U,0X00U,0X00U,0X00U,0X03U,0X03U,0X83U,0Xc3U,0XfbU,0XffU,
0X3fU,0X03U,0X03U,0X03U,0X03U,0X03U,0XffU,0XffU,0X03U,0X03U,0X03U,0X03U,0X03U,0X00U,0X00U,0X00U,
0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,
0X00U,0X00U,0X02U,0X06U,0X06U,0X07U,0X07U,0X02U,0X07U,0X07U,0X07U,0X03U,0X03U,0X01U,0X01U,0X03U,
0X03U,0X07U,0X07U,0X07U,0X06U,0X00U,0X03U,0X03U,0X01U,0X06U,0X06U,0X07U,0X07U,0X00U,0X01U,0X03U,
0X03U,0X07U,0X07U,0X03U,0X01U,0X01U,0X00U,0X00U,0X00U,0X00U,0X02U,0X07U,0X07U,0X03U,0X00U,0X00U,
0X00U,0X01U,0X00U,0X00U,0X06U,0X06U,0X06U,0X06U,0X07U,0X07U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,
0X01U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,
0X00U,0X00U,0X00U,0X02U,0X06U,0X06U,0X07U,0X07U,0X00U,0X00U,0X00U,0X00U,0X07U,0X07U,0X07U,0X07U,
0X07U,0X03U,0X00U,0X00U,0X00U,0X00U,0X02U,0X07U,0X07U,0X03U,0X01U,0X00U,0X00U,0X00U,0X00U,0X00U,
0X00U,0X00U,0X07U,0X07U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,
0X00U,0X00U,0X00U,0X00U,};
const unsigned char gImage_Alarm_08_Word0X51_Y261[]={/*Byte Size422*/
140U,24U,
0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X80U,0Xc0U,0Xf0U,0XfeU,0XfeU,
0Xe6U,0Xc0U,0X80U,0XffU,0XffU,0X80U,0Xe0U,0Xf8U,0X7eU,0XfeU,0Xc2U,0X80U,0X00U,0X00U,0X30U,0Xb0U,
0XffU,0XffU,0XffU,0Xb0U,0Xf6U,0Xe7U,0XffU,0XffU,0XffU,0XffU,0XffU,0XffU,0XffU,0XefU,0Xe7U,0Xc0U,
0X00U,0X20U,0X78U,0XfcU,0XdfU,0XcfU,0XccU,0XccU,0XccU,0X0eU,0XefU,0XfeU,0X7cU,0X78U,0X7fU,0X7fU,
0X78U,0XfeU,0XeeU,0Xe6U,0X00U,0X00U,0X00U,0X06U,0Xf6U,0Xf6U,0X06U,0X06U,0X06U,0X06U,0X06U,0X06U,
0X06U,0X06U,0X06U,0X06U,0XfeU,0XfeU,0X00U,0X00U,0X00U,0X00U,0X00U,0X30U,0X30U,0X30U,0XffU,0XffU,
0X30U,0X30U,0X3cU,0X0cU,0X0cU,0X0cU,0X0cU,0X0cU,0XfcU,0XfcU,0X0cU,0X0cU,0X0cU,0X0cU,0X00U,0X06U,
0X06U,0X06U,0X06U,0XfeU,0XfeU,0X06U,0X06U,0X06U,0X06U,0X06U,0XfeU,0XfeU,0X06U,0X06U,0X06U,0X06U,
0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,
0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X03U,0X07U,0X1bU,0X19U,0X18U,0X18U,0X19U,0X1bU,0X19U,0XffU,
0XffU,0X1bU,0X1bU,0X19U,0X18U,0X18U,0X19U,0X1bU,0X03U,0X10U,0X7cU,0X1fU,0XffU,0XffU,0XffU,0X07U,
0XffU,0XffU,0XffU,0X76U,0X76U,0XffU,0XffU,0X76U,0X76U,0XffU,0XffU,0XffU,0X00U,0X00U,0X0cU,0X0cU,
0X0cU,0XffU,0XffU,0X8cU,0XccU,0XccU,0X7fU,0XffU,0Xc0U,0XffU,0XffU,0XffU,0X80U,0XffU,0X7fU,0X7fU,
0X00U,0X00U,0X00U,0X00U,0XffU,0XffU,0X83U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,
0X07U,0X07U,0Xf0U,0Xf0U,0Xe0U,0X00U,0X04U,0X1cU,0X1cU,0X0eU,0XffU,0XffU,0X06U,0X07U,0X07U,0X00U,
0X00U,0X00U,0X00U,0X00U,0XffU,0XffU,0X00U,0X00U,0X00U,0X00U,0X03U,0X03U,0X83U,0Xc3U,0XfbU,0XffU,
0X3fU,0X03U,0X03U,0X03U,0X03U,0X03U,0XffU,0XffU,0X03U,0X03U,0X03U,0X03U,0X03U,0X00U,0X00U,0X00U,
0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,
0X00U,0X00U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,
0X03U,0X03U,0X03U,0X03U,0X03U,0X00U,0X00U,0X00U,0X07U,0X07U,0X07U,0X00U,0X07U,0X07U,0X07U,0X00U,
0X00U,0X07U,0X07U,0X02U,0X06U,0X07U,0X07U,0X03U,0X00U,0X00U,0X00U,0X02U,0X07U,0X07U,0X03U,0X01U,
0X03U,0X07U,0X07U,0X03U,0X03U,0X01U,0X01U,0X01U,0X03U,0X03U,0X07U,0X07U,0X02U,0X00U,0X00U,0X00U,
0X01U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,
0X00U,0X00U,0X00U,0X02U,0X06U,0X06U,0X07U,0X07U,0X00U,0X00U,0X00U,0X00U,0X07U,0X07U,0X07U,0X07U,
0X07U,0X03U,0X00U,0X00U,0X00U,0X00U,0X02U,0X07U,0X07U,0X03U,0X01U,0X00U,0X00U,0X00U,0X00U,0X00U,
0X00U,0X00U,0X07U,0X07U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,
0X00U,0X00U,0X00U,0X00U,};
const unsigned char gImage_Alarm_09_Word0X51_Y261[]={/*Byte Size422*/
140U,24U,
0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X78U,0X7eU,0XffU,0XffU,0XffU,0XffU,
0XffU,0XffU,0XffU,0XffU,0XffU,0XffU,0XffU,0XffU,0XffU,0XffU,0X7eU,0X78U,0X00U,0X00U,0X00U,0XccU,
0XccU,0XccU,0XccU,0XccU,0XccU,0XccU,0XccU,0XccU,0Xe0U,0X60U,0Xe0U,0XffU,0X7fU,0X60U,0X60U,0Xe0U,
0Xe0U,0X00U,0X30U,0X30U,0X30U,0XffU,0XffU,0X30U,0X30U,0X30U,0XfeU,0XfeU,0X86U,0Xa6U,0Xf6U,0Xe6U,
0Xe6U,0XfeU,0XfeU,0XbeU,0X80U,0X20U,0X76U,0XfeU,0XffU,0XffU,0XfeU,0XffU,0XffU,0XffU,0XfeU,0XfeU,
0XbcU,0XdfU,0XffU,0Xf7U,0Xf6U,0XfeU,0XdeU,0X86U,0X86U,0X00U,0X00U,0X06U,0X06U,0Xc6U,0Xc6U,0X06U,
0X06U,0X06U,0X06U,0XfeU,0XfeU,0X06U,0X06U,0X06U,0X06U,0X06U,0X06U,0X06U,0X00U,0X00U,0X00U,0Xf8U,
0Xf8U,0X1fU,0XffU,0XfeU,0XfcU,0Xf8U,0Xf8U,0XffU,0XffU,0Xf8U,0XfcU,0XfeU,0XffU,0X1fU,0XfbU,0Xf8U,
0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,
0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0XfeU,0XffU,0X7fU,0X7fU,0XffU,0XffU,0X7fU,0X7fU,0X7fU,
0XffU,0XffU,0XffU,0XffU,0XffU,0XffU,0X77U,0X76U,0X00U,0X00U,0X00U,0Xc0U,0Xf8U,0XffU,0XffU,0Xe3U,
0Xe0U,0X7eU,0XfeU,0Xf8U,0Xc0U,0XfcU,0XffU,0X1fU,0X00U,0X00U,0XffU,0XffU,0XffU,0X00U,0X1cU,0X1cU,
0X0eU,0XffU,0XffU,0X06U,0X07U,0X07U,0XffU,0XffU,0X07U,0X1fU,0XbfU,0Xf9U,0Xf1U,0XfdU,0XbfU,0X0fU,
0X01U,0X00U,0X00U,0X07U,0X07U,0XfeU,0XfeU,0XffU,0XffU,0XffU,0XffU,0XffU,0XffU,0XffU,0XffU,0XfeU,
0XfeU,0XffU,0X07U,0X07U,0X07U,0X00U,0X00U,0X00U,0X00U,0XffU,0XffU,0X00U,0X00U,0X00U,0X00U,0XffU,
0XffU,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X00U,0X00U,0X00U,0X00U,0Xf8U,0Xf8U,0X3fU,0X3fU,
0X3eU,0X3eU,0X3eU,0XfeU,0XfeU,0X3eU,0X3eU,0X3fU,0X3fU,0Xf8U,0Xf8U,0X00U,0X00U,0X00U,0X00U,0X00U,
0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,
0X00U,0X00U,0X07U,0X07U,0X03U,0X00U,0X07U,0X07U,0X07U,0X07U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,
0X03U,0X07U,0X07U,0X07U,0X02U,0X00U,0X00U,0X01U,0X01U,0X00U,0X00U,0X00U,0X00U,0X00U,0X02U,0X07U,
0X07U,0X03U,0X07U,0X06U,0X06U,0X07U,0X07U,0X07U,0X00U,0X00U,0X06U,0X06U,0X06U,0X07U,0X07U,0X00U,
0X00U,0X00U,0X07U,0X07U,0X07U,0X07U,0X03U,0X01U,0X01U,0X03U,0X03U,0X07U,0X07U,0X00U,0X00U,0X00U,
0X00U,0X07U,0X07U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X07U,0X07U,0X00U,0X00U,
0X00U,0X00U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,
0X03U,0X03U,0X03U,0X03U,0X03U,0X00U,0X00U,0X00U,0X03U,0X03U,0X00U,0X00U,0X00U,0X00U,0X00U,0X07U,
0X07U,0X00U,0X03U,0X03U,0X03U,0X03U,0X03U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,
0X00U,0X00U,0X00U,0X00U,};
const unsigned char gImage_Alarm_10_Word0X51_Y261[]={/*Byte Size422*/
140U,24U,
0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X0cU,0XccU,0XfcU,0XffU,0XffU,0XecU,
0X0cU,0XccU,0Xc0U,0Xe0U,0Xf8U,0XbeU,0X1fU,0X0fU,0X3fU,0X78U,0Xf0U,0Xe0U,0Xc0U,0X00U,0X00U,0XccU,
0XccU,0XccU,0XccU,0XccU,0XccU,0XccU,0XccU,0XccU,0Xe0U,0X60U,0Xe0U,0XffU,0X7fU,0X60U,0X60U,0Xe0U,
0Xe0U,0X00U,0X30U,0X30U,0X30U,0XffU,0XffU,0X30U,0X30U,0X30U,0XfeU,0XfeU,0X86U,0Xa6U,0Xf6U,0Xe6U,
0Xe6U,0XfeU,0XfeU,0XbeU,0X80U,0X20U,0X76U,0XfeU,0XffU,0XffU,0XfeU,0XffU,0XffU,0XffU,0XfeU,0XfeU,
0XbcU,0XdfU,0XffU,0Xf7U,0Xf6U,0XfeU,0XdeU,0X86U,0X86U,0X00U,0X00U,0X06U,0X06U,0Xc6U,0Xc6U,0X06U,
0X06U,0X06U,0X06U,0XfeU,0XfeU,0X06U,0X06U,0X06U,0X06U,0X06U,0X06U,0X06U,0X00U,0X00U,0X00U,0Xf8U,
0Xf8U,0X1fU,0XffU,0XfeU,0XfcU,0Xf8U,0Xf8U,0XffU,0XffU,0Xf8U,0XfcU,0XfeU,0XffU,0X1fU,0XfbU,0Xf8U,
0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,
0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X63U,0X67U,0X63U,0X73U,0XffU,0XffU,0X33U,0X33U,0X31U,0X00U,
0XffU,0XffU,0X1cU,0X0eU,0X0eU,0X07U,0Xe7U,0Xc1U,0X00U,0X00U,0X00U,0Xc0U,0Xf8U,0XffU,0XffU,0Xe3U,
0Xe0U,0X7eU,0XfeU,0Xf8U,0Xc0U,0XfcU,0XffU,0X1fU,0X00U,0X00U,0XffU,0XffU,0XffU,0X00U,0X1cU,0X1cU,
0X0eU,0XffU,0XffU,0X06U,0X07U,0X07U,0XffU,0XffU,0X07U,0X1fU,0XbfU,0Xf9U,0Xf1U,0XfdU,0XbfU,0X0fU,
0X01U,0X00U,0X00U,0X07U,0X07U,0XfeU,0XfeU,0XffU,0XffU,0XffU,0XffU,0XffU,0XffU,0XffU,0XffU,0XfeU,
0XfeU,0XffU,0X07U,0X07U,0X07U,0X00U,0X00U,0X00U,0X00U,0XffU,0XffU,0X00U,0X00U,0X00U,0X00U,0XffU,
0XffU,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X00U,0X00U,0X00U,0X00U,0Xf8U,0Xf8U,0X3fU,0X3fU,
0X3eU,0X3eU,0X3eU,0XfeU,0XfeU,0X3eU,0X3eU,0X3fU,0X3fU,0Xf8U,0Xf8U,0X00U,0X00U,0X00U,0X00U,0X00U,
0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,
0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X07U,0X07U,0X00U,0X00U,0X00U,0X00U,0X03U,0X03U,0X03U,0X03U,
0X03U,0X03U,0X03U,0X03U,0X00U,0X00U,0X00U,0X01U,0X01U,0X00U,0X00U,0X00U,0X00U,0X00U,0X02U,0X07U,
0X07U,0X03U,0X07U,0X06U,0X06U,0X07U,0X07U,0X07U,0X00U,0X00U,0X06U,0X06U,0X06U,0X07U,0X07U,0X00U,
0X00U,0X00U,0X07U,0X07U,0X07U,0X07U,0X03U,0X01U,0X01U,0X03U,0X03U,0X07U,0X07U,0X00U,0X00U,0X00U,
0X00U,0X07U,0X07U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X07U,0X07U,0X00U,0X00U,
0X00U,0X00U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,
0X03U,0X03U,0X03U,0X03U,0X03U,0X00U,0X00U,0X00U,0X03U,0X03U,0X00U,0X00U,0X00U,0X00U,0X00U,0X07U,
0X07U,0X00U,0X03U,0X03U,0X03U,0X03U,0X03U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,
0X00U,0X00U,0X00U,0X00U,};
const unsigned char gImage_Alarm_11_Word0X51_Y261[]={/*Byte Size422*/
140U,24U,
0X0cU,0XccU,0XfcU,0XffU,0XffU,0XedU,0X0cU,0X0cU,0XccU,0XccU,0XccU,0XfcU,0XffU,0XffU,0XcfU,0XccU,
0XccU,0XccU,0Xc0U,0X00U,0Xf8U,0Xf8U,0Xf8U,0X38U,0X38U,0Xb8U,0XbcU,0XbfU,0XbfU,0XbbU,0Xb8U,0Xb8U,
0Xb8U,0X38U,0X38U,0Xf8U,0Xf8U,0Xf8U,0X00U,0X00U,0X00U,0X06U,0X06U,0X06U,0X06U,0XfeU,0XfeU,0X06U,
0X06U,0X06U,0X06U,0X06U,0XfeU,0XfeU,0X06U,0X06U,0X06U,0X06U,0X00U,0X00U,0X00U,0X00U,0X30U,0X30U,
0X33U,0X3fU,0X3fU,0X3cU,0X30U,0Xf0U,0Xf0U,0X30U,0X3cU,0X3fU,0X3fU,0X33U,0X30U,0X30U,0X00U,0X00U,
0X00U,0X06U,0Xf6U,0Xf6U,0X06U,0X06U,0X06U,0X06U,0X06U,0X06U,0X06U,0X06U,0X06U,0X06U,0XfeU,0XfeU,
0X00U,0X00U,0X00U,0X00U,0X00U,0X06U,0X06U,0X06U,0X06U,0XfeU,0XfeU,0X06U,0X06U,0X06U,0X06U,0X06U,
0XfeU,0XfeU,0X06U,0X06U,0X06U,0X06U,0X00U,0X00U,0X00U,0X00U,0Xf8U,0Xf8U,0Xf8U,0X98U,0X98U,0X98U,
0X9bU,0X9fU,0X9fU,0X9cU,0X98U,0X98U,0X98U,0Xf8U,0Xf8U,0X00U,0X00U,0X00U,0Xe3U,0Xe7U,0X67U,0X67U,
0XffU,0XffU,0X77U,0X37U,0X30U,0X08U,0X6fU,0XefU,0XcfU,0XecU,0XfcU,0X7cU,0X3cU,0X0cU,0X00U,0X00U,
0XffU,0XffU,0XffU,0X00U,0X00U,0XffU,0XffU,0X73U,0X73U,0X73U,0X73U,0X7fU,0X7fU,0X00U,0X00U,0XffU,
0XffU,0XffU,0X00U,0X00U,0X03U,0X03U,0X83U,0Xc3U,0XfbU,0XffU,0X3fU,0X03U,0X03U,0X03U,0X03U,0X03U,
0XffU,0XffU,0X03U,0X03U,0X03U,0X03U,0X03U,0X00U,0X00U,0X06U,0X06U,0X86U,0X86U,0Xc6U,0Xe6U,0Xf6U,
0X7eU,0X3fU,0X3fU,0X7eU,0Xf6U,0Xe6U,0Xc6U,0X86U,0X86U,0X06U,0X06U,0X00U,0X00U,0X00U,0XffU,0XffU,
0X83U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X07U,0X07U,0Xf0U,0Xf0U,0Xe0U,0X00U,
0X03U,0X03U,0X83U,0Xc3U,0XfbU,0XffU,0X3fU,0X03U,0X03U,0X03U,0X03U,0X03U,0XffU,0XffU,0X03U,0X03U,
0X03U,0X03U,0X03U,0X00U,0X00U,0X80U,0XffU,0XffU,0X3fU,0XfdU,0XfdU,0X9dU,0X9dU,0X9dU,0X9dU,0X9dU,
0X9dU,0X9dU,0X9dU,0X9dU,0XfdU,0XfcU,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X07U,0X07U,0X00U,0X00U,
0X00U,0X00U,0X00U,0X00U,0X01U,0X03U,0X03U,0X07U,0X07U,0X00U,0X00U,0X00U,0X07U,0X07U,0X07U,0X00U,
0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X02U,0X07U,0X07U,0X07U,0X07U,0X07U,0X01U,0X00U,0X00U,
0X02U,0X07U,0X07U,0X03U,0X01U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X07U,0X07U,0X00U,0X00U,
0X00U,0X00U,0X00U,0X00U,0X02U,0X07U,0X07U,0X03U,0X03U,0X03U,0X01U,0X00U,0X00U,0X00U,0X00U,0X00U,
0X00U,0X01U,0X01U,0X03U,0X03U,0X07U,0X03U,0X00U,0X00U,0X00U,0X01U,0X03U,0X03U,0X03U,0X03U,0X03U,
0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X00U,0X00U,0X02U,0X07U,0X07U,0X03U,
0X01U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X07U,0X07U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,
0X02U,0X07U,0X07U,0X01U,0X00U,0X07U,0X07U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,0X03U,
0X07U,0X07U,0X00U,0X00U,};
...@@ -2881,26 +3060,26 @@ void Display_Sub(void) ...@@ -2881,26 +3060,26 @@ void Display_Sub(void)
} }
uint32_t Get_Display_Type(void) uint32_t Get_Display_Type(void)
{ {
if(connectbleFlag == 1) // if(connectbleFlag == 1)
{ // {
return 3; // return 3;
} // }
else // else
{ // {
if(zhenduanflag == 0) // if(zhenduanflag == 0)
{ // {
return 2; // return 2;
} // }
else if(zhenduanflag == 1) // else if(zhenduanflag == 1)
{ // {
return 0; // return 0;
} // }
else // else
{ // {
return 1; // return 1;
} // }
} // }
return 2;
} }
...@@ -4186,320 +4365,55 @@ void Display_Send_Vspead(uint8_t menu) ...@@ -4186,320 +4365,55 @@ void Display_Send_Vspead(uint8_t menu)
} }
if(menu > 0) if(menu > 0)
{ {
if(menu != 13) // if(menu != 13)
{ // {
TFT_LCD_Draw_Bmp(3, 40, ( uint8_t * )gImage_Dey_words_1X6_Y16); // TFT_LCD_Draw_Bmp(3, 40, ( uint8_t * )gImage_Dey_words_1X6_Y16);
TFT_LCD_Draw_Bmp(180, 40, ( uint8_t * )gImage_Dey_words_5X195_Y16); // TFT_LCD_Draw_Bmp(180, 40, ( uint8_t * )gImage_Dey_words_5X195_Y16);
TFT_LCD_Draw_Bmp(3, 40+25, ( uint8_t * )gImage_Dey_words_4X6_Y107); // TFT_LCD_Draw_Bmp(3, 40+25, ( uint8_t * )gImage_Dey_words_4X6_Y107);
TFT_LCD_Draw_Bmp(180, 40+25, ( uint8_t * )gImage_Dey_words_8X224_Y107); // TFT_LCD_Draw_Bmp(180, 40+25, ( uint8_t * )gImage_Dey_words_8X224_Y107);
TFT_LCD_Draw_Bmp(3, 40+25+25+25+25+25+25, ( uint8_t * )gImage_gImage_checkComX6_Y165); // TFT_LCD_Draw_Bmp(3, 40+25+25+25+25+25+25, ( uint8_t * )gImage_gImage_checkComX6_Y165);
} // }
switch (menu) switch (menu)
{ {
case 1: case 1:
fuel_val = 1; TFT_LCD_Draw_Bmp(51,261,( uint8_t * )gImage_Alarm_06_Word0X51_Y261);
VSpeed_val = 0;
TFT_LCD_Draw_Bmp(20, 40+25+25+25+25+25+25+25, ( uint8_t * )gImage_gImage_Powerlow1X6_Y16);
TFT_LCD_Draw_Bmp(70, 40+25+25+25+25+25+25+25, ( uint8_t * )gImage_gImage_READY1X6_Y16);
TFT_LCD_Draw_Bmp(150, 40+25+25+25+25+25+25+25, ( uint8_t * )gImage_gImage_LowBean1X6_Y16);
TFT_LCD_Draw_Bmp(160, 40+25+25+25+25, ( uint8_t * )gImage_gImage_blueX6_Y165);
TFT_LCD_Draw_Bmp(140, 40+25+25, ( uint8_t * )NO_F);
TFT_LCD_Draw_Bmp(140+18, 40+25+25, ( uint8_t * )NO_R);
TFT_LCD_Draw_Bmp(140+18+18, 40+25+25, ( uint8_t * )NO_E);
TFT_LCD_Draw_Bmp(140+18+18+18, 40+25+25, ( uint8_t * )NO_E);
// GUI_Display_Version_Code_Service(160, 40+25+25, "FREE", Letter_Num_11, PCodeText_Space_size);
// GUI_Display_Version_Code_Service(160, 40, "0", Letter_Num_11, PCodeText_Space_size);
// GUI_Display_Version_Code_Service(160, 40+25, "1", Letter_Num_11, PCodeText_Space_size);
// GUI_Display_Version_Code_Service(3, 40+25+25, "DM", Letter_Num_11, PCodeText_Space_size);
TFT_LCD_Draw_Bmp(180, 40+25+25+25, ( uint8_t * )NO_K);
TFT_LCD_Draw_Bmp(180+18, 40+25+25+25, ( uint8_t * )NO_W);
GUI_General_Digit_Display(0, Num_15, 6, 5, ODODigitNum09PosX, 40+25+25+25+5);
// GUI_Display_Version_Code_Service(3, 40+25+25+25, "Power", Letter_Num_11, PCodeText_Space_size);
// GUI_Display_Version_Code_Service(160, 40+25+25+25, "10kW", Letter_Num_11, PCodeText_Space_size);
// GUI_Display_Version_Code_Service(3, 40+25+25+25+25, "Color", Letter_Num_11, PCodeText_Space_size);
// GUI_Display_Version_Code_Service(3, 40+25+25+25+25+25, "Time", Letter_Num_11, PCodeText_Space_size);
// GUI_Display_Version_Code_Service(160, 40+25+25+25+25+25, "00-00", Letter_Num_11, PCodeText_Space_size);
TFT_LCD_Draw_Bmp(140, 40+25+25+25+25+25, ( uint8_t * )NO_0);
TFT_LCD_Draw_Bmp(140+18, 40+25+25+25+25+25, ( uint8_t * )NO_0);
TFT_LCD_Draw_Bmp(140+18+27, 40+25+25+25+25+25, ( uint8_t * )NO_DIAN);
TFT_LCD_Draw_Bmp(140+18+18+18, 40+25+25+25+25+25, ( uint8_t * )NO_0);
TFT_LCD_Draw_Bmp(140+18+18+18+18, 40+25+25+25+25+25, ( uint8_t * )NO_0);
break; break;
case 2: case 2:
TFT_LCD_Draw_Bmp(160, 40+25+25+25+25, ( uint8_t * )gImage_gImage_orange1X6_Y16);
TFT_LCD_Draw_Bmp(20, 40+25+25+25+25+25+25+25, ( uint8_t * )gImage_gImage_turnLeft1X6_Y16);
TFT_LCD_Draw_Bmp(150, 40+25+25+25+25+25+25+25, ( uint8_t * )gImage_gImage_highBeanX6_Y165);
// GUI_Display_Version_Code_Service(160, 40, "11", Letter_Num_11, PCodeText_Space_size);
// GUI_Display_Version_Code_Service(160, 40+25, "15", Letter_Num_11, PCodeText_Space_size);
fuel_val = 15;
VSpeed_val = 11;
// GUI_Display_Version_Code_Service(3, 40+25+25, "DM", Letter_Num_11, PCodeText_Space_size);
TFT_LCD_Draw_Bmp(140, 40+25+25, ( uint8_t * )NO_S);
TFT_LCD_Draw_Bmp(140+18, 40+25+25, ( uint8_t * )NO_P);
TFT_LCD_Draw_Bmp(140+18+18, 40+25+25, ( uint8_t * )NO_O);
TFT_LCD_Draw_Bmp(140+18+18+18, 40+25+25, ( uint8_t * )NO_R);
TFT_LCD_Draw_Bmp(140+18+18+18+18, 40+25+25, ( uint8_t * )NO_T);
// GUI_Display_Version_Code_Service(160, 40+25+25, "SPORT", Letter_Num_11, PCodeText_Space_size);
// GUI_Display_Version_Code_Service(3, 40+25+25+25, "Power", Letter_Num_11, PCodeText_Space_size);
// GUI_Display_Version_Code_Service(160, 40+25+25+25, "50kW", Letter_Num_11, PCodeText_Space_size);
TFT_LCD_Draw_Bmp(180, 40+25+25+25, ( uint8_t * )NO_K);
TFT_LCD_Draw_Bmp(180+18, 40+25+25+25, ( uint8_t * )NO_W);
GUI_General_Digit_Display(50, Num_15, 6, 5, ODODigitNum09PosX, 40+25+25+25+5);
// GUI_Display_Version_Code_Service(3, 40+25+25+25+25+25, "Time", Letter_Num_11, PCodeText_Space_size);
// GUI_Display_Version_Code_Service(160, 40+25+25+25+25+25, "11-11", Letter_Num_11, PCodeText_Space_size);
TFT_LCD_Draw_Bmp(140, 40+25+25+25+25+25, ( uint8_t * )NO_1);
TFT_LCD_Draw_Bmp(140+18, 40+25+25+25+25+25, ( uint8_t * )NO_1);
TFT_LCD_Draw_Bmp(140+18+27, 40+25+25+25+25+25, ( uint8_t * )NO_DIAN);
TFT_LCD_Draw_Bmp(140+18+18+18, 40+25+25+25+25+25, ( uint8_t * )NO_1);
TFT_LCD_Draw_Bmp(140+18+18+18+18, 40+25+25+25+25+25, ( uint8_t * )NO_1);
// GUI_Display_Version_Code_Service(3, 40+25+25+25+25, "Color", Letter_Num_11, PCodeText_Space_size);
break; break;
case 3: case 3:
TFT_LCD_Draw_Bmp(160, 40+25+25+25+25, ( uint8_t * )gImage_gImage_greenX6_Y165);
TFT_LCD_Draw_Bmp(20, 40+25+25+25+25+25+25+25, ( uint8_t * )gImage_gImage_turnRight1X6_Y16);
TFT_LCD_Draw_Bmp(70, 40+25+25+25+25+25+25+25, ( uint8_t * )gImage_gImage_AutoX6_Y165);
// TFT_LCD_Draw_Bmp(150, 40+25+25+25+25+25+25+25, ( uint8_t * )gImage_gImage_position1X6_Y16);
// GUI_Display_Version_Code_Service(160, 40, "22", Letter_Num_11, PCodeText_Space_size);
// GUI_Display_Version_Code_Service(160, 40+25, "22", Letter_Num_11, PCodeText_Space_size);
fuel_val = 22;
VSpeed_val = 22;
// GUI_Display_Version_Code_Service(3, 40+25+25, "DM", Letter_Num_11, PCodeText_Space_size);
TFT_LCD_Draw_Bmp(140, 40+25+25, ( uint8_t * )NO_T);
TFT_LCD_Draw_Bmp(140+18, 40+25+25, ( uint8_t * )NO_T);
TFT_LCD_Draw_Bmp(140+18+18, 40+25+25, ( uint8_t * )NO_F);
TFT_LCD_Draw_Bmp(140+18+18+18, 40+25+25, ( uint8_t * )NO_A);
TFT_LCD_Draw_Bmp(140+18+18+18+18, 40+25+25, ( uint8_t * )NO_R);
// GUI_Display_Version_Code_Service(160, 40+25+25, "TTFAR", Letter_Num_11, PCodeText_Space_size);
// GUI_Display_Version_Code_Service(3, 40+25+25+25, "Power", Letter_Num_11, PCodeText_Space_size);
// GUI_Display_Version_Code_Service(160, 40+25+25+25, "100kW", Letter_Num_11, PCodeText_Space_size);
TFT_LCD_Draw_Bmp(180, 40+25+25+25, ( uint8_t * )NO_K);
TFT_LCD_Draw_Bmp(180+18, 40+25+25+25, ( uint8_t * )NO_W);
GUI_General_Digit_Display(100, Num_15, 6, 5, ODODigitNum09PosX, 40+25+25+25+5);
// GUI_Display_Version_Code_Service(3, 40+25+25+25+25+25, "Time", Letter_Num_11, PCodeText_Space_size);
// GUI_Display_Version_Code_Service(160, 40+25+25+25+25+25, "22-22", Letter_Num_11, PCodeText_Space_size);
TFT_LCD_Draw_Bmp(140, 40+25+25+25+25+25, ( uint8_t * )NO_2);
TFT_LCD_Draw_Bmp(140+18, 40+25+25+25+25+25, ( uint8_t * )NO_2);
TFT_LCD_Draw_Bmp(140+18+27, 40+25+25+25+25+25, ( uint8_t * )NO_DIAN);
TFT_LCD_Draw_Bmp(140+18+18+18, 40+25+25+25+25+25, ( uint8_t * )NO_2);
TFT_LCD_Draw_Bmp(140+18+18+18+18, 40+25+25+25+25+25, ( uint8_t * )NO_2);
// GUI_Display_Version_Code_Service(3, 40+25+25+25+25, "Color", Letter_Num_11, PCodeText_Space_size);
break; break;
case 4: case 4:
TFT_LCD_Draw_Bmp(160,40+25+25+25+25, ( uint8_t * )gImage_gImage_red1X6_Y16);
TFT_LCD_Draw_Bmp(20, 40+25+25+25+25+25+25+25, ( uint8_t * )gImage_gImage_BianchengX6_Y165);
TFT_LCD_Draw_Bmp(70, 40+25+25+25+25+25+25+25, ( uint8_t * )gImage_Alarm_12_xhX6_Y165);
TFT_LCD_Draw_Bmp(150, 40+25+25+25+25+25+25+25, ( uint8_t * )gImage_gImage_superT1X6_Y16);
// GUI_Display_Version_Code_Service(160, 40, "33", Letter_Num_11, PCodeText_Space_size);
// GUI_Display_Version_Code_Service(160, 40+25, "33", Letter_Num_11, PCodeText_Space_size);
fuel_val = 33;
VSpeed_val = 33;
// GUI_Display_Version_Code_Service(3, 40+25+25+25+25+25, "Time", Letter_Num_11, PCodeText_Space_size);
// GUI_Display_Version_Code_Service(160, 40+25+25+25+25+25, "13-33", Letter_Num_11, PCodeText_Space_size);
TFT_LCD_Draw_Bmp(140, 40+25+25+25+25+25, ( uint8_t * )NO_1);
TFT_LCD_Draw_Bmp(140+18, 40+25+25+25+25+25, ( uint8_t * )NO_3);
TFT_LCD_Draw_Bmp(140+18+27, 40+25+25+25+25+25, ( uint8_t * )NO_DIAN);
TFT_LCD_Draw_Bmp(140+18+18+18, 40+25+25+25+25+25, ( uint8_t * )NO_3);
TFT_LCD_Draw_Bmp(140+18+18+18+18, 40+25+25+25+25+25, ( uint8_t * )NO_3);
// GUI_Display_Version_Code_Service(3, 40+25+25+25+25, "Color", Letter_Num_11, PCodeText_Space_size);
break; break;
case 5: case 5:
TFT_LCD_Draw_Bmp(20, 40+25+25+25+25+25+25+25, ( uint8_t * )gImage_gImage_TCS1X6_Y16);
TFT_LCD_Draw_Bmp(70, 40+25+25+25+25+25+25+25, ( uint8_t * )gImage_gImage_seattong1X6_Y16);
// GUI_Display_Version_Code_Service(160, 40+25, "44", Letter_Num_11, PCodeText_Space_size);
// GUI_Display_Version_Code_Service(160, 40, "44", Letter_Num_11, PCodeText_Space_size);
fuel_val = 44;
VSpeed_val = 44;
// GUI_Display_Version_Code_Service(3, 40+25+25+25, "ePower", Letter_Num_11, PCodeText_Space_size);
// GUI_Display_Version_Code_Service(160, 40+25+25+25, "1", Letter_Num_11, PCodeText_Space_size);
// TFT_LCD_Draw_Bmp(180, 40+25+25+25, ( uint8_t * )NO_G);
// TFT_LCD_Draw_Bmp(180, 40+25+25+25, ( uint8_t * )NO_K);
TFT_LCD_Draw_Bmp(180, 40+25+25+25, ( uint8_t * )NO_W);
TFT_LCD_Draw_Bmp(180+25, 40+25+25+25, ( uint8_t * )gImage_Dey_words_8X224_Y107);
GUI_Display_Version_Code_Service(155, 40+25+25+25, "-10", Letter_Num_11, PCodeText_Space_size);
// GUI_Display_Version_Code_Service(3, 40+25+25+25+25+25, "Time", Letter_Num_11, PCodeText_Space_size);
// GUI_Display_Version_Code_Service(160, 40+25+25+25+25+25, "14-44", Letter_Num_11, PCodeText_Space_size);
TFT_LCD_Draw_Bmp(140, 40+25+25+25+25+25, ( uint8_t * )NO_1);
TFT_LCD_Draw_Bmp(140+18, 40+25+25+25+25+25, ( uint8_t * )NO_4);
TFT_LCD_Draw_Bmp(140+18+27, 40+25+25+25+25+25, ( uint8_t * )NO_DIAN);
TFT_LCD_Draw_Bmp(140+18+18+18, 40+25+25+25+25+25, ( uint8_t * )NO_4);
TFT_LCD_Draw_Bmp(140+18+18+18+18, 40+25+25+25+25+25, ( uint8_t * )NO_4);
break; break;
case 6: case 6:
// TFT_LCD_Draw_Bmp(20, 40+25+25+25+25+25+25+25, ( uint8_t * )gImage_gImage_seat1X6_Y16);
TFT_LCD_Draw_Bmp(70, 40+25+25+25+25+25+25+25, ( uint8_t * )gImage_gImage_doupoX6_Y165);
// GUI_Display_Version_Code_Service(160, 40+25, "55", Letter_Num_11, PCodeText_Space_size);
// GUI_Display_Version_Code_Service(160, 40, "55", Letter_Num_11, PCodeText_Space_size);
fuel_val = 55;
VSpeed_val = 55;
// GUI_Display_Version_Code_Service(3, 40+25+25+25, "ePower", Letter_Num_11, PCodeText_Space_size);
// GUI_Display_Version_Code_Service(160, 40+25+25+25, "5", Letter_Num_11, PCodeText_Space_size);
TFT_LCD_Draw_Bmp(180, 40+25+25+25, ( uint8_t * )NO_W);
TFT_LCD_Draw_Bmp(180+25, 40+25+25+25, ( uint8_t * )gImage_Dey_words_8X224_Y107);
GUI_Display_Version_Code_Service(155, 40+25+25+25, "-50", Letter_Num_11, PCodeText_Space_size);
// GUI_Display_Version_Code_Service(3, 40+25+25+25+25+25, "Time", Letter_Num_11, PCodeText_Space_size);
// GUI_Display_Version_Code_Service(160, 40+25+25+25+25+25, "15-55", Letter_Num_11, PCodeText_Space_size);
TFT_LCD_Draw_Bmp(140, 40+25+25+25+25+25, ( uint8_t * )NO_1);
TFT_LCD_Draw_Bmp(140+18, 40+25+25+25+25+25, ( uint8_t * )NO_5);
TFT_LCD_Draw_Bmp(140+18+27, 40+25+25+25+25+25, ( uint8_t * )NO_DIAN);
TFT_LCD_Draw_Bmp(140+18+18+18, 40+25+25+25+25+25, ( uint8_t * )NO_5);
TFT_LCD_Draw_Bmp(140+18+18+18+18, 40+25+25+25+25+25, ( uint8_t * )NO_5);
break;
case 7:
TFT_LCD_Draw_Bmp(20, 40+25+25+25+25+25+25+25, ( uint8_t * )gImage_gImage_ABSX6_Y165);
TFT_LCD_Draw_Bmp(70, 40+25+25+25+25+25+25+25, ( uint8_t * )gImage_gImage_xiangonglv1X6_Y16);
// GUI_Display_Version_Code_Service(160, 40+25, "66", Letter_Num_11, PCodeText_Space_size);
// GUI_Display_Version_Code_Service(160, 40, "66", Letter_Num_11, PCodeText_Space_size);
fuel_val = 66;
VSpeed_val = 66;
// GUI_Display_Version_Code_Service(3, 40+25+25+25, "ePower", Letter_Num_11, PCodeText_Space_size);
// GUI_Display_Version_Code_Service(160, 40+25+25+25, "10", Letter_Num_11, PCodeText_Space_size);
TFT_LCD_Draw_Bmp(180, 40+25+25+25, ( uint8_t * )NO_W);
TFT_LCD_Draw_Bmp(180+25, 40+25+25+25, ( uint8_t * )gImage_Dey_words_8X224_Y107);
GUI_Display_Version_Code_Service(145, 40+25+25+25, "-100", Letter_Num_11, PCodeText_Space_size);
// GUI_Display_Version_Code_Service(3, 40+25+25+25+25+25, "Time", Letter_Num_11, PCodeText_Space_size);
// GUI_Display_Version_Code_Service(160, 40+25+25+25+25+25, "16-06", Letter_Num_11, PCodeText_Space_size);
TFT_LCD_Draw_Bmp(140, 40+25+25+25+25+25, ( uint8_t * )NO_1);
TFT_LCD_Draw_Bmp(140+18, 40+25+25+25+25+25, ( uint8_t * )NO_6);
TFT_LCD_Draw_Bmp(140+18+27, 40+25+25+25+25+25, ( uint8_t * )NO_DIAN);
TFT_LCD_Draw_Bmp(140+18+18+18, 40+25+25+25+25+25, ( uint8_t * )NO_0);
TFT_LCD_Draw_Bmp(140+18+18+18+18, 40+25+25+25+25+25, ( uint8_t * )NO_6);
break;
case 7:
break; break;
case 8: case 8:
TFT_LCD_Draw_Bmp(20, 40+25+25+25+25+25+25+25, ( uint8_t * )gImage_gImage_bluetoothX6_Y165);
TFT_LCD_Draw_Bmp(70, 40+25+25+25+25+25+25+25, ( uint8_t * )gImage_gImage_zcguzhang1X6_Y16);
// GUI_Display_Version_Code_Service(160, 40+25, "77", Letter_Num_11, PCodeText_Space_size);
// GUI_Display_Version_Code_Service(160, 40, "77", Letter_Num_11, PCodeText_Space_size);
fuel_val = 77;
VSpeed_val = 77;
// GUI_Display_Version_Code_Service(3, 40+25+25+25+25, "Color", Letter_Num_11, PCodeText_Space_size);
TFT_LCD_Draw_Bmp(160,40+25+25+25+25, ( uint8_t * )gImage_gImage_red1X6_Y16);
// GUI_Display_Version_Code_Service(3, 40+25+25+25+25+25, "Time", Letter_Num_11, PCodeText_Space_size);
// GUI_Display_Version_Code_Service(160, 40+25+25+25+25+25, "17-07", Letter_Num_11, PCodeText_Space_size);
TFT_LCD_Draw_Bmp(140, 40+25+25+25+25+25, ( uint8_t * )NO_1);
TFT_LCD_Draw_Bmp(140+18, 40+25+25+25+25+25, ( uint8_t * )NO_7);
TFT_LCD_Draw_Bmp(140+18+27, 40+25+25+25+25+25, ( uint8_t * )NO_DIAN);
TFT_LCD_Draw_Bmp(140+18+18+18, 40+25+25+25+25+25, ( uint8_t * )NO_0);
TFT_LCD_Draw_Bmp(140+18+18+18+18, 40+25+25+25+25+25, ( uint8_t * )NO_7);
break; break;
case 9: case 9:
// GUI_Display_Version_Code_Service(160, 40+25, "88", Letter_Num_11, PCodeText_Space_size);
// GUI_Display_Version_Code_Service(160, 40, "88", Letter_Num_11, PCodeText_Space_size);
fuel_val = 88;
VSpeed_val = 88;
// GUI_Display_Version_Code_Service(3, 40+25+25+25+25+25, "Time", Letter_Num_11, PCodeText_Space_size);
// GUI_Display_Version_Code_Service(160, 40+25+25+25+25+25, "18-08", Letter_Num_11, PCodeText_Space_size);
TFT_LCD_Draw_Bmp(140, 40+25+25+25+25+25, ( uint8_t * )NO_1);
TFT_LCD_Draw_Bmp(140+18, 40+25+25+25+25+25, ( uint8_t * )NO_8);
TFT_LCD_Draw_Bmp(140+18+27, 40+25+25+25+25+25, ( uint8_t * )NO_DIAN);
TFT_LCD_Draw_Bmp(140+18+18+18, 40+25+25+25+25+25, ( uint8_t * )NO_0);
TFT_LCD_Draw_Bmp(140+18+18+18+18, 40+25+25+25+25+25, ( uint8_t * )NO_8);
TFT_LCD_Draw_Bmp(20, 40+25+25+25+25+25+25+25, ( uint8_t * )gImage_gImage_lowPower1X6_Y16);
break; break;
case 10: case 10:
// GUI_Display_Version_Code_Service(160, 40+25, "99", Letter_Num_11, PCodeText_Space_size);
// GUI_Display_Version_Code_Service(160, 40, "99", Letter_Num_11, PCodeText_Space_size);
fuel_val = 99;
VSpeed_val = 99;
// GUI_Display_Version_Code_Service(3, 40+25+25+25+25+25, "Time", Letter_Num_11, PCodeText_Space_size);
// GUI_Display_Version_Code_Service(160, 40+25+25+25+25+25, "19-09", Letter_Num_11, PCodeText_Space_size);
TFT_LCD_Draw_Bmp(140, 40+25+25+25+25+25, ( uint8_t * )NO_1);
TFT_LCD_Draw_Bmp(140+18, 40+25+25+25+25+25, ( uint8_t * )NO_9);
TFT_LCD_Draw_Bmp(140+18+27, 40+25+25+25+25+25, ( uint8_t * )NO_DIAN);
TFT_LCD_Draw_Bmp(140+18+18+18, 40+25+25+25+25+25, ( uint8_t * )NO_0);
TFT_LCD_Draw_Bmp(140+18+18+18+18, 40+25+25+25+25+25, ( uint8_t * )NO_9);
GUI_Display_Version_Code_Service(70, 40+25+25+25+25+25+25+25, "ALL", Letter_Num_11, PCodeText_Space_size);
break; break;
case 11:
// GUI_Display_Version_Code_Service(160, 40+25, "100", Letter_Num_11, PCodeText_Space_size);
// GUI_Display_Version_Code_Service(160, 40, "99", Letter_Num_11, PCodeText_Space_size);
fuel_val = 100;
VSpeed_val = 99;
// GUI_Display_Version_Code_Service(3, 40+25+25+25+25+25, "Time", Letter_Num_11, PCodeText_Space_size);
// GUI_Display_Version_Code_Service(160, 40+25+25+25+25+25, "00-00", Letter_Num_11, PCodeText_Space_size);
TFT_LCD_Draw_Bmp(140, 40+25+25+25+25+25, ( uint8_t * )NO_0);
TFT_LCD_Draw_Bmp(140+18, 40+25+25+25+25+25, ( uint8_t * )NO_0);
TFT_LCD_Draw_Bmp(140+18+27, 40+25+25+25+25+25, ( uint8_t * )NO_DIAN);
TFT_LCD_Draw_Bmp(140+18+18+18, 40+25+25+25+25+25, ( uint8_t * )NO_0);
TFT_LCD_Draw_Bmp(140+18+18+18+18, 40+25+25+25+25+25, ( uint8_t * )NO_0);
GUI_Display_Version_Code_Service(70, 40+25+25+25+25+25+25+25, "ALL", Letter_Num_11, PCodeText_Space_size);
break;
case 12:
TFT_LCD_Draw_Bmp(20, 40+25+25+25+25+25+25+25, ( uint8_t * )gImage_gImage_bluetoothX6_Y165);
break;
case 13:
// POWER_CTRL_KL30 = 0u; //B+
// POWER_CTRL_KL15 = 0u; //KL15
CAN_Msg_Tx_Enable = 0u;
//Diag_Info_Init( );
//Display_Init( );
//Display_Version_Info(0);
//Send_Init();
//Send_ODO_Init();
HW_Static_Current_Check(1);
break;
default: default:
MENU_CHECK_STEP = 0; MENU_CHECK_STEP = 0;
break; break;
} }
if(menu != 13)
{
GUI_General_Digit_Display(VSpeed_val, Num_15, 6, 5, ODODigitNum09PosX, 40);
GUI_General_Digit_Display(fuel_val, Num_15, 6, 5, ODODigitNum09PosX, 40+25);
}
} }
......
...@@ -335,9 +335,9 @@ void Sys_Run_Mode_100ms_Tasks_Group(void) ...@@ -335,9 +335,9 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
// Recv_Byte1(); // Recv_Byte1();
// } // }
Display_PageNum(); Display_PageNum();
if(MENU_CHECK_STEP == 3) if(MENU_CHECK_STEP == 0)
{ {
if(ACCONOFF_delay_3s < 30) if(ACCONOFF_delay_3s < 200)
{ {
ACCONOFF_delay_3s++; ACCONOFF_delay_3s++;
} }
......
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
* \attention * \attention
* *
* This file is automatically generated by analog signals configuration tool. * This file is automatically generated by analog signals configuration tool.
* Date : 2025/2/18 19:34:44 * Date : 2022/8/3 23:21:24
* Cfg Tool Ver : 1.1.0 * Cfg Tool Ver : 1.1.0
* Engineer : * Engineer :
* (c) Heilongjiang TYW electronics co., LTD * (c) Heilongjiang TYW electronics co., LTD
* *
******************************************************************************/ ******************************************************************************/
...@@ -74,31 +74,21 @@ ADC_Data_st_t stADCData[ADC_SIGNAL_CH_NUMBER]; ...@@ -74,31 +74,21 @@ ADC_Data_st_t stADCData[ADC_SIGNAL_CH_NUMBER];
const uint8_t u8ADCChList[ADC_CONV_CH_NUMBER] = const uint8_t u8ADCChList[ADC_CONV_CH_NUMBER] =
{ {
13U, 12U, 15U, 11U, 14U, 10U, 9U, 7U, 9U, 15U, 14U ,
}; };
const ADC_Ch_Cfg_st_t stADCChCfg[ADC_SIGNAL_CH_NUMBER] = const ADC_Ch_Cfg_st_t stADCChCfg[ADC_SIGNAL_CH_NUMBER] =
{ {
{ 0U, 0U, 0U, 0U, 0U, 1U, ADC_Voltage_Calc_Circuit102,}, { 0U, 0U, 0U, 0U, 0U, 1U, ADC_Voltage_Calc_Circuit101,},
{ 1U, 0U, 0U, 0U, 0U, 1U, ADC_Voltage_Calc_Circuit102,}, { 1U, 0U, 0U, 0U, 0U, 1U, ADC_Voltage_Calc_Circuit101,},
{ 2U, 0U, 0U, 0U, 0U, 1U, ADC_Voltage_Calc_Circuit102,}, { 2U, 0U, 0U, 0U, 0U, 1U, ADC_Voltage_Calc_Circuit102,},
{ 3U, 0U, 0U, 0U, 0U, 1U, ADC_Voltage_Calc_Circuit102,},
{ 4U, 0U, 0U, 0U, 0U, 1U, ADC_Voltage_Calc_Circuit102,},
{ 5U, 0U, 0U, 0U, 0U, 1U, ADC_Voltage_Calc_Circuit102,},
{ 6U, 0U, 0U, 0U, 0U, 1U, ADC_Voltage_Calc_Circuit102,},
{ 7U, 0U, 0U, 0U, 0U, 1U, ADC_Voltage_Calc_Circuit102,},
}; };
const ADC_Res_List_st_t stADCResList[ADC_SIGNAL_CH_NUMBER] = const ADC_Res_List_st_t stADCResList[ADC_SIGNAL_CH_NUMBER] =
{ {
{ 3300000U, 1000000U, 0U, 0U,}, { 0U, 100000U, 0U, 0U,},
{ 3300000U, 1000000U, 0U, 0U,}, { 0U, 100000U, 0U, 0U,},
{ 3300000U, 1000000U, 0U, 0U,}, { 330000U, 47000U, 0U, 0U,},
{ 3300000U, 1000000U, 0U, 0U,},
{ 3300000U, 1000000U, 0U, 0U,},
{ 3300000U, 1000000U, 0U, 0U,},
{ 3300000U, 1000000U, 0U, 0U,},
{ 3300000U, 100000U, 0U, 0U,},
}; };
/* Private function prototypes ----------------------------------------------*/ /* Private function prototypes ----------------------------------------------*/
...@@ -241,7 +231,7 @@ void Analog_Signal_Conv_Service(void) ...@@ -241,7 +231,7 @@ void Analog_Signal_Conv_Service(void)
{ {
u8Valid = 0U; u8Valid = 0U;
} }
if (u8Valid) if (u8Valid)
{ {
u16Result = stADCChCfg[stADCCtrl.u8CurrentCh].pfProcFunc(u16Voltage, u16Result = stADCChCfg[stADCCtrl.u8CurrentCh].pfProcFunc(u16Voltage,
...@@ -400,3 +390,19 @@ uint16_t ADC_Conv_Single_Channel(uint8_t u8ADCCh) ...@@ -400,3 +390,19 @@ uint16_t ADC_Conv_Single_Channel(uint8_t u8ADCCh)
return u16Result; return u16Result;
} }
uint16_t ADC_Read_Signal_Voltage(uint8_t u8ADCCh)//AD采集不建议用这个函数获取最终的结果!
{
uint16_t u16Value;
if (u8ADCCh < ADC_SIGNAL_CH_NUMBER)
{
u16Value = u16ADCSample[u8ADCCh];
}
else
{
u16Value = 0U;
}
return u16Value;
}
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
* \attention * \attention
* *
* This file is automatically generated by analog signals configuration tool. * This file is automatically generated by analog signals configuration tool.
* Date : 2025/2/18 19:34:44 * Date : 2022/8/3 23:21:24
* Cfg Tool Ver : 1.1.0 * Cfg Tool Ver : 1.1.0
* Engineer : * Engineer :
* (c) Heilongjiang TYW electronics co., LTD * (c) Heilongjiang TYW electronics co., LTD
* *
******************************************************************************/ ******************************************************************************/
...@@ -27,19 +27,14 @@ extern { ...@@ -27,19 +27,14 @@ extern {
/* Exported types ------------------------------------------------------------*/ /* Exported types ------------------------------------------------------------*/
enum ADCChName enum ADCChName
{ {
ADC_CH_ZXSW = 0, ADC_CH_KL15_VOLTAGE = 0,
ADC_CH_GKDD, ADC_CH_KL30_VOLTAGE,
ADC_CH_ZTS_A, ADC_CH_10_VOLTAGE,
ADC_CH_DIS,
ADC_CH_ZTS_B,
ADC_CH_LOGOTY,
ADC_CH_WYTY,
ADC_CH_ACC,
}; };
/* Exported macro ------------------------------------------------------------*/ /* Exported macro ------------------------------------------------------------*/
#define ADC_TOTAL_CH_NUMBER (8U) #define ADC_TOTAL_CH_NUMBER (3U)
#define ADC_SIGNAL_CH_NUMBER (8U) #define ADC_SIGNAL_CH_NUMBER (3U)
#define ADC_REF_VOLTAGE u16ADCRefVoltage #define ADC_REF_VOLTAGE u16ADCRefVoltage
/* Exported variables --------------------------------------------------------*/ /* Exported variables --------------------------------------------------------*/
...@@ -54,6 +49,7 @@ extern void Analog_Signal_Conv_Service(void); ...@@ -54,6 +49,7 @@ extern void Analog_Signal_Conv_Service(void);
extern uint16_t ADC_Read_Signal(uint8_t u8ADCCh); extern uint16_t ADC_Read_Signal(uint8_t u8ADCCh);
extern uint8_t ADC_Read_Signal_Valid(uint8_t u8ADCCh); extern uint8_t ADC_Read_Signal_Valid(uint8_t u8ADCCh);
extern uint16_t ADC_Conv_Single_Channel(uint8_t u8ADCCh); extern uint16_t ADC_Conv_Single_Channel(uint8_t u8ADCCh);
extern uint16_t ADC_Read_Signal_Voltage(uint8_t u8ADCCh);
/*! @} */ /*! @} */
#ifdef __cplusplus #ifdef __cplusplus
......
#new Option #new Option
#Mon Feb 10 10:43:38 CST 2025 #Wed Feb 19 11:41:46 CST 2025
IsSort=true IsSort=true
MergeFlashIsCompression=false MergeFlashIsCompression=false
ChangeAppFilePath= ChangeAppFilePath=
...@@ -9,7 +9,7 @@ DBFFilePath= ...@@ -9,7 +9,7 @@ DBFFilePath=
MergeCrcTtpe=1 MergeCrcTtpe=1
MergeBootFilePath= MergeBootFilePath=
IsMergeChangeAddress=false IsMergeChangeAddress=false
MergeFlashOutPutFilePath= MergeFlashOutPutFilePath=D\:\\Code\\\u7231\u739B\u68C0\u6D4B\u53F0\\\u56FE\u7247
GPIOOutPutPath= GPIOOutPutPath=
MergeCanDBCPath= MergeCanDBCPath=
IsFilling=true IsFilling=true
...@@ -39,7 +39,7 @@ JieFaRH850GPIOJSONpath= ...@@ -39,7 +39,7 @@ JieFaRH850GPIOJSONpath=
MergeFlashIsMandatory=false MergeFlashIsMandatory=false
UpdateProcess=\u5409\u5229 UpdateProcess=\u5409\u5229
Driver=Kvaser Driver=Kvaser
MergeFlashImageFormat= MergeFlashImageFormat=ARGB8888
RH850_F1KMGPIOJSONpath= RH850_F1KMGPIOJSONpath=
DriverFilePath= DriverFilePath=
IsMergeCreateHex=false IsMergeCreateHex=false
...@@ -49,11 +49,11 @@ MergeImageFilePath= ...@@ -49,11 +49,11 @@ MergeImageFilePath=
IsMergeCreateUpdateBin=false IsMergeCreateUpdateBin=false
MergeImageSize=128M MergeImageSize=128M
CRCFilePath= CRCFilePath=
MergeFlashCompressionFormat= MergeFlashCompressionFormat=RLE24
IsPlayMusic=false IsPlayMusic=false
IsHexDisplay=true IsHexDisplay=true
MergeLineInXLSPath= MergeLineInXLSPath=
MergeFlashInPutFilePath= MergeFlashInPutFilePath=D\:\\Code\\\u7231\u739B\u68C0\u6D4B\u53F0\\\u56FE\u7247\\\u5F39\u51FA\u62A5\u8B66
MergeFlashIsInternal=false MergeFlashIsInternal=false
MergeOutPutFilePath= MergeOutPutFilePath=
MergeAppFilePath= MergeAppFilePath=
......
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