diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2020-12-15 23:17:54 +0200 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2020-12-15 23:17:54 +0200 |
| commit | 9bbfc1a62c8177ea2d1122b6564d6e8b219f1f47 (patch) | |
| tree | 042f1b5b7ff8a386a6831b3e1cc27e4aa151d0da /Software/Embedded_SW/Embedded/StateMachines | |
| parent | 3e03e036f07c274c3eb2eb256f11b0bcbbc6ac99 (diff) | |
| download | Tango-9bbfc1a62c8177ea2d1122b6564d6e8b219f1f47.tar.gz Tango-9bbfc1a62c8177ea2d1122b6564d6e8b219f1f47.zip | |
small fixes over 1.5.3.4
Diffstat (limited to 'Software/Embedded_SW/Embedded/StateMachines')
| -rw-r--r-- | Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c | 12 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c | 4 |
2 files changed, 9 insertions, 7 deletions
diff --git a/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c b/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c index d7a49dfe0..0da78dc9c 100644 --- a/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c +++ b/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c @@ -30,6 +30,7 @@ #include "modules/General/process.h" #include "StateMachines/Printing/PrintingSTM.h" +#include "StateMachines/Initialization/PowerIdle.h" #include "InitSequence.h" #include "drivers/I2C_Communication/DAC/Blower.h" @@ -605,7 +606,7 @@ uint32_t InitSequenceStartHeatingCallBackFunction(uint32_t IfIndex, uint32_t Bus bool InitialHeating = false; void InitSequenceSetStartHeating(bool StartHeating) { - REPORT_MSG(StartHeating,"InitSequenceStateMachine InitialHeating set"); + REPORT_MSG(StartHeating,"InitSequence StateMachine InitialHeating set"); InitialHeating = StartHeating; } uint32_t InitSequenceStartHeating(void) @@ -635,12 +636,12 @@ uint32_t InitSequenceStartHeating(void) { SetMachineState(MACHINE_STATE_NO_PROCESS_PARAMS); SetMachineStatus(MACHINE_STATE__Ready); - REPORT_MSG(MachineStateDetail,"InitSequenceStateMachine no process parameters file"); + REPORT_MSG(MachineStateDetail,"InitSequence StateMachine no process parameters file"); } } else { - REPORT_MSG(InitialHeating,"InitSequenceStateMachine InitialHeating is OFF"); + REPORT_MSG(InitialHeating,"InitSequence StateMachine InitialHeating is OFF"); SetMachineStatus(MACHINE_STATE__Ready); SetMachineState(MACHINE_STATE_MACHINE_READY_TO_DYE); InitStages++; @@ -780,8 +781,9 @@ uint32_t PowerUpUpdate(MACHINE_STATE_STAGES_ENUM stage) case MACHINE_STATE_BUILT_IN_TEST: response.state = POWER_UP_STATE__BuiltInTest; response.progresspercentage = 15.0; - response.message = "Built In Test failed"; - Error = ERROR_CODE__POWER_UP_BUILT_IN_FAILED; + response.message = "Built In Test"; + //response.message = "Built In Test failed"; + //Error = ERROR_CODE__POWER_UP_BUILT_IN_FAILED; break; case MACHINE_STATE_INITIAL_BLOWER_ACTIVATION: response.state = POWER_UP_STATE__InitialBlowerActivation; diff --git a/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c b/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c index cb0703f27..d6262119c 100644 --- a/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c +++ b/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c @@ -125,7 +125,7 @@ FRESULT OpenJobFile() { readbBytes = 0; } - REPORT_MSG(bBytes,"OpenJobFile"); + Report("OpenJobFile",__FILE__,__LINE__,(int)Fresult,RpMessage,(int)bBytes,0); } return Fresult; } @@ -146,6 +146,7 @@ FRESULT RewindJobFile() FRESULT CloseJobFile() { Fresult = f_close(JobRequestFileHandle); + Report("CloseJobFile",__FILE__,__LINE__,(int)Fresult,RpMessage,(int)JobRequestFileHandle,0); readbBytes = 0; ImmediateRead = 0; @@ -163,7 +164,6 @@ FRESULT CloseJobFile() my_free(SegmentPtr); SegmentPtr = NULL; } - REPORT_MSG(Fresult,"CloseJobFile"); return Fresult; } |