Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
H
HaoJin232
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
时昊
HaoJin232
Commits
a9681e47
Commit
a9681e47
authored
Feb 18, 2024
by
时昊
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🎉
init:删除无用代码和变量
parent
8ed3ae62
Changes
9
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
13 additions
and
9636 deletions
+13
-9636
.gitignore
.gitignore
+2
-0
ExtDll.iex
HJ232_Source/Out/ExtDll.iex
+0
-2
QJ300_circle.hex
HJ232_Source/Out/QJ300_circle.hex
+0
-3894
QJ300_circle.lnp
HJ232_Source/Out/QJ300_circle.lnp
+0
-58
QJ300_circle.map
HJ232_Source/Out/QJ300_circle.map
+0
-5470
QJ300_circle.sct
HJ232_Source/Out/QJ300_circle.sct
+0
-16
init.c
HJ232_Source/source/System/init.c
+1
-4
main.c
HJ232_Source/source/System/main.c
+0
-2
tasks.c
HJ232_Source/source/System/tasks.c
+10
-190
No files found.
.gitignore
View file @
a9681e47
...
...
@@ -40,3 +40,5 @@ HJ232_Source/Out/QJ300_circle.axf
HJ232_Source/tim4DelayCounter.uvguix.tyw05
HJ232_Source/Out/QJ300_circle.axf
/.vscode
/HJ232_Source/Out/*.map
/HJ232_Source/Out
HJ232_Source/Out/ExtDll.iex
deleted
100644 → 0
View file @
8ed3ae62
[EXTDLL]
Count=0
HJ232_Source/Out/QJ300_circle.hex
deleted
100644 → 0
View file @
8ed3ae62
This source diff could not be displayed because it is too large. You can
view the blob
instead.
HJ232_Source/Out/QJ300_circle.lnp
deleted
100644 → 0
View file @
8ed3ae62
--cpu Cortex-M0+
".\objects\gpio.o"
".\objects\wdt.o"
".\objects\sys_tick.o"
".\objects\adc.o"
".\objects\analog_circuits.o"
".\objects\analog_signals.o"
".\objects\sci.o"
".\objects\sci_user.o"
".\objects\clk.o"
".\objects\intp.o"
".\objects\intp_user.o"
".\objects\tim4.o"
".\objects\rtc.o"
".\objects\timera_b_c.o"
".\objects\can.o"
".\objects\bu98r10.o"
".\objects\seg_lcd.o"
".\objects\flash.o"
".\objects\is31fl3236.o"
".\objects\aw93015.o"
".\objects\is31_iic_master.o"
".\objects\main.o"
".\objects\tasks.o"
".\objects\sys_scheduler.o"
".\objects\init.o"
".\objects\powermanagement.o"
".\objects\powermanagement_user.o"
".\objects\system_monitor.o"
".\objects\system_monitor_user.o"
".\objects\rte_adc.o"
".\objects\common_interface.o"
".\objects\telltales_user.o"
".\objects\flash_synchronizer.o"
".\objects\fuel.o"
".\source\Application\Eeprom\eepromManage.lib"
".\objects\eemanager_interface.o"
".\objects\services_mileage_user.o"
".\objects\can_communication_matrix.o"
".\source\Application\APPCan\CAN_Lib.lib"
".\objects\can_user.o"
".\objects\app_telltales.o"
".\source\Application\Telltales\Telltales.lib"
".\objects\app_service.o"
".\objects\app_serviceproc.o"
".\objects\link_layer.o"
".\objects\tp_layer.o"
".\objects\u2_app_service.o"
".\objects\u2_app_serviceproc.o"
".\objects\u2_link_layer.o"
".\objects\u2_tp_layer.o"
".\objects\isr_bat32a239.o"
".\objects\startup_bat32a239.o"
".\objects\system_bat32a239.o"
--strict --scatter ".\Objects\..\Out\QJ300_circle.sct"
--summary_stderr --info summarysizes --map --load_addr_map_info --xref --callgraph --symbols
--info sizes --info totals --info unused --info veneers
--list ".\Listings\..\Out\QJ300_circle.map" -o .\Objects\..\Out\QJ300_circle.axf
\ No newline at end of file
HJ232_Source/Out/QJ300_circle.map
deleted
100644 → 0
View file @
8ed3ae62
This diff is collapsed.
Click to expand it.
HJ232_Source/Out/QJ300_circle.sct
deleted
100644 → 0
View file @
8ed3ae62
; *************************************************************
; *** Scatter-Loading Description File generated by uVision ***
; *************************************************************
LR_IROM1 0x00000000 0x00040000 { ; load region size_region
ER_IROM1 0x00000000 0x00040000 { ; load address = execution address
*.o (RESET, +First)
*(InRoot$$Sections)
.ANY (+RO)
.ANY (+XO)
}
RW_IRAM1 0x20000000 0x00008000 { ; RW data
.ANY (+RW +ZI)
}
}
HJ232_Source/source/System/init.c
View file @
a9681e47
...
...
@@ -87,10 +87,7 @@ void Sys_Startup_Pre_Init(void)
* \attention
* \retval None
******************************************************************************/
//uint8_t u8ResetFlag = 0;
//extern uint32_t u32ResetFlag;
//extern uint32_t TestBackupRam;
void
Sys_Startup_Init
(
void
)
{
...
...
@@ -135,7 +132,7 @@ void Sys_Startup_Init(void)
******************************************************************************/
void
Sys_Sleep_Init
(
void
)
{
// Sys_Tick_Timer_Stop();
}
/**************************************************************************//**
...
...
HJ232_Source/source/System/main.c
View file @
a9681e47
...
...
@@ -8,12 +8,10 @@
#include "timerA_B_C.h"
extern
uint32_t
u32ResetFlag
;
extern
void
Power_Sleep_Init
(
void
);
extern
void
Sys_Enter_Sleep_Mode
(
void
);
extern
void
Power_Wakeup_Init
(
void
);
uint8_t
socPowerEn
=
0
;
int
main
(
void
)
{
...
...
HJ232_Source/source/System/tasks.c
View file @
a9681e47
...
...
@@ -15,7 +15,6 @@
#include "Sys_Scheduler.h"
#include "adc.h"
#include "Analog_Signals.h"
#include "PowerManagement.h"
#include "System_Monitor.h"
#include "Common_Interface.h"
...
...
@@ -23,21 +22,14 @@
#include "Telltales_Lib.h"
#include "Sys_Tick.h"
#include "Fuel.h"
#include "rtc.h"
#include "Flash_synchronizer.h"
#include "eepromManage.h"
#include "CAN_User.h"
#include "gpio.h"
#include "uds_includes.h"
#include "U2_uds_includes.h"
#include "BU98R10.h"
#include "Services_Mileage_User.h"
#include "can.h"
#include "IS31FL3236.h"
...
...
@@ -57,15 +49,10 @@
void
Sys_Run_Mode_Pseudo_Real_Time_Tasks
(
void
)
{
if
(
CAN_Initflag
==
0xeb
)
{
Diagnosis_main
();
// IS31FL3236_Update();
U2_Diagnosis_main
();
// DoCAN_Communication_Service();
// UDS_Server_Application_Service();
}
}
/*============================================================================*/
...
...
@@ -88,9 +75,7 @@ void Sys_Run_Mode_2ms_Tasks(void)
------------------------------------------------------------------------------*/
void
Sys_Run_Mode_5ms_Tasks
(
void
)
{
CAN_RX_Tick
();
}
/*==============================================================================
...
...
@@ -112,22 +97,9 @@ void Sys_Run_Mode_10ms_Tasks(void)
void
Sys_Run_Mode_20ms_Tasks
(
void
)
{
BU98R10_Update_Request
();
Diag_Req_Send
(
20
);
IS31FL3236_Update
();
}
/*============================================================================*/
...
...
@@ -137,27 +109,7 @@ void Sys_Run_Mode_20ms_Tasks(void)
------------------------------------------------------------------------------*/
void
Sys_Run_Mode_50ms_Tasks
(
void
)
{
Flash_Sync_Signal_Generation_Service
();
CAN_LED_Check_50msTask
();
SetDtcFault
();
}
/*============================================================================*/
...
...
@@ -165,183 +117,55 @@ void Sys_Run_Mode_50ms_Tasks(void)
/*==============================================================================
100ms周期执行任务
------------------------------------------------------------------------------*/
uint32_t
tempodo
=
0
;
uint32_t
tempTripA
=
0
;
uint32_t
tempTripB
=
0
;
void
Sys_Run_Mode_100ms_Tasks_Group1
(
void
)
{
// static uint16_t CounterBak;
// uint16_t delta;
// if(SYS_ROLLING_COUNTER_1ms >= CounterBak){
// delta = SYS_ROLLING_COUNTER_1ms - CounterBak;
// }
// else{
// delta = 0xffff - CounterBak + SYS_ROLLING_COUNTER_1ms + 1;
// }
// CounterBak = SYS_ROLLING_COUNTER_1ms;
Power_Management_Service_user
();
}
void
Sys_Run_Mode_100ms_Tasks_Group2
(
void
)
{
/*燃油计算*/
Fuel_Cal_Sevice
(
100u
);
}
void
Sys_Run_Mode_100ms_Tasks_Group3
(
void
)
{
}
void
Sys_Run_Mode_100ms_Tasks_Group4
(
void
)
{
/*获取RTC时间*/
RTC_Service
();
/*大计小计计算*/
CalcODO_100ms_Services
();
}
void
Sys_Run_Mode_100ms_Tasks_Group5
(
void
)
{
}
void
Sys_Run_Mode_100ms_Tasks_Group6
(
void
)
{
}
void
Sys_Run_Mode_100ms_Tasks_Group7
(
void
)
{
ReqSilentTimer100mSService
();
/*MIL灯超时计�?*/
Can_User_Time_Service
(
100
);
}
}
void
Sys_Run_Mode_100ms_Tasks_Group8
(
void
)
{
bsp_CAN_MaskCheck
();
}
void
Sys_Run_Mode_100ms_Tasks_Group9
(
void
)
{
/*�?测断码屏数据是否异常*/
//if(Common_GetIgnOnTime() > 1000)
//checkSegTftState();
/* 临时测试程序 �?�? */
// tempodo = Data_ODO_Read( );
// tempTripA = Data_Read_Trip(EM_TRIP_A);
// tempTripB = Data_Read_Trip(EM_TRIP_B);
/* 临时测试程序 结束 */
}
void
Sys_Run_Mode_100ms_Tasks_Group10
(
void
)
{
// if(tempodo<123u)
// Data_ODO_Modify ( 123u );
// PORT->P7 ^= (1<<1); // Toggle P71
// PORT->P7 ^= (1<<2); // Toggle P72
// RTE_RTC_Services_100Ms_Cbk();
// Data_ODO_Processing();
// Data_Trip_Processing();
// //Data_Avg_Speed_Processing();
// Data_TPMS_Value_Processing();
// Data_Ambient_Temperature_Processing();
// //Display_Schedule_Service();/*显示函数入口*/
// if ( Common_get_MotorModeStaFlag() == 0u)
// {
// if ((bsp_GetMotorState(0) == Normal) && (bsp_GetMotorState(1) == Normal))
// {
// bsp_SetMotorMode(0, MinReset);
// bsp_SetMotorMode(1, MinReset);
// Conmmon_Set_MotorModeStaFlag (1u);
// }
// }
// else if ( Common_get_MotorModeStaFlag() == 1u)
// {
// if ((bsp_GetMotorState(0) == Normal) && (bsp_GetMotorState(1) == Normal))
// {
// bsp_SetMotorMode(0, MaxStep);
// bsp_SetMotorMode(1, MaxStep);
// Conmmon_Set_MotorModeStaFlag(2u);
// }
// }
// else if (Common_get_MotorModeStaFlag() == 2u)
// {
// if ((bsp_GetMotorState(0) == MaxStepKeep) && (bsp_GetMotorState(1) == MaxStepKeep))
// {
// bsp_SetMotorMode(0, MinStep);
// bsp_SetMotorMode(1, MinStep);
// Conmmon_Set_MotorModeStaFlag(3u);
// }
// }
// else
// {
// Conmmon_Set_MotorModeStaFlag(4u);
// /*转�?�电机目标步赋�??*/
// if (bsp_GetMotorState(0) == Normal)
// {
// MeterPostion[0].destPosition = GetGaugesCurrentPos(RevGauges);
// }
// /*车�?�电机目标步赋�??*/
// if (bsp_GetMotorState(1) == Normal)
// {
// MeterPostion[1].destPosition = GetGaugesCurrentPos(VehGauges);
// }
// }
// //Menu_Display_Service();
// //External_Influence_ENERGY_RECOVERY_LEVEL_Select();
// LongTimeNoKey_Operation();
// //Menu_Get_Battery_Sts_Exist();
// //BL_Management_service();
// Popups_Management_Service();
// Popup_Scheduling_Service();
// /*综合油�?�信�?*/
// Data_FuelCounsComprehensive();
// /*小计油�?�信�?*/
// Data_FuelCounsumpTrip();
// /*本次油�?�信�?*/
// Data_FuelCounsumpThisTime();
// /*加油后行车信�?*/
// Data_Info_Last_Refueling();
// /*当前油�??*/
// Fuel_CurrentFuelEco_Data();
// /*综合油�??*/
// Fuel_ComprehensiveFuelEco_Data();
// /*综合气�??*/
// Gas_ComprehensiveGasEco_Data();
// /*机油压力*/
// Oil_EngineOilPressure_Data();
}
/*============================================================================*/
...
...
@@ -383,18 +207,14 @@ void Sys_Exact_50us_Tasks(void)
------------------------------------------------------------------------------*/
void
Sys_Exact_100ms_Tasks
(
void
)
{
// Service_OFF_Timing_Process();
// PORT_ClrBit(CAN0_STB);
/*不休眠的计时*/
}
/*============================================================================*/
void
APP_Startup_Init
(
uint8_t
startMode
)
{
// Power_Management_Init(startMode);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment