diff --git a/framework.yaml b/framework.yaml index d6d9b3c..5f0678f 100644 --- a/framework.yaml +++ b/framework.yaml @@ -7,5 +7,5 @@ spec: virtualEnv: base # 사용할 가상환경 이름입니다. package: requirements.txt # 설치할 Python 패키지 정보 파일입니다.(기본 값은 requirement.txt 입니다.) stackbase: - tagName: v0.0.42 # Stackbase(gitea)에 릴리즈 태그명 입니다. + tagName: v0.0.43 # Stackbase(gitea)에 릴리즈 태그명 입니다. repoName: sampyo-dio # Stackbase(gitea)에 저장될 저장소 이릅니다. diff --git a/main.py b/main.py index 28e6559..fb5b0f2 100644 --- a/main.py +++ b/main.py @@ -49,10 +49,11 @@ def Valve_PureWater(chip, status, action, duration=7): chip.set_values(status) time.sleep(duration) else: # 'Off' - status[2] = 0 - status[3] = 1 - chip.set_values(status) - time.sleep(7) + if pure_value_status != 0: + status[2] = 0 + status[3] = 1 + chip.set_values(status) + time.sleep(7) status[2] = 0 status[3] = 0 @@ -88,10 +89,11 @@ def Valve_MainWater(chip, status, action, duration=7): chip.set_values(status) time.sleep(duration) else: # 'Off' - status[5] = 0 - status[6] = 1 - chip.set_values(status) - time.sleep(7) + if main_valve_status != 0: + status[5] = 0 + status[6] = 1 + chip.set_values(status) + time.sleep(7) status[5] = 0 status[6] = 0 @@ -473,7 +475,7 @@ def start_server(addr, port): def exit_handler(signum, frame): Motor(chip=output_lines, status=status, action='Off') Valve_Vent(chip=output_lines, status=status, action='Off') - Valve_MixedWater(chip=output_lines, status=status, action='Off') + # Valve_MixedWater(chip=output_lines, status=status, action='Off') Valve_PureWater(chip=output_lines, status=status, action='Off') Valve_EnterWater(chip=output_lines, status=status, action='Off') Valve_MainWater(chip=output_lines, status=status, action='Off')