From 360ba8a616cb525053f288ec5dc3fc9719734282 Mon Sep 17 00:00:00 2001
From: wu_xinjun <bent20140204@outlook.com>
Date: 星期一, 07 三月 2022 15:27:37 +0800
Subject: [PATCH] temp
---
src/engine/AcquisitionMain.py | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/engine/AcquisitionMain.py b/src/engine/AcquisitionMain.py
index 1644666..bd680f1 100644
--- a/src/engine/AcquisitionMain.py
+++ b/src/engine/AcquisitionMain.py
@@ -13,7 +13,7 @@
from .ControllThread import ControllThread
from .MicroWaveUDPThread import MicroWaveUDPThread
from . import MessageThreads as ths
-from .CameraDevice import cameraController
+from .devices import cameraController
# add python path of src to sys.path
src_path = os.path.join(__file__, *(['..'] * 2))
@@ -145,6 +145,19 @@
"ply_data":self.ply_data_queue
}
+ # device
+ self.cc = None # camera controller
+ self.mc = None # microwave controller
+ self.dc = None # dust cleaner controller
+ self.rc = None # rotation device controler
+
+ self.controller_dict = {
+ "camera": self.cc,
+ "microwave":self.mc,
+ "dustcleaner":self.dc,
+ "rotation": self.rc
+ }
+
def _connect_to_MQ(self):
credentials = pika.PlainCredentials(self.MQuser, self.MQpassword)
@@ -241,7 +254,7 @@
# connecting to camera via opencv
cc.open_cameras()
# capture the data, and wrap it to data queue
- # cc._start_captureThread()
+ cc._start_captureThread()
def connecting_microwave(self):
@@ -276,6 +289,7 @@
self._stop_alarm_state_up_msg_sender_thread()
self.stop
print("main thread end.")
+ return 0
--
Gitblit v1.9.1