Compare commits
No commits in common. "main" and "v0.0.44" have entirely different histories.
|
@ -7,5 +7,5 @@ spec:
|
|||
virtualEnv: base # 사용할 가상환경 이름입니다.
|
||||
package: requirements.txt # 설치할 Python 패키지 정보 파일입니다.(기본 값은 requirement.txt 입니다.)
|
||||
stackbase:
|
||||
tagName: v0.0.49 # Stackbase(gitea)에 릴리즈 태그명 입니다.
|
||||
tagName: v0.0.44 # Stackbase(gitea)에 릴리즈 태그명 입니다.
|
||||
repoName: sampyo-dio # Stackbase(gitea)에 저장될 저장소 이릅니다.
|
||||
|
|
70
main.py
70
main.py
|
@ -43,27 +43,30 @@ def Valve_PureWater(chip, status, action, duration=7):
|
|||
chip.set_values(status)
|
||||
time.sleep(0.05)
|
||||
|
||||
if pure_valve_status != 0 and action == 'Off':
|
||||
status[2] = 0
|
||||
status[3] = 1
|
||||
chip.set_values(status)
|
||||
time.sleep(7)
|
||||
pure_valve_status = 0
|
||||
elif pure_valve_status == 0 and action == 'On':
|
||||
if action == 'On':
|
||||
status[2] = 1
|
||||
status[3] = 0
|
||||
chip.set_values(status)
|
||||
time.sleep(duration)
|
||||
if duration >= 7:
|
||||
pure_valve_status = 2
|
||||
elif duration < 7:
|
||||
pure_valve_status = 1
|
||||
|
||||
else: # 'Off'
|
||||
if pure_value_status != 0:
|
||||
status[2] = 0
|
||||
status[3] = 1
|
||||
chip.set_values(status)
|
||||
time.sleep(7)
|
||||
|
||||
status[2] = 0
|
||||
status[3] = 0
|
||||
chip.set_values(status)
|
||||
time.sleep(0.05)
|
||||
|
||||
if action == 'On' and duration >= 7:
|
||||
pure_valve_status = 2
|
||||
elif action == 'On' and duration < 7:
|
||||
pure_valve_status = 1
|
||||
else:
|
||||
pure_valve_status = 0
|
||||
|
||||
def Valve_EnterWater(chip, status, action):
|
||||
if action == 'On':
|
||||
status[4] = 1
|
||||
|
@ -80,27 +83,30 @@ def Valve_MainWater(chip, status, action, duration=7):
|
|||
chip.set_values(status)
|
||||
time.sleep(0.05)
|
||||
|
||||
if main_valve_status != 0 and action == 'Off':
|
||||
status[5] = 0
|
||||
status[6] = 1
|
||||
chip.set_values(status)
|
||||
time.sleep(7)
|
||||
main_valve_status = 0
|
||||
elif main_valve_status == 0 and action == 'On':
|
||||
if action == 'On':
|
||||
status[5] = 1
|
||||
status[6] = 0
|
||||
chip.set_values(status)
|
||||
time.sleep(duration)
|
||||
if duration >= 7:
|
||||
main_valve_status = 2
|
||||
elif duration < 7:
|
||||
main_valve_status = 1
|
||||
|
||||
else: # 'Off'
|
||||
if main_valve_status != 0:
|
||||
status[5] = 0
|
||||
status[6] = 1
|
||||
chip.set_values(status)
|
||||
time.sleep(7)
|
||||
|
||||
status[5] = 0
|
||||
status[6] = 0
|
||||
chip.set_values(status)
|
||||
time.sleep(0.05)
|
||||
|
||||
if action == 'On' and duration >= 7:
|
||||
main_valve_status = 2
|
||||
elif action == 'On' and duration < 7:
|
||||
main_valve_status = 1
|
||||
else:
|
||||
main_valve_status = 0
|
||||
|
||||
def Measure_Weight(client):
|
||||
# print('in')
|
||||
val = 0
|
||||
|
@ -273,22 +279,16 @@ def clean_system():
|
|||
Valve_MainWater(chip=output_lines, status=status, action='On')
|
||||
time.sleep(0.5)
|
||||
Valve_PureWater(chip=output_lines, status=status, action='On')
|
||||
time.sleep(0.5)
|
||||
Valve_MixedWater(chip=output_lines, status=status, action='On')
|
||||
time.sleep(clean_duration)
|
||||
|
||||
Valve_MainWater(chip=output_lines, status=status, action='Off')
|
||||
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(clean_duration)
|
||||
|
||||
Valve_PureWater(chip=output_lines, status=status, action='Off')
|
||||
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='Off')
|
||||
time.sleep(0.5)
|
||||
Valve_MixedWater(chip=output_lines, status=status, action='Off')
|
||||
time.sleep(6)
|
||||
|
||||
def runAction():
|
||||
# Write the app's actions in the "runAction" function.
|
||||
|
@ -498,7 +498,7 @@ if __name__ == "__main__":
|
|||
signal.signal(signal.SIGINT, exit_handler)
|
||||
|
||||
main_valve_status = 0
|
||||
pure_valve_status = 0
|
||||
pure_value_status = 0
|
||||
|
||||
Valve_MainWater(chip=output_lines, status=status, action='Off')
|
||||
Valve_PureWater(chip=output_lines, status=status, action='Off')
|
||||
|
|
Loading…
Reference in New Issue