aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2019-04-04 12:12:48 +0300
committerShlomo Hecht <shlomo@twine-s.com>2019-04-04 12:12:48 +0300
commit2357e733b204ddd6efab45d9aa2dad1f4f4e07fe (patch)
tree9060566cfa057671eeba0427847fec5063810bb3 /Software/Embedded_SW/Embedded
parent627eb2d350bccad525bca9e7cbbe5a89ff93b46f (diff)
downloadTango-2357e733b204ddd6efab45d9aa2dad1f4f4e07fe.tar.gz
Tango-2357e733b204ddd6efab45d9aa2dad1f4f4e07fe.zip
IDS - WFCF set to 5 seconds. power off sequence overrides idle sequence
Diffstat (limited to 'Software/Embedded_SW/Embedded')
-rw-r--r--Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c2
-rw-r--r--Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerOffSequence.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
index a6010b158..2a8cac415 100644
--- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
@@ -724,7 +724,7 @@ uint32_t IDSPreSegmentState(void *SegmentDetails, int SegmentId)
InterSegmentStartRocking = 1000;
InterSegmentCenterRockers = 3000;
}
- InterSegmentStartWFCFDispensers = lInterSegmentLength-1500;
+ InterSegmentStartWFCFDispensers = lInterSegmentLength-5000;
}
}
diff --git a/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerOffSequence.c b/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerOffSequence.c
index dcb91ea55..454204229 100644
--- a/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerOffSequence.c
+++ b/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerOffSequence.c
@@ -21,6 +21,7 @@
#include "Common/SWUpdate/FirmwareUpgrade.h"
#include "StateMachines/Printing/PrintingSTM.h"
+#include "PowerIdle.h"
#include "InitSequence.h"
#include "drivers/I2C_Communication/DAC/Blower.h"
@@ -140,6 +141,7 @@ uint32_t PowerOffWaitForProcessesCallback(uint32_t IfIndex, uint32_t BusyFlag)
(WaitForProcessCounter++<900))
{
REPORT_MSG (PowerOffMachineState, "On going processes, wait for end of process");
+ resetIdleCounter();
}
else
{
@@ -224,6 +226,7 @@ uint32_t PowerOffWaitForTemperatureCallback(uint32_t IfIndex, uint32_t BusyFlag)
if ((MaxTemp>POWER_OFF_TEMP_THRESHOLD)&&(WaitForProcessCounter++<1800))
{
Report("On going cooling down, wait for end of cooling",__FILE__,__LINE__,(int)MaxTemp,RpWarning,(int)WaitForProcessCounter,0);
+ resetIdleCounter();
}
else
{