From 05deecee00664bba6de14451279b702e021ff546 Mon Sep 17 00:00:00 2001 From: jomjol <30766535+jomjol@users.noreply.github.com> Date: Fri, 19 May 2023 21:53:56 +0200 Subject: [PATCH] BugFix Make Reference --- code/components/jomjol_flowcontroll/ClassFlowControll.h | 3 ++- code/components/jomjol_flowcontroll/MainFlowControl.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/components/jomjol_flowcontroll/ClassFlowControll.h b/code/components/jomjol_flowcontroll/ClassFlowControll.h index 48a72fcc..7fcf5747 100644 --- a/code/components/jomjol_flowcontroll/ClassFlowControll.h +++ b/code/components/jomjol_flowcontroll/ClassFlowControll.h @@ -34,13 +34,14 @@ protected: bool AutoStart; float AutoInterval; - bool SetupModeActive; void SetInitialParameter(void); std::string aktstatusWithTime; std::string aktstatus; int aktRunNr; public: + bool SetupModeActive; + void InitFlow(std::string config); bool doFlow(string time); void doFlowTakeImageOnly(string time); diff --git a/code/components/jomjol_flowcontroll/MainFlowControl.cpp b/code/components/jomjol_flowcontroll/MainFlowControl.cpp index 46883d8f..e69abc46 100644 --- a/code/components/jomjol_flowcontroll/MainFlowControl.cpp +++ b/code/components/jomjol_flowcontroll/MainFlowControl.cpp @@ -657,7 +657,7 @@ esp_err_t handler_editflow(httpd_req_t *req) string out2 = out.substr(0, out.length() - 4) + "_org.jpg"; - if ((*flowctrl.getActStatus() == "Flow finished") && psram_init_shared_memory_for_take_image_step()) { + if ((flowctrl.SetupModeActive || (*flowctrl.getActStatus() == "Flow finished")) && psram_init_shared_memory_for_take_image_step()) { LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Taking image for Alignment Mark Update..."); CAlignAndCutImage *caic = new CAlignAndCutImage("cutref", in); @@ -679,6 +679,7 @@ esp_err_t handler_editflow(httpd_req_t *req) zw = "CutImage Done"; } else { + LogFile.WriteToFile(ESP_LOG_WARN, TAG, *flowctrl.getActStatus()); LogFile.WriteToFile(ESP_LOG_WARN, TAG, "Taking image for Alignment Mark not possible while device is busy with a round!"); zw = "Device Busy"; }