makes synchronization of main events with Kaleido and Santoker roasting machines configurable (disabled by default)

Author: MAKOMO

src/artisanlib/canvas.py

@@ -13118,11 +13118,11 @@ def OnMonitor(self) -> None:
                         disconnected_handler=lambda : self.aw.sendmessageSignal.emit(QApplication.translate('Message', '{} disconnected').format('Santoker'),True,None),
                         # CHARGE handler disactivated to not trigger CHARGE after CHARGE is signalled to the machine by START
                         # NOTE: only after CHARGE the heater
-#                        charge_handler=lambda : (self.markChargeDelaySignal.emit(0) if (self.timeindex[0] == -1) else None),
-                        dry_handler=lambda : (self.markDRYSignal.emit(False) if (self.timeindex[1] == 0) else None),
-                        fcs_handler=lambda : (self.markFCsSignal.emit(False) if (self.timeindex[2] == 0) else None),
-                        scs_handler=lambda : (self.markSCsSignal.emit(False) if (self.timeindex[4] == 0) else None),
-                        drop_handler=lambda : (self.markDropSignal.emit(False) if (self.timeindex[6] == 0) else None))
+                        charge_handler=lambda : (self.markChargeDelaySignal.emit(0) if (len(self.aw.santokerEventFlags)>0 and self.aw.santokerEventFlags[0] and self.timeindex[0] == -1) else None),
+                        dry_handler=lambda : (self.markDRYSignal.emit(False) if (len(self.aw.santokerEventFlags)>1 and self.aw.santokerEventFlags[1] and self.timeindex[1] == 0) else None),
+                        fcs_handler=lambda : (self.markFCsSignal.emit(False) if (len(self.aw.santokerEventFlags)>2 and self.aw.santokerEventFlags[2] and self.timeindex[2] == 0) else None),
+                        scs_handler=lambda : (self.markSCsSignal.emit(False) if (len(self.aw.santokerEventFlags)>4 and self.aw.santokerEventFlags[4] and self.timeindex[4] == 0) else None),
+                        drop_handler=lambda : (self.markDropSignal.emit(False) if (len(self.aw.santokerEventFlags)>6 and self.aw.santokerEventFlags[6] and self.timeindex[6] == 0) else None))
                     self.aw.santoker.setLogging(self.device_logging)
                     self.aw.santoker.start()
                 elif self.device == 171:

src/artisanlib/comm.py

@@ -1827,34 +1827,37 @@ def Kaleido_BTET(self) -> Tuple[float,float,float]:
         if self.aw.kaleido is not None:
             t1, t2, _sid = self.aw.kaleido.getBTET()
 # it remains unclear what those machine exactly report and when. In some cases processingn this event flag can lead to unfavorable situations so we do not process them at all
-#            try:
-#                event_flag:int = _sid & 15 # last 4 bits of the sid
-#                if event_flag == 1 and self.aw.qmc.timeindex[0] == -1:
-#                    self.aw.qmc.markChargeSignal.emit(True) # CHARGE
+# now the syncing of those event flags can be user configurable and is by default OFF
+            try:
+                event_flag:int = _sid & 15 # last 4 bits of the sid
+                if len(self.aw.kaleidoEventFlags)>0 and self.aw.kaleidoEventFlags[0] and event_flag == 1 and self.aw.qmc.timeindex[0] == -1:
+                    self.aw.qmc.markChargeSignal.emit(True) # CHARGE
 #                elif event_flag == 2 and self.aw.qmc.TPalarmtimeindex is None:
 #                    self.aw.qmc.markTPSignal.emit() # TP
-#                elif event_flag == 3 and self.aw.qmc.timeindex[1] == 0:
-#                    self.aw.qmc.markDRYSignal.emit(True) # DRY
-#                elif event_flag == 4 and self.aw.qmc.timeindex[2] == 0:
-#                    self.aw.qmc.markFCsSignal.emit(True) # FCs
-#                elif event_flag == 5 and self.aw.qmc.timeindex[3] == 0:
-#                    self.aw.qmc.markFCeSignal.emit(True) # FCe
-#                elif event_flag == 6 and self.aw.qmc.timeindex[4] == 0:
-#                    self.aw.qmc.markSCsSignal.emit(True) # SCs
-#                elif event_flag == 7 and self.aw.qmc.timeindex[5] == 0:
-#                    self.aw.qmc.markSCeSignal.emit(True) # SCe
-#                elif (event_flag == 8 and self.aw.qmc.timeindex[6] == 0 and
-#                    self.aw.qmc.timeindex[0] > -1 and self.aw.qmc.autoDropIdx == 0 and
-#                    (self.aw.qmc.timex[-1] - self.aw.qmc.timex[self.aw.qmc.timeindex[0]]) > 7*60):
-#                    # only after 7min into the roast and if CHARGE is marked
-#                    self.aw.qmc.autoDropIdx = len(self.aw.qmc.timex) - 2
-#                    self.aw.qmc.markDropSignal.emit(True) # DROP
+                elif len(self.aw.kaleidoEventFlags)>1 and self.aw.kaleidoEventFlags[1] and event_flag == 3 and self.aw.qmc.timeindex[1] == 0:
+                    self.aw.qmc.markDRYSignal.emit(True) # DRY
+                elif len(self.aw.kaleidoEventFlags)>2 and self.aw.kaleidoEventFlags[2] and event_flag == 4 and self.aw.qmc.timeindex[2] == 0:
+                    self.aw.qmc.markFCsSignal.emit(True) # FCs
+                elif len(self.aw.kaleidoEventFlags)>3 and self.aw.kaleidoEventFlags[3] and event_flag == 5 and self.aw.qmc.timeindex[3] == 0:
+                    self.aw.qmc.markFCeSignal.emit(True) # FCe
+                elif len(self.aw.kaleidoEventFlags)>4 and self.aw.kaleidoEventFlags[4] and event_flag == 6 and self.aw.qmc.timeindex[4] == 0:
+                    self.aw.qmc.markSCsSignal.emit(True) # SCs
+                elif len(self.aw.kaleidoEventFlags)>5 and self.aw.kaleidoEventFlags[5] and event_flag == 7 and self.aw.qmc.timeindex[5] == 0:
+                    self.aw.qmc.markSCeSignal.emit(True) # SCe
+                elif len(self.aw.kaleidoEventFlags)>6 and self.aw.kaleidoEventFlags[6] and (event_flag == 8 and self.aw.qmc.timeindex[6] == 0 and
+                    self.aw.qmc.timeindex[0] > -1 and self.aw.qmc.autoDropIdx == 0 and
+                    (self.aw.qmc.timex[-1] - self.aw.qmc.timex[self.aw.qmc.timeindex[0]]) > 7*60):
+                    # only after 7min into the roast and if CHARGE is marked
+                    self.aw.qmc.autoDropIdx = len(self.aw.qmc.timex) - 2
+                    self.aw.qmc.markDropSignal.emit(True) # DROP
 #                elif event_flag == 9 and self.aw.qmc.timeindex[7] == 0:
 #                    self.aw.qmc.markCoolSignal.emit(True) # COOL
-#            except Exception as e: # pylint: disable=broad-except
-#                _log.error(e)
+            except Exception as e: # pylint: disable=broad-except
+                _log.error(e)
         return tx,t2,t1 # time, ET (chan2), BT (chan1)
 
+
+
     def Kaleido_SVAT(self) -> Tuple[float,float,float]:
         tx = self.aw.qmc.timeclock.elapsedMilli()
         if self.aw.kaleido is not None:

src/artisanlib/devices.py

@@ -1150,6 +1150,24 @@ def __init__(self, parent:QWidget, aw:'ApplicationWindow', activeTab:int = 0) ->
         self.santokerPort.setValidator(QIntValidator(1, 65535,self.santokerPort))
         self.santokerPort.setEnabled(not self.aw.santokerSerial)
 
+        eventFlagLabels = [
+            QApplication.translate('Label','CHARGE'),
+            QApplication.translate('Label','DRY'),
+            QApplication.translate('Label','FCs'),
+            QApplication.translate('Label','FCe'),
+            QApplication.translate('Label','SCs'),
+            QApplication.translate('Label','SCe'),
+            QApplication.translate('Label','DROP')
+        ]
+        self.santokerEventFlags:List[QCheckBox] = [QCheckBox(l) for l in eventFlagLabels]
+        self.santokerEventFlags[3].setEnabled(False) # not available
+        self.santokerEventFlags[5].setEnabled(False) # not available
+        for i, cb in enumerate(self.santokerEventFlags):
+            cb.setToolTip(QApplication.translate('Tooltip','Receive {} event from machine').format(cb.text()))
+            if len(self.aw.santokerEventFlags) > i:
+                cb.setChecked(self.aw.santokerEventFlags[i])
+
+
         self.santokerSerialFlag = QCheckBox(QApplication.translate('Label','Serial'))
         self.santokerSerialFlag.setChecked(self.aw.santokerSerial and not self.aw.santokerBLE)
         self.santokerSerialFlag.stateChanged.connect(self.santokerSerialStateChanged)
@@ -1187,6 +1205,12 @@ def __init__(self, parent:QWidget, aw:'ApplicationWindow', activeTab:int = 0) ->
 #        self.kaleidoPIDFlag = QCheckBox()
 #        self.kaleidoPIDFlag.setChecked(self.aw.kaleidoPID)
 
+        self.kaleidoEventFlags:List[QCheckBox] = [QCheckBox(l) for l in eventFlagLabels]
+        for i, cb in enumerate(self.kaleidoEventFlags):
+            cb.setToolTip(QApplication.translate('Tooltip','Receive {} event from machine').format(cb.text()))
+            if len(self.aw.kaleidoEventFlags) > i:
+                cb.setChecked(self.aw.kaleidoEventFlags[i])
+
         mugmaHostLabel = QLabel(QApplication.translate('Label','Host'))
         self.mugmaHost = QLineEdit(self.aw.mugmaHost)
         self.mugmaHost.setAlignment(Qt.AlignmentFlag.AlignRight)
@@ -1226,12 +1250,25 @@ def __init__(self, parent:QWidget, aw:'ApplicationWindow', activeTab:int = 0) ->
         santokerHBox.addStretch()
         santokerHBox.addLayout(santokerNetworkGrid)
         santokerHBox.addStretch()
+
+        santokerEventFlagHBox = QHBoxLayout()
+        santokerEventFlagHBox.setSpacing(17)
+        santokerEventFlagHBox.addStretch()
+        santokerSerialHBox.addSpacing(20)
+        for cb in self.santokerEventFlags:
+            santokerEventFlagHBox.addWidget(cb)
+        santokerSerialHBox.addSpacing(20)
+        santokerEventFlagHBox.addStretch()
+
         santokerVBox = QVBoxLayout()
         santokerVBox.addLayout(santokerSerialHBox)
+        santokerVBox.addSpacing(15)
         santokerVBox.addLayout(santokerHBox)
+        santokerVBox.addSpacing(15)
+        santokerVBox.addLayout(santokerEventFlagHBox)
         santokerVBox.addStretch()
         santokerVBox.setSpacing(5)
-        santokerVBox.setContentsMargins(0,0,0,0)
+        santokerVBox.setContentsMargins(7,5,7,5) # left, top, right, bottom
 
         santokerNetworkGroupBox = QGroupBox('Santoker')
         santokerNetworkGroupBox.setLayout(santokerVBox)
@@ -1245,16 +1282,30 @@ def __init__(self, parent:QWidget, aw:'ApplicationWindow', activeTab:int = 0) ->
 #        kaleidoNetworkGrid.addWidget(self.kaleidoPIDFlag,2,0)
 #        kaleidoNetworkGrid.addWidget(kaleidoPIDLabel,2,1)
         kaleidoNetworkGrid.setSpacing(20)
-        kaleidoNetworkGroupBox = QGroupBox('Kaleido')
-        kaleidoNetworkGroupBox.setLayout(kaleidoNetworkGrid)
         kaleidoHBox = QHBoxLayout()
-        kaleidoHBox.addWidget(kaleidoNetworkGroupBox)
+        kaleidoHBox.addLayout(kaleidoNetworkGrid)
         kaleidoHBox.addStretch()
+
+        kaleidoEventFlagHBox = QHBoxLayout()
+        kaleidoEventFlagHBox.setSpacing(17)
+        kaleidoEventFlagHBox.addStretch()
+        kaleidoEventFlagHBox.addSpacing(20)
+        for cb in self.kaleidoEventFlags:
+            kaleidoEventFlagHBox.addWidget(cb)
+        kaleidoEventFlagHBox.addSpacing(20)
+        kaleidoEventFlagHBox.addStretch()
+
         kaleidoVBox = QVBoxLayout()
         kaleidoVBox.addLayout(kaleidoHBox)
+        kaleidoVBox.addSpacing(15)
+        kaleidoVBox.addLayout(kaleidoEventFlagHBox)
         kaleidoVBox.addStretch()
         kaleidoVBox.setSpacing(5)
-        kaleidoVBox.setContentsMargins(0,0,0,0)
+        kaleidoVBox.setContentsMargins(7,5,7,5) # left, top, right, bottom
+
+        kaleidoNetworkGroupBox = QGroupBox('Kaleido')
+        kaleidoNetworkGroupBox.setLayout(kaleidoVBox)
+
 
         mugmaNetworkGrid = QGridLayout()
         mugmaNetworkGrid.addWidget(mugmaHostLabel,0,1)
@@ -1437,7 +1488,7 @@ def __init__(self, parent:QWidget, aw:'ApplicationWindow', activeTab:int = 0) ->
         #LAYOUT TAB 7 (Santoker)
         tab7VLayout = QVBoxLayout()
         tab7VLayout.addWidget(santokerNetworkGroupBox)
-        tab7VLayout.addLayout(kaleidoVBox)
+        tab7VLayout.addWidget(kaleidoNetworkGroupBox)
         tab7VLayout.addStretch()
         tab7V2Layout = QVBoxLayout()
         tab7V2Layout.addLayout(mugmaVBox)
@@ -3272,6 +3323,9 @@ def okEvent(self) -> None: # pyright: ignore [reportGeneralTypeIssues] # Code is
             self.aw.ser.externalprogram = self.programedit.text()
             self.aw.ser.externaloutprogram = self.outprogramedit.text()
 
+            self.aw.santokerEventFlags = [cb.isChecked() for cb in self.santokerEventFlags]
+            self.aw.kaleidoEventFlags = [cb.isChecked() for cb in self.kaleidoEventFlags]
+
             self.aw.two_bucket_mode = self.dual_bucket_mode.isChecked()
             self.aw.green_task_precision = self.greenTaskPrecision.value()
 

src/artisanlib/main.py

@@ -1857,6 +1857,7 @@ def __init__(self, parent:Optional[QWidget] = None, *, locale:str, WebEngineSupp
         #    santokerSerial and santokerBLE should never be True at the same time (BLE will have preceedence)
         self.santokerSerial:bool = False # if True connection is via the main serial port
         self.santokerBLE:bool = False # if True connection is via the main serial port
+        self.santokerEventFlags:List[bool] = [False, False, False, False, False, False, False ] # CHARGE, DRY, FCs, FCe, SCs, SCe, DROP
         self.santoker:Optional[Santoker] = None # holds the Santoker instance created on connect; reset to None on disconnect
 
         # Santoker R
@@ -1882,6 +1883,7 @@ def __init__(self, parent:Optional[QWidget] = None, *, locale:str, WebEngineSupp
         self.kaleidoSerial:bool = False # if True connection is via the main serial port
         self.kaleidoPID:bool = True # if True the external Kaleido PID is operated, otherwise the internal Artisan PID is active
         self.kaleido:Optional[KaleidoPort] = None # holds the Kaleido instance created on connect; reset to None on disconnect
+        self.kaleidoEventFlags:List[bool] = [False, False, False, False, False, False, False ] # CHARGE, DRY, FCs, FCe, SCs, SCe, DROP
 
         # Ikawa BLE
         self.ikawa:'Optional[IKAWA_BLE]' = None # noqa: UP037
@@ -17687,10 +17689,14 @@ def settingsLoad(self, filename:Optional[str] = None, theme:bool = False, machin
             self.santokerPort = toInt(settings.value('santokerPort',self.santokerPort))
             self.santokerSerial = toBool(settings.value('santokerSerial',self.santokerSerial))
             self.santokerBLE = toBool(settings.value('santokerBLE',self.santokerBLE))
+            if settings.contains('santokerEventFlags'):
+                self.santokerEventFlags = [toBool(x) for x in toList(settings.value('santokerEventFlags',self.santokerEventFlags))]
             self.kaleidoHost = toString(settings.value('kaleidoHost',self.kaleidoHost))
             self.kaleidoPort = toInt(settings.value('kaleidoPort',self.kaleidoPort))
             self.kaleidoSerial = toBool(settings.value('kaleidoSerial',self.kaleidoSerial))
             self.kaleidoPID = toBool(settings.value('kaleidoPID',self.kaleidoPID))
+            if settings.contains('kaleidoEventFlags'):
+                self.kaleidoEventFlags = [toBool(x) for x in toList(settings.value('kaleidoEventFlags',self.kaleidoEventFlags))]
             self.mugmaHost = toString(settings.value('mugmaHost',self.mugmaHost))
             self.mugmaPort = toInt(settings.value('mugmaPort',self.mugmaPort))
             self.colorTrack_mean_window_size = toInt(settings.value('ctMean',self.colorTrack_mean_window_size))
@@ -19717,10 +19723,12 @@ def saveAllSettings(self, settings:QSettings, default_settings:Optional[Dict[str
             self.settingsSetValue(settings, default_settings, 'santokerPort',self.santokerPort, read_defaults)
             self.settingsSetValue(settings, default_settings, 'santokerSerial',self.santokerSerial, read_defaults)
             self.settingsSetValue(settings, default_settings, 'santokerBLE',self.santokerBLE, read_defaults)
+            self.settingsSetValue(settings, default_settings, 'santokerEventFlags',self.santokerEventFlags, read_defaults)
             self.settingsSetValue(settings, default_settings, 'kaleidoHost',self.kaleidoHost, read_defaults)
             self.settingsSetValue(settings, default_settings, 'kaleidoPort',self.kaleidoPort, read_defaults)
             self.settingsSetValue(settings, default_settings, 'kaleidoSerial',self.kaleidoSerial, read_defaults)
             self.settingsSetValue(settings, default_settings, 'kaleidoPID',self.kaleidoPID, read_defaults)
+            self.settingsSetValue(settings, default_settings, 'kaleidoEventFlags',self.kaleidoEventFlags, read_defaults)
             self.settingsSetValue(settings, default_settings, 'mugmaHost',self.mugmaHost, read_defaults)
             self.settingsSetValue(settings, default_settings, 'mugmaPort',self.mugmaPort, read_defaults)
             self.settingsSetValue(settings, default_settings, 'ctMean',self.colorTrack_mean_window_size, read_defaults)

src/artisanlib/util.py

@@ -139,6 +139,7 @@ def stringfromseconds(seconds_raw:float, leadingzero:bool = True) -> str:
 
 #Converts a string into a seconds integer. Use for example to interpret times from Roaster Properties Dlg inputs
 #accepted formats: "00:00","-00:00"
+# returns -1 on invalid inputs
 def stringtoseconds(string:str) -> int:
     timeparts = string.split(':')
     if len(timeparts) != 2:

src/requirements-dev.txt

@@ -13,7 +13,7 @@ types-docutils>=0.21.0.20250715
 lxml-stubs>=0.5.1
 mypy==1.17.0
 pyright==1.1.403
-ruff>=0.12.3
+ruff>=0.12.4
 pylint==3.3.7
 pre-commit>=4.2.0
 pytest>=8.4.1

wiki/ReleaseHistory.md

@@ -23,6 +23,7 @@ v3.2.1
   - unlimited number of buttons can be created while display is limited to maximum 10 rows with maximum 50 buttons each
   - palette load uses and updates the user selected profile path
   - increases the maximum number of recent roast entries from 25 to 40
+  - makes synchronization of main events with Kaleido and Santoker roasting machines configurable (disabled by default)
 
 * FIXES
   - fixes regression which broke the designer such that points could not be moved ([Discussion #1905](../../../discussions/1905) and [Issue #1916](../../../issues/1916))