Skip to content

M
MV18
Commit bbb22262 authored by hu's avatar hu
Browse files
Options

调整指示灯，调整开机电机逻辑，调整开机动画位置

parent e91c4d6d
Expand all Show whitespace changes
Inline Side-by-side
Showing with 530 additions and 993 deletions
C_Layout.hwl
View file @ bbb22262
OPEN source 0 0 60 100 OPEN source 0 0 60 100
Source < attributes TOOLTIP on,TOOLTIP_FORMAT signed,TOOLTIP_MODE details,FREEZE off,MARKS off Source < attributes TOOLTIP on,TOOLTIP_FORMAT signed,TOOLTIP_MODE details,FREEZE off,MARKS off
OPEN assembly 60 0 40 31 OPEN assembly 60 0 40 31
Assembly < attributes ADR on,CODE off,ABSADR on,SYMB off,FORMAT Auto,FREEZE off,TOPPC 0xF48000 Assembly < attributes ADR on,CODE off,ABSADR on,SYMB off,FORMAT Auto,FREEZE off,TOPPC 0xF3AC40
OPEN procedure 0 39 60 17 OPEN procedure 0 39 60 17
Procedure < attributes VALUES on,TYPES off Procedure < attributes VALUES on,TYPES off
OPEN register 60 31 40 25 OPEN register 60 31 40 25
...@@ -17,4 +17,4 @@ Command < attributes CACHESIZE 1000 ...@@ -17,4 +17,4 @@ Command < attributes CACHESIZE 1000
bckcolor 50331647 bckcolor 50331647
font 'Courier New' 9 BLACK font 'Courier New' 9 BLACK
AUTOSIZE on AUTOSIZE on
ACTIVATE "Command" "Register" "Memory" "Procedure" "Assembly" "Data:2" "Source" "Data:1" ACTIVATE "Command" "Register" "Memory" "Procedure" "Assembly" "Data:2" "Data:1" "Source"
Sources/EEPROM/api_EEPROM.c
View file @ bbb22262
...@@ -370,6 +370,30 @@ void Init2EData(void) ...@@ -370,6 +370,30 @@ void Init2EData(void)
Radio.VehRadio = ((INT16U)Diag2eData.D_FCAA[0] << 8) | ((INT16U)Diag2eData.D_FCAA[1]); Radio.VehRadio = ((INT16U)Diag2eData.D_FCAA[0] << 8) | ((INT16U)Diag2eData.D_FCAA[1]);
//---- F1A8 ----// //---- F1A8 ----//
Diag2eData.D_F1A8[2] = 0x00; //Byte2::Bit0 左转向 : default:0 硬线 1 CAN
//Byte2::Bit1 右转向 : default:0 硬线 1 CAN
//Byte2::Bit2 远光灯 : default:0 硬线 1 CAN
//Byte2::Bit3 近光灯 : default:0 硬线 1 CAN
//Byte2::Bit4 前雾灯 : default:0 硬线 1 CAN
//Byte2::Bit5 后雾灯 : default:0 硬线 1 CAN
//Byte2::Bit6 位置灯 : default:0 硬线 1 CAN
//左转向
ConfigItem.LTurnConfig = Diag2eData.D_F1A8[2] & 0x01;
//右转向
ConfigItem.RTurnConfig = (Diag2eData.D_F1A8[2] >> 1) & 0x01;
//远转向
ConfigItem.HighBeamConfig = (Diag2eData.D_F1A8[2] >> 2) & 0x01;
//近光灯
ConfigItem.LowBeamConfig = (Diag2eData.D_F1A8[2] >> 3) & 0x01;
//前雾灯
ConfigItem.FrontFogConfig = (Diag2eData.D_F1A8[2] >> 4) & 0x01;
//后雾灯
ConfigItem.RearFogConfig = (Diag2eData.D_F1A8[2] >> 5) & 0x01;
//位置灯
ConfigItem.PosLampConfig = (Diag2eData.D_F1A8[2] >> 6) & 0x01;
//--------------------------------------------------------------------------------------------------------------------
Diag2eData.D_F1A8[0] = 90; //Byte0 实际是120,后面+30 超速报警值 : default:120km/h Diag2eData.D_F1A8[0] = 90; //Byte0 实际是120,后面+30 超速报警值 : default:120km/h
Diag2eData.D_F1A8[1] = 0x09; //Byte1::Bit0 超速报警 : default:1 配置 Diag2eData.D_F1A8[1] = 0x09; //Byte1::Bit0 超速报警 : default:1 配置
...@@ -377,7 +401,7 @@ void Init2EData(void) ...@@ -377,7 +401,7 @@ void Init2EData(void)
//Byte1::Bit3 气压 : default:1 配置 //Byte1::Bit3 气压 : default:1 配置
//Byte1::Bit7 - Bit4 语言 : default:0 中文 //Byte1::Bit7 - Bit4 语言 : default:0 中文
Diag2eData.D_F1A8[2] = 0x00; //Byte2::Bit3 - Bit0 发动机状态 : default:0 0x0：全柴Q23国六发动机 0x1：云内D20国六发动机 //Diag2eData.D_F1A8[2] = 0x00; //Byte2::Bit3 - Bit0 发动机状态 : default:0 0x0：全柴Q23国六发动机 0x1：云内D20国六发动机
//Byte2::Bit7 - Bit4 单位 : default:0 km/h，L/100km //Byte2::Bit7 - Bit4 单位 : default:0 km/h，L/100km
Diag2eData.D_F1A8[3] = 0x46; //3200-5000rpm Diag2eData.D_F1A8[3] = 0x46; //3200-5000rpm
...@@ -395,7 +419,7 @@ void Init2EData(void) ...@@ -395,7 +419,7 @@ void Init2EData(void)
Diag2eData.D_F1A8[6] = 0x00; Diag2eData.D_F1A8[6] = 0x00;
Diag2eData.D_F1A8[7] = 0x00; //Byte7::Bit3 - Bit2 蹄片磨损 : default:0 屏蔽 Diag2eData.D_F1A8[7] = 0x00; //Byte7::Bit3 - Bit2 蹄片磨损 : default:0 屏蔽
//(void)memset(&Diag2eData.D_F1A8[7], 0, 14); (void)memset(&Diag2eData.D_F1A8[8], 0, 13);
//超速报警值 //超速报警值
SetMeuMsg.OverSpeed = Diag2eData.D_F1A8[0] + 30; //--// SetMeuMsg.OverSpeed = Diag2eData.D_F1A8[0] + 30; //--//
......
Sources/MOTOR/Motor_interface.c
View file @ bbb22262
...@@ -38,8 +38,8 @@ void bsp_MeterConfig(void) ...@@ -38,8 +38,8 @@ void bsp_MeterConfig(void)
{ {
Gpio_Loading(); Gpio_Loading();
bsp_set_meterCfg(Motor_1, direction_2,2880,200); //ת bsp_set_meterCfg(Motor_1, direction_2,2760,200); //ת
bsp_set_meterCfg(Motor_2, direction_2,2880,200); // bsp_set_meterCfg(Motor_2, direction_2,2760,200); //
//bsp_set_meterCfg(Motor_3,direction_1,90*12,200); //bsp_set_meterCfg(Motor_3,direction_1,90*12,200);
//bsp_set_meterCfg(Motor_4,direction_1,240*12,200); //bsp_set_meterCfg(Motor_4,direction_1,240*12,200);
......
Sources/TFT/app_DataProcess.c
View file @ bbb22262
...@@ -896,36 +896,23 @@ void App_CalFre(_FreType *Veh) ...@@ -896,36 +896,23 @@ void App_CalFre(_FreType *Veh)
--------------------------------------------------------------------------*/ --------------------------------------------------------------------------*/
void App_CalBorad(void) void App_CalBorad(void)
{ {
workMode_t MotorState[4] = {0,0,0,0}; workMode_t MotorState[4] = {0, 0, 0, 0};
//-- 自检 --// //-- 自检 --//
if (CheckStep == 0) if (CheckStep == 0)
{ {
/* MotorState[0] = bsp_GetMotorState(Motor_1);
g_sysFlag.Bits.TempMeterInit = Disable; MotorState[1] = bsp_GetMotorState(Motor_2);
g_vehMeter.DestPosition = 2400;
g_revMeter.DestPosition = 2445; if ((MotorState[0] == Normal) && (MotorState[1] == Normal))
g_tempMeter.DestPosition = 200; {
if ((g_vehMeter.CurPosition >= 2400) && (g_revMeter.CurPosition >= 2445)) bsp_SetMotorMode(Motor_1, MinReset);
CheckStep = 1; bsp_SetMotorMode(Motor_2, MinReset);
*/
bsp_SetMotorMode(Motor_1,SelfCheck);
bsp_SetMotorMode(Motor_2,SelfCheck);
CheckStep = 1; CheckStep = 1;
} }
}
else if (CheckStep == 1) else if (CheckStep == 1)
{ {
/*
g_vehMeter.DestPosition = 0;
g_revMeter.DestPosition = 0;
g_tempMeter.DestPosition = 0;
if ((g_vehMeter.CurPosition == 0) && (g_revMeter.CurPosition == 0))
{
CheckStep = 2;
g_sysFlag.Bits.TempMeterInit = Enable;
g_Init.InitTempTime = 0;
}
*/
MotorState[0] = bsp_GetMotorState(Motor_1); MotorState[0] = bsp_GetMotorState(Motor_1);
MotorState[1] = bsp_GetMotorState(Motor_2); MotorState[1] = bsp_GetMotorState(Motor_2);
...@@ -949,6 +936,15 @@ void App_CalBorad(void) ...@@ -949,6 +936,15 @@ void App_CalBorad(void)
//-- Fuel --// //-- Fuel --//
App_CalFuelBoard(); App_CalFuelBoard();
//开机LOGO
g_curLightFlag = 1;
//if ((g_adcResult.AdcValue > V_16v) && (g_30LOGOFlag == 0))
if (g_30LOGOFlag == 0x0u)
{
g_30LOGOFlag = 1;
Gui_Logo_Disp();
}
} }
/*-------------------------------------------------------------------------- /*--------------------------------------------------------------------------
* Function Name : App_CalVehBoard * Function Name : App_CalVehBoard
......
Sources/TFT/gui_Disp.c
View file @ bbb22262
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
* Author: QTC * Author: QTC
*/ */
#define GLOBALS_GUI_DISP #define GLOBALS_GUI_DISP
#include "defines.h" #include "defines.h"
#include "g_includes.h" #include "g_includes.h"
...@@ -20,171 +19,22 @@ ...@@ -20,171 +19,22 @@
--------------------------------------------------------------------------*/ --------------------------------------------------------------------------*/
void Gui_MotorFirstReset(void) void Gui_MotorFirstReset(void)
{ {
workMode_t MotorState[4] = {0,0,0,0}; bsp_SetMotorMode(Motor_1, MaxReset);
bsp_SetMotorMode(Motor_2, MaxReset);
bsp_SetMotorMode(Motor_1,MaxReset);
bsp_SetMotorMode(Motor_2,MaxReset); //bsp_WDOG_Feed();
MotorState[0] = bsp_GetMotorState(Motor_1); //Api_GetAdcResult();
MotorState[1] = bsp_GetMotorState(Motor_2); //g_curLightFlag = 1;
while ((MotorState[0] != Normal) || (MotorState[1] != Normal)) //Gui_KL30LedDisplay();
{ //if ((g_adcResult.AdcValue > V_16v) && (g_30LOGOFlag == 0))
bsp_WDOG_Feed(); //{
Api_GetAdcResult(); // g_30LOGOFlag = 1;
g_curLightFlag=1; // Gui_Logo_Disp();
//}
Gui_KL30LedDisplay(); //Gui_LightProc();
if((g_adcResult.AdcValue > V_16v)&&(g_30LOGOFlag==0))
{
g_30LOGOFlag=1;
Gui_Logo_Disp();
}
Gui_LightProc();
MotorState[0] = bsp_GetMotorState(Motor_1);
MotorState[1] = bsp_GetMotorState(Motor_2);
}
/*
Enable_signal(g_vehMeter.MotorFirstReset);
Enable_signal(g_revMeter.MotorFirstReset);
g_vehMeter.DestPosition = null;
g_revMeter.DestPosition = null;
g_vehMeter.CurPosition = 3688;
g_revMeter.CurPosition = 3688;
for(;;)
{
bsp_WDOG_Feed();
Api_GetAdcResult();
g_curLightFlag=1;
Gui_KL30LedDisplay();
if((g_adcResult.AdcValue > V_16v)&&(g_30LOGOFlag==0))
{
g_30LOGOFlag=1;
Gui_Logo_Disp();
}
Gui_LightProc();
if((g_vehMeter.DestPosition == g_vehMeter.CurPosition) && \
(g_revMeter.DestPosition == g_revMeter.CurPosition))
{
break;
}
}
g_vehMeter.DestPosition = null;
g_revMeter.DestPosition = null;
g_vehMeter.CurPosition = 15;
g_revMeter.CurPosition = 15;
for(;;)
{
bsp_WDOG_Feed();
g_curLightFlag=1;
Gui_LightProc();
Gui_KL30LedDisplay();
if((g_vehMeter.DestPosition == g_vehMeter.CurPosition) && \
(g_revMeter.DestPosition == g_revMeter.CurPosition)
)
{
break;
}
}
Disable_signal(g_vehMeter.MotorFirstReset);
Disable_signal(g_revMeter.MotorFirstReset);
Disable_signal(g_vehMeter.DestPosition);
Disable_signal(g_revMeter.DestPosition);
Disable_signal(g_vehMeter.CurPosition);
Disable_signal(g_revMeter.CurPosition);
*/
} }
/*-------------------------------------------------------------------------
* Function Name : Gui_MotorStarReset
* Description :
* Input : None
* Output : None
* Return : None
* onther :
--------------------------------------------------------------------------*/
void Gui_MotorStarReset(void)
{
workMode_t MotorState[4] ={0,0,0,0};
bsp_SetMotorMode(Motor_1,MinReset);
bsp_SetMotorMode(Motor_2,MinReset);
MotorState[0] = bsp_GetMotorState(Motor_1);
MotorState[1] = bsp_GetMotorState(Motor_2);
while ((MotorState[0] != Normal) || (MotorState[1] != Normal))
{
bsp_WDOG_Feed();
g_LED.CheckLightsTime = 0;
g_curLightFlag=1;
Gui_Logo_Disp();
Gui_LightProc();
Api_GetAdcResult();
Gui_KL30LedDisplay();
MotorState[0] = bsp_GetMotorState(Motor_1);
MotorState[1] = bsp_GetMotorState(Motor_2);
}
/*
g_vehMeter.MotorReset = Enable;
g_revMeter.MotorReset = Enable;
g_vehMeter.DestPosition = null;
g_revMeter.DestPosition = null;
g_vehMeter.CurPosition = 80;
g_revMeter.CurPosition = 80;
Api_SetMotorTimer(T_4s, (_Clock *)&g_Clock);
for(;;)
{
bsp_WDOG_Feed();
g_LED.CheckLightsTime = 0;
g_curLightFlag=1;
Gui_Logo_Disp();
Gui_LightProc();
Api_GetAdcResult();
Gui_KL30LedDisplay();
if(Api_MotorTimerOver((_Clock *)&g_Clock))
{
break;
}
if((g_vehMeter.DestPosition == g_vehMeter.CurPosition) && \
(g_revMeter.DestPosition == g_revMeter.CurPosition))
{
break;
}
}
Disable_signal(g_vehMeter.MotorReset);
Disable_signal(g_revMeter.MotorReset);
Disable_signal(g_vehMeter.DestPosition);
Disable_signal(g_revMeter.DestPosition);
Disable_signal(g_vehMeter.CurPosition);
Disable_signal(g_revMeter.CurPosition);
*/
}
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
* Function Name : GUI_MotorOffReset * Function Name : GUI_MotorOffReset
* Description : 电机复位 * Description : 电机复位
...@@ -202,48 +52,6 @@ void Gui_MotorOffReset(void) ...@@ -202,48 +52,6 @@ void Gui_MotorOffReset(void)
MeterPostion[Motor_1].destPosition = 0; MeterPostion[Motor_1].destPosition = 0;
MeterPostion[Motor_2].destPosition = 0; MeterPostion[Motor_2].destPosition = 0;
} }
/*
Api_SetMotorTimer(T_4s, (_Clock *)&g_Clock);
g_vehMeter.DestPosition = null;
g_revMeter.DestPosition = null;
for(;;)
{
bsp_WDOG_Feed();
g_Init.InitLogoTime = null;
App_K30ReceiveCanMsg();
App_SleepProc();
Gui_KL30LedDisplay();
Api_GetAdcResult();
T2MS_Task();
T20MS_Task_Copy();
Gui_ButtonProc((_Button *)&G_Button);
Gui_BeepPrioProc((_Beep *)g_Beep);
Api_ClockGenerate();
App_ChcekSleep();
if(Api_MotorTimerOver((_Clock *)&g_Clock))
{
break;
}
if((g_vehMeter.DestPosition == g_vehMeter.CurPosition))
Disable_signal(g_vehMeter.MotorReset);
if((g_revMeter.DestPosition == g_revMeter.CurPosition))
Disable_signal(g_revMeter.MotorReset);
if((g_vehMeter.DestPosition == g_vehMeter.CurPosition) && (g_revMeter.DestPosition == g_revMeter.CurPosition))
{
break;
}
}
Disable_signal(g_vehMeter.MotorReset);
Disable_signal(g_revMeter.MotorReset);
Disable_signal(g_vehMeter.CurPosition);
Disable_signal(g_revMeter.CurPosition);
*/
} }
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
* Function Name : Gui_Logo_Disp * Function Name : Gui_Logo_Disp
...@@ -267,9 +75,9 @@ void Gui_Logo_Disp(void) ...@@ -267,9 +75,9 @@ void Gui_Logo_Disp(void)
--------------------------------------------------------------------------*/ --------------------------------------------------------------------------*/
void Gui_LCD_Display(void) void Gui_LCD_Display(void)
{ {
if(g_Init.InitLogoTime >= T_2_5s) if (g_Init.InitLogoTime >= T_2_5s)
{ {
if(g_ClearWin1 == 1) if (g_ClearWin1 == 1)
{ {
bsp_ClearFullWindow(null); bsp_ClearFullWindow(null);
Api_ClearIcon(0, 240, 0, 320); Api_ClearIcon(0, 240, 0, 320);
...@@ -287,16 +95,16 @@ void Gui_LCD_Display(void) ...@@ -287,16 +95,16 @@ void Gui_LCD_Display(void)
} }
//贴底图 //贴底图
if(bMenuSwFlag) if (bMenuSwFlag)
{ {
if(MenuOptTab[bCurMenuIDX].Enter) if (MenuOptTab[bCurMenuIDX].Enter)
{ {
MenuOptTab[bCurMenuIDX].Enter(); MenuOptTab[bCurMenuIDX].Enter();
} }
} }
//动态显示 //动态显示
if(MenuOptTab[bCurMenuIDX].Do) if (MenuOptTab[bCurMenuIDX].Do)
{ {
MenuOptTab[bCurMenuIDX].Do(); MenuOptTab[bCurMenuIDX].Do();
} }
...@@ -304,9 +112,9 @@ void Gui_LCD_Display(void) ...@@ -304,9 +112,9 @@ void Gui_LCD_Display(void)
bMenuSwFlag = (bCurMenuIDX != bNextMenuIDX) ? 1 : 0; bMenuSwFlag = (bCurMenuIDX != bNextMenuIDX) ? 1 : 0;
//退出 //退出
if(bMenuSwFlag) if (bMenuSwFlag)
{ {
if(MenuOptTab[bCurMenuIDX].Exit) if (MenuOptTab[bCurMenuIDX].Exit)
{ {
MenuOptTab[bCurMenuIDX].Exit(); MenuOptTab[bCurMenuIDX].Exit();
} }
...@@ -339,7 +147,7 @@ void Gui_LCD_Display(void) ...@@ -339,7 +147,7 @@ void Gui_LCD_Display(void)
void Gui_IODD0AEnable(void) void Gui_IODD0AEnable(void)
{ {
g_ClearWin1 = 1; g_ClearWin1 = 1;
bMenuSwFlag=1; bMenuSwFlag = 1;
Time_Updeta; Time_Updeta;
InstFuel_Updeta; InstFuel_Updeta;
AveFuel_Updeta; AveFuel_Updeta;
......
Sources/TFT/gui_Disp.h
View file @ bbb22262
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
#ifndef GUI_DISPLAY_H_ #ifndef GUI_DISPLAY_H_
#define GUI_DISPLAY_H_ #define GUI_DISPLAY_H_
EXTERN_GUI_DISP void Gui_MotorStarReset(void);
EXTERN_GUI_DISP void Gui_MotorOffReset(void); EXTERN_GUI_DISP void Gui_MotorOffReset(void);
EXTERN_GUI_DISP void Gui_MotorFirstReset(void); EXTERN_GUI_DISP void Gui_MotorFirstReset(void);
EXTERN_GUI_DISP void Gui_Logo_Disp(void); EXTERN_GUI_DISP void Gui_Logo_Disp(void);
......
Sources/USER/System.c deleted 100644 → 0
View file @ e91c4d6d
This diff is collapsed.
Sources/USER/preprocess.c
View file @ bbb22262
...@@ -16,20 +16,20 @@ ...@@ -16,20 +16,20 @@
--------------------------------------------------------------------------*/ --------------------------------------------------------------------------*/
void T2MS_Task(void) void T2MS_Task(void)
{ {
if(T2MS_FF) if (T2MS_FF)
{ {
T2MS_FF = 0; T2MS_FF = 0;
if(g_Clock.TMotorEnable) if (g_Clock.TMotorEnable)
{ {
if(g_Clock.MotorTime < g_Clock.OverMotorTime) if (g_Clock.MotorTime < g_Clock.OverMotorTime)
{ {
g_Clock.MotorTime++; g_Clock.MotorTime++;
} }
} }
if(g_Clock.TFEnable) if (g_Clock.TFEnable)
{ {
if(g_Clock.FilterTime < g_Clock.OverFTime) if (g_Clock.FilterTime < g_Clock.OverFTime)
{ {
g_Clock.FilterTime++; g_Clock.FilterTime++;
} }
...@@ -44,23 +44,23 @@ void T2MS_Task(void) ...@@ -44,23 +44,23 @@ void T2MS_Task(void)
* Return : None * Return : None
* onther : * onther :
--------------------------------------------------------------------------*/ --------------------------------------------------------------------------*/
INT8U PowerUpCn=0; INT8U PowerUpCn = 0;
void T20MS_Task(void) void T20MS_Task(void)
{ {
if(T20MS_FF > 9) if (T20MS_FF > 9)
{ {
T20MS_FF = 0; T20MS_FF = 0;
//------------KL30 KL15 Ctl -----------// //------------KL30 KL15 Ctl -----------//
if((g_Init.InitLogoTime > T_4s) || (g_curkeyinput == KeyOFF)) if ((g_Init.InitLogoTime > T_4s) || (g_curkeyinput == KeyOFF))
{ {
if((api_UpdateLcdQue(&bDSTable[0]))) if ((api_UpdateLcdQue(&bDSTable[0])))
{ {
//记住主界面位置 //记住主界面位置
if(g_Style == 1) if (g_Style == 1)
{ {
//if((bCurMenuIDX >= _MN_DSP_SCREEN1) && (bCurMenuIDX <= _MN_DSP_SCREEN4)) //if((bCurMenuIDX >= _MN_DSP_SCREEN1) && (bCurMenuIDX <= _MN_DSP_SCREEN4))
if(bCurMenuIDX <= _MN_DSP_SCREEN4) if (bCurMenuIDX <= _MN_DSP_SCREEN4)
{ {
bMainMenuIDX = bCurMenuIDX; bMainMenuIDX = bCurMenuIDX;
} }
...@@ -68,41 +68,41 @@ void T20MS_Task(void) ...@@ -68,41 +68,41 @@ void T20MS_Task(void)
else else
{ {
//if((bCurMenuIDX >= _MN_DSP_SCREEN1_1) && (bCurMenuIDX <= _MN_DSP_SCREEN3_1)) //if((bCurMenuIDX >= _MN_DSP_SCREEN1_1) && (bCurMenuIDX <= _MN_DSP_SCREEN3_1))
if(bCurMenuIDX <= _MN_DSP_SCREEN3_1) if (bCurMenuIDX <= _MN_DSP_SCREEN3_1)
{ {
bMainMenuIDX = bCurMenuIDX; bMainMenuIDX = bCurMenuIDX;
} }
} }
//-- KL15 --// //-- KL15 --//
if((bCurMenuIDX != _MN_SHOW_ERRINFO) && (bCurMenuIDX != _MN_DSP_ALARM)&&(g_curkeyinput == KeyON)) if ((bCurMenuIDX != _MN_SHOW_ERRINFO) && (bCurMenuIDX != _MN_DSP_ALARM) && (g_curkeyinput == KeyON))
NextMenu(_MN_DSP_ALARM); NextMenu(_MN_DSP_ALARM);
} }
} }
} }
//------------ KL30 Ctl -----------------// //------------ KL30 Ctl -----------------//
//写数据 //写数据
if((OldBD83790A!=BD83790A)||(OldBD83790B!=BD83790B)) if ((OldBD83790A != BD83790A) || (OldBD83790B != BD83790B))
{ {
//DB8379_WriteData(ON);
}
DB8379_WriteData(ON); DB8379_WriteData(ON);
}
OldBD83790A = BD83790A; OldBD83790A = BD83790A;
OldBD83790B = BD83790B; OldBD83790B = BD83790B;
if(!DIDFlag.Bits.DID101FValid) if (!DIDFlag.Bits.DID101FValid)
{ {
App_K30ReceiveCanMsg(); App_K30ReceiveCanMsg();
Gui_KL30LedDisplay(); //30电指示灯 Gui_KL30LedDisplay(); //30电指示灯
} }
//------------ KL15 Ctl -----------// //------------ KL15 Ctl -----------//
//诊断灯全亮 //诊断灯全亮
if(DIDFlag.Bits.DID101FValid == Enable) if (DIDFlag.Bits.DID101FValid == Enable)
{ {
if(g_curkeyinput == KeyON) if (g_curkeyinput == KeyON)
{ {
if(IOCTL_DID101F.FF_Byte == Active) if (IOCTL_DID101F.FF_Byte == Active)
{ {
Gui_AllLedDisplay(); Gui_AllLedDisplay();
} }
...@@ -114,10 +114,10 @@ void T20MS_Task(void) ...@@ -114,10 +114,10 @@ void T20MS_Task(void)
} }
else else
{ {
if((g_curkeyinput != KeyOFF)&&(g_adcResult.AdcValue > V_6v) && (g_LED.CheckLightsTime >= T_0_2s)) if ((g_curkeyinput != KeyOFF) && (g_adcResult.AdcValue > V_6v) && (g_LED.CheckLightsTime >= T_0_2s))
{ {
App_ReceiveCanMsg(); //CAN数据解析 App_ReceiveCanMsg(); //CAN数据解析
if(g_curkeyinput == KeyHi)//高压模式关灯 if (g_curkeyinput == KeyHi) //高压模式关灯
{ {
//-- Led OFF--// //-- Led OFF--//
...@@ -132,9 +132,7 @@ void T20MS_Task(void) ...@@ -132,9 +132,7 @@ void T20MS_Task(void)
{ {
Gui_KL15LedDisplay(); //15电指示灯 Gui_KL15LedDisplay(); //15电指示灯
} }
} }
} }
} }
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
...@@ -147,19 +145,19 @@ void T20MS_Task(void) ...@@ -147,19 +145,19 @@ void T20MS_Task(void)
--------------------------------------------------------------------------*/ --------------------------------------------------------------------------*/
void T20MS_Task_Copy(void) void T20MS_Task_Copy(void)
{ {
if(T20MS_FF > 9) if (T20MS_FF > 9)
{ {
T20MS_FF = 0; T20MS_FF = 0;
if((g_Init.InitLogoTime > T_4s) || (g_curkeyinput == KeyOFF)) if ((g_Init.InitLogoTime > T_4s) || (g_curkeyinput == KeyOFF))
{ {
if((api_UpdateLcdQue(&bDSTable[0]))) if ((api_UpdateLcdQue(&bDSTable[0])))
{ {
//记住主界面位置 //记住主界面位置
if(g_Style == 1) if (g_Style == 1)
{ {
//if((bCurMenuIDX >= _MN_DSP_SCREEN1) && (bCurMenuIDX <= _MN_DSP_SCREEN4)) //if((bCurMenuIDX >= _MN_DSP_SCREEN1) && (bCurMenuIDX <= _MN_DSP_SCREEN4))
if(bCurMenuIDX <= _MN_DSP_SCREEN4) if (bCurMenuIDX <= _MN_DSP_SCREEN4)
{ {
bMainMenuIDX = bCurMenuIDX; bMainMenuIDX = bCurMenuIDX;
} }
...@@ -167,14 +165,14 @@ void T20MS_Task_Copy(void) ...@@ -167,14 +165,14 @@ void T20MS_Task_Copy(void)
else else
{ {
//if((bCurMenuIDX >= _MN_DSP_SCREEN1_1) && (bCurMenuIDX <= _MN_DSP_SCREEN3_1)) //if((bCurMenuIDX >= _MN_DSP_SCREEN1_1) && (bCurMenuIDX <= _MN_DSP_SCREEN3_1))
if(bCurMenuIDX <= _MN_DSP_SCREEN3_1) if (bCurMenuIDX <= _MN_DSP_SCREEN3_1)
{ {
bMainMenuIDX = bCurMenuIDX; bMainMenuIDX = bCurMenuIDX;
} }
} }
//-- KL15 --// //-- KL15 --//
if((bCurMenuIDX != _MN_SHOW_ERRINFO) && (bCurMenuIDX != _MN_DSP_ALARM)&&(g_curkeyinput == KeyON)) if ((bCurMenuIDX != _MN_SHOW_ERRINFO) && (bCurMenuIDX != _MN_DSP_ALARM) && (g_curkeyinput == KeyON))
NextMenu(_MN_DSP_ALARM); NextMenu(_MN_DSP_ALARM);
} }
} }
......
Sources/bsp_System.c
View file @ bbb22262
...@@ -106,47 +106,7 @@ void bsp_Sys_ON(void) ...@@ -106,47 +106,7 @@ void bsp_Sys_ON(void)
void bsp_Sys_OFF(void) void bsp_Sys_OFF(void)
{ {
MCCTL1_MCTOIE = Disable; MCCTL1_MCTOIE = Disable;
/*
MCCC0_MCOM = 0;
MCCC0_MCAM = 0;
MCCC0_CD = 0;
MCCC1_MCOM = 0;
MCCC1_MCAM = 0;
MCCC1_CD = 0;
MCCC2_MCOM = 0;
MCCC2_MCAM = 0;
MCCC2_CD = 0;
MCCC3_MCOM = 0;
MCCC3_MCAM = 0;
MCCC3_CD = 0;
MCCC4_MCOM = 0;
MCCC4_MCAM = 0;
MCCC4_CD = 0;
MCCC5_MCOM = 0;
MCCC5_MCAM = 0;
MCCC5_CD = 0;
MCCC6_MCOM = 0;
MCCC6_MCAM = 0;
MCCC6_CD = 0;
MCCC7_MCOM = 0;
MCCC7_MCAM = 0;
MCCC7_CD = 0;
PTU_PTU0 = LOW;
PTU_PTU1 = LOW;
PTU_PTU2 = LOW;
PTU_PTU3 = LOW;
PTU_PTU4 = LOW;
PTU_PTU5 = LOW;
PTU_PTU6 = LOW;
PTU_PTU7 = LOW;
*/
MotorDriveOff(); MotorDriveOff();
PER1AD = 0x00; PER1AD = 0x00;
......
Sources/main.c
View file @ bbb22262
...@@ -29,51 +29,45 @@ void main(void) ...@@ -29,51 +29,45 @@ void main(void)
Gui_MotorFirstReset(); Gui_MotorFirstReset();
Init2EData(); Init2EData();
App_CalFuelInit(); App_CalFuelInit();
//Reset_Device();
//Power_Up();
App_StarUpInfo1(); App_StarUpInfo1();
for(;;) for (;;)
{ {
_FEED_COP(); _FEED_COP();
T2MS_Task(); T2MS_Task();
Api_GetAdcResult(); Api_GetAdcResult();
App_SendCanMsg(); App_SendCanMsg();
if(g_curkeyinput == KeyON) if (g_curkeyinput == KeyON)
{ {
App_FuelManage(); App_FuelManage();
switch(g_runStep) switch (g_runStep)
{ {
case SYS_INIT_TASK: case SYS_INIT_TASK:
bsp_Sys_ON(); bsp_Sys_ON();
if(g_validFlag.Bits.BD8379Init) if (g_validFlag.Bits.BD8379Init)
{ {
DB8379_Init(); DB8379_Init();
} }
g_validFlag.Bits.BD8379Init=Disable; g_validFlag.Bits.BD8379Init = Disable;
DiagnosisInit_main(); DiagnosisInit_main();
if(g_30LOGOFlag==0) if (g_30LOGOFlag == 0)
{ {
bsp_TFT_Init(); bsp_TFT_Init();
} }
App_Paramer_Init(); App_Paramer_Init();
App_Load_Data(); App_Load_Data();
if((g_Lastkeyinput == KeyLow) || (g_Lastkeyinput == KeyHi)) if ((g_Lastkeyinput == KeyLow) || (g_Lastkeyinput == KeyHi))
{ {
Gui_MotorFirstReset(); Gui_MotorFirstReset();
} }
else
{
Gui_MotorStarReset();
}
g_Lastkeyinput = g_curkeyinput; g_Lastkeyinput = g_curkeyinput;
Api_ReadAccKm(); Api_ReadAccKm();
g_runStep = CAN_TASK; g_runStep = CAN_TASK;
break; break;
case CAN_TASK: case CAN_TASK:
CheckEcmMulDTC(); //CheckEcmMulDTC();
CheckOSC(); CheckOSC();
g_runStep = CALCULATE_TASK; g_runStep = CALCULATE_TASK;
break; break;
...@@ -94,7 +88,7 @@ void main(void) ...@@ -94,7 +88,7 @@ void main(void)
break; break;
case GUI_TASK: case GUI_TASK:
Gui_BeepPrioProc((_Beep *)g_Beep); Gui_BeepPrioProc((_Beep *)g_Beep);
if(g_ReadState == RunErr) if (g_ReadState == RunErr)
{ {
Api_ReadAccKm(); Api_ReadAccKm();
} }
...@@ -112,26 +106,26 @@ void main(void) ...@@ -112,26 +106,26 @@ void main(void)
Diagnosis_main(); Diagnosis_main();
App_CheckCanDrop(); App_CheckCanDrop();
App_StoreDTC_handle(); App_StoreDTC_handle();
if(g_curkeyinput == KeyOFF) if (g_curkeyinput == KeyOFF)
{ {
SetPowerSt(0); SetPowerSt(0);
g_Init.InitLogoTime = null; g_Init.InitLogoTime = null;
g_curLightFlag = 0; g_curLightFlag = 0;
if(g_sysFlag.Bits.SysOffEn) if (g_sysFlag.Bits.SysOffEn)
{ {
Disable_signal(g_sysFlag.Bits.SysOffEn); Disable_signal(g_sysFlag.Bits.SysOffEn);
App_State_OFF(); App_State_OFF();
Gui_MotorOffReset(); Gui_MotorOffReset();
} }
Gui_BeepPrioProc((_Beep *)g_Beep); Gui_BeepPrioProc((_Beep *)g_Beep);
if(g_sysFlag.Bits.AccSaveState) if (g_sysFlag.Bits.AccSaveState)
{ {
Disable_signal(g_sysFlag.Bits.AccSaveState); Disable_signal(g_sysFlag.Bits.AccSaveState);
Disable_signal(g_sysFlag.Bits.WakeUpState); Disable_signal(g_sysFlag.Bits.WakeUpState);
Api_WriteAccReg(); Api_WriteAccReg();
SaveDtcInfo.EE_WriteDtcSel = StoreDTC_EE; SaveDtcInfo.EE_WriteDtcSel = StoreDTC_EE;
} }
if(WriteleFlag2E == Enable) if (WriteleFlag2E == Enable)
{ {
App_2E_Write_handle(); App_2E_Write_handle();
Init2EData(); Init2EData();
......
TBDML.ini
View file @ bbb22262
...@@ -176,19 +176,19 @@ SHOWDIALOG=0 ...@@ -176,19 +176,19 @@ SHOWDIALOG=0
IP= IP=
[Recent HI-WAVE FindProcedure Search] [Recent HI-WAVE FindProcedure Search]
Search0=Gui_MotorFirstReset Search0=App_CalBorad
Search1=Gui_MotorStarReset Search1=App_CalVehSpdFromCap
Search2=Gui_LightProc Search2=App_CalVehBoard
Search3=App_CalBorad Search3=Gui_MotorFirstReset
Search4=main Search4=main
Search5=Api_VehCap_isr Search5=Gui_MotorStarReset
Search6=0xFFFF Search6=Gui_LightProc
Search7=T20MS_Task Search7=Api_VehCap_isr
Search8=DB8379_Init Search8=0xFFFF
Search9=Gui_KL15LedDisplay Search9=T20MS_Task
Search10=DB8379_WriteData Search10=DB8379_Init
Search11=Gui_KL30LedDisplay Search11=Gui_KL15LedDisplay
Search12=bsp_CAN1_Rev_isr Search12=DB8379_WriteData
Search13=App_SendCanMsg Search13=Gui_KL30LedDisplay
Search14=bsp_CANSendFrame Search14=bsp_CAN1_Rev_isr
Search15=bsp_CAN0_Rev_isr Search15=App_SendCanMsg
app_Headers/g_VarType.h
View file @ bbb22262
...@@ -844,6 +844,14 @@ typedef struct ...@@ -844,6 +844,14 @@ typedef struct
typedef struct typedef struct
{ {
INT8U LTurnConfig; //左转向
INT8U RTurnConfig; //右转向
INT8U HighBeamConfig; //远光灯
INT8U LowBeamConfig; //近光灯
INT8U FrontFogConfig; //前雾灯
INT8U RearFogConfig; //后雾灯
INT8U PosLampConfig; //位置灯
//-----------------------
INT8U ABS_ESCConfig; INT8U ABS_ESCConfig;
INT8U GasConfig; INT8U GasConfig;
INT8U CoolLevelConfig; INT8U CoolLevelConfig;
......
app_Sources/app_System.c
View file @ bbb22262
...@@ -611,13 +611,13 @@ void App_Load_Data(void) ...@@ -611,13 +611,13 @@ void App_Load_Data(void)
g_vehMeterInfo.Resistor[7] = 180; g_vehMeterInfo.Resistor[7] = 180;
g_vehMeterInfo.DashStep[0] = 0; g_vehMeterInfo.DashStep[0] = 0;
g_vehMeterInfo.DashStep[1] = 320; g_vehMeterInfo.DashStep[1] = 307;
g_vehMeterInfo.DashStep[2] = 636; g_vehMeterInfo.DashStep[2] = 614;
g_vehMeterInfo.DashStep[3] = 960; g_vehMeterInfo.DashStep[3] = 920;
g_vehMeterInfo.DashStep[4] = 1284; g_vehMeterInfo.DashStep[4] = 1227;
g_vehMeterInfo.DashStep[5] = 1596; g_vehMeterInfo.DashStep[5] = 1534;
g_vehMeterInfo.DashStep[6] = 2244; g_vehMeterInfo.DashStep[6] = 2147;
g_vehMeterInfo.DashStep[7] = 2880; g_vehMeterInfo.DashStep[7] = 2760;
//-- Rev --// //-- Rev --//
g_revMeterInfo.bVirtualVal = 8; g_revMeterInfo.bVirtualVal = 8;
...@@ -632,13 +632,13 @@ void App_Load_Data(void) ...@@ -632,13 +632,13 @@ void App_Load_Data(void)
g_revMeterInfo.Resistor[7] = 4000; g_revMeterInfo.Resistor[7] = 4000;
g_revMeterInfo.DashStep[0] = 0; g_revMeterInfo.DashStep[0] = 0;
g_revMeterInfo.DashStep[1] = 360; g_revMeterInfo.DashStep[1] = 345;
g_revMeterInfo.DashStep[2] = 720; g_revMeterInfo.DashStep[2] = 690;
g_revMeterInfo.DashStep[3] = 1080; g_revMeterInfo.DashStep[3] = 1035;
g_revMeterInfo.DashStep[4] = 1400; g_revMeterInfo.DashStep[4] = 1380;
g_revMeterInfo.DashStep[5] = 1800; g_revMeterInfo.DashStep[5] = 1725;
g_revMeterInfo.DashStep[6] = 2160; g_revMeterInfo.DashStep[6] = 2070;
g_revMeterInfo.DashStep[7] = 2880; g_revMeterInfo.DashStep[7] = 2760;
//-- Temp --// //-- Temp --//
if (ConfigItem.TempConfig == 0) //报警点为100 if (ConfigItem.TempConfig == 0) //报警点为100
......
gui_Sources/gui_Led.c
View file @ bbb22262
This diff is collapsed.
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