aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2020-11-29 16:36:21 +0200
committerShlomo Hecht <shlomo@twine-s.com>2020-11-29 16:36:21 +0200
commitc38ee983e35e9469cb8370c8bcdcb18738321327 (patch)
tree23874e9612864d9297aba11c07cef5f844c05980 /Software/Embedded_SW/Embedded
parent5c762220bfbd41370f5dabc99b6e273bc1347432 (diff)
downloadTango-c38ee983e35e9469cb8370c8bcdcb18738321327.tar.gz
Tango-c38ee983e35e9469cb8370c8bcdcb18738321327.zip
version 1.5.3.2 fix flat head and more
Diffstat (limited to 'Software/Embedded_SW/Embedded')
-rw-r--r--Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c2
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_Blowers.c4
-rw-r--r--Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c8
3 files changed, 12 insertions, 2 deletions
diff --git a/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c b/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c
index da4b66b4e..3b88982c2 100644
--- a/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c
+++ b/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c
@@ -20,7 +20,7 @@ typedef struct
} TangoVersion_t;
-TangoVersion_t _gTangoVersion = {1,5,3,1};
+TangoVersion_t _gTangoVersion = {1,5,3,2};
#define BUILD_DATE __DATE__
char Dat[50] = BUILD_DATE;
diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_Blowers.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_Blowers.c
index d98af2097..63118221b 100644
--- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_Blowers.c
+++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_Blowers.c
@@ -510,8 +510,10 @@ uint32_t HeadBlowersInitCallbak(uint32_t IfIndex, uint32_t ReadValue)
uint32_t HeadBlowersV0Init(void)
{
if (Head_Type != HEAD_TYPE_ARC)
+ {
+ Waste_Check_Flows();
return OK;
-
+ }
if (HeadBlowersInitControlId != 0xFF)
RemoveControlCallback(HeadBlowersInitControlId,HeadBlowersInitCallbak);
diff --git a/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c b/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c
index 2a8cdc2ac..5da32a538 100644
--- a/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c
+++ b/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c
@@ -644,6 +644,14 @@ uint32_t EndState(void *JobDetails, char *Message)
//EndWaiting[Module_Thread] = ModuleWaiting;
ThreadEndState();
}
+ if (Configured[Module_Waste])
+ {
+ PrepareWaiting[Module_Waste] = ModuleIdle;
+ //SegmentWaiting[Module_Waste] = ModuleIdle;
+ //PreSegmentWaiting[Module_Waste] = ModuleIdle;
+ //DistanceToSpoolWaiting[Module_Waste] = ModuleIdle;
+ //EndWaiting[Module_Thread] = ModuleWaiting;
+ }
CloseJobFile();
//ROM_IntMasterEnable();
SendJobProgress(0.0,0,true,Message);