aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2019-09-24 08:46:48 +0300
committerShlomo Hecht <shlomo@twine-s.com>2019-09-24 08:46:48 +0300
commitcc59620809c8a96fbc5005ba1182ca7ee7c08304 (patch)
tree53f22164ea56956fdffe2b8cea4596b827ba169d /Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c
parent6c1afaaec63883c2dc8ca25153473ae7e553820c (diff)
downloadTango-cc59620809c8a96fbc5005ba1182ca7ee7c08304.tar.gz
Tango-cc59620809c8a96fbc5005ba1182ca7ee7c08304.zip
fix current alarms, prevent dispenser homing when midtank is empty, prevent loading when a job is active
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c')
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c
index c59a95180..9ad42d739 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c
@@ -719,6 +719,11 @@
}
uint32_t ThreadLoadButton(THREAD_LOAD_STAGES_ENUM ReadValue)
{
+ if (JobIsActive())
+ {
+ Report("ThreadLoadButton called on job",__FILE__,__LINE__,LoadStages,RpMessage,ReadValue,0);
+ return ERROR;
+ }
Report("ThreadLoadButton",__FILE__,__LINE__,LoadStages,RpMessage,ReadValue,0);
if (LoadStages > ReadValue)
{