Jelajahi Sumber

BugFix Make Reference

jomjol 2 tahun lalu
induk
melakukan
05deecee00

+ 2 - 1
code/components/jomjol_flowcontroll/ClassFlowControll.h

@@ -34,13 +34,14 @@ protected:
 
 
 	bool AutoStart;
 	bool AutoStart;
 	float AutoInterval;
 	float AutoInterval;
-	bool SetupModeActive;
 	void SetInitialParameter(void);	
 	void SetInitialParameter(void);	
 	std::string aktstatusWithTime;
 	std::string aktstatusWithTime;
 	std::string aktstatus;
 	std::string aktstatus;
 	int aktRunNr;
 	int aktRunNr;
 
 
 public:
 public:
+	bool SetupModeActive;
+
 	void InitFlow(std::string config);
 	void InitFlow(std::string config);
 	bool doFlow(string time);
 	bool doFlow(string time);
 	void doFlowTakeImageOnly(string time);
 	void doFlowTakeImageOnly(string time);

+ 2 - 1
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";
         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...");
             LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Taking image for Alignment Mark Update...");
 
 
             CAlignAndCutImage *caic = new CAlignAndCutImage("cutref", in);
             CAlignAndCutImage *caic = new CAlignAndCutImage("cutref", in);
@@ -679,6 +679,7 @@ esp_err_t handler_editflow(httpd_req_t *req)
             zw = "CutImage Done";
             zw = "CutImage Done";
         }
         }
         else {
         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!");
             LogFile.WriteToFile(ESP_LOG_WARN, TAG, "Taking image for Alignment Mark not possible while device is busy with a round!");
             zw = "Device Busy";
             zw = "Device Busy";
         }
         }