aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/StateMachines
diff options
context:
space:
mode:
Diffstat (limited to 'Software/Embedded_SW/Embedded/StateMachines')
-rw-r--r--Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerIdle.c2
-rw-r--r--Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c40
2 files changed, 1 insertions, 41 deletions
diff --git a/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerIdle.c b/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerIdle.c
index 17166a095..4ab177244 100644
--- a/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerIdle.c
+++ b/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerIdle.c
@@ -115,7 +115,7 @@ void PowerIdleSetIdle(void)
if (HandleProcessParameters(&ProcessParametersClear,false)!= OK)
{
LOG_ERROR (1, "Turn Heaters idle failed");
- return;
+ //return;
}
if (BlowerCfg.enabled == true)
{
diff --git a/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c b/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c
index ab5e68b46..9f5151117 100644
--- a/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c
+++ b/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c
@@ -134,8 +134,6 @@ static ReturnCode ExitState(void *JobDetails);
//static ReturnCode (* state[])(void *JobDetails) = { IdleState, ValidateState, PrepareState, PrintState, CleanState};
void AbortJob(char *Msg);
void HandleJobEnd(JobEndReasonEnum JobEndReason);
-uint32_t BtsrSaveParamsToEeprom(BTSRParameters *BtsrPrameters);
-uint32_t BtsrReadParamsFromEeprom(BTSRParameters *BtsrPrameters);
typedef enum
{
@@ -1448,44 +1446,6 @@ uint32_t ResumeCurrentJobRequestFunc(MessageContainer* requestContainer)
return OK;
}
-uint32_t BtsrSaveParamsToEeprom(BTSRParameters *BtsrPrameters)
-{
- uint32_t status = 0;
-
- status |= MCU_E2PromProgram(EEPROM_BTSR_FEEDING_TENSION, (uint32_t)(BtsrPrameters->feedingtension*10));
- status |= MCU_E2PromProgram(EEPROM_BTSR_TYPE, (uint32_t)(BtsrPrameters->btsryarntype));
- status |= MCU_E2PromProgram(EEPROM_BTSR_APPLICATION, (uint32_t)(BtsrPrameters->btsrapplicationtype));
- status |= MCU_E2PromProgram(EEPROM_BTSR_LENGTH_OFFSET, (uint32_t)(BtsrPrameters->threadlengthfactor));
- status |= MCU_E2PromProgram(EEPROM_BTSR_TENSION_ERROR, (uint32_t)(BtsrPrameters->tensionerror*10));
- status |= MCU_E2PromProgram(EEPROM_BTSR_SPOOL_TENSION, (uint32_t)(BtsrPrameters->spooltension));
- status |= MCU_E2PromProgram(EEPROM_BTSR_EXIT_TENSION, (uint32_t)(BtsrPrameters->exittension));
- return status;
-}
-
-uint32_t BtsrReadParamsFromEeprom(BTSRParameters *BtsrPrameters)
-{
- uint32_t status = 0;
- uint32_t feedingtension, type, application, lengthoffset;
- uint32_t tensionerror, spooltension, exittension;
-
- status |= MCU_E2PromRead(EEPROM_BTSR_FEEDING_TENSION, &feedingtension);
- BtsrPrameters->feedingtension = ((double)feedingtension)/10;
- status |= MCU_E2PromRead(EEPROM_BTSR_TYPE, &type);
- BtsrPrameters->btsryarntype = type;
- status |= MCU_E2PromRead(EEPROM_BTSR_APPLICATION, &application);
- BtsrPrameters->btsrapplicationtype = application;
- status |= MCU_E2PromRead(EEPROM_BTSR_LENGTH_OFFSET, &lengthoffset);
- BtsrPrameters->threadlengthfactor = lengthoffset;
- status |= MCU_E2PromRead(EEPROM_BTSR_TENSION_ERROR, &tensionerror);
- BtsrPrameters->tensionerror = ((double)tensionerror)/10;
- status |= MCU_E2PromRead(EEPROM_BTSR_SPOOL_TENSION, &spooltension);
- BtsrPrameters->spooltension = spooltension;
- status |= MCU_E2PromRead(EEPROM_BTSR_EXIT_TENSION, &exittension);
- BtsrPrameters->exittension = exittension;
- Report("BtsrReadParamsFromEeprom",__FILE__,__LINE__,(int)(feedingtension),RpWarning,(int)(tensionerror),(int)exittension);
- Report("BtsrReadParamsFromEeprom",__FILE__,__LINE__,(int)(application),RpWarning,(int)(type),(int)lengthoffset);
- return status;
-}
void StartJob(void *JobDetails)
{