From 887766f8ce51ebcb72f314bce7fe5eceb85eaf76 Mon Sep 17 00:00:00 2001 From: ST-TEN-1 Date: Wed, 3 Aug 2022 10:47:09 +0200 Subject: [PATCH] wip st-ten-2 support for multimeter and no camera/neopixel --- config/machine_settings/defaults.ini | 6 ++++++ config/machine_settings/hostnames.ini | 2 +- config/machine_settings/stten2.ini | 13 +++++++------ src/components/__init__.py | 2 +- src/main.py | 12 ++++++++++-- 5 files changed, 25 insertions(+), 10 deletions(-) diff --git a/config/machine_settings/defaults.ini b/config/machine_settings/defaults.ini index 6e689c4..547aa70 100644 --- a/config/machine_settings/defaults.ini +++ b/config/machine_settings/defaults.ini @@ -1,3 +1,9 @@ +[hardware_config] +tecna_t3: present +neo_pixels: present +galaxy_camera: present +multimeter: absent + [galaxy_camera] horizontal_resolution: 2448 vertical_resolution: 2048 diff --git a/config/machine_settings/hostnames.ini b/config/machine_settings/hostnames.ini index 59efc80..b1358bf 100644 --- a/config/machine_settings/hostnames.ini +++ b/config/machine_settings/hostnames.ini @@ -1,5 +1,5 @@ [hostnames] -ST-RES-1: stres1 +ST-TEN-2: stten2 ST-TEN-1: stten1 this: this mino: mino diff --git a/config/machine_settings/stten2.ini b/config/machine_settings/stten2.ini index b338022..69c494d 100644 --- a/config/machine_settings/stten2.ini +++ b/config/machine_settings/stten2.ini @@ -1,8 +1,9 @@ -[tecna_t3] -port: COM5 - -[neo_pixels] -port: COM4 -baudrate: 9600 +[hardware_config] +tecna_t3: present +neo_pixels: absent +galaxy_camera: absent +multimeter: present +vision_saver: absent +vision: absent diff --git a/src/components/__init__.py b/src/components/__init__.py index f63d792..a71b5e3 100644 --- a/src/components/__init__.py +++ b/src/components/__init__.py @@ -8,5 +8,5 @@ from .remote_api import RemoteAPI from .serial_label_printer import Serial_Label_Printer from .tecna_marposs_provaset_t3p import TecnaMarpossProvasetT3P from .test_component import TestComponent -from .vision import Vision +#from .vision import Vision from .vision_saver import VisionSaver diff --git a/src/main.py b/src/main.py index 972f6f5..79ee385 100644 --- a/src/main.py +++ b/src/main.py @@ -54,7 +54,7 @@ try: # IMPORT PROJECT ONLY AFTER SETTING UP SIGNAL, FAULTHANDLER AND LOGGHING from components import (ArchiveSynchronizer, GalaxyCamera, NeoPixels, Os_Label_Printer, RemoteAPI, - TecnaMarpossProvasetT3P, Vision, VisionSaver) + TecnaMarpossProvasetT3P, VisionSaver) from lib.db import Users from lib.helpers import ConfigReader from PyQt5.QtCore import QObject, QThread, pyqtSignal @@ -84,8 +84,16 @@ try: "remote_api": {"c": RemoteAPI, "k": {"main": self}}, "tecna_t3": {"c": TecnaMarpossProvasetT3P, "k": {"paused": True}}, "vision_saver": {"c": VisionSaver, "t": False}, - "vision": {"c": Vision, "k": {"paused": True}}, + } + + for key in self.components_specs.copy().keys(): + if key in self.config["hardware_config"].keys() and self.config["hardware_config"][key] != "present": + self.components_specs.pop(key) + if self.config["hardware_config"]["vision"] is "present": + from src.components.vision import Vision + self.components_specs["vision"]= {"c": Vision, "k": {"paused": True}} + self.components = {} self.threads = {} for component_name, spec in self.components_specs.items():