diff options
Diffstat (limited to 'Software/Embedded_SW/Embedded/StateMachines/Initialization')
| -rw-r--r-- | Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c b/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c index 802ce81cc..0d3b5e2f0 100644 --- a/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c +++ b/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c @@ -83,7 +83,6 @@ uint32_t InitSequenceMachineReadyToDye(void); uint32_t InitSequenceStateMachine( INIT_SEQUENCE_STAGES_ENUM ReadValue); uint32_t PowerUpUpdate(MACHINE_STATE_STAGES_ENUM stage); int InitFailures = 0; -extern uint32_t PressureSensorV0[2]; MACHINE_STATE_STAGES_ENUM GetMachineState(void) { @@ -112,19 +111,19 @@ uint32_t InitSequenceCallBackFunction(uint32_t IfIndex, uint32_t BusyFlag) MCU_E2PromProgram(EEPROM_INIT_FAILURE_COUNTER,InitFailures+1); - if (InitFailures >= REPEATED_INIT_FAILURE_LIMIT+3) + /*if (InitFailures >= REPEATED_INIT_FAILURE_LIMIT+3) { InitFailures = 0; MCU_E2PromProgram(EEPROM_INIT_FAILURE_COUNTER,0); - } - if (InitFailures > REPEATED_INIT_FAILURE_LIMIT) - { + }*/ + //if (InitFailures > REPEATED_INIT_FAILURE_LIMIT) + //{ Report("HWConfigurationInit repeated failure",__FILE__,__LINE__,(int)InitFailures,RpWarning,(int)EEPROM_INIT_FAILURE_COUNTER,0); /*SetMachineState(MACHINE_STATE_HW_CONFIG_FAILED); AlarmHandlingSetAlarm (EVENT_TYPE__MACHINE_STATE_HW_CONFIG_FAILED,ON); SetMachineStatus(MACHINE_STATE__Error); return ERROR;*/ - } + //} status = (MACHINE_STATE_STAGES_ENUM)HWConfigurationInit(); if (status == OK) { @@ -834,6 +833,10 @@ uint32_t PowerUpUpdate(MACHINE_STATE_STAGES_ENUM stage) calculate = (double)((MillisecGetTemperatures(TEMP_SENSE_ANALOG_DRYER_TEMP1)/100)/(dryerzone1temp))*70.0; if (calculate > 0) result = (int)calculate; + if (result > 70.00) + result = 70.0; + if (HeaterCheckReady()==false) + result-=2; response.progresspercentage = 30.0 + result; } //Report("Heating calculation",__FILE__,(int)dryerzone1temp,(int)response.progresspercentage,RpWarning,(int)result,0); |