control.json

@@ -1,49 +1,39 @@
 {
     "device": {
-        "enter": {
-            "action": "Off"
-        },
-        "main": {
-            "action": "Off",
-            "duration": 4
-        },
-        "measure": {
-            "action": "On"
-        },
-        "mixed": {
-            "action": "Off"
-        },
-        "motor": {
-            "action": "Off"
-        },
-        "pure": {
-            "action": "Off",
-            "duration": 4
-        },
         "setzero": {
             "action": "Off"
         },
+        "measure": {
+            "action": "On",
+	    "duration": 20
+        },
+        "mixed": {
+            "action": "Off",
+            "duration": 5
+        },
+        "pure": {
+            "action": "Off",
+            "duration": 10,
+            "holding": 7
+        },
+	"enter":{
+	    "action": "Off",
+	    "duration": 5
+	},
         "vent": {
+            "action": "Off",
+            "duration": 15,
+            "holding": 5
+        },
+        "motor": {
             "action": "Off"
         }
     },
     "maintenance": {
-        "clean": {
+	"clean": {
-            "duration": 20,
+	    "duration": 20,
-            "time": 25
+	    "time": 25
-        }
+	}
     },
-    "type": "manual",
+    "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
-    }
-}

framework.yaml

@@ -1,11 +1,11 @@
-version: bwc/v2 # bwc 버전 정보입니다.
+version: bwc/v2 # bwc 버전 정보입니다.
-spec: 
+spec: 
-  appName: sampyo-dio-app # 앱의 이름입니다.
+  appName: sampyo-dio-app # 앱의 이름입니다.
-  runFile: main.py # 앱의 실행 파일입니다.
+  runFile: main.py # 앱의 실행 파일입니다.
-  env:
+  env:
-    bin: python3 # 앱을 실행할 바이너라 파일 종류입니다.(장비에 따라 다르므로 확인 후 정의해야 합니다.)
+    bin: python3 # 앱을 실행할 바이너라 파일 종류입니다.(장비에 따라 다르므로 확인 후 정의해야 합니다.)
-    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.31 # Stackbase(gitea)에 릴리즈 태그명 입니다.
-  repoName: sampyo-dio # Stackbase(gitea)에 저장될 저장소 이릅니다.	
+  repoName: sampyo-dio # Stackbase(gitea)에 저장될 저장소 이릅니다.	

main.py

@@ -1,5 +1,6 @@
 import json
 import time
+import argparse
 import sys, signal
 import gpiod
 from pymodbus.client import ModbusTcpClient
@@ -9,8 +10,6 @@ import pytz
 from datetime import datetime
 import threading, socket
 import uuid
-import logging
-from logging.handlers import RotatingFileHandler
 
 def Motor(chip, status, action):
     if action == 'On':
@@ -36,101 +35,15 @@ def Valve_MixedWater(chip, status, action):
     
     chip.set_values(status)
 
-def Valve_PureWater(chip, status, action, duration=7):
+def Valve_PureWater(chip, status, action):
-    global pure_valve_status
+    if action == 'On':
-
-    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)
+    else: # action == 'Off'
-        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):
-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':
         status[4] = 1
     else: # action == 'Off'
@@ -162,144 +75,107 @@ def Calculate_Concentration(weight):
     result = (float(weight) * volume_water * 128.5) - 126.11 # 1000 / 531 = 1.883239171
     data['data']['concentration'] = result
     # print(f'{weight}, {result}')
-    return result
 
 def Set_Zero(client):
     client.write_coil(1, 1)
 
 def Command_Read():
-    global client, main_valve_status, logger
+    global client
 
     with open('./control.json', 'r') as f:
         cmd = json.load(f)
 
     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'])
         
+        Valve_Vent(chip=output_lines, status=status, action='Off')
+        Motor(chip=output_lines, status=status, action='Off')
         
-        # Step 0. Mesure init weight before starting the sequence
+        mixed_duration = int(cmd['device']['mixed']['duration'])
-        time.sleep(step0_duration)
+        pure_duration = int(cmd['device']['pure']['duration'])
-        start = Measure_Weight(client=client) 
+        pure_holding = int(cmd['device']['pure']['holding'])
+        vent_duration = int(cmd['device']['vent']['duration'])
+        vent_holding = int(cmd['device']['vent']['holding'])
+        measure_duration = int(cmd['device']['measure']['duration'])
+        enter_duration = int(cmd['device']['enter']['duration'])
+        start = Measure_Weight(client=client)
+        time.sleep(5)
         
-        # Step 1. Vent pured water before input mixed water
+        # input mixed water
-        # Target valve status: [Motor: Off, Vent: On, Pure: Off, Enter: On, Main: On]
+        Valve_MixedWater(chip=output_lines, status=status, action='On')
-        # Valve_EnterWater(chip=output_lines, status=status, action='On')
+        time.sleep(0.5)
-        Valve_MainWater(chip=output_lines, status=status, action='On')
+        Valve_EnterWater(chip=output_lines, status=status, action='On')
         time.sleep(0.5)
         Valve_Vent(chip=output_lines, status=status, action='On')
-        time.sleep(0.5)
+        time.sleep(vent_holding)
-        # 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)
+        time.sleep(vent_holding)
         
-        # 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')
         time.sleep(0.5)
-        # Valve_EnterWater(chip=output_lines, status=status, action='On')
+        Valve_EnterWater(chip=output_lines, status=status, action='On')
-        Valve_EnterWater(chip=output_lines, status=status, action='On', duration=main_duration)
+        time.sleep(mixed_duration)
-        time.sleep(step3_duration)
         
-        # Step 4. Mesure the weight
+        Valve_MixedWater(chip=output_lines, status=status, action='Off')
-        # Target valve status: [Motor: Off, Vent: Off, Pure: Off, Enter: Off, Main: Off]
-        Valve_MainWater(chip=output_lines, status=status, action='Off')
         time.sleep(0.5)
         Valve_EnterWater(chip=output_lines, status=status, action='Off')
-        time.sleep(step4_duration)
+        time.sleep(measure_duration)
-        
+
-        
+        # measure weight
         end = Measure_Weight(client=client)
         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}')
 
-        # Step 5. Drain the mixed water and add pure water.
+        
-        # Target valve status: [Motor: Off, Vent: On, Pure: On, Enter: On, Main: Off]
+        Motor(chip=output_lines, status=status, action='On')
-        Valve_Vent(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_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
+        Valve_Vent(chip=output_lines, status=status, action='On')
-        # Target valve status: [Motor: Off, Vent: On, Pure: On, Enter: Off, Main: Off]
+        time.sleep(vent_duration)
-        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')
+
+        # 2) Input Pure Water
+        Valve_PureWater(chip=output_lines, status=status, action='On')
         time.sleep(0.5)
-        Motor(chip=output_lines, status=status, action='On')
+        Valve_EnterWater(chip=output_lines, status=status, action='On')
-        time.sleep(step7_duration)
+        time.sleep(pure_duration)
-        
+
-        # Step 8. Drain pure Water
+        Valve_PureWater(chip=output_lines, status=status, action='Off')
-        # Target valve status: [Motor: On, Vent: On, Pure: Off, Enter: Off, Main: Off]
-        Valve_Vent(chip=output_lines, status=status, action='On')
         time.sleep(0.5)
         Valve_EnterWater(chip=output_lines, status=status, action='Off')
         time.sleep(0.5)
-        Valve_PureWater(chip=output_lines, status=status, action='Off')
-        time.sleep(step8_duration)
 
-        # Step 9. Stop moter
+        # 4) Wait until empty
-        # Target valve status: [Motor: Off, Vent: On, Pure: Off, Enter: Off, Main: Off]
+        Valve_Vent(chip=output_lines, status=status, action='On')
+        time.sleep(vent_duration)
+        time.sleep(0.5)
+
+        # 5) Motor Off and Vent close
         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(0.5)
+
         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'
         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_MixedWater(chip=output_lines, status=status, action=cmd['device']['mixed']['action'])
-        # Valve_PureWater(chip=output_lines, status=status, action=cmd['device']['pure']['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_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'])
-        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':
             result = Measure_Weight(client=client)
             Calculate_Concentration(result)
@@ -311,35 +187,23 @@ def Command_Read():
     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'])
+    clean_duration = int(cmd['maintenace']['clean']['duration'])
 
     if cmd['type'] == 'clean':
         Valve_EnterWater(chip=output_lines, status=status, action='Off')
         time.sleep(0.5)
-        
+        Value_PureWater(chip=output_lines, status=status, action='On')
-        Valve_MainWater(chip=output_lines, status=status, action='On')
         time.sleep(0.5)
-        Valve_PureWater(chip=output_lines, status=status, action='On')
+        Value_MixedWater(chip=output_lines, status=status, action='On')
         time.sleep(clean_duration)
         
-        Valve_MainWater(chip=output_lines, status=status, action='Off')
+        Value_PureWater(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)
+        Value_MixedWater(chip=output_lines, status=status, action='Off')
+        time.sleep(6)
 
 def runAction():
     # Write the app's actions in the "runAction" function.
@@ -385,9 +249,6 @@ def runAction():
             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
@@ -402,7 +263,7 @@ def runAction():
             time.sleep(3 - diff)
 
 def handle_client(conn, ip, port):
-    global data, logger
+    global data
     while True:
         try:
             recv = conn.recv(100)
@@ -425,8 +286,6 @@ def handle_client(conn, ip, port):
                     data_weight = '{:.3f}'.format(h_weight)
                     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'
                     
                     try:
@@ -444,7 +303,6 @@ def handle_client(conn, ip, port):
                         conn.sendall(err_msg.encode("utf8"))
                 
                 elif message[3] == 'S': # Start measurement
-                    logger.debug(f'TCP [S:Start measurement]')
                     try:
                         with open('./control.json', 'r') as f:
                             cmd = json.load(f)
@@ -461,7 +319,6 @@ def handle_client(conn, ip, port):
                         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)
@@ -469,16 +326,14 @@ def handle_client(conn, ip, port):
                         cmd['type'] = 'clean'
 
                         with open('./control.json', 'w') as f:
-                            json.dump(cmd, f, indent=4)
+                            json.dunp(cmd, f, indent=4)
-                        
+                            send_msg = 'STXOKETX'
-                        send_msg = 'STXOKETX'
+                            conn.sendall(send_msg.encode("utf8"))
-                        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
-                    logger.debug(f'TCP [T:Stop measurement]')
                     try:
                         with open('./control.json', 'r') as f:
                             cmd = json.load(f)
@@ -527,26 +382,19 @@ def start_server(addr, port):
         client_handler.start()
 
     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):
     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')
     
     client.close()
     
     sys.exit(0)
         
 if __name__ == "__main__":
-    # Set GPIO
     output_chip = gpiod.chip('gpiochip11')
     config = gpiod.line_request()
     config.consumer = 'output'
@@ -557,40 +405,18 @@ if __name__ == "__main__":
     
     status = [0, 0, 0, 0, 0, 0, 0, 0]
     
-    # When forced to terminate
     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:
         jsonData = json.load(f)
 
-    # Set the weight of water in the chamber
     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_port = jsonData['modbus-server']['port']
     
     client = ModbusTcpClient(modbus_addr, modbus_port)
     
-    # Define the default data format
     data = {
         "timestamp": 0,
         "data":{