Skip to content

H
HaoJin232
Commit 59d3ac7a authored by 时昊's avatar 时昊
Browse files
Options

🎉 init:删除无用代码-菜单模块

parent b3af226b
Expand all Show whitespace changes
Inline Side-by-side
Showing with 6560 additions and 8265 deletions
HJ232_Source/Out/QJ300_circle.hex
View file @ 59d3ac7a
This diff is collapsed.
HJ232_Source/Out/QJ300_circle.lnp
View file @ 59d3ac7a
......@@ -42,7 +42,6 @@
".\objects\backgroundlight.o"
".\objects\bglinterface.o"
".\objects\key.o"
".\objects\menus.o"
".\objects\can_communication_matrix.o"
".\source\Application\APPCan\CAN_Lib.lib"
".\objects\can_user.o"
......
HJ232_Source/Out/QJ300_circle.map
View file @ 59d3ac7a
This diff is collapsed.
HJ232_Source/source/Application/APPCan/CAN_Communication_Matrix.c
View file @ 59d3ac7a
#include "CAN_Communication_Matrix.h"
#include "CAN_User.h"
#include "Menus.h"
/* 2022/01/19 15:02:57 */
const st_CAN_SendAttribute st_CANSendAttr[ID_SEND_TOTAL] =
......@@ -12,7 +12,7 @@ const st_CAN_SendAttribute st_CANSendAttr[ID_SEND_TOTAL] =
{0x510ul, 18ul * 1000ul, 17ul, 0u, MSG_STD, 6u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_510},
{0x450ul, 98ul * 1000ul, 23ul, 0u, MSG_STD, 7u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_450},
{0x515ul, 48ul * 1000ul, 29ul, 0u, MSG_STD, 7u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_515},
//{0x502ul, 98ul * 1000ul, 48ul, 0u, MSG_STD, 8u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_502},//̥ѹԤ
//{0x502ul, 98ul * 1000ul, 48ul, 0u, MSG_STD, 8u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_502},//̥ѹ���Ԥ��
};
const st_CANMsgAttribute CAN_MSG_CONST_ARRAY[ID_TOTAL_MAX] =
......
HJ232_Source/source/Application/APPCan/CAN_User.c
View file @ 59d3ac7a
......@@ -9,7 +9,7 @@
#include "PowerManagement_user.h"
#include "Data_Gear.h"
#include "Common_Interface.h"
#include "Menus.h"
#include "BGLInterface.h"
#include "Fuel.h"
#include "Telltales_user.h"
......@@ -136,11 +136,7 @@ void Can_Set_Buff_510(uint8_t CopyData[])
CopyData[0] = Get_CurFuelSetp();
}
CopyData[1] |= (Line_In_Get_Status(LINE_IN_HighBeam) & 0x01) << 7;
CopyData[1] |= (Line_In_Get_Status(LINE_IN_LeftTurn) & 0x01) << 6;
CopyData[1] |= (Line_In_Get_Status(LINE_IN_RightTurn) & 0x01) << 5;
CopyData[1] |= (Line_In_Get_Status(LINE_IN_OilPressure) & 0x01) << 4;
CopyData[1] |= (Line_In_Get_Status(LINE_IN_OBD) & 0x01) << 3;
temp16 = FuelR/10;
if(FuelR>3100){
......@@ -149,7 +145,7 @@ void Can_Set_Buff_510(uint8_t CopyData[])
CopyData[2] = (temp16>>8)&0xff;
CopyData[3] = temp16&0xff;
CopyData[4] |= (Line_In_Get_Status(LINE_IN_ABS) & 0x01) << 7;
}
void Can_Set_Buff_523(uint8_t CopyData[])
......@@ -198,14 +194,7 @@ void Can_Set_Buff_450(uint8_t CopyData[])
CopyData[7] = 0u; /* 8 */
if (Get_TCS_Status() == 0)
{
temp8 = 1;
}
else
{
temp8 = 0;
}
CopyData[1] = temp8 & 0x0f;
......@@ -1323,10 +1312,7 @@ uint8_t TCS_WorkModeFlsh = 0;
uint16_t Get_TCS_WorkModeFlash(void)
{
if ((Get_ID_125_Sig_TCS_WorkMode() == 1) || (Get_TCS_Status() == 0))
{
TCS_WorkModeFlsh = 1;
}
return TCS_WorkModeFlsh;
}
......
HJ232_Source/source/Application/BackLight/BGLInterface.c
View file @ 59d3ac7a
......@@ -6,7 +6,7 @@
#include "BGLInterface.h"
#include "Common_Interface.h"
//#include "LightDetect.h"
#include "Menus.h"
#include "sci.h"
#include "System_Monitor.h"
#include "gpio.h"
......@@ -114,7 +114,7 @@ dayOrNight_E Get_Day_Or_Night(void)
/**@brief Back Ground Light Config function
* @author TYW
* @param[in] BGLType 背光类型
* @param[in] DutyVal 占空?
* @param[in] DutyVal 占空�?
* @since 1.0.0.0
*/
void BGLPwm_Config(uint8_t BGLType, uint16_t DutyVal)
......@@ -204,76 +204,7 @@ void BackLightSchedu(uint8_t BGLPowerSt, uint8_t WakeFlag)
BLStatePara. BL_User_NTC_AD_MAX = NTC_AD_MAX;
BLStatePara. BL_User_effect = BGL_GRADUAL;
if(Get_BL_User_Set_Level() == BL_USER_SET_LV_AUTO){
#if 0
if(time < BG_Debounce_Time_Ms){
time += 50;
}
else{
time = 0;
lightValue[pLightValue] = Get_Light_Value();
if(pLightValue < Light_Buffer_Size){
pLightValue++;
}
else{
pLightValue = 0;
}
/*计算平均?*/
temp32 = 0;
for(i=0; i<Light_Buffer_Size; i++){
temp32 += lightValue[i];
}
Ave_LightValue = temp32/Light_Buffer_Size;
if(Ave_LightValue < CHANGE_TO_NIGHT_MODE_VALUE){
}
else if(Ave_LightValue > CHANGE_TO_DAY_MODE_VALUE){
}
if(Ave_LightValue < BG_Auto_Mode_Min_Light){
BL_Tmp_PARA.BL_User_TFTDuty = BG_Auto_Mode_Min_Duty;
}
else if(Ave_LightValue > BG_Auto_Mode_Max_Light){
BL_Tmp_PARA.BL_User_TFTDuty = BG_Auto_Mode_Max_Duty;
}
else{
BL_Tmp_PARA.BL_User_TFTDuty = ((b2 - b1)*Ave_LightValue - (b2 - b1)*a1 + (a2 - a1)*b1)/(a2-a1);
}
}
#endif
}
else{
if (BLStatePara.BL_User_TFTLvl < BL_LV_TOTAL && BLStatePara.BL_User_DIALLvl < BL_LV_TOTAL && BLStatePara.BL_User_RGBLvl < BL_LV_TOTAL )
{
BL_Tmp_PARA.BL_User_TFTDuty = BackLightValue_TFT_Default[BLStatePara.BL_User_Type][BLStatePara.BL_User_TFTLvl];
//BL_Tmp_PARA.BL_User_GaugesDuty = BackLightValue_DIAL_Default[BLStatePara.BL_User_Type][BLStatePara.BL_User_DIALLvl];
//BL_Tmp_PARA.BL_User_RDuty = BackLightValue_R_Default[BLStatePara.BL_User_Theme][BLStatePara.BL_User_Type][BLStatePara.BL_User_RGBLvl];
//BL_Tmp_PARA.BL_User_GDuty = BackLightValue_G_Default[BLStatePara.BL_User_Theme][BLStatePara.BL_User_Type][BLStatePara.BL_User_RGBLvl];
//BL_Tmp_PARA.BL_User_BDuty = BackLightValue_B_Default[BLStatePara.BL_User_Theme][BLStatePara.BL_User_Type][BLStatePara.BL_User_RGBLvl];
BL_Tmp_PARA.BL_User_TFTDuty_MIN = BackLightValue_TFT_Default[BLStatePara.BL_User_Type][BL_LV_MIN];
//BL_Tmp_PARA.BL_User_GaugesDuty_MIN = BackLightValue_DIAL_Default[BLStatePara.BL_User_Type][BL_LV_MIN];
//BL_Tmp_PARA.BL_User_RDuty_MIN = BackLightValue_R_Default[BLStatePara.BL_User_Theme][BLStatePara.BL_User_Type][BL_LV_MIN];
//BL_Tmp_PARA.BL_User_GDuty_MIN = BackLightValue_G_Default[BLStatePara.BL_User_Theme][BLStatePara.BL_User_Type][BL_LV_MIN];
//BL_Tmp_PARA.BL_User_BDuty_MIN = BackLightValue_B_Default[BLStatePara.BL_User_Theme][BLStatePara.BL_User_Type][BL_LV_MIN];
}
else
{
;
}
}
#if COLOR_LED_DEBUG
DebugBGLPara();
#endif
BackLightDeal(BL_Tmp_PARA, BLStatePara);
}
......@@ -300,7 +231,7 @@ void SetBGLType(uint8_t BGLType)
/**@brief Get Ground Light Level function
* @author TYW
* @param[in] BGLTheme 背光等级
* @param[in] PositionLight 小灯触发 1是小灯触? 0是关?
* @param[in] PositionLight 小灯触发 1是小灯触�? 0是关�?
* @since 1.0.0.0
*/
void SetBGLLvl(BL_Lvl_PARA BGLLvl, uint8_t FunPositionLight)
......@@ -349,7 +280,7 @@ uint8_t ProcessLittleLight(uint8_t BGLLvl)
}
/**@brief Get Ground Light NTCval function
* @author TYW
* @param[in] BGLNTCADVal 热敏电阻电压?
* @param[in] BGLNTCADVal 热敏电阻电压�?
* @since 1.0.0.0
*/
void SetBGLNTCVol(uint16_t BGLNTCVol)
......@@ -359,7 +290,7 @@ void SetBGLNTCVol(uint16_t BGLNTCVol)
/**@brief Debug Ground Light function
* @author TYW
* @调试背光用传递占空比参数用于调整背后亮度和颜?
* @调试背光用传递占空比参数用于调整背后亮度和颜�?
* @since 1.0.0.0
*/
#if COLOR_LED_DEBUG
......@@ -381,7 +312,7 @@ void DebugBGLPara(void)
}
/**@brief Debug Ground Light function
* @author TYW
* @param[in] TestTFTDuty TFT占空?
* @param[in] TestTFTDuty TFT占空�?
* @since 1.0.0.0
*/
void SetTFTDebugPara(uint16_t TestTFTDuty)
......@@ -390,7 +321,7 @@ void SetTFTDebugPara(uint16_t TestTFTDuty)
}
/**@brief Debug Ground Light function
* @author TYW
* @param[in] TestGaugesDuty Gauges占空?
* @param[in] TestGaugesDuty Gauges占空�?
* @since 1.0.0.0
*/
void SetGaugesDebugPara(uint16_t TestGaugesDuty)
......@@ -399,7 +330,7 @@ void SetGaugesDebugPara(uint16_t TestGaugesDuty)
}
/**@brief Debug Ground Light function
* @author TYW
* @param[in] TestRDuty RED占空?
* @param[in] TestRDuty RED占空�?
* @since 1.0.0.0
*/
void SetRDebugPara(uint16_t TestRDuty)
......@@ -408,7 +339,7 @@ void SetRDebugPara(uint16_t TestRDuty)
}
/**@brief Debug Ground Light function
* @author TYW
* @param[in] TestGDuty Green占空?
* @param[in] TestGDuty Green占空�?
* @since 1.0.0.0
*/
void SetGDebugPara(uint16_t TestGDuty)
......@@ -441,45 +372,11 @@ void BGTask(void)/*必须放在50ms任务*/
BackLightTestWakeFlag = 0u;
// D_Or_N = Get_Day_Or_Night_Control();
// if(D_Or_N == Manual_Day){
// DayOrNight = _DAY;
// }
// else if(D_Or_N == Manual_Night){
// DayOrNight = _NIGHT;
// }
// else if(D_Or_N == DayOrNight_Automatic){
// if(Ave_LightValue < CHANGE_TO_NIGHT_MODE_VALUE){
// DayOrNight = _NIGHT;
// }
// else if(Ave_LightValue > CHANGE_TO_DAY_MODE_VALUE){
// DayOrNight = _DAY;
// }
// }
lv = Get_BL_User_Set_Level();
switch(lv)
{
case BL_USER_SET_LV_1:
TmpBGLLvl.BL_TFT_Lvl = BL_LV_3;
break;
case BL_USER_SET_LV_2:
TmpBGLLvl.BL_TFT_Lvl = BL_LV_5;
break;
case BL_USER_SET_LV_3:
TmpBGLLvl.BL_TFT_Lvl = BL_LV_7;
break;
case BL_USER_SET_LV_4:
TmpBGLLvl.BL_TFT_Lvl = BL_LV_9;
break;
case BL_USER_SET_LV_5:
TmpBGLLvl.BL_TFT_Lvl = BL_LV_10;
break;
case BL_USER_SET_LV_AUTO:
TmpBGLLvl.BL_TFT_Lvl = BL_LV_7;
}
lv = 1;
TmpBGLLvl.BL_DIAL_Lvl = BL_LV_MIN;
TmpBGLLvl.BL_RGB_Lvl = BL_LV_MIN;
......
HJ232_Source/source/Application/DataProcessor/Services_Mileage_User.c
View file @ 59d3ac7a
......@@ -3,7 +3,7 @@
#include "Services_Mileage_User.h"
#include "Common_Interface.h"
#include "eepromManage.h"
#include "Menus.h"
#include "CAN_Communication_Matrix.h"
#include "wdt.h"
uint32_t TotalODOTemp = 0;
......@@ -105,23 +105,7 @@ void CalcODO_50ms_Services(void)
g_WriteMileage.Trip += 10;
g_WriteMileage.Trip1 += 10;
if(Get_Unit_Setting() == Metric){
if (g_WriteMileage.Trip > 999999) { //999km999m
g_WriteMileage.Trip = 0;
}
if (g_WriteMileage.Trip1 > 999999) { //999km999m
g_WriteMileage.Trip1 = 0;
}
}
if(Get_Unit_Setting() == Imperial){
if (g_WriteMileage.Trip > 1609343) { //999mile999
g_WriteMileage.Trip = 0;
}
if (g_WriteMileage.Trip1 > 1609343) { //999mile999
g_WriteMileage.Trip1 = 0;
}
}
if (g_WriteMileage.Odo > 1609343999) { //999999mile
g_WriteMileage.Odo = 1609343999;
}
......
HJ232_Source/source/Application/MCU_Core_Protocol/MCU_Core_Protocol.c
View file @ 59d3ac7a
......@@ -7,7 +7,7 @@
#include "rtc.h"
#include "Flash_synchronizer.h"
#include "Data_Gear.h"
#include "Menus.h"
#include "BGLInterface.h"
#include "SEG_LCD.h"
#include "System_Monitor.h"
......@@ -153,7 +153,7 @@ void Get_ID_01_Data(uint8_t** buffer, uint8_t* length)
else{
Send_ID_01_02.Sig.Theme = 1;
}
Send_ID_01_00.Sig.ConnectPhone = Common_Get_ConnectPhoneSts();
*buffer = Send_ID_01_00.Msg;
*length = Send_ID_01_00_Len;
......@@ -178,7 +178,7 @@ void Get_ID_01_Data(uint8_t** buffer, uint8_t* length)
else{
Send_ID_01_02.Sig.Theme = 1;
}
Send_ID_01_01.Sig.ConnectPhone = Common_Get_ConnectPhoneSts();
/*Byte6*/
Send_ID_01_01.Sig.Animation = 1;
*buffer = Send_ID_01_01.Msg;
......@@ -197,7 +197,7 @@ void Get_ID_01_Data(uint8_t** buffer, uint8_t* length)
/*Byte5*/
Send_ID_01_02.Sig.DispMode = DISP_MODE_DRIVE_INFO;
Send_ID_01_02.Sig.SelfTest = Get_Self_Test_Sts();
Send_ID_01_02.Sig.Language = Common_Get_Language();
if(Get_Day_Or_Night() == _DAY){
Send_ID_01_02.Sig.Theme = 0;
......@@ -205,7 +205,7 @@ void Get_ID_01_Data(uint8_t** buffer, uint8_t* length)
else{
Send_ID_01_02.Sig.Theme = 1;
}
Send_ID_01_02.Sig.ConnectPhone = Common_Get_ConnectPhoneSts();
/*Byte6*/
// Send_ID_01_02.Sig.LED_Coolant = Get_LED_Sts(m_LED_Coolant);
// Send_ID_01_02.Sig.LED_ENGINE_OIL_LOW = Get_LED_Sts(m_LED_ENGINE_OIL_LOW);
......@@ -252,8 +252,8 @@ void Get_ID_01_Data(uint8_t** buffer, uint8_t* length)
/*Byte17*/
temp32 = Data_ODO_Read( );
temp32 /= 10;
Send_ID_01_02.Sig.Mileage_Unit = Get_Unit_Setting();
Send_ID_01_02.Sig.Disp_Mileage_Mode = Get_Disp_Mileage_Mode();
Send_ID_01_02.Sig.TOTAL_H4 = (temp32>>16)&0x0000000F;
/*Byte18*/
......@@ -298,15 +298,8 @@ void Get_ID_01_Data(uint8_t** buffer, uint8_t* length)
else{
Send_ID_01_02.Sig.Theme = 1;
}
Send_ID_01_03.Sig.ConnectPhone = Common_Get_ConnectPhoneSts();
/*Byte6*/
Send_ID_01_03.Sig.Data6 = Get_Menu_Byte6();
/*Byte7*/
Send_ID_01_03.Sig.Data7 = Get_Menu_Byte7();
/*Byte8*/
Send_ID_01_03.Sig.Data8 = Get_Menu_Byte8();
/*Byte9*/
Send_ID_01_03.Sig.Data9 = Get_Menu_Byte9();
*buffer = Send_ID_01_03.Msg;
......@@ -336,41 +329,12 @@ void Drive_Info_Display_Update_Service(void)
uint8_t SpeedStand = 0;
static uint16_t Checktime = 0;
//里程\车速
if(Get_Disp_Mileage_Mode() == Mileage_Mode_Total)
{
totaldisp = Data_ODO_Read();
totaldisp /= 100;
}
else if(Get_Disp_Mileage_Mode() == Mileage_Mode_TripA)
{
totaldisp = Data_Read_Trip(EM_TRIP_A);
totaldisp /= 100;
}
else if(Get_Disp_Mileage_Mode() == Mileage_Mode_TripB)
{
totaldisp = Data_Read_Trip(EM_TRIP_B);
totaldisp /= 100;
}
vehicle = Common_Get_Disp_V_Speed();
if(Get_Unit_Setting() == Imperial)
{
totaldisp = (totaldisp * 6213)/10000;
vehicle = (vehicle * 621)/1000;
}
else
{
if((Get_Disp_Mileage_Mode() == Mileage_Mode_TripA) && (totaldisp > 9999))
{
Data_Clear_Trip ( EM_TRIP_A );
}
else if((Get_Disp_Mileage_Mode() == Mileage_Mode_TripB) && (totaldisp > 9999))
{
Data_Clear_Trip ( EM_TRIP_B );
}
}
if (Get_Disp_Mileage_Mode() == Mileage_Mode_FaultCode)
if (1)
{
if (GetDtcAmnt() == 0)
{
......@@ -422,41 +386,7 @@ void Drive_Info_Display_Update_Service(void)
{
if (Common_GetIgnOnTime() >= IGON_SelfcheckingTimer)
{
if (get_SEG_Check_Contrl() == 0)
{
// 档位显示
SEG_LCD_Gear_Display(1, get_ID_ISG_Power(), CAN_MSG_Status(ID_ISG_Count));
// 车速显示
SEG_LCD_Vehicle_Speed_Num_Display(1, Get_Unit_Setting(), vehicle / 10); // 1:mph default:km/h
// 转速显示
SEG_LCD_Engine_Speed_Seg_Display(1, Common_Get_Disp_E_Speed(), SpeedStand);
// 累计里程显示
if (BatteryErrFlg)
{
SEG_LCD_BatteryErr_Display(1, Common_GetIgnOnTime());
}
else
{
if (Get_Disp_Mileage_Mode() == Mileage_Mode_FaultCode)
{
SEG_LCD_FaultCode_Display(1, faultcodedisp);
}
else
{
SEG_LCD_ODO_Trip_Display(1, Get_Disp_Mileage_Mode(), Get_Unit_Setting(), totaldisp); // mode/unit/batt/totaldisp
}
}
// 燃油显示
SEG_Fuel_Level_Display(1, Get_Fuel_Disp_Byte());
// 蓄电池电压
SEG_LCD_Battery_Voltage_Display(1, get_Delay_ECU_Battery_Voltage(), CAN_MSG_Status(ID_ECU_Battery_Count));
}
}
}
......@@ -489,17 +419,6 @@ void Selfcheck_Display_Update_Service(void)
SEG_LCD_Engine_Speed_Seg_Selftest(Animat_Espeed * 8);
Animat_Espeed = Common_GetIgnOnTime();
// 里程自检
if ((Get_Disp_Mileage_Mode() != Mileage_Mode_TempErr) && ((!Get_ID_113_Tbatt()) || (get_ID_ISG_BATT() > 10)))
{
SEG_LCD_ODO_Trip_FaultCode_Selftest(Animat_ODO / 15);
Animat_ODO = Common_GetIgnOnTime() / 10;
}
else
{
SEG_LCD_BatteryErr_Display(1, Common_GetIgnOnTime());
BatteryErrFlg = 1;
}
// Animat_ODO+=10;
// 水温自检
......@@ -527,16 +446,7 @@ void Selfcheck_Display_Update_Service(void)
if (Animat_Espeed)
Animat_Espeed = IGON_SelfcheckingTimer - Common_GetIgnOnTime();
// 里程自检
if ((Get_Disp_Mileage_Mode() != Mileage_Mode_TempErr) && ((!Get_ID_113_Tbatt()) || (get_ID_ISG_BATT() > 10)))
{
SEG_LCD_ODO_Trip_FaultCode_Selftest(Animat_ODO / 150);
}
else
{
SEG_LCD_BatteryErr_Display(1, Common_GetIgnOnTime());
BatteryErrFlg = 1;
}
if (Animat_ODO)
Animat_ODO = IGON_SelfcheckingTimer - Common_GetIgnOnTime();
......@@ -557,7 +467,7 @@ void Selfcheck_Display_Update_Service(void)
else
{
// 20221117 TYW大计清零后，循环显示断码检测
if (get_SEG_Check_Contrl())
if (1)
{
if (SEG_Check_ContrlTime > 300)
{
......
HJ232_Source/source/Application/Menu/Menus.c
View file @ 59d3ac7a
#include "Menus.h"
#include "Common_Interface.h"
#include "rtc.h"
#include "MCU_Core_Protocol.h"
......
HJ232_Source/source/Application/PowerManagement/PowerManagement_user.c
View file @ 59d3ac7a
......@@ -20,7 +20,7 @@
#include "Data_Gear.h"
#include "timerA_B_C.h"
#include "Key.h"
#include "Menus.h"
#include "uds_includes.h"
#include "U2_uds_includes.h"
#include "CAN_User.h"
......@@ -48,7 +48,7 @@ void Power_KL30_Init ( void )
Data_Gear_KL30_Init();
//APP_CAN_Init();
//SEG_LCD_Init();
MenuKL30Init();
}
......@@ -241,7 +241,7 @@ void Power_IG_ON_Init(void)
DiagnosisInit_main();
U2_DiagnosisInit_main();
Key_Status_Init();
MenuIgnOnInit();
Protocol_KL15_ON_Init();
uart2_User_KL15_Init();
APP_CAN_Init();
......@@ -254,7 +254,7 @@ void Power_IG_ON_Init(void)
DtcFaultInit();
/*----------------------------------------*/
BatteryVoltageDelayInit();
Set_SEG_Check_Contrl(0);
}
void Power_IG_OVP_Init(void)
{
......
HJ232_Source/source/Application/Telltales/Telltales_user.c
View file @ 59d3ac7a
......@@ -13,10 +13,10 @@
#include "MCU_Core_Protocol.h"
#include "Data_Gear.h"
#include "app_Telltales.h"
#include "Menus.h"
#include "Fuel.h"
#include "Key.h"
#include "Menus.h"
const LED_Attribute_st LED_Attribute[LED_Max]__attribute__ ((aligned (4)));
Tellib_uint8_t Tel_Mem [ Tel_MEM_Block_Size * LED_Max + Tel_MEM_Block_Addition ] __attribute__ ((aligned (4)));
......@@ -241,148 +241,13 @@ uint16_t LED_TSC_Judgement(void)
static uint16_t gu16_last_TCS_workMode = 0x00;
static uint16_t gu16_last_result = 0u;
Get_CANdate = Get_ID_125_Sig_TCS_SysState();
Get_CANdate1 = Get_ID_125_Sig_TCS_WorkMode();
Get_CANdate2 = Get_ID_125_Sig_TCS_WarningLamp();
Get_CANdate3 = (CAN_SIG_NORMAL == CAN_MSG_Status(ID_TCS_Count)) ? 1 : 0;
if (Common_GetIgnOnTime() > 3200)
{
/*
if ((Get_CANdate3 == 1) && (Get_CANdate1 == 0) && Get_TCS_Status())
{
if ((Get_CANdate == 0u) || (Get_CANdate2 == 1))
{
Set_TCS_WorkModeFlshTime(120);
if (Get_CANdate == 0) // TCS_SysState_Init
{
u8Result = 1u;
}
else if (Get_CANdate2 == 1) // TCS_WarningLamp_Open
{
if (FLASH_SYNC_1Hz)
{
u8Result = 1;
}
else
{
u8Result = 0;
}
}
}
else
{
if (Get_TCS_WorkModeFlash() == 1) // Six_Flash
{
if (FLASH_SYNC_1Hz)
{
u8Result = 1;
}
else
{
u8Result = 0;
}
}
}
}
else
{
Set_TCS_WorkModeFlshTime(0);
u8Result = 0u;
}
*/
if ( Get_TCS_Status() == 0 )
{
gu8_flashCnt = 0;
gu16_last_TCS_workMode = 0x01;
return u8Result = 0u;
} /* */
if ( CAN_SIG_LOST == CAN_MSG_Status( ID_TCS_Count ) )
{
gu8_flashCnt = 0;
gu16_last_TCS_workMode = 0x01;
return u8Result = 0u;
} /* */
//tmpTCS_workMode = Get_ID_125_Sig_TCS_WorkMode();
if ( 0x01 == Get_CANdate1 )
{
gu8_flashCnt = 0;
gu16_last_TCS_workMode = Get_CANdate1;
return u8Result = 0u;
} /* */
//tmpTCS_SysState = Get_ID_125_Sig_TCS_SysState();
if ( 0x00 == Get_CANdate )
{
gu8_flashCnt = 0;
gu16_last_TCS_workMode = Get_CANdate1;
return u8Result = 1u;
}
//tmpTCS_WarningLamp = Get_ID_125_Sig_TCS_WarningLamp();
if ( 0x01 == Get_CANdate2 )
{
/* 1. */
if ( FLASH_SYNC_1Hz )
{ u8Result = 1u; }
else
{ u8Result = 0u; }
gu8_flashCnt = 0;
gu16_last_TCS_workMode = 0;
}
else
{
if ( 0x01 == gu16_last_TCS_workMode ) //上一次的工作模式为1,表示上一次灯关闭;当前工作模式为0，灯闪烁
{
if ( FLASH_SYNC_1Hz )
{ u8Result = 1u; }
else
{ u8Result = 0u; }
if ( gu16_last_result != u8Result )
{
gu8_flashCnt++;
gu16_last_result = u8Result;
if ( gu8_flashCnt > 12 )
{
gu16_last_TCS_workMode = Get_CANdate1;
u8Result = 1u;
}
}
}
else
{
u8Result = 1u;
gu16_last_result = u8Result;
gu8_flashCnt = 0;
}
}
}
return u8Result;
}
void LED_TSC_Execution(uint16_t led_status)
{
if ((led_status == 1u) && (Get_TCS_Status()))
{
SEG_LCD_TSC(SEG_LCD_LIGHT);
App_Telltales_Ctrl(LED_TLight, 1);
}
else
{
SEG_LCD_TSC(SEG_LCD_OFF);
App_Telltales_Ctrl(LED_TLight, 0);
}
}
......
HJ232_Source/source/System/tasks.c
View file @ 59d3ac7a
......@@ -32,7 +32,7 @@
#include "LightDetect.h"
#include "BGLInterface.h"
#include "Key.h"
#include "Menus.h"
#include "CAN_User.h"
#include "gpio.h"
#include "uds_includes.h"
......@@ -159,32 +159,19 @@ void Sys_Run_Mode_10ms_Tasks(void)
void Sys_Run_Mode_20ms_Tasks(void)
{
//Key_Status_Detect_Service();
MenuStatusSwitchODO(Key_Get_Status(KEY_MODE));
MenuStatusSwitchUnit(Key_Get_Status(KEY_SET));
/*if(Common_Get_IG_Sts() == COMMON_POWER_ON)
{
if((Common_GetIgnOnTime() >= IGON_SelfcheckingTimer)&&(get_SEG_Check_Contrl() == 0))
{
//转�?�显�?
SEG_LCD_Engine_Speed_Seg_Display( Common_Get_Disp_E_Speed());
}
}*/
BU98R10_Update_Request();
//转�?�表头走�?
//Gauges_Management_Service();
Diag_Req_Send(20);
IS31FL3236_Update();
// Coolant_Processing_Service();
// Tacho_Processing_Service();
// Speed_Processing_Service();
// CD4051B_Debounce_Service();
}
......@@ -202,13 +189,9 @@ void Sys_Run_Mode_50ms_Tasks(void)
Flash_Sync_Signal_Generation_Service();
if(get_SEG_Check_Contrl() == 0) CalcODO_50ms_Services();//20221117 TYW大计清零后，循环显示断码�?�? 停止大计/小计里程
// Data_Time_Calibration();
// Data_Service_Gear_Processing();
// Speed_PPK_Processing();
// TLC6C5912_Sync_Service();
// Sound_Scheduling_Service();
BGTask();
......@@ -218,7 +201,7 @@ void Sys_Run_Mode_50ms_Tasks(void)
SetDtcFault();
// Data_Group_Processing_Service();
}
......@@ -294,10 +277,7 @@ void Sys_Run_Mode_100ms_Tasks_Group6(void)
void Sys_Run_Mode_100ms_Tasks_Group7(void)
{
//MenuManage();
/*联电和德尔福协议自动识别*/
//CAN_Check_Liandian();
ReqSilentTimer100mSService();
/*MIL灯超时计�?*/
......
HJ232_Source/source/UDS/app_Service.c
View file @ 59d3ac7a
......@@ -10,7 +10,7 @@
#include "CAN_User.h"
#include "Analog_Signals.h"
#include "flash.h"
#include "Menus.h"
#define GLOBALS_UDS_CFG
#define GLOBALS_USER_DEF
......@@ -1220,11 +1220,11 @@ void App_22_service(_N_USData *AppUSData)
{
// case DID0FA0: //读-当前会话模式
case 0xF195: //读软件版本号
pTemp8 = MCU_version;
MCU_SWversion[0] = pTemp8[0];
MCU_SWversion[1] = pTemp8[2];
MCU_SWversion[5] = (pTemp8[4]&0x0f)*100 + (pTemp8[5]&0x0f)*10 + (pTemp8[6]&0x0f);
pTemp8 = MCU_CompileData;
MCU_SWversion[2] = (pTemp8[0]&0x0f)*10 + (pTemp8[1]&0x0f);
MCU_SWversion[3] = (pTemp8[2]&0x0f)*10 + (pTemp8[3]&0x0f);
MCU_SWversion[4] = (pTemp8[4]&0x0f)*10 + (pTemp8[5]&0x0f);
......@@ -1235,7 +1235,7 @@ void App_22_service(_N_USData *AppUSData)
}
break;
case 0xF194: //读软件编码
pTemp8 = PART_NUM;
MCU_SoftCode[2] = pTemp8[5];
MCU_SoftCode[3] = pTemp8[6];
MCU_SoftCode[4] = pTemp8[7];
......@@ -1260,7 +1260,7 @@ void App_22_service(_N_USData *AppUSData)
}
break;
case 0xF187: // 读零件号
pTemp8 = PART_NUM;
for(i=0;i<MaxBuff;i++){
temp8 = *(pTemp8++);
......
HJ232_Source/tim4DelayCounter.uvoptx
View file @ 59d3ac7a
......@@ -1215,30 +1215,6 @@
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\source\Application\Menu\Menus.h</PathWithFileName>
<FilenameWithoutPath>Menus.h</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>3</GroupNumber>
<FileNumber>82</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\source\Application\Menu\Menus.c</PathWithFileName>
<FilenameWithoutPath>Menus.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>3</GroupNumber>
<FileNumber>83</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\source\Application\APPCan\CAN_Communication_Matrix.h</PathWithFileName>
<FilenameWithoutPath>CAN_Communication_Matrix.h</FilenameWithoutPath>
<RteFlg>0</RteFlg>
......@@ -1246,7 +1222,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
<FileNumber>84</FileNumber>
<FileNumber>82</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
......@@ -1258,7 +1234,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
<FileNumber>85</FileNumber>
<FileNumber>83</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
......@@ -1270,7 +1246,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
<FileNumber>86</FileNumber>
<FileNumber>84</FileNumber>
<FileType>4</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
......@@ -1282,7 +1258,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
<FileNumber>87</FileNumber>
<FileNumber>85</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
......@@ -1294,7 +1270,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
<FileNumber>88</FileNumber>
<FileNumber>86</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
......@@ -1306,7 +1282,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
<FileNumber>89</FileNumber>
<FileNumber>87</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
......@@ -1318,7 +1294,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
<FileNumber>90</FileNumber>
<FileNumber>88</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
......@@ -1338,7 +1314,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>4</GroupNumber>
<FileNumber>91</FileNumber>
<FileNumber>89</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
......@@ -1350,7 +1326,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
<FileNumber>92</FileNumber>
<FileNumber>90</FileNumber>
<FileType>4</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
......@@ -1370,7 +1346,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>5</GroupNumber>
<FileNumber>93</FileNumber>
<FileNumber>91</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
......@@ -1382,7 +1358,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
<FileNumber>94</FileNumber>
<FileNumber>92</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
......@@ -1394,7 +1370,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
<FileNumber>95</FileNumber>
<FileNumber>93</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
......@@ -1406,7 +1382,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
<FileNumber>96</FileNumber>
<FileNumber>94</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
......@@ -1418,7 +1394,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
<FileNumber>97</FileNumber>
<FileNumber>95</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
......@@ -1430,7 +1406,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
<FileNumber>98</FileNumber>
<FileNumber>96</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
......@@ -1442,7 +1418,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
<FileNumber>99</FileNumber>
<FileNumber>97</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
......@@ -1454,7 +1430,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
<FileNumber>100</FileNumber>
<FileNumber>98</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
......@@ -1466,7 +1442,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
<FileNumber>101</FileNumber>
<FileNumber>99</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
......@@ -1478,7 +1454,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
<FileNumber>102</FileNumber>
<FileNumber>100</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
......@@ -1490,7 +1466,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
<FileNumber>103</FileNumber>
<FileNumber>101</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
......@@ -1510,7 +1486,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>6</GroupNumber>
<FileNumber>104</FileNumber>
<FileNumber>102</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
......@@ -1522,7 +1498,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
<FileNumber>105</FileNumber>
<FileNumber>103</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
......@@ -1534,7 +1510,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
<FileNumber>106</FileNumber>
<FileNumber>104</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
......@@ -1546,7 +1522,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
<FileNumber>107</FileNumber>
<FileNumber>105</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
......@@ -1558,7 +1534,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
<FileNumber>108</FileNumber>
<FileNumber>106</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
......@@ -1570,7 +1546,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
<FileNumber>109</FileNumber>
<FileNumber>107</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
......@@ -1582,7 +1558,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
<FileNumber>110</FileNumber>
<FileNumber>108</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
......@@ -1594,7 +1570,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
<FileNumber>111</FileNumber>
<FileNumber>109</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
......@@ -1606,7 +1582,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
<FileNumber>112</FileNumber>
<FileNumber>110</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
......@@ -1618,7 +1594,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
<FileNumber>113</FileNumber>
<FileNumber>111</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
......
HJ232_Source/tim4DelayCounter.uvprojx
View file @ 59d3ac7a
......@@ -793,16 +793,6 @@
<FileType>1</FileType>
<FilePath>.\source\Application\Key\Key.c</FilePath>
</File>
<File>
<FileName>Menus.h</FileName>
<FileType>5</FileType>
<FilePath>.\source\Application\Menu\Menus.h</FilePath>
</File>
<File>
<FileName>Menus.c</FileName>
<FileType>1</FileType>
<FilePath>.\source\Application\Menu\Menus.c</FilePath>
</File>
<File>
<FileName>CAN_Communication_Matrix.h</FileName>
<FileType>5</FileType>
......
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