Skip to content

H
HaoJin232
Commit 3fa7100a authored by 时昊's avatar 时昊
Browse files
Options

Merge branch 'shihao' into 'dev' 

Shihao

See merge request !14
parents 40797146 f17d9fcc
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 112 additions and 1061 deletions
HJ232_Source/source/Application/PowerManagement/PowerManagement_user.c
View file @ 3fa7100a
......@@ -45,15 +45,11 @@ void Power_KL30_Init ( void )
CoolantTemp_KL30_Init();
// eeprom_StoreInfo_Init( );
Data_Gear_KL30_Init();
//APP_CAN_Init();
//SEG_LCD_Init();
BU98R10_Init();
MenuKL30Init();
Data_User_Mileage_KL30Init();
}
......
HJ232_Source/source/System/tasks.c
View file @ 3fa7100a
......@@ -88,35 +88,9 @@ void Sys_Run_Mode_10ms_Tasks(void)
Analog_Signal_Conv_Service();
Telltales_Management();
Can_BusOff_Fun(10u);
Selfcheck_Display_Update_Service();
Key_Status_Detect_Service();
//Test();
// Telltales_Left_Right_Management_Service();
// Key_Service();
// //CAN_BUSOFF_Recover();
// /*车�?�处�?*/
// SetGaugesPara(VehGauges, VehSpeedAmplification(Cal_Veh_Val()));
// /*转�?�处�?*/
// Common_Set_Act_E_Speed(Get_ID_CF00400_Sig_EngineSpeed() / 8);
// SetGaugesPara(RevGauges, RevSpeedManage(Common_Get_Act_E_Speed()));
// /*表头调度函数 added by yutian*/
// UserGaugeSchedule();/*在主循环中调�?*/
// /*end*/
// Sound_Play_Service();
// CD4051B_ReadSignal_Serviece();
// Can_BusOff_Fun();
// //for (i = 0; i < LED_Max ; i++)
// //{
// // Telltales_DiagCtrl(i, 1u);
// //}
//if(Common_Get_IG_Sts() == COMMON_POWER_ON)
Data_Mileage_Write_EEPROM();
Data_Mileage_Write_EEPROM();
}
/*============================================================================*/
......@@ -127,25 +101,7 @@ Data_Mileage_Write_EEPROM();
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();
}
......@@ -160,15 +116,7 @@ void Sys_Run_Mode_50ms_Tasks(void)
Flash_Sync_Signal_Generation_Service();
// Data_Time_Calibration();
// Data_Service_Gear_Processing();
// Speed_PPK_Processing();
// TLC6C5912_Sync_Service();
// Sound_Scheduling_Service();
BGTask();
CAN_LED_Check_50msTask();
......@@ -176,7 +124,7 @@ void Sys_Run_Mode_50ms_Tasks(void)
SetDtcFault();
// Data_Group_Processing_Service();
}
......
HJ232_Source/tim4DelayCounter.uvoptx
View file @ 3fa7100a
This diff is collapsed.
HJ232_Source/tim4DelayCounter.uvprojx
View file @ 3fa7100a
......@@ -339,8 +339,7 @@
<MiscControls></MiscControls>
<Define></Define>
<Undefine></Undefine>
<IncludePath>.\source\System;.\source\Driver\inc;.\source\Application;.\source\Application\LINE_IN;.\source\Application\PowerManagement;.\source\Application\RTE;.\source\Application\MCU_Core_Protocol;.\source\Application\Telltales;.\source\Application\Fuel;.\source\Application\Eeprom;.\source\Application\DataProcessor;.\source\Application\LightDetect;.\source\Application\BackLight;.\source\Application\Key;.\source\Application\Menu;.\source\Application\APPCan;.\source\UDS;.\source\Application\Gauges;.\source\Application\CoolantTemp;.\source\UDS2;.\\RTE\Device\BAT32A239KK64FB</IncludePath>
<IncludePath>.\source\System;.\source\Driver\inc;.\source\Application;.\source\Application\LINE_IN;.\source\Application\PowerManagement;.\source\Application\RTE;.\source\Application\MCU_Core_Protocol;.\source\Application\Telltales;.\source\Application\CalcFrequency;.\source\Application\Fuel;.\source\Application\Eeprom;.\source\Application\DataProcessor;.\source\Application\LightDetect;.\source\Application\BackLight;.\source\Application\Key;.\source\Application\Menu;.\source\Application\APPCan;.\source\UDS;.\source\Application\Gauges;.\source\Application\CoolantTemp;.\source\UDS2;.\\RTE\Device\BAT32A239KK64FB;.\source\Application\Mileage;.\source\Application\Display\GUI_LCD_DIS;.\source\Application\Display\SEG_LCD_DIS</IncludePath>
<IncludePath>.\source\System;.\source\Driver\inc;.\source\Application;.\source\Application\LINE_IN;.\source\Application\PowerManagement;.\source\Application\RTE;.\source\Application\MCU_Core_Protocol;.\source\Application\Telltales;.\source\Application\Fuel;.\source\Application\Eeprom;.\source\Application\DataProcessor;.\source\Application\LightDetect;.\source\Application\BackLight;.\source\Application\Key;.\source\Application\Menu;.\source\Application\APPCan;.\source\UDS;.\source\Application\Gauges;.\source\Application\CoolantTemp;.\source\UDS2;.\\RTE\Device\BAT32A239KK64FB;.\source\Application\Mileage;.\source\Application\Display\GUI_LCD_DIS;.\source\Application\Display\SEG_LCD_DIS</IncludePath>
</VariousControls>
</Cads>
<Aads>
......@@ -714,64 +713,6 @@
<FileType>5</FileType>
<FilePath>.\source\Application\Eeprom\eeprom_includes.h</FilePath>
</File>
<File>
<FileName>Services_Mileage_User.h</FileName>
<FileType>5</FileType>
<FilePath>.\source\Application\DataProcessor\Services_Mileage_User.h</FilePath>
</File>
<File>
<FileName>Services_Mileage_User.c</FileName>
<FileType>1</FileType>
<FilePath>.\source\Application\DataProcessor\Services_Mileage_User.c</FilePath>
<FileName>Data_Gear.h</FileName>
<FileType>5</FileType>
<FilePath>.\source\Application\DataProcessor\Data_Gear.h</FilePath>
</File>
<File>
<FileName>Data_Gear.c</FileName>
<FileType>1</FileType>
<FilePath>.\source\Application\DataProcessor\Data_Gear.c</FilePath>
</File>
<File>
<FileName>BackgroundLight.h</FileName>
<FileType>5</FileType>
<FilePath>.\source\Application\BackLight\BackgroundLight.h</FilePath>
</File>
<File>
<FileName>BackGroundLight.c</FileName>
<FileType>1</FileType>
<FilePath>.\source\Application\BackLight\BackGroundLight.c</FilePath>
</File>
<File>
<FileName>BGLInterface.h</FileName>
<FileType>5</FileType>
<FilePath>.\source\Application\BackLight\BGLInterface.h</FilePath>
</File>
<File>
<FileName>BGLInterface.c</FileName>
<FileType>1</FileType>
<FilePath>.\source\Application\BackLight\BGLInterface.c</FilePath>
</File>
<File>
<FileName>Key.h</FileName>
<FileType>5</FileType>
<FilePath>.\source\Application\Key\Key.h</FilePath>
</File>
<File>
<FileName>Key.c</FileName>
<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>
......@@ -813,44 +754,44 @@
<FilePath>.\source\Application\Telltales\app_Telltales.h</FilePath>
</File>
<File>
<FileName>libMileage.lib</FileName>
<FileType>4</FileType>
<FilePath>.\source\Application\Mileage\libMileage.lib</FilePath>
<FileName>Gui_Lcd_Dis.c</FileName>
<FileType>1</FileType>
<FilePath>.\source\Application\Display\GUI_LCD_DIS\Gui_Lcd_Dis.c</FilePath>
</File>
<File>
<FileName>Services_Mileage.h</FileName>
<FileName>Gui_Lcd_Dis.h</FileName>
<FileType>5</FileType>
<FilePath>.\source\Application\Mileage\Services_Mileage.h</FilePath>
<FilePath>.\source\Application\Display\GUI_LCD_DIS\Gui_Lcd_Dis.h</FilePath>
</File>
<File>
<FileName>Services_Mileage_User.c</FileName>
<FileName>Gui_Seg_Dis.c</FileName>
<FileType>1</FileType>
<FilePath>.\source\Application\Mileage\Services_Mileage_User.c</FilePath>
<FilePath>.\source\Application\Display\SEG_LCD_DIS\Gui_Seg_Dis.c</FilePath>
</File>
<File>
<FileName>Services_Mileage_User.h</FileName>
<FileName>Gui_Seg_Dis.h</FileName>
<FileType>5</FileType>
<FilePath>.\source\Application\Mileage\Services_Mileage_User.h</FilePath>
<FilePath>.\source\Application\Display\SEG_LCD_DIS\Gui_Seg_Dis.h</FilePath>
</File>
<File>
<FileName>Gui_Lcd_Dis.c</FileName>
<FileType>1</FileType>
<FilePath>.\source\Application\Display\GUI_LCD_DIS\Gui_Lcd_Dis.c</FilePath>
<FileName>libMileage.lib</FileName>
<FileType>4</FileType>
<FilePath>.\source\Application\Mileage\libMileage.lib</FilePath>
</File>
<File>
<FileName>Gui_Lcd_Dis.h</FileName>
<FileName>Services_Mileage.h</FileName>
<FileType>5</FileType>
<FilePath>.\source\Application\Display\GUI_LCD_DIS\Gui_Lcd_Dis.h</FilePath>
<FilePath>.\source\Application\Mileage\Services_Mileage.h</FilePath>
</File>
<File>
<FileName>Gui_Seg_Dis.c</FileName>
<FileName>Services_Mileage_User.c</FileName>
<FileType>1</FileType>
<FilePath>.\source\Application\Display\SEG_LCD_DIS\Gui_Seg_Dis.c</FilePath>
<FilePath>.\source\Application\Mileage\Services_Mileage_User.c</FilePath>
</File>
<File>
<FileName>Gui_Seg_Dis.h</FileName>
<FileName>Services_Mileage_User.h</FileName>
<FileType>5</FileType>
<FilePath>.\source\Application\Display\SEG_LCD_DIS\Gui_Seg_Dis.h</FilePath>
<FilePath>.\source\Application\Mileage\Services_Mileage_User.h</FilePath>
</File>
</Files>
</Group>
......
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