Merge branch 'master' of git.cpyypt.cn:jindou/LogTT_tools

LogTT_SvrV02.py

@@ -42,6 +42,7 @@ mqtt_hex = 1
 version = "0.0.0.2"
 version_w_ascii = 1
 version_w_hex = 1
+version_w_tt = 1
 
 error_msg = ""
 info_msg = ""
@@ -77,6 +78,10 @@ def get_log_file_name_hex(sn):
     log_file_name = f"./log/LogTT_{sn}_hex_" + datetime.now().strftime('%Y-%m-%d') + ".log"
     return log_file_name
 
+def get_log_file_name_tt(sn):
+    # global
+    log_file_name = f"./log/LogTT_{sn}_tt_" + datetime.now().strftime('%Y-%m-%d') + ".log"
+    return log_file_name
 
 def my_unpack(s, data, i):
     global info_msg
@@ -124,6 +129,27 @@ def subscribe(client: mqtt_client):
         start_pt = "PT_CMD="
         flag_ascii = False
         flag_hex = True
+
+        if msg.topic.find("ttup") > 0:
+            msg_tt = datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')[:-3] + "-->:"
+            msg_tt = msg_tt + f"topic:{msg.topic} msg:{msg.payload.hex().upper()}"
+            # 输出信息
+            try:
+                with open(get_log_file_name_tt(LogTT_SN), 'a') as f:
+                    global version_w_tt
+                    if version_w_tt > 0:
+                        f.write("version:" + version + "\n")
+                        version_w_tt = 0
+                    f.write(msg_tt + "\r\n")
+                    f.close()
+            except Exception as e:
+                print(str(e))
+
+            print(msg_tt)
+
+            return
+
+
         if msg.payload[:len(start_ttl)] == start_ttl.encode("utf-8"):
             flag_ascii = True
             flag_hex = True

main.py

@@ -22,6 +22,7 @@ from requests import get as requests_get
 # pyinstaller.exe -D -n LogTT_tools_V0.0.0.2 main.py
 # pyinstaller.exe -w -F -n LogTT_tools_V0.0.0.3 main.py
 # pyinstaller.exe -w -F -n LogTT_tools_V0.0.0.3 main.py
+# pyinstaller.exe -w -F -n LogTT_tools_V0.0.0.4 main.py
 
 client_id = "LogTT_tool_" + node()
 g_client = mqtt_client.Client(client_id)
@@ -35,7 +36,7 @@ mqtt_timer_time_out = 3*1000
 mqtt_subtopic = [("cpyypt/up/9002/#", 0)]
 mqtt_pubtopic = "cpyypt/down/9002/0000000001"
 
-version = "0.0.0.3"
+version = "0.0.0.4"
 version_w_ascii = 1
 version_w_hex = 1
 
@@ -231,7 +232,7 @@ class MyWindow(QMainWindow, Ui_MainWindow):
 
             elif msg.payload[:len(start_rs485)] == start_rs485.encode("utf-8"):
                 cmd_type = start_rs485
-                flag_ascii = False
+                flag_ascii = True
                 flag_hex = True
                 head = msg.payload[:len(start_rs485)]
                 body = msg.payload[len(start_rs485):]