From 6b37ae2b15eca92b3cacac0e113290eb28ccfa8b Mon Sep 17 00:00:00 2001
From: wu_xinjun <bent20140204@outlook.com>
Date: 星期一, 20 六月 2022 15:49:50 +0800
Subject: [PATCH] get pointclouds from client

---
 src/engine/AcquisitionMain.py |   36 +++++++++++++++++++++++-------------
 1 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/engine/AcquisitionMain.py b/src/engine/AcquisitionMain.py
index 4c98a0f..a401666 100644
--- a/src/engine/AcquisitionMain.py
+++ b/src/engine/AcquisitionMain.py
@@ -80,6 +80,8 @@
         self.CAMERA_COUNT = CAMERA_COUNT
         # microwave
         self.MICROWAVEhost = MICROWAVEhost
+        # self.MICROWAVEPort = MICROWAVEhost
+        self.MICROWAVEport = 9911
 
         # dust cleaner
         self.com = "COM11"
@@ -207,10 +209,16 @@
                     routing_key="server"
                     )
 
-        self.mc = microwaveController()
-
-
-
+        self.mc = microwaveController(
+                    MicrowaveHost=self.MICROWAVEhost,
+                    MicrowavePort=self.MICROWAVEport,
+                    init_packet_threshold=100,
+                    init_timeusage_threshold=3,
+                    device_id=self.device_id,
+                    logs_queue=self.LogsSender_queue,
+                    plys_queue=self.PlysSender_queue,
+                    routing_key="server"            
+        )
         
 
     def run_rabbitmq(self):
@@ -236,15 +244,17 @@
             print(f"stop {t.name}")
 
     def start(self):
-        try:
-            self.run_all()
-            print("[*] Client is runing ...")
-            self.CommandsReceiver_Thread.join()
-        except Exception as e:
-            print(e)
-            print("running error, stop all threads")
-            self.stop_all()
-        print("main thread end.")
+        # try:
+        #     self.run_all()
+        #     print("[*] Client is runing ...")
+        #     self.CommandsReceiver_Thread.join()
+        # except Exception as e:
+        #     print(e)
+        #     print("running error, stop all threads")
+        #     self.stop_all()
+        # print("main thread end.")
+        self.run_all()
+        self.CommandsReceiver_Thread.join()
         return 0
  
             

--
Gitblit v1.9.1