This commit is contained in:
2026-03-20 21:19:53 +08:00
parent 9d3b4b836f
commit 6a749331db
125 changed files with 29972 additions and 23051 deletions

View File

@@ -34,8 +34,8 @@ void NumericPrepForOutputAndDisplay(void)
else if(currentMode.Bit.DebugMode) DebugDisplay();
else if(currentMode.Bit.CalibMode) CalibrationDisplay();
else if((alarmState & HARD_ALARM) == HARD_ALARM) HardWareAlarmInfo(alarmState);
else if(isCurrentGas) GasChangeDisplay();
else CommAddrDisplay(localAddress);
else if(systemAlarm.Bit.GasChange) GasChangeDisplay();
else CommAddrDisplay(localAddress);
#endif
//---------------------------------------------------------------------------
@@ -87,8 +87,8 @@ void AlarmFlashDisplay(void)
// ErrorDisplay(alarmState);
//
// if((alarmState & HARD_ALARM) == HARD_ALARM) HardWareAlarmInfo(alarmState);
// else if(isCurrentGas) GasChangeDisplay();
// else CommAddrDisplay(localAddress);
// else if(systemAlarm.Bit.GasChange) GasChangeDisplay();
// else CommAddrDisplay(localAddress);
//
// LcdModeInit();
// LcdWriteDisplay();

View File

@@ -13,7 +13,7 @@ extern u32 pulseCounter, unitPerPulse;
extern u16 isPulseUpdaed;
extern s16 calibUnitPerPulse;
extern const u16 MaxPulseOutput[];
//extern const u16 MaxPulseOutput[];
extern const u16 PULSE_TABLE[];
//******************************************************************************
void PulseParameterInit(void);