From 503678df16d0192421dad0f6ddd1df770873ad22 Mon Sep 17 00:00:00 2001
From: wu_xinjun <bent20140204@outlook.com>
Date: 星期四, 16 六月 2022 10:34:53 +0800
Subject: [PATCH] dust cleaner installed!
---
src/engine/AcquisitionMain.py | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/src/engine/AcquisitionMain.py b/src/engine/AcquisitionMain.py
index 17d80ed..4c98a0f 100644
--- a/src/engine/AcquisitionMain.py
+++ b/src/engine/AcquisitionMain.py
@@ -7,7 +7,7 @@
# from .ControllThread import ControllThread
# from .MicroWaveUDPThread import MicroWaveUDPThread
from . import MessageThreads as ths
-from .devices import cameraController, dustCleanerController
+from .devices import cameraController, dustCleanerController,microwaveController
# # add python path of src to sys.path
# src_path = os.path.join(__file__, *(['..'] * 2))
@@ -75,11 +75,17 @@
self.MQpassword = MQpassword
self.parameters = None
# camera
- self.IMAGE_WIDTH = 3840
- self.IMAGE_HEIGHT = 2880
- self.CAMERA_COUNT = 4
+ self.IMAGE_WIDTH = IMAGE_WIDTH
+ self.IMAGE_HEIGHT = IMAGE_HEIGHT
+ self.CAMERA_COUNT = CAMERA_COUNT
# microwave
self.MICROWAVEhost = MICROWAVEhost
+
+ # dust cleaner
+ self.com = "COM11"
+ self.bps = "115200"
+ self.timeout = 1
+
# threads
self.threads = []
@@ -182,9 +188,9 @@
def _connect_device(self):
# connect to cameras
self.cc = cameraController(
- IMAGE_WIDTH=IMAGE_WIDTH,
- IMAGE_HEIGHT=IMAGE_HEIGHT,
- CAMERA_COUNT=CAMERA_COUNT,
+ IMAGE_WIDTH=self.IMAGE_WIDTH,
+ IMAGE_HEIGHT=self.IMAGE_HEIGHT,
+ CAMERA_COUNT=self.CAMERA_COUNT,
device_id=self.device_id,
logs_queue=self.LogsSender_queue,
images_queue=self.ImagesSender_queue,
@@ -192,7 +198,20 @@
init_routing_key="server"
)
- # self.dc = dustCleanerController()
+ self.dc = dustCleanerController(
+ com = self.com,
+ bps = self.bps,
+ timeout=self.timeout,
+ logs_queue=self.LogsSender_queue,
+ device_id=self.device_id,
+ routing_key="server"
+ )
+
+ self.mc = microwaveController()
+
+
+
+
def run_rabbitmq(self):
self._connect_to_MQ()
--
Gitblit v1.9.1