Skip to content

J
jiancetai
Commit 4734e3ea authored by 梁百峰's avatar 梁百峰
Browse files
Options

Merge branch 'yadea_C011_jiancetai_z' of... 

Merge branch 'yadea_C011_jiancetai_z' of http://tyw-server.synology.me:12345/chenjiale/jiancetai into yedea_RS485
parents 86f96416 afa7cddb
Hide whitespace changes
Inline Side-by-side
Showing with 1800 additions and 533 deletions
source/app/api_gpio/io_config.c
View file @ 4734e3ea
......@@ -87,7 +87,7 @@ void Api_GPIO_Init(void)
Port_SetPinConfig(1, 3, &stc_IN_pin_config); //
Port_SetPinConfig(1, 7, &stc_IN_pin_config); //
// Port_SetPinConfig(1, 4, &stc_IN_pin_config); //NEW BUTTON 7 AD �ɼ�
Port_SetPinConfig(1, 15, &stc_IN_pin_config); // b+~
Port_SetPinConfig(1, 10, &stc_IN_pin_config); // test
//AD�ɼ���
......@@ -111,7 +111,7 @@ void Api_GPIO_Init(void)
.enGpioInitOutputLevel = PortGpioLow,
};
Port_SetPinConfig(1, 15, &stc_OUT_pin_config); // b+~
//BD8379����
Port_SetPinConfig(2, 4, &stc_OUT_pin_config); //L_ONEBitCLU_OUT
Port_SetPinConfig(2, 5, &stc_OUT_pin_config); //L_CLKBitCLU_OUT
......
source/app/api_timer/api_timer.c
View file @ 4734e3ea
......@@ -277,7 +277,7 @@ static void TIMER_1MS_ISR(void)
CanRecvLibTimerCall(Timer1msCnts);
//button State
if (ClusterValidTimerCnts) {
if(g_Stage != STAGE_ClearODO && g_Stage != STAGE_AutoCheck) {
if(g_Stage != STAGE_ClearODO && HJ_OtherKeyCurrent.count != 11) {
ClusterValidTimerCnts--;
}
else {
......@@ -657,7 +657,7 @@ static void TIMER13_10MS_ISR(void)
DisplayErrTimer = 0;
}
if (g_Stage == STAGE_AutoCheck) {
if (HJ_OtherKeyCurrent.count == 11) {
if(StaticCurrent.count < 50){
StaticCurrent.buf[StaticCurrent.count] = AdcValList[14];//18
AAA = AdcValList[14];
......
source/app/app_tft/app_tft.c
View file @ 4734e3ea
......@@ -34,7 +34,7 @@ unsigned int g_RPM_Val;
#define HW_VERSON_Y SMALL_PIC_BASE
#define SW_HJStatic_X 10
#define SW_HJStatic_Y 107
#define SW_HJStatic_Y 85
#define SW_HJSW_X SW_HJStatic_X
#define SW_HJHW_Y SW_HJStatic_Y + 20
......@@ -1447,16 +1447,15 @@ void General_Display(void)
{
uint8_t uiStage = 0;
uint8_t uiDspInfo[16+1];
uiDspInfo[0]=0;
UpdateTitle();
if(g_Stage == 0)
SetCheckBenchVersion();//���̨�汾��
// if(g_Stage == 0)
// SetCheckBenchVersion();//���̨�汾��
SetDisplayStaticItemW1(P_Line, 0, 30, DRAW_LUMIN_ICOM_WINDOW); // ����
if(Diaplay_test >= 999) {
Diaplay_test = 999;
}
sprintf(uiDspInfo,"%3d",Diaplay_test);
DspOneLineStaticStr(uiDspInfo, 130, 42);
// if(Diaplay_test >= 999) {
// Diaplay_test = 999;
// }
// sprintf(uiDspInfo,"%3d",Diaplay_test);
// DspOneLineStaticStr(uiDspInfo, 130, 42);
//switch(App_CalDataLen(Diaplay_test)) //�������
//{
......@@ -1467,33 +1466,33 @@ void General_Display(void)
// case 1:
// SetDisplayDynamicItemW1(NumberList[Diaplay_test % 10], 152, 35, DRAW_LUMIN_ICOM_WINDOW); //������� ��λ
//}
if (g_UI_Language == UI_ENGLISH) {
SetDisplayStaticItemW1(CumulativeCheckClusterEn, 0, 32, DRAW_LUMIN_ICOM_WINDOW); //�ۼƼ��
//SetDisplayStaticItemW1(State, 0, 80, DRAW_LUMIN_ICOM_WINDOW); //״̬
} else {
SetDisplayStaticItemW1(CumulativeCheckCluster, 0, 32, DRAW_LUMIN_ICOM_WINDOW); //�ۼƼ��
if(g_Stage == STAGE_SetEOL)
{
DspOneLineStaticStr(Test_array, FUNC_X+30, 150);
}
else
{
DspOneLineStaticStr(Test_array, FUNC_X+30, FUNC_Y); //sn
}
if(g_Stage == STAGE_OilDown && RxFinish == FINISH)
{
DspOneLineStaticStr(MultiplePack.Data, FUNC_X+30, 150);
}
// if (g_UI_Language == UI_ENGLISH) {
// SetDisplayStaticItemW1(CumulativeCheckClusterEn, 0, 32, DRAW_LUMIN_ICOM_WINDOW); //�ۼƼ��
// //SetDisplayStaticItemW1(State, 0, 80, DRAW_LUMIN_ICOM_WINDOW); //״̬
// } else {
// // SetDisplayStaticItemW1(CumulativeCheckCluster, 0, 32, DRAW_LUMIN_ICOM_WINDOW); //�ۼƼ��
// if(g_Stage == STAGE_SetEOL)
// {
// DspOneLineStaticStr(Test_array, FUNC_X+30, 150);
// }
// else
// {
// DspOneLineStaticStr(Test_array, FUNC_X+30, FUNC_Y); //sn
// }
// if(g_Stage == STAGE_OilDown && RxFinish == FINISH)
// {
// DspOneLineStaticStr(MultiplePack.Data, FUNC_X+30, 150);
// }
//SetDisplayStaticItemW1(State, 0, 80, DRAW_LUMIN_ICOM_WINDOW); //״̬
}
// //SetDisplayStaticItemW1(State, 0, 80, DRAW_LUMIN_ICOM_WINDOW); //״̬
// }
//DisplayStep(g_Stage);
SetDisplayStaticItemW2(P_Line, 0, 103, DRAW_LUMIN_ICOM_WINDOW); // ����
SetDisplayStaticItemW2(P_Line, 0, 291, DRAW_LUMIN_ICOM_WINDOW); // ����
// SetDisplayStaticItemW2(P_Line, 0, 103, DRAW_LUMIN_ICOM_WINDOW); // ����
// SetDisplayStaticItemW2(P_Line, 0, 291, DRAW_LUMIN_ICOM_WINDOW); // ����
}
......@@ -1527,6 +1526,7 @@ void DisplayStaticCurrent_S(uint16_t uiStartX,uint16_t uiDspLine)
}else if(StaticCurrent.Finsh == 2) {
ErrorBlink_S(SMALL_PIC_LIST_COL2_X + CHECK_STATE_OFFSET2, uiDspLine);
}
StaticCurrentCheck();
}
......@@ -1946,16 +1946,16 @@ void DspCheckState(uint8_t uiState)
if (g_UI_Language == UI_CHINESE) {
switch(uiState) {
case STATE_CHECKING:
SetDisplayDynamicItemW1(StateChecking, 0, 78, DRAW_LUMIN_ICOM_WINDOW);//״̬:�����
SetDisplayDynamicItemW1(StateChecking, 0, 40, DRAW_LUMIN_ICOM_WINDOW);//״̬:�����
break;
case STATE_CHECKED:
SetDisplayDynamicItemW1(StateChecked, 0, 77, DRAW_LUMIN_ICOM_WINDOW);//״̬:������
SetDisplayDynamicItemW1(StateChecked, 0, 40, DRAW_LUMIN_ICOM_WINDOW);//״̬:������
break;
case STATE_CONFIGURING:
SetDisplayDynamicItemW1(stateConfiguring, 0, 77, DRAW_LUMIN_ICOM_WINDOW);//״̬:������
SetDisplayDynamicItemW1(stateConfiguring, 0, 40, DRAW_LUMIN_ICOM_WINDOW);//״̬:������
break;
case STATE_CONFIGED:
SetDisplayDynamicItemW1(stateConfigOver, 3, 77, DRAW_LUMIN_ICOM_WINDOW);//״̬:�������
SetDisplayDynamicItemW1(stateConfigOver, 3, 40, DRAW_LUMIN_ICOM_WINDOW);//״̬:�������
break;
case STATE_CONFIGERROR:
uint8_t uiDspInfo[16+1];
......@@ -2079,10 +2079,17 @@ void AUTO_Step1(void)
uint8_t uiDspInfo_NUM1[16+1];
uiDspInfo_NUM1[0]=0;
sprintf(uiDspInfo_NUM1,"NUM1:",SW_Data);
DspOneLineDynamicStr(uiDspInfo_NUM1,SW_HJSW_X, SW_HJHW_Y);
DspOneLineStaticStr(NUM1_Data,SW_HJSW_X + 70,SW_HJHW_Y);//�ڲ��汾��1
// sprintf(uiDspInfo_NUM1,"NUM1:",SW_Data);
// DspOneLineDynamicStr(uiDspInfo_NUM1,SW_HJSW_X, SW_HJHW_Y);
// DspOneLineStaticStr(NUM1_Data,SW_HJSW_X + 70,SW_HJHW_Y);//�ڲ��汾��1
SetDisplayStaticItemW2(YD_lingjianhao , 0, SW_HJHW_Y, DRAW_LUMIN_ICOM_WINDOW);
SetDisplayStaticItemW2(YD_ruanjian , 0, SW_HJHW_Y+25, DRAW_LUMIN_ICOM_WINDOW);
SetDisplayStaticItemW2(YD_yingjian , 0, SW_HJHW_Y+25+25, DRAW_LUMIN_ICOM_WINDOW);
SetDisplayStaticItemW2(YD_yingxianwaifan , 0, SW_HJHW_Y+25+25+25, DRAW_LUMIN_ICOM_WINDOW);
SetDisplayStaticItemW2(YD_yibiao , 0, SW_HJHW_Y+25+25+25+25, DRAW_LUMIN_ICOM_WINDOW);
SetDisplayStaticItemW2(YD_zhichisaom , 0, SW_HJHW_Y+25+25+25+25+25, DRAW_LUMIN_ICOM_WINDOW);
SetDisplayStaticItemW2(YD_dianyuanwaifa , 0, SW_HJHW_Y+25+25+25+25+25+25, DRAW_LUMIN_ICOM_WINDOW);
if(NUM1Flag ==NUM1_UDSStateSuc){
SetDisplayDynamicItemW2(RIGHT_S, SW_HJSW_X + 200, SW_HJHW_Y, DRAW_LUMIN_ICOM_WINDOW);//����
......@@ -2093,8 +2100,8 @@ void AUTO_Step1(void)
uint8_t uiDspInfo_NUM2[16+1];
uiDspInfo_NUM2[0]=0;
sprintf(uiDspInfo_NUM2,"NUM2:",SW_Data);
DspOneLineDynamicStr(uiDspInfo_NUM2,SW_HJSW_X, SW_HJHW_Y + 20);
// sprintf(uiDspInfo_NUM2,"NUM2:",SW_Data);
// DspOneLineDynamicStr(uiDspInfo_NUM2,SW_HJSW_X, SW_HJHW_Y + 20);
DspOneLineStaticStr(NUM2_Data,SW_HJSW_X + 70,SW_HJHW_Y + 20);//�ڲ��汾��2
......@@ -2108,9 +2115,9 @@ void AUTO_Step1(void)
uiDspInfo_NUM3[0]=0;
sprintf(uiDspInfo_NUM3,"NUM3:",SW_Data);
DspOneLineDynamicStr(uiDspInfo_NUM3,SW_HJSW_X, SW_HJHW_Y + 40);
// DspOneLineDynamicStr(uiDspInfo_NUM3,SW_HJSW_X, SW_HJHW_Y + 40);
DspOneLineStaticStr(NUM3_Data,SW_HJSW_X + 70,SW_HJHW_Y + 40);//�ڲ��汾��3
// DspOneLineStaticStr(NUM3_Data,SW_HJSW_X + 70,SW_HJHW_Y + 40);//�ڲ��汾��3
if(NUM3Flag ==NUM3_UDSStateSuc){
SetDisplayDynamicItemW2(RIGHT_S, SW_HJSW_X + 200, SW_HJHW_Y + 40, DRAW_LUMIN_ICOM_WINDOW);//����
......@@ -2125,7 +2132,7 @@ void AUTO_Step1(void)
uint8_t NUM4_L[20];
sprintf(uiDspInfo_NUM4,"NUM4:",SW_Data);
DspOneLineDynamicStr(uiDspInfo_NUM4,SW_HJSW_X, SW_HJHW_Y + 60);
// DspOneLineDynamicStr(uiDspInfo_NUM4,SW_HJSW_X, SW_HJHW_Y + 60);
memcpy(NUM4_H, NUM4_Data, 11);
memcpy(NUM4_L, NUM4_Data+11, 10);
......@@ -2141,50 +2148,50 @@ void AUTO_Step1(void)
uint8_t uiDspInfo_NUM5[16+1];
uiDspInfo_NUM2[0]=0;
sprintf(uiDspInfo_NUM5,"NUM5:",SW_Data);
//DspOneLineDynamicStr(uiDspInfo_NUM5,SW_HJSW_X, SW_HJHW_Y + 80);
sprintf(uiDspInfo_NUM5,"NUM5:%2d.%2d",0x01,0x0c);//软件版本号
// DspOneLineDynamicStr(uiDspInfo_NUM5,SW_HJSW_X, SW_HJHW_Y + 80);
DspOneLineStaticStr(NUM5_Data,SW_HJSW_X + 70,SW_HJHW_Y + 80);//�ڲ��汾��5
// DspOneLineStaticStr(NUM5_Data,SW_HJSW_X + 70,SW_HJHW_Y + 80);//�ڲ��汾��5
if(NUM5Flag ==NUM5_UDSStateSuc){
SetDisplayDynamicItemW2(RIGHT_S, SW_HJSW_X + 200, SW_HJHW_Y + 80, DRAW_LUMIN_ICOM_WINDOW);//����
}else if(NUM5Flag == NUM5_UDSStateFail) {
ErrorBlink_S(SW_HJSW_X + 200, SW_HJHW_Y + 80);
}
// if(NUM5Flag ==NUM5_UDSStateSuc){
// SetDisplayDynamicItemW2(RIGHT_S, SW_HJSW_X + 200, SW_HJHW_Y + 80, DRAW_LUMIN_ICOM_WINDOW);//����
// }else if(NUM5Flag == NUM5_UDSStateFail) {
// ErrorBlink_S(SW_HJSW_X + 200, SW_HJHW_Y + 80);
// }
uint8_t uiDspInfo_NUM6[16+1];
uiDspInfo_NUM6[0]=0;
sprintf(uiDspInfo_NUM6,"NUM6:",SW_Data);
DspOneLineDynamicStr(uiDspInfo_NUM6,SW_HJSW_X, SW_HJHW_Y + 100);
sprintf(uiDspInfo_NUM6,"NUM6: %3d",0x8C);
// DspOneLineDynamicStr(uiDspInfo_NUM6,SW_HJSW_X, SW_HJHW_Y + 100);
DspOneLineStaticStr(NUM6_Data,SW_HJSW_X + 70,SW_HJHW_Y + 100);//�ڲ��汾��6
// DspOneLineStaticStr(NUM6_Data,SW_HJSW_X + 70,SW_HJHW_Y + 100);//�ڲ��汾��6
if(NUM6Flag ==NUM6_UDSStateSuc){
SetDisplayDynamicItemW2(RIGHT_S, SW_HJSW_X + 200, SW_HJHW_Y + 100, DRAW_LUMIN_ICOM_WINDOW);//����
}else if(NUM6Flag == NUM6_UDSStateFail) {
ErrorBlink_S(SW_HJSW_X + 200, SW_HJHW_Y + 100);
}
// if(NUM6Flag ==NUM6_UDSStateSuc){
// SetDisplayDynamicItemW2(RIGHT_S, SW_HJSW_X + 200, SW_HJHW_Y + 100, DRAW_LUMIN_ICOM_WINDOW);//����
// }else if(NUM6Flag == NUM6_UDSStateFail) {
// ErrorBlink_S(SW_HJSW_X + 200, SW_HJHW_Y + 100);
// }
uint8_t uiDspInfo_NUM7[16+1];
uiDspInfo_NUM7[0]=0;
sprintf(uiDspInfo_NUM7,"NUM7:",SW_Data);
DspOneLineDynamicStr(uiDspInfo_NUM7,SW_HJSW_X, SW_HJHW_Y + 120);
sprintf(uiDspInfo_NUM7,"NUM8: 1.00",SW_Data);
// DspOneLineDynamicStr(uiDspInfo_NUM7,SW_HJSW_X, SW_HJHW_Y + 120);
DspOneLineStaticStr(NUM7_Data,SW_HJSW_X + 70,SW_HJHW_Y + 120);//�ڲ��汾��7
// DspOneLineStaticStr(NUM7_Data,SW_HJSW_X + 70,SW_HJHW_Y + 120);//�ڲ��汾��7
if(NUM7Flag ==NUM7_UDSStateSuc){
SetDisplayDynamicItemW2(RIGHT_S, SW_HJSW_X + 200, SW_HJHW_Y + 120, DRAW_LUMIN_ICOM_WINDOW);//����
}else if(NUM7Flag == NUM7_UDSStateFail) {
ErrorBlink_S(SW_HJSW_X + 200, SW_HJHW_Y + 120);
}
// if(NUM7Flag ==NUM7_UDSStateSuc){
// SetDisplayDynamicItemW2(RIGHT_S, SW_HJSW_X + 200, SW_HJHW_Y + 120, DRAW_LUMIN_ICOM_WINDOW);//����
// }else if(NUM7Flag == NUM7_UDSStateFail) {
// // ErrorBlink_S(SW_HJSW_X + 200, SW_HJHW_Y + 120);
// }
uint8_t uiDspInfo_NUM8[16+1];
uiDspInfo_NUM8[0]=0;
sprintf(uiDspInfo_NUM8,"NUM8:",SW_Data);
DspOneLineDynamicStr(uiDspInfo_NUM8,SW_HJSW_X, SW_HJHW_Y + 140);
sprintf(uiDspInfo_NUM8,"NUM9:",SW_Data);
// DspOneLineDynamicStr(uiDspInfo_NUM8,SW_HJSW_X, SW_HJHW_Y + 140);
DspOneLineStaticStr(NUM8_Data,SW_HJSW_X + 70,SW_HJHW_Y + 140);//�ڲ��汾��7
......@@ -2193,6 +2200,20 @@ void AUTO_Step1(void)
}else if(NUM8Flag == NUM7_UDSStateFail) {
ErrorBlink_S(SW_HJSW_X + 200, SW_HJHW_Y + 140);
}
uint8_t uiDspInfo_NUM9[16+1];
uiDspInfo_NUM9[0]=0;
sprintf(uiDspInfo_NUM9,"NUM10:",SW_Data);
// DspOneLineDynamicStr(uiDspInfo_NUM9,SW_HJSW_X, SW_HJHW_Y + 160);
DspOneLineStaticStr(NUM9_Data,SW_HJSW_X + 70,SW_HJHW_Y + 160);//�ڲ��汾��7
// if(NUM8Flag ==NUM7_UDSStateSuc){
// SetDisplayDynamicItemW2(RIGHT_S, SW_HJSW_X + 200, SW_HJHW_Y + 140, DRAW_LUMIN_ICOM_WINDOW);//����
// }else if(NUM8Flag == NUM7_UDSStateFail) {
// ErrorBlink_S(SW_HJSW_X + 200, SW_HJHW_Y + 140);
// }
// uint8_t uiDspInfo_SW[16+1];
// uiDspInfo_SW[0]=0;
//
......@@ -2376,7 +2397,7 @@ void AUTO_Step10(void)
{
if(ButtomCurrent.count >= 0)
{
DisplayStaticCurrent_S(SW_HJStatic_X,SW_HJStatic_Y);
DisplayStaticCurrent_S(SW_HJStatic_X,80);
}
}
void AUTO_Step11(void)
......@@ -2398,22 +2419,22 @@ void AUTO_Step11(void)
void AUTO_Display(void)
{
if(g_uiStaticCurrentCheckFlag == 0) {
if (g_UI_Language == UI_CHINESE) {//Function01_CN
SetDisplayStaticItemW1(HJ_photograph, FUNC_X, 110, DRAW_LUMIN_ICOM_WINDOW);
}
else if (g_UI_Language == UI_ENGLISH) {
DspOneLineStaticStr("01.Auto", FUNC_X, FUNC_Y);
}
}
else {
if (g_UI_Language == UI_CHINESE) {
SetDisplayStaticItemW1(HJ_photograph, FUNC_X, 110, DRAW_LUMIN_ICOM_WINDOW);
}
else if (g_UI_Language == UI_ENGLISH) {
DspOneLineStaticStr("02.Auto(S)", FUNC_X, FUNC_Y);
}
}
// if(g_uiStaticCurrentCheckFlag == 0) {
// if (g_UI_Language == UI_CHINESE) {//Function01_CN
// SetDisplayStaticItemW1(HJ_photograph, FUNC_X, 110, DRAW_LUMIN_ICOM_WINDOW);
// }
// else if (g_UI_Language == UI_ENGLISH) {
// DspOneLineStaticStr("01.Auto", FUNC_X, FUNC_Y);
// }
// }
// else {
// if (g_UI_Language == UI_CHINESE) {
// SetDisplayStaticItemW1(HJ_photograph, FUNC_X, 110, DRAW_LUMIN_ICOM_WINDOW);
// }
// else if (g_UI_Language == UI_ENGLISH) {
// DspOneLineStaticStr("02.Auto(S)", FUNC_X, FUNC_Y);
// }
// }
// if(g_AutoConfig.AUTO_STEP0_APPLY == 1) AUTO_Step0();
// if(g_AutoConfig.AUTO_STEP1_APPLY == 1) AUTO_Step1();
......@@ -2427,7 +2448,7 @@ void AUTO_Display(void)
// if(g_AutoConfig.AUTO_STEP9_APPLY == 1) AUTO_Step9();
//if(g_AutoConfig.AUTO_STEP11_APPLY == 1) AUTO_Step11();
AUTO_Step10();
AUTO_Step1();
......@@ -2952,192 +2973,166 @@ void UpdateCenterInfo(uint8_t uiErrType)
}
void HJ_OtherDisplay()
{
SetDisplayStaticItemW2(HJ_pilotlamp, 0, 110, DRAW_LUMIN_ICOM_WINDOW);
uint8_t uiDspInfoVSpeed[16+1];
uiDspInfoVSpeed[0]=0;
sprintf(uiDspInfoVSpeed,"%4d km/h",HJ_CurvSpeedNum);
DspOneLineDynamicStr(uiDspInfoVSpeed, 80, 120);
uint8_t uiDspInfoEspeed[16+1];
uiDspInfoEspeed[0]=0;
sprintf(uiDspInfoEspeed,"%4d r/min",HJ_CureSpeedNum);
DspOneLineDynamicStr(uiDspInfoEspeed, 80, 205);
uint8_t uiDspInfoFuel[16+1];
uiDspInfoFuel[0]=0;
sprintf(uiDspInfoFuel,"%4d /5",HJ_CurFuelNum);
DspOneLineDynamicStr(uiDspInfoFuel, 80, 150);
switch (HJ_CurFuelNum) {
case 1: {
if ((FuelResTest >= 1350) && (FuelResTest <= 1650)) {
SetDisplayDynamicItemW2(RIGHT_S, SW_HJSW_X + 200, 150, DRAW_LUMIN_ICOM_WINDOW);//����
}else if(NUM7Flag == NUM7_UDSStateFail) {
ErrorBlink_S(SW_HJSW_X + 200, 150);
}
}break;
case 2: {
if ((FuelResTest >= 648) && (FuelResTest <= 792)) {
SetDisplayDynamicItemW2(RIGHT_S, SW_HJSW_X + 200, 150, DRAW_LUMIN_ICOM_WINDOW);//����
}else if(NUM7Flag == NUM7_UDSStateFail) {
ErrorBlink_S(SW_HJSW_X + 200, 150);
// SetDisplayStaticItemW2(HJ_pilotlamp, 0, 110, DRAW_LUMIN_ICOM_WINDOW);
uint8_t uiDspInfoTime[40];
uint8_t uiDspInfodrive[40] = {0};
uint8_t uiDspInfoPower[40] = {0};
uint8_t uiDspInfocolor[40] = {0};
uint8_t uiDspInfoledt[40] = {0};
uint8_t uiDspInfoled[40] = {0};
uiDspInfoTime[0]=0;
sprintf(uiDspInfoledt,"LED:",HJ_CurFuelNum);
DspOneLineDynamicStr(uiDspInfoledt, 10, 210);
if(HJ_OtherKeyCurrent.count > 0)
{
if(HJ_OtherKeyCurrent.count <= 10) {
HJ_CurvSpeedNum = ((HJ_OtherKeyCurrent.count - 1) * 11 );
}
}break;
case 3: {
if ((FuelResTest >= 180) && (FuelResTest <= 220)) {
SetDisplayDynamicItemW2(RIGHT_S, SW_HJSW_X + 200, 150, DRAW_LUMIN_ICOM_WINDOW);//����
}else if(NUM7Flag == NUM7_UDSStateFail) {
ErrorBlink_S(SW_HJSW_X + 200, 150);
}
}break;
case 4:
case 5: {
if ((FuelResTest >= 90) && (FuelResTest <= 110)) {
SetDisplayDynamicItemW2(RIGHT_S, SW_HJSW_X + 200, 150, DRAW_LUMIN_ICOM_WINDOW);//����
}else if(NUM7Flag == NUM7_UDSStateFail) {
ErrorBlink_S(SW_HJSW_X + 200, 150);
}
}break;
default: {
if (FuelResTest >= 60000) {
SetDisplayDynamicItemW2(RIGHT_S, SW_HJSW_X + 200, 150, DRAW_LUMIN_ICOM_WINDOW);//����
}else if(NUM7Flag == NUM7_UDSStateFail) {
ErrorBlink_S(SW_HJSW_X + 200, 150);
}
}break;
//电量
if(HJ_OtherKeyCurrent.count == 1)
{
HJ_SettingNum = 1;
}
else if(HJ_OtherKeyCurrent.count == 2)
{
HJ_SettingNum = 15;
}
else
{
HJ_SettingNum = HJ_CurvSpeedNum;
}
}
uint8_t uiDspInfoSetting[16+1];
uiDspInfoSetting[0]=0;
sprintf(uiDspInfoSetting,"%4d /6",HJ_SettingNum);
DspOneLineDynamicStr(uiDspInfoSetting, 80, 265);
uint8_t uiDspInfoTime[16+1];
uiDspInfoTime[0]=0;
//switch(HJ_OtherKeyCurrent.count)
//{
// case 1:
// sprintf(uiDspInfoTime,"00:00",HJ_CurFuelNum);
// break;
// case 2:
// sprintf(uiDspInfoTime,"11:11",HJ_CurFuelNum);
// break;
// case 3:
// sprintf(uiDspInfoTime,"22:22",HJ_CurFuelNum);
// break;
// case 4:
// sprintf(uiDspInfoTime,"23:59",HJ_CurFuelNum);
// break;
// default:
// sprintf(uiDspInfoTime,"00:00",HJ_CurFuelNum);
// break;
//}
//if(Othercount >= 3 ) {
// DspOneLineDynamicStr(uiDspInfoTime, 115, 175);
//} else {
// //SET_DISPLAY_STATIC_ITEM(0, HJSettingTime, 80, 146, DRAW_LUMIN_ICOM_WINDOW);
// SetDisplayStaticItemW2(HJSettingTime, 105, 170, DRAW_LUMIN_ICOM_WINDOW);
//}
switch(HJ_OtherKeyCurrent.count)
{
case 1:
//SetDisplayStaticItemW2(HJ_rightlight , 90, 225, DRAW_LUMIN_ICOM_WINDOW);
SetDisplayStaticItemW2(HJ_Lightout, 90, 225, DRAW_LUMIN_ICOM_WINDOW);
sprintf(uiDspInfoTime,"Time: 00:00",HJ_CurFuelNum);
sprintf(uiDspInfodrive,"DriveMode: FREE",HJ_CurFuelNum);
sprintf(uiDspInfoPower,"Power-: 10 kw",HJ_CurFuelNum);
sprintf(uiDspInfocolor,"Color: blue",HJ_CurFuelNum);
sprintf(uiDspInfoled,"POWERlow;READY;",HJ_CurFuelNum);
DspOneLineDynamicStr(uiDspInfoled, 20, 240);
sprintf(uiDspInfoled,"Lowbeam",HJ_CurFuelNum);
DspOneLineDynamicStr(uiDspInfoled, 20, 265);
// SetDisplayStaticItemW2(HJ_Lightout, 90, 240, DRAW_LUMIN_ICOM_WINDOW);//灯全灭
break;
case 2:
SetDisplayStaticItemW2(HJ_Left, 70, 225, DRAW_LUMIN_ICOM_WINDOW);
SetDisplayStaticItemW2(HJ_rightlight, 150, 225, DRAW_LUMIN_ICOM_WINDOW);
sprintf(uiDspInfoTime,"Time: 11:11",HJ_CurFuelNum);
sprintf(uiDspInfodrive,"DriveMode: SPORT",HJ_CurFuelNum);
sprintf(uiDspInfoPower,"Power-: 50 kw",HJ_CurFuelNum);
sprintf(uiDspInfocolor,"Color: orange",HJ_CurFuelNum);
SetDisplayStaticItemW2(HJ_ZiDong, 70, 215, DRAW_LUMIN_ICOM_WINDOW);
SetDisplayStaticItemW2(HJ_Left, 20, 240, DRAW_LUMIN_ICOM_WINDOW);
SetDisplayStaticItemW2(HJ_Distancelight, 120, 240, DRAW_LUMIN_ICOM_WINDOW);
//SetDisplayStaticItemW2(HJ_Lightout, 150, 225, DRAW_LUMIN_ICOM_WINDOW);
break;
case 3:
SetDisplayStaticItemW2(HJ_Distancelight, 70, 225, DRAW_LUMIN_ICOM_WINDOW);
SetDisplayStaticItemW2(HJ_ABS , 150, 225, DRAW_LUMIN_ICOM_WINDOW);
sprintf(uiDspInfoTime,"Time: 22:22:00",HJ_CurFuelNum);
sprintf(uiDspInfodrive,"DriveMode: TTFAR",HJ_CurFuelNum);
sprintf(uiDspInfoPower,"Power-: 100 kw",HJ_CurFuelNum);
sprintf(uiDspInfocolor,"Color: green",HJ_CurFuelNum);
sprintf(uiDspInfoled,"yuanguang;",HJ_CurFuelNum);
DspOneLineDynamicStr(uiDspInfoled, 10, 240);
SetDisplayStaticItemW2(HJ_rightlight, 140, 230, DRAW_LUMIN_ICOM_WINDOW);
break;
case 4:
SetDisplayStaticItemW2(HJ_DianPen , 90, 225, DRAW_LUMIN_ICOM_WINDOW);
sprintf(uiDspInfoTime,"Time: 13:33",HJ_CurFuelNum);
sprintf(uiDspInfoPower,"Energy recovery",HJ_CurFuelNum);
sprintf(uiDspInfocolor,"Color: red",HJ_CurFuelNum);
sprintf(uiDspInfoled,"biancheng;xunhang;",HJ_CurFuelNum);
DspOneLineDynamicStr(uiDspInfoled, 20, 240);
sprintf(uiDspInfoled,"chaojiTdongli;",HJ_CurFuelNum);
DspOneLineDynamicStr(uiDspInfoled, 20, 270);
break;
case 5:
SetDisplayStaticItemW2(HJ_JiYou , 70, 225, DRAW_LUMIN_ICOM_WINDOW);
SetDisplayStaticItemW2(HJ_S , 150, 225, DRAW_LUMIN_ICOM_WINDOW);
sprintf(uiDspInfoTime,"Time: 14:44",HJ_CurFuelNum);
sprintf(uiDspInfoPower,"Power+: 1 Grid",HJ_CurFuelNum);
sprintf(uiDspInfoled,"zuotong;",HJ_CurFuelNum);
DspOneLineDynamicStr(uiDspInfoled, 20, 270);
SetDisplayStaticItemW2(HJ_TCS , 20, 240, DRAW_LUMIN_ICOM_WINDOW);
break;
case 6:
SetDisplayStaticItemW2(HJ_NGear , 70, 225, DRAW_LUMIN_ICOM_WINDOW);
SetDisplayStaticItemW2(HJ_TCS , 100, 225, DRAW_LUMIN_ICOM_WINDOW);
sprintf(uiDspInfoTime,"Time: 15:55",HJ_CurFuelNum);
sprintf(uiDspInfoPower,"Power+: 5 Grid",HJ_CurFuelNum);
sprintf(uiDspInfoled,"zuodianganying",HJ_CurFuelNum);
DspOneLineDynamicStr(uiDspInfoled, 20, 240);
sprintf(uiDspInfoled,"doupohuangjiang;",HJ_CurFuelNum);
DspOneLineDynamicStr(uiDspInfoled, 20, 270);
break;
case 7:
SetDisplayStaticItemW2(HJ_ZiDong , 90, 225, DRAW_LUMIN_ICOM_WINDOW);
sprintf(uiDspInfoTime,"Time: 16:06",HJ_CurFuelNum);
sprintf(uiDspInfoPower,"Power+: 10 Grid",HJ_CurFuelNum);
SetDisplayStaticItemW2(HJ_ABS , 20, 225, DRAW_LUMIN_ICOM_WINDOW);
sprintf(uiDspInfoled,"xiangonglv;",HJ_CurFuelNum);
DspOneLineDynamicStr(uiDspInfoled, 20, 260);
// SetDisplayStaticItemW2(HJ_rightlight, 90, 225, DRAW_LUMIN_ICOM_WINDOW);
break;
case 8:
sprintf(uiDspInfoTime,"Time: 17:07",HJ_CurFuelNum);
sprintf(uiDspInfocolor,"Color: red",HJ_CurFuelNum);
sprintf(uiDspInfoled,"lanya;cheguzhang",HJ_CurFuelNum);
DspOneLineDynamicStr(uiDspInfoled, 20, 240);
//SetDisplayStaticItemW2(, 90, 225, DRAW_LUMIN_ICOM_WINDOW);
//SetDisplayStaticItemW2( HJ_Engine, 90, 225, DRAW_LUMIN_ICOM_WINDOW);
break;
case 9:
SetDisplayStaticItemW2(HJ_E, 90, 225, DRAW_LUMIN_ICOM_WINDOW);
sprintf(uiDspInfoTime,"Time: 18:08",HJ_CurFuelNum);
sprintf(uiDspInfoled,"didianliang",HJ_CurFuelNum);
DspOneLineDynamicStr(uiDspInfoled, 20, 240);
break;
case 10:
SetDisplayStaticItemW2(HJ_HEV, 90, 225, DRAW_LUMIN_ICOM_WINDOW);
sprintf(uiDspInfoTime,"Time: 19:09",HJ_CurFuelNum);
SetDisplayStaticItemW2( HJ_Alllight, 20, 240, DRAW_LUMIN_ICOM_WINDOW);
// SetDisplayStaticItemW2(, 90, 225, DRAW_LUMIN_ICOM_WINDOW);
break;
case 11:
SetDisplayStaticItemW2( HJ_Alllight, 90, 225, DRAW_LUMIN_ICOM_WINDOW);
case 11://静态电流
Port_SetPortPinLevel(1, 21, PortGpioLow); //stb
Port_SetPortPinLevel(1, 15, PortGpioLow); //stb
AUTO_Step10();
// SetDisplayStaticItemW2( HJ_Alllight, 90, 240, DRAW_LUMIN_ICOM_WINDOW);//
// sprintf(uiDspInfoTime,"Time: 00:00",HJ_CurFuelNum);
break;
// case 12:
// SetDisplayStaticItemW2(, 90, 225, DRAW_LUMIN_ICOM_WINDOW);
// break;
// case 13:
// SetDisplayStaticItemW2(, 90, 225, DRAW_LUMIN_ICOM_WINDOW);
// break;
// case 14:
// SetDisplayStaticItemW2(, 90, 225, DRAW_LUMIN_ICOM_WINDOW);
// break;
// case 15:
// SetDisplayStaticItemW2(, 90, 225, DRAW_LUMIN_ICOM_WINDOW);
// break;
// case 16:
// SetDisplayStaticItemW2(, 90, 225, DRAW_LUMIN_ICOM_WINDOW);
// break;
// case 17:
// SetDisplayStaticItemW2(, 90, 225, DRAW_LUMIN_ICOM_WINDOW);
// break;
// case 6:
// SetDisplayStaticItemW2(, 90, 225, DRAW_LUMIN_ICOM_WINDOW);
// break;
default:
SetDisplayStaticItemW2( HJ_Alllight, 90, 240, DRAW_LUMIN_ICOM_WINDOW);
sprintf(uiDspInfoTime,"Time: 00:00",HJ_CurFuelNum);
break;
}
// case 6:
// SetDisplayStaticItemW2(, 90, 225, DRAW_LUMIN_ICOM_WINDOW);
// break;
if(HJ_OtherKeyCurrent.count != 11)
{
DspOneLineDynamicStr(uiDspInfoTime, 10, 110);
DspOneLineDynamicStr(uiDspInfodrive, 10, 135);
DspOneLineDynamicStr(uiDspInfoPower, 10, 160);
DspOneLineDynamicStr(uiDspInfocolor, 10, 185);
uint8_t uiDspInfoVSpeed[40];
uiDspInfoVSpeed[0]=0;
sprintf(uiDspInfoVSpeed,"VSpeed:%4d km/h",HJ_CurvSpeedNum);
DspOneLineDynamicStr(uiDspInfoVSpeed, 10, 60);
default:
SetDisplayStaticItemW2( HJ_Alllight, 90, 225, DRAW_LUMIN_ICOM_WINDOW);
break;
uint8_t uiDspInfoFuel[40];
uiDspInfoFuel[0]=0;
sprintf(uiDspInfoFuel,"Electricity: %2d/100",HJ_SettingNum);
DspOneLineDynamicStr(uiDspInfoFuel, 10, 85);
}
}
void UpdateCenterTripC(void)
......@@ -3170,40 +3165,54 @@ void UpdateCenterTripC(void)
{
DspCheckResult(RESULT_MAN_REVIEW);
}
if(g_Stage == 0)
{
g_Stage = STAGE_Led_Telltale_Check;
Botton.LED.Statu = 1;
}
Port_SetPortPinLevel(1, 20, PortGpioHigh); //stb
switch(g_Stage) //��̬ͼѡ����
{
case 0:
STEP0_Display();
// STEP0_Display();
#if (PRO_JAPE2)
Electricity();
#endif
break;
case STAGE_AutoCheck: //�Լ�
AUTO_Display();
// AUTO_Display();
break;
case STAGE_Led_Telltale_Check: //����ָʾ��
case STAGE_Led_Telltale_Check: //双闪
AUTO_Display();
//LED_Display();
break;
case STAGE_Speed: //����ת��Ƶ��ռ�ձ�
//SPEED_Display();
break;
case STAGE_WaterAndFuel: //ˮ�ͼ��
case STAGE_Speed: //按键+
case STAGE_WaterAndFuel: //ˮ�ͼ�� //按键-
//OIL_TEMP_Display();
Port_SetPortPinLevel(1, 21, PortGpioHigh); //stb
Port_SetPortPinLevel(1, 15, PortGpioHigh); //stb
HJ_OtherDisplay();
ButtomCurrent.enable = 0;
break;
case STAGE_TFTCheck: //TFT
case STAGE_TFTCheck: //右移
//TFT_Display();
break;
case STAGE_Other: //���� ELse
// ELSE_Display();
HJ_OtherDisplay();
break;
case STAGE_ClearODO: //END ����
//END_Display();
break;
case STAGE_SetEOL: //���� EOL����
//EOL_Display();
break;
case STAGE_LCDCheck: //LCD
//LCD_Display();
break;
default:
......
source/app/app_tft/picture.h
View file @ 4734e3ea
This source diff could not be displayed because it is too large. You can view the blob instead.
source/bsp_source/bsp_button/bsp_app_AUTO.c
View file @ 4734e3ea
......@@ -38,6 +38,8 @@ uint8_t NUM5_Data[10];
uint8_t NUM6_Data[10];
uint8_t NUM7_Data[10];
uint8_t NUM8_Data[20];
uint8_t NUM9_Data[20];
uint8_t NUM10_Data[20];
uint8_t CSW_Data[10];
uint8_t SendSW;
uint8_t SendNUM1;
......@@ -2057,7 +2059,7 @@ void OtherCheck(void)
SetStartTime(0);
break;
case AUTO_STATIC:
StaticCurrentCheck();
break;
// case AUTO_OTHER:
// SpeedFreqILLCheck();
......@@ -2528,7 +2530,7 @@ void APP_AUTO(void)
default:
ErrorCode = 99;//??????
SetStartTime(0);
ButtomCurrent.enable = 0;
break;
}
}
......
source/bsp_source/bsp_button/bsp_button.c
View file @ 4734e3ea
......@@ -131,7 +131,7 @@ void Get_Button_Value()//��ȡ����AD
else
Botton.Back_light.Flag = 0;
#else
if (g_Stage != STAGE_AutoCheck) {
if (HJ_OtherKeyCurrent.count != 11) {
Test_AD = Calculate_Thermistor(AdcValList[15]);
if((Test_AD > 130) && (Test_AD < 150))//����
Botton.Luminosity.Flag = 1;
......@@ -1409,7 +1409,7 @@ void UserPressAuto(void)
{
g_Stage = STAGE_AutoCheck;
#if (PRO_CONFIG_CHECK_APPLY)
Auto_Init(1);//��������̬�������
// Auto_Init(1);//��������̬�������
#endif
}
......@@ -1447,41 +1447,42 @@ uint8_t g_LedCheckDeriction = 0;
void UserPressWarning(void)
{
g_Stage = STAGE_Led_Telltale_Check;
#if (PRO_CONFIG_CHECK_APPLY)
if(g_LedCheckDeriction == 1 && LedCurrent.count > 0) {
LedCurrent.count = 0;
}
g_LedCheckDeriction = 0;
if (g_uiLedWaitTimer <= 0){
#if (SEMI_AUTOMATIC_STAGE)
if(LedCurrent.count < STAGE_COUNT_HARD_LINE_LED)
LedCurrent.count ++;
g_uiLedWaitTimer = 1000;
// if(LedCurrent.count == 4){
// LedCurrent.count = 1;
// }
#else
#if (PRO_NU2)
if(LedCurrent.count < 6)
LedCurrent.count ++;
g_uiLedWaitTimer = 1000;
if(LedCurrent.count == 6){
LedCurrent.count = 1;
}
#else
if(LedCurrent.count < 4)
LedCurrent.count ++;
g_uiLedWaitTimer = 1000;
if(LedCurrent.count == 4){
LedCurrent.count = 1;
}
#endif
#endif
}
memset(&BuzzerAlarm, 0, sizeof(BuzzerAlarm));
memset(&CheckCurrent,0,sizeof(CheckCurrent));
LedCurrent.Flag = 0;
#endif
// #if (PRO_CONFIG_CHECK_APPLY)
// if(g_LedCheckDeriction == 1 && LedCurrent.count > 0) {
// LedCurrent.count = 0;
// }
// g_LedCheckDeriction = 0;
// if (g_uiLedWaitTimer <= 0){
// #if (SEMI_AUTOMATIC_STAGE)
// if(LedCurrent.count < STAGE_COUNT_HARD_LINE_LED)
// LedCurrent.count ++;
// g_uiLedWaitTimer = 1000;
// // if(LedCurrent.count == 4){
// // LedCurrent.count = 1;
// // }
// #else
// #if (PRO_NU2)
// if(LedCurrent.count < 6)
// LedCurrent.count ++;
// g_uiLedWaitTimer = 1000;
// if(LedCurrent.count == 6){
// LedCurrent.count = 1;
// }
// #else
// if(LedCurrent.count < 4)
// LedCurrent.count ++;
// g_uiLedWaitTimer = 1000;
// if(LedCurrent.count == 4){
// LedCurrent.count = 1;
// }
// #endif
// #endif
// }
// memset(&BuzzerAlarm, 0, sizeof(BuzzerAlarm));
// memset(&CheckCurrent,0,sizeof(CheckCurrent));
// LedCurrent.Flag = 0;
// #endif
}
uint8_t g_SpeedCheckDeriction = 0;
void UserPressKeySpeedUp(void)
......@@ -2290,23 +2291,7 @@ void HJ_SwitchSecondPage()
g_Stage = STAGE_Other;
//VSPEED
if(HJ_OtherKeyCurrent.count <= 10) {
HJ_CurvSpeedNum = ((((HJ_OtherKeyCurrent.count - 1) * 20 )*100)/105) + 1;
if(HJ_CurvSpeedNum < 25)
HJ_CurvSpeedNum-=1;
} else {
HJ_CurvSpeedNum = 199;
}
//Gear
if(HJ_OtherKeyCurrent.count <= 7) {
HJ_SettingNum = (HJ_OtherKeyCurrent.count-1);}
else if(HJ_OtherKeyCurrent.count == 8 ) {
HJ_SettingNum = 0;
} else{
HJ_SettingNum = 15 - HJ_OtherKeyCurrent.count;
}
//ESPEED
if(HJ_OtherKeyCurrent.count <= 9) {
......@@ -2519,7 +2504,7 @@ void Stage_Manage()
#endif
}
if(Botton.Auto.Statu == 1){ // �Լ�
if((Botton.Auto.Statu == 1)){ // �Լ�
Botton.Auto.Statu = 0;
#if (SEMI_AUTOMATIC_STAGE)
#else
......@@ -2534,11 +2519,7 @@ void Stage_Manage()
// UserPressEOL();//��������
g_Stage = STAGE_Other;
if (HJ_OtherKeyCurrent.count == 0) {
HJ_OtherKeyCurrent.count = 11;
} else {
HJ_OtherKeyCurrent.count --;
}
ClearOtherSWFlagFun();
ClearOtherFlagFun();
Othercount = 0;
......@@ -2557,11 +2538,24 @@ void Stage_Manage()
if(Botton.SpeedDown.Statu == 1){ // SPEED DOWN
Botton.SpeedDown.Statu = 0;
g_Stage = STAGE_Speed;
HJ_OtherKeyCurrent.count ++;
if(HJ_OtherKeyCurrent.count == 11)
{
Auto_Init(1);
}
if(HJ_OtherKeyCurrent.count > 11) {
HJ_OtherKeyCurrent.count = 1;
}
#if (SEMI_AUTOMATIC_STAGE)
if (g_PerFuncExecSecond == 0)
ExecSemiAutomaticCheck(0);
#else
UserPressKeySpeedDown();//����-����
// UserPressKeySpeedDown();//����-����
#endif
}
......@@ -2575,14 +2569,22 @@ void Stage_Manage()
if(Botton.FuelWaterUp.Statu == 1){
Botton.FuelWaterUp.Statu = 0;
g_Stage = STAGE_WaterAndFuel;
if (HJ_OtherKeyCurrent.count == 0) {
HJ_OtherKeyCurrent.count = 11;
Auto_Init(1);
} else {
HJ_OtherKeyCurrent.count --;
}
#if (SEMI_AUTOMATIC_STAGE)
#else
UserPressKeyOilTempUp();//ȼ�͡�ˮ��+����
Gear_SWCount ++;
if(Gear_SWCount > 5)
{
Gear_SWCount = 1;
}
// UserPressKeyOilTempUp();//ȼ�͡�ˮ��+����
// Gear_SWCount ++;
// if(Gear_SWCount > 5)
// {
// Gear_SWCount = 1;
// }
#endif
}
......@@ -2684,16 +2686,12 @@ void Stage_Manage()
//UserPressKeyElse();//��������
// DOWNKeyCurrent.count ++;
g_Stage = STAGE_Other;
HJ_OtherKeyCurrent.count ++;
Line_Temp();
RS485_User_Tx_Data();
ClearOtherSWFlagFun();
ClearOtherFlagFun();
Othercount = 0;
if(HJ_OtherKeyCurrent.count > 11) {
HJ_OtherKeyCurrent.count = 0;
}
Othercount = 0;
#endif
}
......@@ -2708,7 +2706,7 @@ void Stage_Manage()
g_OldStage = g_Stage;
if(g_Stage != STAGE_AutoCheck)
if(HJ_OtherKeyCurrent.count != 11)
{
ErrorCode = 0;
StaticCurrent.Finsh = 0;
......
source/bsp_source/bsp_button/bsp_button.h
View file @ 4734e3ea
......@@ -26,6 +26,8 @@ extern uint8_t NUM5_Data[10];
extern uint8_t NUM6_Data[10];
extern uint8_t NUM7_Data[10];
extern uint8_t NUM8_Data[20];
extern uint8_t NUM9_Data[20];
extern uint8_t NUM10_Data[20];
extern uint8_t CSW_Data[10];
extern volatile uint16_t ErrorCode;
......
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