From d1a2dd1027017626e0849715c559c2c88863da73 Mon Sep 17 00:00:00 2001 From: "support.sampyo" Date: Wed, 29 May 2024 04:27:22 +0000 Subject: [PATCH] Commit message --- control.json | 6 +++--- framework.yaml | 2 +- main.py | 27 +-------------------------- 3 files changed, 5 insertions(+), 30 deletions(-) diff --git a/control.json b/control.json index 87d5be4..6133e18 100644 --- a/control.json +++ b/control.json @@ -9,12 +9,12 @@ }, "mixed": { "action": "Off", - "duration": 7 + "duration": 5 }, "pure": { "action": "Off", "duration": 10, - "holding": 5 + "holding": 7 }, "enter":{ "action": "Off", @@ -23,7 +23,7 @@ "vent": { "action": "Off", "duration": 15, - "holding": 2 + "holding": 5 }, "motor": { "action": "Off" diff --git a/framework.yaml b/framework.yaml index 74860ea..703e1d9 100644 --- a/framework.yaml +++ b/framework.yaml @@ -7,5 +7,5 @@ spec: virtualEnv: base # 사용할 가상환경 이름입니다. package: requirements.txt # 설치할 Python 패키지 정보 파일입니다.(기본 값은 requirement.txt 입니다.) stackbase: - tagName: v0.0.26 # Stackbase(gitea)에 릴리즈 태그명 입니다. + tagName: v0.0.27 # Stackbase(gitea)에 릴리즈 태그명 입니다. repoName: sampyo-dio # Stackbase(gitea)에 저장될 저장소 이릅니다. diff --git a/main.py b/main.py index 235c213..1f0dfe9 100644 --- a/main.py +++ b/main.py @@ -122,31 +122,6 @@ def Command_Read(): Calculate_Concentration(weight=(float(end)-float(start))) - # # vent mixed water - # Valve_Vent(chip=output_lines, status=status, action='On') - # time.sleep(0.5) - # Motor(chip=output_lines, status=status, action='On') - # time.sleep(vent_duration) - # Motor(chip=output_lines, status=status, action='Off') - # time.sleep(0.5) - # Valve_Vent(chip=output_lines, status=status, action='Off') - # time.sleep(0.5) - - # # input pure water - # Valve_PureWater(chip=output_lines, status=status, action='On') - # time.sleep(pure_duration) - # Valve_PureWater(chip=output_lines, status=status, action='Off') - # time.sleep(0.5) - - # # vent pure water - # Valve_Vent(chip=output_lines, status=status, action='On') - # time.sleep(0.5) - # Motor(chip=output_lines, status=status, action='On') - # time.sleep(vent_duration) - # Motor(chip=output_lines, status=status, action='Off') - # time.sleep(0.5) - # Valve_Vent(chip=output_lines, status=status, action='Off') - # time.sleep(1) # Vent and Clear sequence # 1) Motor On @@ -157,7 +132,7 @@ def Command_Read(): Valve_PureWater(chip=output_lines, status=status, action='On') time.sleep(0.5) Valve_EnterWater(chip=output_lines, status=status, action='On') - time.sleep(vent_holding) + time.sleep(pure_holding) # 3) Open Vent Valve_Vent(chip=output_lines, status=status, action='On')