Commit 75db2c07 authored by 时昊's avatar 时昊

增加燃油库

parent 60856990
......@@ -2542,6 +2542,34 @@
<FILEKIND>Text</FILEKIND>
<FILEFLAGS></FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>Fuel.c</PATH>
<PATHFORMAT>Windows</PATHFORMAT>
<FILEKIND>Text</FILEKIND>
<FILEFLAGS>Debug</FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>Fuel.h</PATH>
<PATHFORMAT>Windows</PATHFORMAT>
<FILEKIND>Text</FILEKIND>
<FILEFLAGS></FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>Fuel_V3.2.lib</PATH>
<PATHFORMAT>Windows</PATHFORMAT>
<FILEKIND>Unknown</FILEKIND>
<FILEFLAGS>Debug</FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>FuelConfig.h</PATH>
<PATHFORMAT>Windows</PATHFORMAT>
<FILEKIND>Text</FILEKIND>
<FILEFLAGS></FILEFLAGS>
</FILE>
</FILELIST>
<LINKORDER>
<FILEREF>
......@@ -3594,6 +3622,26 @@
<PATH>Simulated_IIC_2_Master.h</PATH>
<PATHFORMAT>Windows</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>Fuel.c</PATH>
<PATHFORMAT>Windows</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>Fuel.h</PATH>
<PATHFORMAT>Windows</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>Fuel_V3.2.lib</PATH>
<PATHFORMAT>Windows</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>FuelConfig.h</PATH>
<PATHFORMAT>Windows</PATHFORMAT>
</FILEREF>
</LINKORDER>
</TARGET>
</TARGETLIST>
......@@ -4028,6 +4076,30 @@
<PATH>Flash_synchronizer.c</PATH>
<PATHFORMAT>Windows</PATHFORMAT>
</FILEREF>
<FILEREF>
<TARGETNAME>Standard</TARGETNAME>
<PATHTYPE>Name</PATHTYPE>
<PATH>Fuel.c</PATH>
<PATHFORMAT>Windows</PATHFORMAT>
</FILEREF>
<FILEREF>
<TARGETNAME>Standard</TARGETNAME>
<PATHTYPE>Name</PATHTYPE>
<PATH>Fuel.h</PATH>
<PATHFORMAT>Windows</PATHFORMAT>
</FILEREF>
<FILEREF>
<TARGETNAME>Standard</TARGETNAME>
<PATHTYPE>Name</PATHTYPE>
<PATH>Fuel_V3.2.lib</PATH>
<PATHFORMAT>Windows</PATHFORMAT>
</FILEREF>
<FILEREF>
<TARGETNAME>Standard</TARGETNAME>
<PATHTYPE>Name</PATHTYPE>
<PATH>FuelConfig.h</PATH>
<PATHFORMAT>Windows</PATHFORMAT>
</FILEREF>
<FILEREF>
<TARGETNAME>Standard</TARGETNAME>
<PATHTYPE>Name</PATHTYPE>
......
This diff is collapsed.
/******************************************************************************
�� �� ����Fuel.h
����������ȼ�����ݴ���
�� �ߣ�����
�� ����V1.0
�� �ڣ�2016.11.3
******************************************************************************/
#ifndef _FUEL_H_
#define _FUEL_H_
//EXTERN INT8U AFCInitSts;
EXTERN AFC_PARA FuelPARA;
EXTERN FuelStruct FuelInit;
EXTERN FuelStruct FuelInit_Data;
EXTERN FuelStruct FuelInit_DataBackup;
EXTERN AFC_INIT FuelAFCInit;
EXTERN uint16_t DataFuelConsOf100msUL;
#define Fuel_Short_Cricuit_Res 0
#define Fuel_Open_Res 5000
typedef struct
{
INT8U Sensor_State;
INT8U Step_Get;
INT16U Res_Dis;
INT8U Seg_Get;
INT8U Seg_Val;
INT16U Res_Get;
INT16U Capacity_Get;
INT16U Capacity_Val;
INT8U Precent_Get;
INT8U Precent_Val;
INT16U Flag;
INT8U Res_Valid;
INT16U AFC_Get;
}_Fuel_Data_Struct;
EXTERN _Fuel_Data_Struct FuelData;
//EXTERN INT8U Fuel_Sensor_State;//ȼ�ʹ�����״̬
extern volatile uint16_t AnalogFuelSensorRes; //ȼ�ʹ�������ֵ,��λ��0.1 Ohm
//extern unsigned char sFuelInitOver ;
void Fuel_KL15_Change_Config_Init(void);
void Fuel_Change_Config(void);
void Fuel_KL30_Read_Config_Init(void);
void SET_YB_InitData(void);
void GET_Data_For_YB(void); //10ms����
void GET_Data_To_DSP(void); //100ms����
void PowerDN_Time_Add(void) ;
unsigned char FuelSensorState(unsigned int vFuelR);
#endif
\ No newline at end of file
#ifndef _FUELCONFIG_H
#define _FUELCONFIG_H
typedef unsigned int INT16U;
typedef unsigned char INT8U;
typedef unsigned long INT32U;
//Fuel Config
typedef struct _FuelStruct {
INT16U FuelShortCircuitR;
INT16U FuelOpenCircuitR;
INT16U DisplayZoneBoundary[11];
INT16U FuelCapacityBoundary[11];
}FuelStruct;
extern void InitFuelParamter(FuelStruct *para);
extern void SaveSampleVal(INT16U FuelResistance); //unit:ohm,accuracy:0.1
extern void FuelFSM(void);
extern void SetRPM(INT16U n); //Call only when the fuel is used,unit:RPM,accuracy:1
extern void SetSpeed(INT8U n); //Call only when the fuel is used,unit:km/h,accuracy:1
extern void SetFuelSensorRecoverGroupCnt(INT16U n); //1:500ms,2:1000ms,3:1500ms.......,range:5s(10)-30min(3600)
extern void SetFuelSensorOpenCircuitGroupCnt(INT16U n); //1:500ms,2:1000ms,3:1500ms.......,range:5s(10)-30min(3600)
extern void SetFuelSensorShortCircuitGroupCnt(INT16U n); //1:500ms,2:1000ms,3:1500ms.......,range:5s(10)-30min(3600)
extern void SetPowerSt(INT8U n);
extern INT8U GetFuelSeg(void); //Segment, range:0~8
extern INT8U GetFuelStep(void); //Pointer or Mono TFT stepless,range:0,10~90, 0,10:E, 90:F
extern INT16U GetFuelCapacityVal(void); //unit:L,accuracy:0.1
extern void SetDisplayStepMinVal(INT8U n); //Set GetFuelStep() min val,range:0~80,default 10
extern void SetCalcResistanceRange(INT8U min, INT8U max); //Call this function after calling InitFuelParamter();
//Set the range of calculated resistance value, default:40-120, max number:240;
//ResistanceRange[0]:Sample resistance minimum,fuel high;
//ResistanceRange[239]:Sample resistance maximum, fuel low.
enum {
FuelSensorNormal,
FuelSensorShortCircuit,
FuelSensorOpenCircuit,
FuelSensorPreFault,
};
extern INT8U GetFuelSensorState(void);
enum {
FUEL_ST_FIRST_POWER_UP, //0
FUEL_ST_IGN_ON_PROCESS, //1
FUEL_ST_POWER_ON_ADD_FUEL, //2
FUEL_ST_VEHICLE_RUN, //3
FUEL_ST_IGN_OFF_PROCESS, //4
FUEL_ST_IGN_OFF, //5
};
extern INT8U GetFuelFSM_St(void);
extern INT16U GetFuelResistance(void); //unit:ohm,accuracy:0.1
extern INT8U GetPowerDn(void);
extern INT16U GetPowerDownTimeCnt(void);
// AFC & DrivingRange
typedef struct _AFC_INIT {
INT8U CalcAFCMaxNum; //max 100km,default 50
INT16U AFCMin; //unit:L,accuracy:0.1
INT16U AFCMax; //unit:L,accuracy:0.1
INT16U AFCPreinstall; //unit:L,accuracy:0.1
INT32U CurODO; // unit:m,accuracy:1
INT32U MaxDRMileage; //unit:km,accuracy:0.01
}AFC_INIT;
extern void InitAFC(AFC_INIT *data);
extern void ResetAFC(AFC_INIT *data);
typedef struct _AFC_PARA {
INT32U CurODO; // unit:m,accuracy:1
INT16U FuleConsume; // unit:ul,accuracy:1
INT16U RPM; // unit:RPM,accuracy:1
INT8U Speed; // unit:km/h,accuracy:1
}AFC_PARA;
extern void SetAFCPara(AFC_PARA *data);
extern void AFCTimerCall(void); //must per 10ms interrupt
extern INT16U GetDRMileage(void); //unit:km,accuracy:1
extern INT16U GetCurAFC(void); //unit:L,accuracy:0.1
extern INT16U GetAFCSumH(void);
extern INT16U GetAFCSumL(void);
#endif
......@@ -6353,7 +6353,7 @@ if(GUIBackUp.Language != MenuData.Language)
void GUI_Setting_Menu3_IC_Res_Display(void)
{
#if 0
#if 1
INT8U Refresh;
INT16U Res;
Res = 0;
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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