- disable Kaleido machine state DROP synchronization for the first 7min into the roast and enable undo of the DROP action (Issue #1808)

- disables playback of DROP event, only active after CHARGE, for the first 7min into the roast

Author: MAKOMO

src/artisanlib/canvas.py

@@ -4779,10 +4779,10 @@ def sample_processing(self, local_flagstart:bool, temp1_readings:List[float], te
                             except Exception as e: # pylint: disable=broad-except
                                 _log.exception(e)
                         # autodetect DROP event
-                        # only if 8min into roast and BT>160C/320F
-                        if self.autoDropIdx == 0 and self.autoDropFlag and self.autoDROPenabled and self.timeindex[0] > -1 and not self.timeindex[6] and \
+                        # only if 7min into roast and BT>160C/320F
+                        if self.autoDropIdx == 0 and self.autoDropFlag and self.autoDROPenabled and self.timeindex[0] > -1 and self.timeindex[6] == 0 and \
                             length_of_qmc_timex >= 5 and ((self.mode == 'C' and sample_temp2[-1] > 160) or (self.mode == 'F' and sample_temp2[-1] > 320)) and\
-                            ((sample_timex[-1] - sample_timex[self.timeindex[0]]) > 420):
+                            ((sample_timex[-1] - sample_timex[self.timeindex[0]]) > 7*60):
                             b = self.aw.BTbreak(length_of_qmc_timex - 1,event='DROP') # call BTbreak with last index
                             if b > 0:
                                 # we found a BT break at the current index minus b
@@ -5881,14 +5881,17 @@ def processAlarm(self,number:int, beep:bool, action:int, string:str) -> None:
                 _, _, exc_tb = sys.exc_info()
                 self.adderror((QApplication.translate('Error Message','Exception:') + ' processAlarm() {0}').format(str(ex)),getattr(exc_tb, 'tb_lineno', '?'))
 
-    # called only after CHARGE
+    # called only after CHARGE with at least 7min into the roast
     def playbackdrop(self) -> None:
         try:
             #needed when using device NONE
-            if (self.autoDropIdx == 0 and self.timex and self.timeindexB[6] and not self.timeindex[6] and
+            if (self.timeindex[0] > -1 and self.autoDropIdx == 0 and self.timex and self.timeindexB[6]>0 and self.timeindex[6] == 0 and
+                (self.timex[-1] - self.timex[self.timeindex[0]]) > 7*60 and
                 ((self.replayType == 0 and self.timeB[self.timeindexB[6]] - self.timeclock.elapsed()/1000. <= 0) or # by time
-                    (self.replayType == 1 and self.TPalarmtimeindex and self.ctemp2[-1] is not None and self.stemp2B[self.timeindexB[6]] - self.ctemp2[-1] <= 0) or # by BT
-                    (self.replayType == 2 and self.TPalarmtimeindex and self.ctemp1[-1] is not None and self.stemp1B[self.timeindexB[6]] - self.ctemp1[-1] <= 0))): # by ET
+                    (self.replayType == 1 and len(self.ctemp2)>0 and len(self.stemp2B)>self.timeindexB[6] and  # pylint: disable=chained-comparison
+                        self.TPalarmtimeindex and self.ctemp2[-1] is not None and self.stemp2B[self.timeindexB[6]] - self.ctemp2[-1] <= 0) or # by BT
+                    (self.replayType == 2 and len(self.ctemp1)>0 and len(self.stemp1B)>self.timeindexB[6] and  # pylint: disable=chained-comparison
+                        self.TPalarmtimeindex and self.ctemp1[-1] is not None and self.stemp1B[self.timeindexB[6]] - self.ctemp1[-1] <= 0))): # by ET
                 self.autoDropIdx = len(self.timex) - 2
                 self.markDropSignal.emit(False)
         except Exception as ex: # pylint: disable=broad-except
@@ -14703,7 +14706,7 @@ def markDrop(self, noaction:bool = False) -> None:
                     # we check if this is the first DROP mark on this roast
                     firstDROP = self.timeindex[6] == 0 # on UNDO DROP we do not send the record to plus
                     if self.aw.buttonDROP.isFlat() and self.timeindex[6] > 0:
-                        self.autoDropIdx = -1 # disable autoCharge to allow manual re-CHARGE
+                        self.autoDropIdx = -1 # disable autoDROP to allow manual re-DROP
                         # undo wrongly set FCs
                         # deactivate autoDROP
                         self.autoDROPenabled = False

src/artisanlib/comm.py

@@ -1794,7 +1794,11 @@ def Kaleido_BTET(self) -> Tuple[float,float,float]:
                     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:
+                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 event_flag == 9 and self.aw.qmc.timeindex[7] == 0:
                     self.aw.qmc.markCoolSignal.emit(True) # COOL

src/requirements-dev.txt

@@ -13,19 +13,19 @@ types-docutils>=0.21.0.20241128
 lxml-stubs>=0.5.1
 mypy==1.15.0
 pyright==1.1.398
-ruff>=0.11.3
+ruff>=0.11.4
 pylint==3.3.6
 pre-commit>=4.2.0
 pytest>=8.3.5
-pytest-cov==6.0.0
+pytest-cov==6.1.1
 #pytest-qt==4.4.0
 #pytest-xvfb==3.0.0
 #PyVirtualDisplay==3.0
 #pytest-asyncio==0.23.3
 #pytest-bdd==6.1.1
 #pytest-benchmark==4.0.0
 #pytest-mock==3.11.1
-hypothesis>=6.130.8
+hypothesis>=6.130.9
 coverage>=7.8.0
 coverage-badge==1.1.2
 codespell==2.4.1