diff --git a/framework.yaml b/framework.yaml index bcf19c4..11ca598 100644 --- a/framework.yaml +++ b/framework.yaml @@ -7,5 +7,5 @@ spec: virtualEnv: base # 사용할 가상환경 이름입니다. package: requirements.txt # 설치할 Python 패키지 정보 파일입니다.(기본 값은 requirement.txt 입니다.) stackbase: - tagName: v0.0.19 # Stackbase(gitea)에 릴리즈 태그명 입니다. + tagName: v0.0.20 # Stackbase(gitea)에 릴리즈 태그명 입니다. repoName: sampyo-dio # Stackbase(gitea)에 저장될 저장소 이릅니다. diff --git a/main.py b/main.py index 41ef7f3..0730721 100644 --- a/main.py +++ b/main.py @@ -62,7 +62,7 @@ def Measure_Weight(client): val = result.registers[0] val -= 1000 val /= 1000 - print(f'value: {val}') + #print(f'value: {val}') except Exception as e: pass @@ -103,6 +103,10 @@ def Command_Read(): Valve_MixedWater(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_Vent(chip=output_lines, status=status, action='On') + time.sleep(vent_holding) + Valve_Vent(chip=output_lines, status=status, action='Off') time.sleep(mixed_duration) Valve_MixedWater(chip=output_lines, status=status, action='Off') time.sleep(0.5) @@ -142,24 +146,24 @@ def Command_Read(): # time.sleep(1) # Vent and Clear sequence - # 1) Open Vent and wait for 2 sec - Valve_Vent(chip=output_lines, status=status, action='On') - time.sleep(vent_holding) - - # 2) Motor On + # 1) Motor On Motor(chip=output_lines, status=status, action='On') time.sleep(0.5) - # 3) Input Pure Water + # 2) Input Pure Water Valve_PureWater(chip=output_lines, status=status, action='On') time.sleep(0.5) Valve_EnterWater(chip=output_lines, status=status, action='On') - time.sleep(pure_duration + pure_holding) - Valve_PureWater(chip=output_lines, status=status, action='Off') - time.sleep(0.5) - Valve_PureWater(chip=output_lines, status=status, action='Off') - time.sleep(0.5) + time.sleep(vent_holding) + # 3) Open Vent + Valve_Vent(chip=output_lines, status=status, action='On') + time.sleep(pure_duration) + + Valve_PureWater(chip=output_lines, status=status, action='Off') + time.sleep(0.5) + Valve_EnterWater(chip=output_lines, status=status, action='Off') + # 4) Wait until empty time.sleep(vent_duration)