🦄 refactor:删除无用文件-频率采集

HJ232_Source/Out/QJ300_circle.lnp

@@ -34,7 +34,6 @@
 ".\objects\mcu_core_protocol.o"
 ".\objects\telltales_user.o"
 ".\objects\flash_synchronizer.o"
-".\objects\calcfrequency_user.o"
 ".\objects\fuel.o"
 ".\source\Application\Eeprom\eepromManage.lib"
 ".\objects\eemanager_interface.o"
@@ -49,7 +48,6 @@
 ".\objects\can_user.o"
 ".\objects\gauges.o"
 ".\objects\coolanttemp.o"
-".\source\Application\CalcFrequency\CalcFrequency.lib"
 ".\objects\app_telltales.o"
 ".\source\Application\Telltales\Telltales.lib"
 ".\objects\app_service.o"

HJ232_Source/source/Application/CalcFrequency/CalcFrequency.h

-/*
- * bsp_clock.h
- *
- *  Created on: 2021
- *      Author: QTC
- */
-
-#ifndef _CALCFREQ_H_
-#define _CALCFREQ_H_
-#include "common.h"
-#include "CalcFrequency.h"
-	
-
-/*-------------------------------------------------------------------------
-* Function Name  : RevFreInit
-* Description    : 转速频率初始化函数
-* Input          : MaxFreq：转速最大频率，单位Hz
-                   TIMn_Clock：频率捕捉计数频率,单位Hz
-                   SpeedRadio：转速速比     
-                                                    转速 x 速比
-                   转速速比计算方式：            频率 = ————————————————————————
-                                                        60
-* Output         : None
-* Return         : None
-* onther         : 30电初始化一次
---------------------------------------------------------------------------*/
-extern void RevFreInit(uint32_t MaxFreq,uint32_t  TIMn_Clock,uint32_t SpeedRadio);
-
-
-
-/*-------------------------------------------------------------------------
-* Function Name  : InputRevLowPulseTime
-* Description    : 输入转速脉冲低电平时间
-* Input          : TIMn_TCx：时间计数。TIM_overFlag：是否发生溢出
-* Output         : None
-* Return         : None
-* onther         : 捕获中断中调用
---------------------------------------------------------------------------*/
-extern void InputRevLowPulseTime(uint16_t* TIMn_TCx,uint16_t* TIM_overFlag);
-
-
-/*-------------------------------------------------------------------------
-* Function Name  : InputRevHighPulseTime
-* Description    : 输入转速脉冲高电平时间
-* Input          : TIMn_TCx：时间计数。TIM_overFlag：是否发生溢出
-* Output         : None
-* Return         : None
-* onther         : 捕获中断中调用
---------------------------------------------------------------------------*/
-extern void InputRevHighPulseTime(uint16_t* TIMn_TCx,uint16_t* TIM_overFlag);
-
-
-/*-------------------------------------------------------------------------
-* Function Name  : CalcRevFreqService
-* Description    : 计算转速频率服务函数
-* Input          : deltaTime：函数调用周期时间，仅计算超时使用，时间要求不严格
-* Output         : None
-* Return         : None
-* onther         : 建议放在100ms周期任务中
---------------------------------------------------------------------------*/
-extern void CalcRevFreqService(uint16_t deltaTime);  
-
-/*-------------------------------------------------------------------------
-* Function Name  : Get_Rev_Speed
-* Description    : 获取真实转速
-* Input          : None
-* Output         : 转速值
-* Return         : None
-* onther         : 
---------------------------------------------------------------------------*/
-uint16_t Get_Rev_Speed(void);
-
-
-/*-------------------------------------------------------------------------
-* Function Name  : VehFreInit
-* Description    : 车速频率初始化函数
-* Input          : MaxSpeed：最大车速，单位km/h
-                   TIMn_Clock：频率捕捉计数频率,单位Hz
-                   SpeedRadio：转速速比     
-                                                     车速 x PPK
-                   车速PPK计算方式：            频率 = ————————————————————————
-                                                        3600
-* Output         : None
-* Return         : None
-* onther         : 30电初始化一次
---------------------------------------------------------------------------*/
-void   VehFreInit(uint32_t MaxSpeed,uint32_t  TIMn_Clock,uint32_t PPK);
-
-
-/*-------------------------------------------------------------------------
-* Function Name  : CalcVehFreqService
-* Description    : 计算车速频率服务函数
-* Input          : deltaTime：函数调用周期时间，仅计算超时使用，时间要求不严格
-* Output         : None
-* Return         : None
-* onther         : 建议放在100ms周期任务中
---------------------------------------------------------------------------*/
-void CalcVehFreqService(uint16_t deltaTime);
-
-
-
-/*-------------------------------------------------------------------------
-* Function Name  : InputVehLowPulseTime
-* Description    : 输入车速脉冲低电平时间
-* Input          : TIMn_TCx：时间计数。TIM_overFlag：是否发生溢出
-* Output         : None
-* Return         : None
-* onther         : 捕获中断中调用
---------------------------------------------------------------------------*/
-void InputVehLowPulseTime(uint16_t* TIMn_TCx,uint16_t* TIM_overFlag);
-
-
-/*-------------------------------------------------------------------------
-* Function Name  : InputVehHighPulseTime
-* Description    : 输入车速脉冲高电平时间
-* Input          : TIMn_TCx：时间计数。TIM_overFlag：是否发生溢出
-* Output         : None
-* Return         : None
-* onther         : 捕获中断中调用
---------------------------------------------------------------------------*/
-void InputVehHighPulseTime(uint16_t* TIMn_TCx,uint16_t* TIM_overFlag);
-
-
-/*-------------------------------------------------------------------------
-* Function Name  : Get_Veh_Speed
-* Description    : 获取真实车速
-* Input          : None
-* Output         : 车速值
-* Return         : None
-* onther         : 
---------------------------------------------------------------------------*/
-uint16_t Get_Veh_Speed(void);
-
-
-/*-----------user code --------------------*/
-void CalcFreqData(uint16_t deltaTime);
-void CalcFreq_KL15_Init(void);
-
-#endif /* _CALCFREQ_H_ */

HJ232_Source/source/Application/CalcFrequency/CalcFrequency_user.c

-
-#include "CalcFrequency.h" 
-#include "Common_Interface.h"
-#include "tim4.h"
-#include "MCU_Core_Protocol.h"
-#include "CAN_Communication_Matrix.h"
-#include "SEG_LCD.h"
-
-//static uint16_t VehSpeedBuf[3];
-//static uint8_t VehSpeedCount;
-void CalcFreq_KL15_Init(void)
-{
-//    E_Speed_Dir = E_SPEED_SEG_UP;
-//    EspeedBak = 0;
-//    E_Speed_Current_Bar = 0;
-//    CurEspeed = 0;
-//    DesEspeed = 0;
-    // VehSpeedBuf[0] = 0;
-    // VehSpeedBuf[1] = 0;
-    // VehSpeedBuf[2] = 0;
-    // VehSpeedCount = 0;
-    Capture_Init(40u);
-    RevFreInit(200u, 500000u, 1u);
-    //Capture_Init(40u);
-    //VehFreInit(360u, 500000u, 23616u); // 23637u);  //20230602;
-}
-uint16_t DisVehDelay = 0;
-void CalcFreqData(uint16_t deltaTime)
-{
-    uint16_t RevSpeed = 0;
-    uint16_t VehSpeed = 0;
-    uint16_t DispVehSpeed = 0;
-	uint16_t RearVeh = 0;
-	uint16_t DispRearVeh = 0;
-    uint32_t temp32 = 0;
-	uint8_t Valid = 0;
-
-	CalcRevFreqService(deltaTime);
-    
-    /*转�??*/
-    RevSpeed = Get_Rev_Speed();
-    if (RevSpeed > 18000)
-    { /*输入频率大于300Hz，转速显�?0*/
-        RevSpeed = 0;
-    }
-    else if (RevSpeed > 12000)
-    {
-        RevSpeed = 12000;
-    }
-    
-    if ((RevSpeed < 12100) && (Common_GetIgnOnTime() > IGON_SelfcheckingTimer))
-    { /*输入频率大于200HZ（小�?300HZ）时，保持当前�?�显示�??*/
-        Common_Set_Act_E_Speed(RevSpeed);
-        Common_Set_Act_E_Speed_Valid(COMMON_Valid);
-        Common_Set_Disp_E_Speed(RevSpeed);
-        Common_Set_Disp_E_Speed_Valid(COMMON_Valid);
-    }
-    
-
-    temp32 = Get_ID_12B_Rear_Speed();
-    temp32 *= 5625;
-    temp32 /= 10000;
-    Valid = Get_ID_12B_Rear_Wheel_Speed_Validity();
-    if ((Valid == 1) || (temp32 < 30) || (CAN_SIG_LOST == CAN_MSG_Status(ID_ABS_12B_Count)))
-    {
-        VehSpeed = 0;
-        DispVehSpeed = 0;
-    }
-    else
-    {
-        VehSpeed = temp32;
-        DispVehSpeed = temp32 * 108 / 10;
-        if (DispVehSpeed > 1990)
-        {
-            DispVehSpeed = 1990;
-        }
-        
-    }
-    Common_Set_Act_V_Speed(VehSpeed);
-    Common_Set_Act_V_Speed_Valid(COMMON_Valid);
-
-    DisVehDelay += deltaTime;
-    if(DisVehDelay >= 200){
-        DisVehDelay = 0;
-        DispVehSpeed = ((uint32_t)VehSpeed*108)/100;
-        if(DispVehSpeed  > 1990){
-            DispVehSpeed = 1990;
-        }
-        Common_Set_Disp_V_Speed(DispVehSpeed);
-        Common_Set_Disp_V_Speed_Valid(COMMON_Valid);
-    }
-}

HJ232_Source/source/Application/Menu/Menus.c

@@ -5,7 +5,6 @@
 #include "MCU_Core_Protocol.h"
 #include "CAN_User.h"
 #include "Services_Mileage_User.h"
-#include "CalcFrequency.h" 
 #include "CAN_Communication_Matrix.h" 
 #include "Flash_synchronizer.h"
 

HJ232_Source/source/Application/PowerManagement/PowerManagement_user.c

@@ -12,7 +12,7 @@
 #include "Telltales_user.h"
 #include "MCU_Core_Protocol.h"
 #include "tim4.h"
-#include "CalcFrequency.h" 
+
 #include "Fuel.h"
 #include "CoolantTemp.h"
 #include "Services_Mileage_User.h"
@@ -196,7 +196,7 @@ void Power_Wakeup_Init ( void )
     // uart2_User_KL30_Init();
     Common_DataInit();
     Key_Status_Init();
-    CalcFreq_KL15_Init();
+
     IS31_OFF_Wakeup();
     IS31FL3236_Update();
     Init93015_IIC();//4034
@@ -244,7 +244,6 @@ void Power_IG_ON_Init(void)
     MenuIgnOnInit();
     Protocol_KL15_ON_Init();
     uart2_User_KL15_Init();
-    CalcFreq_KL15_Init();
     APP_CAN_Init();
     CalcODOKL15Init();
     Common_Set_IG_Sts(COMMON_POWER_ON);

HJ232_Source/source/Driver/src/tim4.c

@@ -6,7 +6,7 @@
  */
  
 #include "tim4.h"
-#include "CalcFrequency.h"
+
 
 #define              INTERVAL_TIMER_MODE        0
 #define              CAPTURE_MODE               0x0104
@@ -206,13 +206,13 @@ void  bsp_tim4_01_isr_Handler( void )
     if(*pTMRmn == EdgeRising){
         
         *pTMRmn = EdgeFalling;
-        InputRevHighPulseTime(pTDRmn,pTSRmn);   //高低电平是反的，我也不知道为啥
+        //InputRevHighPulseTime(pTDRmn,pTSRmn);   //高低电平是反的，我也不知道为啥
 
     }
     else{
         
         *pTMRmn = EdgeRising;
-        InputRevLowPulseTime(pTDRmn,pTSRmn);
+        //InputRevLowPulseTime(pTDRmn,pTSRmn);
         
     }      
     INTC_ClearPendingIRQ(TM01_IRQn); 

HJ232_Source/source/System/tasks.c

@@ -23,7 +23,6 @@
 #include "PowerManagement_user.h"
 #include "Telltales_Lib.h"
 #include "Sys_Tick.h"
-#include "CalcFrequency.h" 
 #include "Fuel.h" 
 #include "CoolantTemp.h"
 #include "rtc.h" 
@@ -55,7 +54,7 @@
 *******************************************************************************/
 
 /*==============================================================================
-伪实时任?
+伪实时任�?
 ------------------------------------------------------------------------------*/
 
 void Sys_Run_Mode_Pseudo_Real_Time_Tasks(void)
@@ -127,14 +126,14 @@ void Sys_Run_Mode_10ms_Tasks(void)
 //    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();/*在主循环中调?*/
+//    UserGaugeSchedule();/*在主循环中调�?*/
 //    /*end*/
 //    Sound_Play_Service();
 //    CD4051B_ReadSignal_Serviece();
@@ -169,14 +168,14 @@ void Sys_Run_Mode_20ms_Tasks(void)
 	{
       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();
@@ -203,7 +202,7 @@ void Sys_Run_Mode_50ms_Tasks(void)
     Flash_Sync_Signal_Generation_Service();
 
 
-    if(get_SEG_Check_Contrl() == 0)	CalcODO_50ms_Services();//20221117  TYW大计清零后，循环显示断码?? 停止大计/小计里程
+    if(get_SEG_Check_Contrl() == 0)	CalcODO_50ms_Services();//20221117  TYW大计清零后，循环显示断码�?�? 停止大计/小计里程
 
 //    Data_Time_Calibration();
 //    Data_Service_Gear_Processing();
@@ -252,8 +251,6 @@ void Sys_Run_Mode_100ms_Tasks_Group1(void)
 void Sys_Run_Mode_100ms_Tasks_Group2(void)
 {
 
-    /*车转速服务函?*/
-    CalcFreqData(100u);
 
     /*燃油计算*/
     Fuel_Cal_Sevice(100u);
@@ -282,7 +279,7 @@ void Sys_Run_Mode_100ms_Tasks_Group4(void)
 }
 void Sys_Run_Mode_100ms_Tasks_Group5(void)
 {
-    /*挡位??*/
+    /*挡位�?�?*/
     //Data_Service_Gear_Processing();
 
 }
@@ -305,7 +302,7 @@ void Sys_Run_Mode_100ms_Tasks_Group7(void)
     //CAN_Check_Liandian();
     ReqSilentTimer100mSService();
 
-    /*MIL灯超时计?*/
+    /*MIL灯超时计�?*/
     Can_User_Time_Service(100);
 
  }
@@ -321,12 +318,12 @@ void Sys_Run_Mode_100ms_Tasks_Group8(void)
 }
 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);
@@ -380,13 +377,13 @@ void Sys_Run_Mode_100ms_Tasks_Group10(void)
 //    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);
@@ -400,20 +397,20 @@ void Sys_Run_Mode_100ms_Tasks_Group10(void)
 //    //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();
@@ -436,11 +433,11 @@ void Sys_Sleep_Mode_Tasks(void)
 
 /*******************************************************************************
 *                                                                              *
-*                           精确?50us计时任务列表                             *
+*                           精确�?50us计时任务列表                             *
 *                                                                              *
 *******************************************************************************/
 /*==============================================================================
-精确?50us计时任务 禁止添加修改列表中的任务
+精确�?50us计时任务 禁止添加修改列表中的任务
 ------------------------------------------------------------------------------*/
 void Sys_Exact_50us_Tasks(void)
 {
@@ -450,11 +447,11 @@ void Sys_Exact_50us_Tasks(void)
 
 /*******************************************************************************
 *                                                                              *
-*                           精确?100ms计时任务列表                            *
+*                           精确�?100ms计时任务列表                            *
 *                                                                              *
 *******************************************************************************/
 /*==============================================================================
-精确?100ms计时任务 禁止添加修改列表中的任务
+精确�?100ms计时任务 禁止添加修改列表中的任务
 ------------------------------------------------------------------------------*/
 void Sys_Exact_100ms_Tasks(void)
 {

HJ232_Source/tim4DelayCounter.uvprojx

@@ -339,7 +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\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</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</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -708,16 +708,6 @@
               <FileType>1</FileType>
               <FilePath>.\source\Application\Telltales\Flash_synchronizer.c</FilePath>
             </File>
-            <File>
-              <FileName>CalcFrequency.h</FileName>
-              <FileType>5</FileType>
-              <FilePath>.\source\Application\CalcFrequency\CalcFrequency.h</FilePath>
-            </File>
-            <File>
-              <FileName>CalcFrequency_user.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>.\source\Application\CalcFrequency\CalcFrequency_user.c</FilePath>
-            </File>
             <File>
               <FileName>Fuel.h</FileName>
               <FileType>5</FileType>
@@ -863,11 +853,6 @@
               <FileType>5</FileType>
               <FilePath>.\source\Application\CoolantTemp\CoolantTemp.h</FilePath>
             </File>
-            <File>
-              <FileName>CalcFrequency.lib</FileName>
-              <FileType>4</FileType>
-              <FilePath>.\source\Application\CalcFrequency\CalcFrequency.lib</FilePath>
-            </File>
             <File>
               <FileName>app_Telltales.c</FileName>
               <FileType>1</FileType>

utility/MCU_Cfg/src/tim4.c

@@ -6,7 +6,7 @@
  */
  
 #include "tim4.h"
-#include "CalcFrequency.h"
+
 
 #define              INTERVAL_TIMER_MODE        0
 #define              CAPTURE_MODE               0x0104