From 61e7c3d4b7db47c2747d86b2120b51600acce0b3 Mon Sep 17 00:00:00 2001
From: "support.sampyo" <support.sampyo@sdt.inc>
Date: Thu, 10 Oct 2024 07:53:25 +0000
Subject: [PATCH] Commit message

---
 control.json   |  8 ++++----
 framework.yaml |  2 +-
 main.py        | 19 ++++++++++---------
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/control.json b/control.json
index 7ac224c..0e08a5a 100644
--- a/control.json
+++ b/control.json
@@ -37,12 +37,12 @@
     "working-time": {
         "step0": 5,
         "step1": 10,
-        "step2": 6,
-        "step3": 9,
+        "step2": 0.5,
+        "step3": 4,
         "step4": 20,
         "step5": 20,
-        "step6": 7,
-        "step7": 12,
+        "step6": 0.5,
+        "step7": 15,
         "step8": 10,
         "step9": 140
     }
diff --git a/framework.yaml b/framework.yaml
index bd39d7f..9380dd2 100644
--- a/framework.yaml
+++ b/framework.yaml
@@ -7,5 +7,5 @@ spec:
     virtualEnv: base # 사용할 가상환경 이름입니다.
     package: requirements.txt # 설치할 Python 패키지 정보 파일입니다.(기본 값은 requirement.txt 입니다.)
 stackbase:
-  tagName: v0.0.50 # Stackbase(gitea)에 릴리즈 태그명 입니다.
+  tagName: v0.0.51 # Stackbase(gitea)에 릴리즈 태그명 입니다.
   repoName: sampyo-dio # Stackbase(gitea)에 저장될 저장소 이릅니다.	
diff --git a/main.py b/main.py
index b8b3547..ae5517d 100644
--- a/main.py
+++ b/main.py
@@ -218,11 +218,12 @@ def Command_Read():
         
         # Step 4. Mesure the weight
         # Target valve status: [Motor: Off, Vent: Off, Pure: Off, Enter: Off, Main: Off]
-        Valve_EnterWater(chip=output_lines, status=status, action='Off')
-        time.sleep(0.5)
         Valve_MainWater(chip=output_lines, status=status, action='Off')
-        
+        time.sleep(0.5)
+        Valve_EnterWater(chip=output_lines, status=status, action='Off')
         time.sleep(step4_duration)
+        
+        
         end = Measure_Weight(client=client)
         time.sleep(1)
         
@@ -232,10 +233,10 @@ def Command_Read():
 
         # Step 5. Drain the mixed water and add pure water.
         # Target valve status: [Motor: Off, Vent: On, Pure: On, Enter: On, Main: Off]
-        Valve_EnterWater(chip=output_lines, status=status, action='On')
-        time.sleep(0.5)
         Valve_Vent(chip=output_lines, status=status, action='On')
         time.sleep(0.5)
+        Valve_EnterWater(chip=output_lines, status=status, action='On')
+        time.sleep(0.5)
         # Valve_PureWater(chip=output_lines, status=status, action='On', duration=pure_duration)
         Valve_PureWater(chip=output_lines, status=status, action='On')
         time.sleep(step5_duration)
@@ -247,19 +248,19 @@ def Command_Read():
         
         # Step 7. Input pure water and clean
         # Target valve status: [Motor: On, Vent: Off, Pure: On, Enter: On, Main: Off]
-        Valve_EnterWater(chip=output_lines, status=status, action='On')
-        time.sleep(0.5)
         Valve_Vent(chip=output_lines, status=status, action='Off')
         time.sleep(0.5)
+        Valve_EnterWater(chip=output_lines, status=status, action='On')
+        time.sleep(0.5)
         Motor(chip=output_lines, status=status, action='On')
         time.sleep(step7_duration)
         
         # Step 8. Drain pure Water
         # Target valve status: [Motor: On, Vent: On, Pure: Off, Enter: Off, Main: Off]
-        Valve_EnterWater(chip=output_lines, status=status, action='Off')
-        time.sleep(0.5)
         Valve_Vent(chip=output_lines, status=status, action='On')
         time.sleep(0.5)
+        Valve_EnterWater(chip=output_lines, status=status, action='Off')
+        time.sleep(0.5)
         Valve_PureWater(chip=output_lines, status=status, action='Off')
         time.sleep(step8_duration)