Compare commits

..

No commits in common. "main" and "v0.0.12" have entirely different histories.

16 changed files with 392 additions and 1097 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -1,12 +1,12 @@
{ {
"appId": "81a695f0-a990-43c8-998f-2ba1bf9c6005", "appId": "81a695f0-a990-43c8-998f-2ba1bf9c6005",
"modbus-server": { "modbus-server": {
"address": "172.17.16.202", "address": "25.7.55.237",
"port": 5020 "port": 5020
}, },
"tcp-server": { "tcp-server": {
"address": "172.17.16.201", "address": "25.7.57.1",
"port": 24 "port": 7007
}, },
"volume-water": 542 "volume-water": 542
} }

View File

@ -1,12 +0,0 @@
{
"appId": "81a695f0-a990-43c8-998f-2ba1bf9c6005",
"modbus-server": {
"address": "25.7.55.237",
"port": 5020
},
"tcp-server": {
"address": "25.7.57.1",
"port": 7007
},
"volume-water": 542
}

View File

@ -1,49 +1,26 @@
{ {
"device": { "device": {
"enter": { "setzero": {
"action": "Off" "action": "Off"
}, },
"main": {
"action": "Off",
"duration": 4
},
"measure": { "measure": {
"action": "On" "action": "On"
}, },
"mixed": { "mixed": {
"action": "Off" "action": "Off",
}, "duration": 15
"motor": {
"action": "Off"
}, },
"pure": { "pure": {
"action": "Off", "action": "Off",
"duration": 4 "duration": 15
},
"setzero": {
"action": "Off"
}, },
"vent": { "vent": {
"action": "Off",
"duration": 30
},
"motor": {
"action": "Off" "action": "Off"
} }
}, },
"maintenance": { "type": "manual"
"clean": {
"duration": 20,
"time": 25
}
},
"type": "manual",
"working-time": {
"step0": 5,
"step1": 10,
"step2": 0.5,
"step3": 4,
"step4": 20,
"step5": 20,
"step6": 0.5,
"step7": 15,
"step8": 10,
"step9": 140
}
} }

View File

@ -1,27 +0,0 @@
{
"device": {
"setzero": {
"action": "Off"
},
"measure": {
"action": "On"
},
"mixed": {
"action": "Off",
"duration": 15
},
"pure": {
"action": "Off",
"duration": 15
},
"vent": {
"action": "Off",
"duration": 30
},
"motor": {
"action":
"On"
}
},
"type": "manual"
}

View File

@ -7,5 +7,5 @@ spec:
virtualEnv: base # 사용할 가상환경 이름입니다. virtualEnv: base # 사용할 가상환경 이름입니다.
package: requirements.txt # 설치할 Python 패키지 정보 파일입니다.(기본 값은 requirement.txt 입니다.) package: requirements.txt # 설치할 Python 패키지 정보 파일입니다.(기본 값은 requirement.txt 입니다.)
stackbase: stackbase:
tagName: v0.0.51 # Stackbase(gitea)에 릴리즈 태그명 입니다. tagName: v0.0.12 # Stackbase(gitea)에 릴리즈 태그명 입니다.
repoName: sampyo-dio # Stackbase(gitea)에 저장될 저장소 이릅니다. repoName: sampyo-dio # Stackbase(gitea)에 저장될 저장소 이릅니다.

View File

@ -7,5 +7,5 @@ spec:
virtualEnv: base # 사용할 가상환경 이름입니다. virtualEnv: base # 사용할 가상환경 이름입니다.
package: requirements.txt # 설치할 Python 패키지 정보 파일입니다.(기본 값은 requirement.txt 입니다.) package: requirements.txt # 설치할 Python 패키지 정보 파일입니다.(기본 값은 requirement.txt 입니다.)
stackbase: stackbase:
tagName: v0.0.13 # Stackbase(gitea)에 릴리즈 태그명 입니다. tagName: v0.0.5 # Stackbase(gitea)에 릴리즈 태그명 입니다.
repoName: sampyo-dio # Stackbase(gitea)에 저장될 저장소 이릅니다. repoName: sampyo-dio # Stackbase(gitea)에 저장될 저장소 이릅니다.

360
main.py
View File

@ -1,5 +1,6 @@
import json import json
import time import time
import argparse
import sys, signal import sys, signal
import gpiod import gpiod
from pymodbus.client import ModbusTcpClient from pymodbus.client import ModbusTcpClient
@ -9,8 +10,6 @@ import pytz
from datetime import datetime from datetime import datetime
import threading, socket import threading, socket
import uuid import uuid
import logging
from logging.handlers import RotatingFileHandler
def Motor(chip, status, action): def Motor(chip, status, action):
if action == 'On': if action == 'On':
@ -36,125 +35,30 @@ def Valve_MixedWater(chip, status, action):
chip.set_values(status) chip.set_values(status)
def Valve_PureWater(chip, status, action, duration=7): def Valve_PureWater(chip, status, action):
global pure_valve_status
status[2] = 0
status[3] = 0
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':
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
status[2] = 0
status[3] = 0
chip.set_values(status)
time.sleep(0.05)
# def Valve_EnterWater(chip, status, action):
def Valve_EnterWater(chip, status, action, duration=7):
# if action == 'On':
# status[4] = 1
# else: # action == 'Off'
# status[4] = 0
# chip.set_values(status)
global main_valve_status
status[5] = 0
status[6] = 0
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':
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
status[5] = 0
status[6] = 0
chip.set_values(status)
time.sleep(0.05)
# def Valve_MainWater(chip, status, action, duration=7):
def Valve_MainWater(chip, status, action):
global main_valve_status
# status[5] = 0
# status[6] = 0
# 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':
# 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
# status[5] = 0
# status[6] = 0
# chip.set_values(status)
# time.sleep(0.05)
if action == 'On': if action == 'On':
status[4] = 1 status[3] = 1
else: # action == 'Off' else: # action == 'Off'
status[4] = 0 status[3] = 0
chip.set_values(status) chip.set_values(status)
def Measure_Weight(client): def Measure_Weight(client):
# print('in') # print('In')
val = 0 val = 0
try: try:
result = client.read_holding_registers(1, 1) result = client.read_holding_registers(1, 1)
if not result: if result.isError():
print(f'Error: {result}') print(f'Error: {result}')
else: else:
val = result.registers[0] val = result.registers[0]
val -= 1000 val -= 1000
val /= 1000 val /= 1000
# print(f'value: {val}') print(f'value: {val}')
except Exception as e: except Exception as e:
print(f'Measure_Weight Error: {e}')
pass pass
return float(val) return val
def Calculate_Concentration(weight): def Calculate_Concentration(weight):
global data, volume_water global data, volume_water
@ -162,144 +66,72 @@ def Calculate_Concentration(weight):
result = (float(weight) * volume_water * 128.5) - 126.11 # 1000 / 531 = 1.883239171 result = (float(weight) * volume_water * 128.5) - 126.11 # 1000 / 531 = 1.883239171
data['data']['concentration'] = result data['data']['concentration'] = result
# print(f'{weight}, {result}') # print(f'{weight}, {result}')
return result
def Set_Zero(client): def Set_Zero(client):
client.write_coil(1, 1) client.write_coil(1, 1)
def Command_Read(): def Command_Read():
global client, main_valve_status, logger
with open('./control.json', 'r') as f: with open('./control.json', 'r') as f:
cmd = json.load(f) cmd = json.load(f)
if cmd['type'] == 'auto': if cmd['type'] == 'auto':
main_duration = float(cmd['device']['main']['duration'])
pure_duration = float(cmd['device']['pure']['duration'])
step0_duration = float(cmd['working-time']['step0'])
step1_duration = float(cmd['working-time']['step1'])
step2_duration = float(cmd['working-time']['step2'])
step3_duration = float(cmd['working-time']['step3'])
step4_duration = float(cmd['working-time']['step4'])
step5_duration = float(cmd['working-time']['step5'])
step6_duration = float(cmd['working-time']['step6'])
step7_duration = float(cmd['working-time']['step7'])
step8_duration = float(cmd['working-time']['step8'])
step9_duration = float(cmd['working-time']['step9'])
# Step 0. Mesure init weight before starting the sequence
time.sleep(step0_duration)
start = Measure_Weight(client=client)
# Step 1. Vent pured water before input mixed water
# Target valve status: [Motor: Off, Vent: On, Pure: Off, Enter: On, Main: On]
# Valve_EnterWater(chip=output_lines, status=status, action='On')
Valve_MainWater(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_MainWater(chip=output_lines, status=status, action='On', duration=main_duration)
Valve_EnterWater(chip=output_lines, status=status, action='On', duration=main_duration)
time.sleep(step1_duration)
# Step 2. Empty the remaining pure water
# Target valve status: [Motor: Off, Vent: On, Pure: Off, Enter: Off, Main: On]
Valve_EnterWater(chip=output_lines, status=status, action='Off')
time.sleep(step2_duration)
# Step 3. Input the mixed water
# Target valve status: [Motor: Off, Vent: Off, Pure: Off, Enter: On, Main: On]
Valve_Vent(chip=output_lines, status=status, action='Off') Valve_Vent(chip=output_lines, status=status, action='Off')
time.sleep(0.5) Motor(chip=output_lines, status=status, action='Off')
# Valve_EnterWater(chip=output_lines, status=status, action='On')
Valve_EnterWater(chip=output_lines, status=status, action='On', duration=main_duration)
time.sleep(step3_duration)
# Step 4. Mesure the weight mixed_duration = int(cmd['device']['mixed']['duration'])
# Target valve status: [Motor: Off, Vent: Off, Pure: Off, Enter: Off, Main: Off] pure_duration = int(cmd['device']['pure']['duration'])
Valve_MainWater(chip=output_lines, status=status, action='Off') vent_duration = int(cmd['device']['vent']['duration'])
time.sleep(0.5)
Valve_EnterWater(chip=output_lines, status=status, action='Off')
time.sleep(step4_duration)
time.sleep(5)
start = Measure_Weight(client=client)
time.sleep(5)
# input mixed water
Valve_MixedWater(chip=output_lines, status=status, action='On')
time.sleep(mixed_duration)
Valve_MixedWater(chip=output_lines, status=status, action='Off')
time.sleep(10)
# measure weight
end = Measure_Weight(client=client) end = Measure_Weight(client=client)
time.sleep(1) time.sleep(1)
res = Calculate_Concentration(weight=(float(end)-float(start))) Calculate_Concentration(weight=(float(end)-float(start)))
logger.debug(f'[auto] weight: {end - start} concentration: {res:.3f}') # vent mixed water
# Step 5. Drain the mixed water and add pure water.
# Target valve status: [Motor: Off, Vent: On, Pure: On, Enter: On, Main: Off]
Valve_Vent(chip=output_lines, status=status, action='On') Valve_Vent(chip=output_lines, status=status, action='On')
time.sleep(0.5) 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)
# Step 6. Drain mixed water
# Target valve status: [Motor: Off, Vent: On, Pure: On, Enter: Off, Main: Off]
Valve_EnterWater(chip=output_lines, status=status, action='Off')
time.sleep(step6_duration)
# Step 7. Input pure water and clean
# Target valve status: [Motor: On, Vent: Off, Pure: On, Enter: On, Main: Off]
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') Motor(chip=output_lines, status=status, action='On')
time.sleep(step7_duration) 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)
# Step 8. Drain pure Water # input pure water
# Target valve status: [Motor: On, Vent: On, Pure: Off, Enter: Off, Main: Off] 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') Valve_Vent(chip=output_lines, status=status, action='On')
time.sleep(0.5) time.sleep(0.5)
Valve_EnterWater(chip=output_lines, status=status, action='Off') Motor(chip=output_lines, status=status, action='On')
time.sleep(0.5) time.sleep(vent_duration)
Valve_PureWater(chip=output_lines, status=status, action='Off')
time.sleep(step8_duration)
# Step 9. Stop moter
# Target valve status: [Motor: Off, Vent: On, Pure: Off, Enter: Off, Main: Off]
Motor(chip=output_lines, status=status, action='Off') Motor(chip=output_lines, status=status, action='Off')
time.sleep(step9_duration) time.sleep(0.5)
Valve_Vent(chip=output_lines, status=status, action='Off')
time.sleep(1)
return 1 return 1
elif cmd['type'] == 'clean':
logger.debug(f"[clean] duration: {int(cmd['maintenance']['clean']['duration'])}")
clean_system()
time.sleep(3)
else: # cmd['type'] == 'manual' else: # cmd['type'] == 'manual'
Motor(chip=output_lines, status=status, action=cmd['device']['motor']['action']) Motor(chip=output_lines, status=status, action=cmd['device']['motor']['action'])
Valve_Vent(chip=output_lines, status=status, action=cmd['device']['vent']['action']) Valve_Vent(chip=output_lines, status=status, action=cmd['device']['vent']['action'])
# Valve_MixedWater(chip=output_lines, status=status, action=cmd['device']['mixed']['action']) Valve_MixedWater(chip=output_lines, status=status, action=cmd['device']['mixed']['action'])
# Valve_PureWater(chip=output_lines, status=status, action=cmd['device']['pure']['action'])
# Valve_EnterWater(chip=output_lines, status=status, action=cmd['device']['enter']['action'])
Valve_MainWater(chip=output_lines, status=status, action=cmd['device']['main']['action'])
if cmd['device']['pure']['duration'] == 0:
Valve_PureWater(chip=output_lines, status=status, action=cmd['device']['pure']['action']) Valve_PureWater(chip=output_lines, status=status, action=cmd['device']['pure']['action'])
else:
Valve_PureWater(chip=output_lines, status=status, action=cmd['device']['pure']['action'], duration=cmd['device']['pure']['duration'])
# if cmd['device']['main']['duration'] == 0:
# Valve_MainWater(chip=output_lines, status=status, action=cmd['device']['main']['action'])
# else:
# Valve_MainWater(chip=output_lines, status=status, action=cmd['device']['main']['action'], duration=cmd['device']['main']['duration'])
if cmd['device']['main']['duration'] == 0:
Valve_EnterWater(chip=output_lines, status=status, action=cmd['device']['enter']['action'])
else:
Valve_EnterWater(chip=output_lines, status=status, action=cmd['device']['enter']['action'], duration=cmd['device']['main']['duration'])
if cmd['device']['measure']['action'] == 'On': if cmd['device']['measure']['action'] == 'On':
result = Measure_Weight(client=client) result = Measure_Weight(client=client)
Calculate_Concentration(result) Calculate_Concentration(result)
@ -310,37 +142,6 @@ def Command_Read():
return 0 return 0
def clean_system():
global main_valve_status
with open('./control.json', 'r') as f:
cmd = json.load(f)
clean_duration = int(cmd['maintenance']['clean']['duration'])
if cmd['type'] == 'clean':
Valve_EnterWater(chip=output_lines, status=status, action='Off')
time.sleep(0.5)
Valve_MainWater(chip=output_lines, status=status, action='On')
time.sleep(0.5)
Valve_PureWater(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)
def runAction(): def runAction():
# Write the app's actions in the "runAction" function. # Write the app's actions in the "runAction" function.
@ -351,7 +152,6 @@ def runAction():
# 1. device-app-test -> Good # 1. device-app-test -> Good
# 2. device-app-light-app -> Good # 2. device-app-light-app -> Good
# 3. device-test-app -> Bad # 3. device-test-app -> Bad
global data
sdtcloud = sdtcloudnodeqmqtt.sdtcloudnodeqmqtt() sdtcloud = sdtcloudnodeqmqtt.sdtcloudnodeqmqtt()
mqttClient1 = sdtcloud.setClient(f"device-app-1{uuid.uuid1()}") # parameter is client ID(string) mqttClient1 = sdtcloud.setClient(f"device-app-1{uuid.uuid1()}") # parameter is client ID(string)
mqttClient2 = sdtcloud.setClient(f"device-app-2{uuid.uuid1()}") # parameter is client ID(string) mqttClient2 = sdtcloud.setClient(f"device-app-2{uuid.uuid1()}") # parameter is client ID(string)
@ -365,8 +165,8 @@ def runAction():
# - Asset Code's variable: assetCode(string) # - Asset Code's variable: assetCode(string)
# - You may need it to create a topic. # - You may need it to create a topic.
cnt = 0 cnt = 0
clean_flag = 0
while True: while True:
start = time.time() start = time.time()
result = Command_Read() result = Command_Read()
@ -380,29 +180,12 @@ def runAction():
end = time.time() end = time.time()
try:
now = datetime.now(pytz.timezone('Asia/Seoul'))
time_str = now.strftime('%H')
time_int = int(time_str)
with open('./control.json', 'r') as f:
cmd = json.load(f)
if time_int == int(cmd['maintenance']['clean']['time']):
if clean_flag < 3:
clean_flag += 1
clean_system()
else:
clean_flag = 0
except:
pass
diff = end - start diff = end - start
if diff < 3: if diff < 3:
time.sleep(3 - diff) time.sleep(3 - diff)
def handle_client(conn, ip, port): def handle_client(conn, ip, port):
global data, logger global data
while True: while True:
try: try:
recv = conn.recv(100) recv = conn.recv(100)
@ -425,8 +208,6 @@ def handle_client(conn, ip, port):
data_weight = '{:.3f}'.format(h_weight) data_weight = '{:.3f}'.format(h_weight)
data_concent = '{:.3f}'.format(h_concentration) data_concent = '{:.3f}'.format(h_concentration)
logger.debug(f'TCP [R:Transfer data] weight: {data_weight}, concent: {data_concent}')
send_msg = 'STX' + time_str + '|' + data_weight + '|' + data_concent + 'ETX' send_msg = 'STX' + time_str + '|' + data_weight + '|' + data_concent + 'ETX'
try: try:
@ -444,7 +225,6 @@ def handle_client(conn, ip, port):
conn.sendall(err_msg.encode("utf8")) conn.sendall(err_msg.encode("utf8"))
elif message[3] == 'S': # Start measurement elif message[3] == 'S': # Start measurement
logger.debug(f'TCP [S:Start measurement]')
try: try:
with open('./control.json', 'r') as f: with open('./control.json', 'r') as f:
cmd = json.load(f) cmd = json.load(f)
@ -460,25 +240,7 @@ def handle_client(conn, ip, port):
err_msg = 'STXERRORETX' err_msg = 'STXERRORETX'
conn.sendall(err_msg.encode("utf8")) conn.sendall(err_msg.encode("utf8"))
elif message[3] == 'C': # Clean sequence
logger.debug(f'TCP [C:Clean sequence]')
try:
with open('./control.json', 'r') as f:
cmd = json.load(f)
cmd['type'] = 'clean'
with open('./control.json', 'w') as f:
json.dump(cmd, f, indent=4)
send_msg = 'STXOKETX'
conn.sendall(send_msg.encode("utf8"))
except Exception as e:
err_msg = 'STXERRORETX'
conn.sendall(err_msg.encode("utf8"))
elif message[3] == 'T': # Stop measurement elif message[3] == 'T': # Stop measurement
logger.debug(f'TCP [T:Stop measurement]')
try: try:
with open('./control.json', 'r') as f: with open('./control.json', 'r') as f:
cmd = json.load(f) cmd = json.load(f)
@ -505,7 +267,7 @@ def handle_client(conn, ip, port):
# print("Closing the connection") # print("Closing the connection")
def start_server(addr, port): def start_server(addr, port):
host = addr # "172.17.16.201" host = addr # "25.7.57.1"
port = port # 5000 port = port # 5000
soc = socket.socket(socket.AF_INET, socket.SOCK_STREAM) soc = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
@ -528,25 +290,17 @@ def start_server(addr, port):
soc.close() soc.close()
def seoul_time(*args):
utc_dt = datetime.now()
seoul_tz = pytz.timezone('Asia/Seoul')
return utc_dt.replace(tzinfo=pytz.utc).astimezone(seoul_tz).timetuple()
def exit_handler(signum, frame): def exit_handler(signum, frame):
Motor(chip=output_lines, status=status, action='Off') Motor(chip=output_lines, status=status, action='Off')
Valve_Vent(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_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')
client.close() client.close()
sys.exit(0) sys.exit(0)
if __name__ == "__main__": if __name__ == "__main__":
# Set GPIO
output_chip = gpiod.chip('gpiochip11') output_chip = gpiod.chip('gpiochip11')
config = gpiod.line_request() config = gpiod.line_request()
config.consumer = 'output' config.consumer = 'output'
@ -557,40 +311,18 @@ if __name__ == "__main__":
status = [0, 0, 0, 0, 0, 0, 0, 0] status = [0, 0, 0, 0, 0, 0, 0, 0]
# When forced to terminate
signal.signal(signal.SIGINT, exit_handler) signal.signal(signal.SIGINT, exit_handler)
# Set the logger
logger = logging.getLogger('sampyo_dio')
logger.setLevel(logging.DEBUG)
handler = RotatingFileHandler('/home/root/working.log', maxBytes=1024*1024, backupCount=3)
handler.setLevel(logging.DEBUG)
formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
formatter.converter = seoul_time
handler.setFormatter(formatter)
logger.addHandler(handler)
# Initialized valves
main_valve_status = 0
pure_valve_status = 0
Valve_MainWater(chip=output_lines, status=status, action='Off')
Valve_PureWater(chip=output_lines, status=status, action='Off')
# Read config file
with open('./config.json', encoding='UTF-8') as f: with open('./config.json', encoding='UTF-8') as f:
jsonData = json.load(f) jsonData = json.load(f)
# Set the weight of water in the chamber
volume_water = 1000.0 / float(jsonData['volume-water']) volume_water = 1000.0 / float(jsonData['volume-water'])
# Set the IP address and port of NodeQ RS-232 module and activate TCP Client
modbus_addr = jsonData['modbus-server']['address'] modbus_addr = jsonData['modbus-server']['address']
modbus_port = jsonData['modbus-server']['port'] modbus_port = jsonData['modbus-server']['port']
client = ModbusTcpClient(modbus_addr, modbus_port) client = ModbusTcpClient(modbus_addr, modbus_port)
# Define the default data format
data = { data = {
"timestamp": 0, "timestamp": 0,
"data":{ "data":{

375
test.py
View File

@ -1,375 +0,0 @@
import ssl
import json
import time
import argparse
import sys, signal
import gpiod
from pymodbus.client import ModbusTcpClient
import AWSIoTPythonSDK.MQTTLib as AWSIoTPyMQTT
import asyncio, pytz
from datetime import datetime
import threading, socket
def Motor(chip, status, action):
if action == 'On':
status[0] = 1
else: # action == 'Off'
status[0] = 0
chip.set_values(status)
def Valve_Vent(chip, status, action):
if action == 'On':
status[1] = 1
else: # action == 'Off'
status[1] = 0
chip.set_values(status)
def Valve_MixedWater(chip, status, action):
if action == 'On':
status[2] = 1
else: # action == 'Off'
status[2] = 0
chip.set_values(status)
def Valve_PureWater(chip, status, action):
if action == 'On':
status[3] = 1
else: # action == 'Off'
status[3] = 0
chip.set_values(status)
def Measure_Weight(client):
# print('In')
try:
result = client.read_holding_registers(1, 1)
if result.isError():
print(f'Error: {result}')
else:
val = result.registers[0]
val -= 1000
val /= 1000
# print(f'value: {val}')
except Exception as e:
pass
return val
def Calculate_Concentration(weight):
global data
data['data']['weight'] = weight
result = (float(weight) * 1.883239171 * 128.5) - 126.11 # 1000 / 531 = 1.883239171
data['data']['concentration'] = result
# print(f'{weight}, {result}')
def Set_Zero(client):
client.write_coil(1, 1)
def Command_Read():
with open('./control.json', 'r') as f:
cmd = json.load(f)
if cmd['type'] == 'auto':
Valve_Vent(chip=output_lines, status=status, action='Off')
Motor(chip=output_lines, status=status, action='Off')
# set zero
# Set_Zero(client=client)
time.sleep(5)
start = Measure_Weight(client=client)
time.sleep(5)
# input mixed water
Valve_MixedWater(chip=output_lines, status=status, action='On')
time.sleep(19)
Valve_MixedWater(chip=output_lines, status=status, action='Off')
# time.sleep(20)
time.sleep(10)
# measure weight
end = Measure_Weight(client=client)
time.sleep(1)
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(40)
Motor(chip=output_lines, status=status, action='Off')
time.sleep(0.5)
Valve_Vent(chip=output_lines, status=status, action='Off')
# input pure water
Valve_PureWater(chip=output_lines, status=status, action='On')
time.sleep(19)
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(40)
Motor(chip=output_lines, status=status, action='Off')
time.sleep(0.5)
Valve_Vent(chip=output_lines, status=status, action='Off')
time.sleep(5)
else: # cmd['type'] == 'manual'
Motor(chip=output_lines, status=status, action=cmd['device']['motor']['action'])
Valve_Vent(chip=output_lines, status=status, action=cmd['device']['vent']['action'])
Valve_MixedWater(chip=output_lines, status=status, action=cmd['device']['mixed']['action'])
Valve_PureWater(chip=output_lines, status=status, action=cmd['device']['pure']['action'])
if cmd['device']['measure']['action'] == 'On':
result = Measure_Weight(client=client)
Calculate_Concentration(result)
if cmd['device']['setzero']['action'] == 'On':
Set_Zero(client=client)
def connectMQTT(clientID, projectCode):
CLIENT_ID = clientID
ENDPOINT = "avk03ee629rck-ats.iot.ap-northeast-2.amazonaws.com"
PATH_TO_CERTIFICATE = f"/etc/sdt/cert/{projectCode}-certificate.pem"
PATH_TO_PRIVATE_KEY = f"/etc/sdt/cert/{projectCode}-private.pem"
PATH_TO_AMAZON_ROOT_CA_1 = f"/etc/sdt/cert/AmazonRootCA1.pem"
myAWSIoTMQTTClient = AWSIoTPyMQTT.AWSIoTMQTTClient(CLIENT_ID)
myAWSIoTMQTTClient.configureEndpoint(ENDPOINT, 8883)
myAWSIoTMQTTClient.configureCredentials(PATH_TO_AMAZON_ROOT_CA_1, PATH_TO_PRIVATE_KEY, PATH_TO_CERTIFICATE)
myAWSIoTMQTTClient.configureMQTTOperationTimeout(5)
myAWSIoTMQTTClient.configureConnectDisconnectTimeout(10)
myAWSIoTMQTTClient.configureOfflinePublishQueueing(-1) # Infinite offline Publish queueing
myAWSIoTMQTTClient.configureDrainingFrequency(2) # Draining: 2 Hz
return myAWSIoTMQTTClient
def publishMsg(mqttClient, topic, msg):
# Make the copip3 nnect() call
# mqttClient.connect()
while True:
try:
mqttClient.connect()
break
except Exception as e:
print(f'Connection Fail: {e}')
continue
msg['timestamp'] = int(time.time() * 1000)
# Publish message to server desired number of times.
# print('Begin Publish')
mqttClient.publish(topic=topic, payload=json.dumps(msg), QoS=1)
while True:
try:
mqttClient.disconnect()
break
except Exception as e:
print(f'Disconnection Fail: {e}')
continue
def runAction(projectCode, assetCode):
# Write the app's actions in the "runAction" function.
# Connect MQTT Broker
# You have to rename client id. There are special rules.
# Client Name: "device-app-*"
# For Example
# 1. device-app-test -> Good
# 2. device-app-light-app -> Good
# 3. device-test-app -> Bad
mqttClient1 = connectMQTT("device-app-test1", projectCode)
mqttClient2 = connectMQTT("device-app-test2", projectCode)
mqttClient3 = connectMQTT("device-app-test3", projectCode)
mqttClient4 = connectMQTT("device-app-test4", projectCode)
mqttClient5 = connectMQTT("device-app-test5", projectCode)
mqttlist = [mqttClient1, mqttClient2, mqttClient3, mqttClient4, mqttClient5]
# If you have config's value, please make config.json file.
# - Project Code's variable: projectCode(string)
# - Asset Code's variable: assetCode(string)
# - You may need it to create a topic.
with open('./config.json', encoding='UTF-8') as f:
jsonData = json.load(f)
topic = f"sdtcloud/{projectCode}/{assetCode}/app/{jsonData['appId']}/data"
cnt = 0
while True:
start = time.time()
Command_Read()
# publishMsg(mqttlist[cnt], topic, data)
end = time.time()
cnt += 1
if cnt == 5:
cnt = 0
diff = end - start
if diff < 3:
time.sleep(3 - diff)
def handle_client(conn, ip, port):
global data
while True:
try:
recv = conn.recv(100)
if not recv:
# print(f"Connection with {addr} was reset. Waiting for new connection.")
break
message = recv.decode().strip()
if message[:3] != 'STX' or message[-3:] != 'ETX':
err_msg = 'STXERRORETX'
conn.sendall(err_msg.encode("utf8"))
else:
if message[3] == 'R': # Transfer data from SDT to Sampyo
now = datetime.now(pytz.timezone('Asia/Seoul'))
time_str = now.strftime('%Y%m%d%H%M%S')
h_weight = float(data['data']['weight'])
h_concentration = float(data['data']['concentration'])
data_weight = '{:.3f}'.format(h_weight)
data_concent = '{:.3f}'.format(h_concentration)
send_msg = 'STX' + time_str + '|' + data_weight + '|' + data_concent + 'ETX'
try:
with open('./control.json', 'r') as f:
cmd = json.load(f)
cmd['device']['measure']['action'] = 'On'
with open('./control.json', 'w') as f:
json.dump(cmd, f, indent=4)
conn.sendall(send_msg.encode("utf8"))
except Exception as e:
err_msg = 'STXERRORETX'
conn.sendall(err_msg.encode("utf8"))
elif message[3] == 'S': # Start measurement
try:
with open('./control.json', 'r') as f:
cmd = json.load(f)
cmd['type'] = 'auto'
with open('./control.json', 'w') as f:
json.dump(cmd, f, indent=4)
send_msg = 'STXOKETX'
conn.sendall(send_msg.encode("utf8"))
except Exception as e:
err_msg = 'STXERRORETX'
conn.sendall(err_msg.encode("utf8"))
elif message[3] == 'T': # Stop measurement
try:
with open('./control.json', 'r') as f:
cmd = json.load(f)
cmd['type'] = 'manual'
cmd['device']['measure']['action'] = 'Off'
with open('./control.json', 'w') as f:
json.dump(cmd, f, indent=4)
send_msg = 'STXOKETX'
conn.sendall(send_msg.encode("utf8"))
except Exception as e:
err_msg = 'STXERRORETX'
conn.sendall(err_msg.encode("utf8"))
else:
err_msg = 'STXERRORETX'
conn.sendall(err_msg.encode("utf8"))
except ConnectionResetError:
# print("Connection with " + ip + ":" + port + " was reset. Waiting for new connection.")
break
# print("Closing the connection")
def start_server():
host = "25.7.57.1"
port = 5000
soc = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
soc.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
try:
soc.bind((host, port))
except:
sys.exit()
soc.listen(1) # Only one connection at a time.
while True:
conn, addr = soc.accept()
ip, port = str(addr[0]), str(addr[1])
print("Connected with " + ip + ":" + port)
client_handler = threading.Thread(target=handle_client, args=(conn, ip, port))
client_handler.start()
soc.close()
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_PureWater(chip=output_lines, status=status, action='Off')
client.close()
sys.exit(0)
if __name__ == "__main__":
output_chip = gpiod.chip('gpiochip11')
config = gpiod.line_request()
config.consumer = 'output'
config.request_type = gpiod.line_request.DIRECTION_OUTPUT
output_lines = output_chip.get_lines([0, 1, 2, 3, 4, 5, 6, 7])
output_lines.request(config, default_vals=[0, 0, 0, 0, 0, 0, 0, 0])
status = [0, 0, 0, 0, 0, 0, 0, 0]
signal.signal(signal.SIGINT, exit_handler)
client = ModbusTcpClient('25.7.55.237', 5020)
parser = argparse.ArgumentParser()
parser.add_argument('-app',help='')
args = parser.parse_args()
# ROOT_PATH = f'/usr/local/sdt/app/{args.app}'
data = {
"timestamp": 0,
"data":{
"weight": 0,
"concentration": 0
}
}
## Get ProjectCode and AssetCode
with open(f'/etc/sdt/device.config/config.json', encoding='UTF-8') as f:
codeData = json.load(f)
## Execution main funcion
operation_thread = threading.Thread(target=runAction, args=(codeData["projectcode"], codeData["assetcode"]))
operation_thread.start()
## Execution TCP/IP server
start_server()

View File

View File