From 3bb08fbd7b2eb39ba898c24bc385ab0c48b730e4 Mon Sep 17 00:00:00 2001
From: "support.sampyo" <support.sampyo@sdt.inc>
Date: Tue, 26 Mar 2024 08:16:31 +0000
Subject: [PATCH] Commit message

---
 .framework.yaml.un~ | Bin 5695 -> 663 bytes
 framework.yaml      |   2 +-
 framework.yaml~     |   4 +--
 main.py             |  62 +++-----------------------------------------
 4 files changed, 6 insertions(+), 62 deletions(-)

diff --git a/.framework.yaml.un~ b/.framework.yaml.un~
index e9ce13c69381570cc664c63119ae202653906c0d..f61fed145c441bf59dc7f9d165b46b57c2d306bd 100644
GIT binary patch
delta 152
zcmdn5Go4jGEHih0Xr4>{QwF9Jub2NQu3RGL)5F_%p-JWQ#AkV%Rx6pW;dF|*6uw3-
zf`Ng7d-6w75k}L=20W&QKrR;$3ji@A6ay(Z8zjb%#?<1=0+EfsF!7==Cx{K!wYgC!
VgOQ`f2O>N9qp&*ISaYW5s{lN4BuW4P

literal 5695
zcmeI0O=uHQ5XZOMw6Thyc<Djm6+s#$p{;t!K}57iDTo#HAgkTP(B`AbYf!wTUs`Dn
zK?ufTY7S}CQlZ*nBKUz<FM1Who>a)b1wjNaqBFZ0vf>9Jalyk5Oy=zeFT3;mzj?zB
zhr+i{Mvg|`OY+V=o)@~hW2x-lTfVxj`?K%)p`k}TU-x}F^<kHP@Y{kUNn5}N8RJUu
zxDr<VEZOJl^X+H5*$J+kA3die)ZSo-tBOb5$S|$6u9a3qX^!dBx2olewmi$k;;c45
zr_C3AFw<u6?ci<TI5QeXaw#D54HsT@OJ`r>RWR8M#;<uvlDhHeJD4$*<pyW?FEbF3
zhwmFW+N3X-@=owg;K&P69ARL|P@GRFW5*&%KMRj@?o}g65Qvys5exV9Y=Ko*Q(}5j
zznQB(e9A-~G%{0H#lcAfG|tuzPKMC&*a1x$u{8qdX9j4=1dZu;ffMKf#*|phECB{%
zu7+b{3Re+y_JPRf{sfk0qQ^(5C?N+dWyID9U|(9ny5ZltzzOVST){CY<w_8$dt4o#
z2*uT~8sR>Ekt5uhqIjIcRXlWwUx-GSp1!M36~&zt6NRj{whkxKBLAempnI#8Rc);T
ztNyykr+%5Texs+h^idHVmL!nwdhnc6<1Lx7We5s+WmO37(PUVaPcvW`i(1xxVuX7W
zBconR4ftI*APOn5xTIwYpcEX5D`~SxP(#pF6959oorMg=fKRa%PdEa=EZAuvfHzhF
zP<fyd@l*TP5A9!HQ|(_3Hp0asM26t0Ep%X0R&0v^`>g?6HaGge!p2^|CD_z2((532
z2R3EH_85@QcnsL>4Z`kkWo1)qL9c~fo&%e*VS5b7;ll=OSA(zzT7gY)>9w$qIBh*;
z!}b`E6W0vb9VTpAd$ec&2W>s=ER+i@1x`7jY}g(_AsIs<oeh?Q=057xx;g}FHPoR4
Z+nNzu$MD(oodMh3AnXH8*8Y#nKLCf9LnHtI

diff --git a/framework.yaml b/framework.yaml
index 1453327..4088f61 100644
--- a/framework.yaml
+++ b/framework.yaml
@@ -7,5 +7,5 @@ spec:
     virtualEnv: base # 사용할 가상환경 이름입니다.
     package: requirements.txt # 설치할 Python 패키지 정보 파일입니다.(기본 값은 requirement.txt 입니다.)
 stackbase:
-  tagName: v0.0.5 # Stackbase(gitea)에 릴리즈 태그명 입니다.
+  tagName: v0.0.6 # Stackbase(gitea)에 릴리즈 태그명 입니다.
   repoName: sampyo-dio # Stackbase(gitea)에 저장될 저장소 이릅니다.	
diff --git a/framework.yaml~ b/framework.yaml~
index 3d39b43..1453327 100644
--- a/framework.yaml~
+++ b/framework.yaml~
@@ -5,7 +5,7 @@ spec:
   env:
     bin: python3 # 앱을 실행할 바이너라 파일 종류입니다.(장비에 따라 다르므로 확인 후 정의해야 합니다.)
     virtualEnv: base # 사용할 가상환경 이름입니다.
-    package: requirement.txt # 설치할 Python 패키지 정보 파일입니다.(기본 값은 requirement.txt 입니다.)
+    package: requirements.txt # 설치할 Python 패키지 정보 파일입니다.(기본 값은 requirement.txt 입니다.)
 stackbase:
-  tagName: v0.0.1 # Stackbase(gitea)에 릴리즈 태그명 입니다.
+  tagName: v0.0.5 # Stackbase(gitea)에 릴리즈 태그명 입니다.
   repoName: sampyo-dio # Stackbase(gitea)에 저장될 저장소 이릅니다.	
diff --git a/main.py b/main.py
index ed7dd57..1cf77b4 100644
--- a/main.py
+++ b/main.py
@@ -136,48 +136,7 @@ def Command_Read():
         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):
-    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, con_info):
+def runAction():
     # Write the app's actions in the "runAction" function.
     
     # Connect MQTT Broker
@@ -193,12 +152,6 @@ def runAction(projectCode, assetCode, con_info):
     mqttClient3 = sdtcloud.setClient(f"device-app-3{uuid.uuid1()}") # parameter is client ID(string)
     mqttClient4 = sdtcloud.setClient(f"device-app-4{uuid.uuid1()}") # parameter is client ID(string)
     mqttClient5 = sdtcloud.setClient(f"device-app-5{uuid.uuid1()}") # parameter is client ID(string)
-    
-    # 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.
@@ -207,12 +160,11 @@ def runAction(projectCode, assetCode, con_info):
     # - You may need it to create a topic.
 
 
-    topic = f"sdtcloud/{projectCode}/{assetCode}/app/{con_info['appId']}/data"
-    
     cnt = 0
     while True:
         start = time.time()
         Command_Read()
+        data['timestamp'] = int(time.time() * 1000)
         sdtcloud.pubMessage(mqttlist[cnt], data)
         end = time.time()
         
@@ -362,12 +314,6 @@ if __name__ == "__main__":
     
     client = ModbusTcpClient(modbus_addr, modbus_port)
     
-    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":{
@@ -377,11 +323,9 @@ if __name__ == "__main__":
     }
     
     ## 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"], jsonData))
+    operation_thread = threading.Thread(target=runAction, args=())
     operation_thread.start()
     
     tcp_addr = jsonData['tcp-server']['address']