差异
This commit is contained in:
@@ -43,17 +43,18 @@ typedef union
|
||||
|
||||
typedef struct
|
||||
{
|
||||
u16 ExtPowerInput: 1; // 0
|
||||
u16 FactoryTestMode: 1; // 1
|
||||
u16 ZeroCalib: 1; // 2
|
||||
u16 CalibMode: 1; // 3
|
||||
u16 DebugMode: 1; // 4
|
||||
u16 TurnOffSystem: 1; // 5
|
||||
u16 ComModeOperate: 1; // 6
|
||||
u16 DigitOutput: 1; // 7
|
||||
u16 IntCalibMode: 1; // 8
|
||||
u16 LowCalibEnd : 1; // 9
|
||||
u16 HighCalibEnd : 1; // 10
|
||||
u16 ExtPowerInput: 1; // 0 <20>ⲿ<EFBFBD><E2B2BF>Դ<EFBFBD><D4B4><EFBFBD><EFBFBD>
|
||||
u16 FactoryTestMode: 1; // 1 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ģʽ
|
||||
u16 ZeroCalib: 1; // 2 <20><><EFBFBD><EFBFBD><EFBFBD>ߵ<EFBFBD><DFB5>±궨ģʽ
|
||||
u16 CalibMode: 1; // 3 Уģʽ
|
||||
u16 DebugMode: 1; // 4 <20><><EFBFBD><EFBFBD>ģʽ
|
||||
u16 TurnOffSystem: 1; // 5 <20>ر<EFBFBD>ϵͳ
|
||||
u16 ComModeOperate: 1; // 6 <20><><EFBFBD>ڲ<EFBFBD><DAB2><EFBFBD>ģʽ
|
||||
u16 DigitOutput: 1; // 7 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
u16 IntCalibMode: 1; // 8 <20>ڲ<EFBFBD><DAB2>궨ģʽ
|
||||
u16 LowCalibEnd : 1; // 9 <20><><EFBFBD>±궨<C2B1><EAB6A8><EFBFBD>ɱ<EFBFBD>־
|
||||
u16 HighCalibEnd : 1; // 10 <20><><EFBFBD>±궨<C2B1><EAB6A8><EFBFBD>ɱ<EFBFBD>־
|
||||
u16 PreCalibEnd : 1; // 11 Уǰ<D7BC><C7B0><EFBFBD><EFBFBD><EFBFBD>Ȳ<EFBFBD><C8B2><EFBFBD>д<EFBFBD><D0B4><EFBFBD><EFBFBD><EFBFBD>ɱ<EFBFBD>־
|
||||
} __System_Status_Bit_TypeDef;
|
||||
|
||||
typedef union
|
||||
@@ -65,9 +66,9 @@ typedef union
|
||||
|
||||
typedef struct
|
||||
{
|
||||
u16 ZeroCalib: 1; // 2
|
||||
u16 CalibMode: 1; // 3
|
||||
u16 DebugMode: 1; // 4
|
||||
u16 ZeroCalib: 1; // 0
|
||||
u16 DebugMode: 1; // 1
|
||||
u16 CalibMode: 1; // 2
|
||||
} __HW_Switch_BIT_TypeDef;
|
||||
|
||||
typedef union
|
||||
@@ -92,8 +93,9 @@ typedef struct
|
||||
u16 EnableTempInit: 1; // 10
|
||||
u16 KeyPressed: 1; // 11
|
||||
u16 PulseOperate: 1; // 12
|
||||
u16 ReadParameterOK: 1; // 13
|
||||
|
||||
u16 ReadParameterOK: 1; // 13
|
||||
u16 MainTimerOut: 1; // 13
|
||||
u16 ProcessTimerOut: 1; // 13
|
||||
} __Hardware_Status_Bit_TypeDef;
|
||||
|
||||
typedef struct
|
||||
@@ -105,7 +107,7 @@ typedef struct
|
||||
u16 NeedForInit: 1; // 4
|
||||
|
||||
} __Display_Status_Bit_TypeDef;
|
||||
|
||||
|
||||
//**********************************************************************************************
|
||||
//extern u16 MAPBuffer1,MAPBuffer2,MAPBuffer3,MAPBuffer4,MAPBuffer5,MAPBuffer6,MAPBuffer7,MAPBuffer8;
|
||||
//extern u16 MAPBuffer9,MAPBuffer10,MAPBuffer11,MAPBuffer12,MAPBuffer13,MAPBuffer14,MAPBuffer15,MAPBuffer16;
|
||||
@@ -169,29 +171,28 @@ extern u16 jumpError ;
|
||||
|
||||
//**********************************************************************************************
|
||||
extern __Hardware_Status_Bit_TypeDef HWState;
|
||||
extern __SystemProcess_Union_TypeDef systemProcess;
|
||||
extern __SystemProcess_Union_TypeDef systemProcessing;
|
||||
extern __SystemState_Union_TypeDef currentMode;
|
||||
extern __Alarm_State_TypeDef systemAlarm;
|
||||
//----------------------------------------------------------------------------------------------
|
||||
extern u32 securityID;
|
||||
extern u16 IDvalidTime, comCounter, comResetCounter, AutoOffsetCounter, timePeriod, autoTxdCounter, SysVolErrorCount;
|
||||
extern u16 IDvalidTime, comCounter, AutoOffsetCounter, timePeriod, autoTxdCounter, SysVolErrorCount;
|
||||
extern u16 calibType;
|
||||
extern u16 curveMode;
|
||||
//----------------------------------------------------------------------------------------------
|
||||
extern u8 Dis1[15], timer[8];
|
||||
extern u16 language,displayCNT;
|
||||
extern u16 displayCNT;
|
||||
extern __Display_Status_Bit_TypeDef displayMode;
|
||||
//----------------------------------------------------------------------------------------------
|
||||
extern u32 unitPerPulse;
|
||||
//extern u32 unitPerPulse;
|
||||
//----------------------------------------------------------------------------------------------
|
||||
// for flowrate
|
||||
extern u16 displayUpdate;
|
||||
extern u16 reverseScale, zeroSuppression, calibFlowGain;
|
||||
extern u32 currentFlowRate;
|
||||
|
||||
extern u16 samplingInterval, factoryInterval, responseTimeIndex, samplingIntervalTarget;
|
||||
extern u16 samplingInterval, responseTimeIndex, samplingIntervalTarget;
|
||||
extern u16 systemVoltage, batteryGrid;
|
||||
extern u16 calibTemperature;
|
||||
//extern u16 calibTemperature;
|
||||
//**********************************************************************************************
|
||||
extern u16 tmpIA;
|
||||
extern s32 tmpSLA, tmpSLB;
|
||||
@@ -214,20 +215,18 @@ extern const u16 UpdateTimeVaule[]; // 0.235s, 0.45s, 0.5s, 1s, 2s
|
||||
extern const u16 FRUnitForHour[];
|
||||
extern const u16 FRUnitForMinute[];
|
||||
//**********************************************************************************************
|
||||
extern void SetDisplayUpdateTime(void);
|
||||
extern void DisableDisplayTimerInterrupt(void);
|
||||
extern void ReadCurrentTime(void);
|
||||
//extern void SetDisplayUpdateTime(void);
|
||||
//extern void DisableDisplayTimerInterrupt(void);
|
||||
//extern void ReadCurrentTime(void);
|
||||
|
||||
void ManagePrimaryProcess(void);
|
||||
void ManageRTCProcess(void);
|
||||
void EnterUserMode(void);
|
||||
void EnterCalibMode(void);
|
||||
void EnterZeroCalibMode(void);
|
||||
void EnterBatteryMode(void);
|
||||
void EnterDebugMode(void);
|
||||
void EnterGcfTestMode(void);
|
||||
void ManagePrimaryTimeInterval(void);
|
||||
void ModeExitCount(void);
|
||||
void ManagePrimaryTimeInterval(void);
|
||||
void EnterMainEntry(void);
|
||||
void BackupParameterToFlash(void);
|
||||
void SystemParameterInit(void);
|
||||
@@ -236,9 +235,6 @@ void SystemHardWareInit(void);
|
||||
void SystemInterfaceInit(void);
|
||||
void InitGlobalVar(void);
|
||||
void SystemInitProcess(void);
|
||||
void SystemPolling(void);
|
||||
void SetPriority(void);
|
||||
|
||||
|
||||
u32 ReadParameterFromMemory(u16 parameterAdr, u16 parameterLen, u32 parameterDefault);
|
||||
#endif
|
||||
Reference in New Issue
Block a user