@@ -5834,22 +5834,17 @@ def updateLCDtime(self) -> None:
58345834 try:
58355835 if self.aw.sample_loop_running and len(self.timeindex) == 8: # ensure we have a valid self.timeindex array
58365836
5837- if self.timeindex[0] != -1 and len(self.timex) > self.timeindex[0]:
5837+ if self.timeindex[6] != 0 and len(self.timex) > self.timeindex[6]:
5838+ ts = tx - self.timex[self.timeindex[6]]
5839+ elif self.timeindex[0] != -1 and len(self.timex) > self.timeindex[0]:
58385840 ts = tx - self.timex[self.timeindex[0]]
58395841 else:
58405842 ts = tx
58415843
58425844 # if more than max cool (from statistics) past DROP and not yet COOLend turn the time LCD red:
5843- if (self.timeindex[0]!=-1 and self.timeindex[6] and
5844- not self.timeindex[7] and
5845- ((len(self.timex) == 1+self.timeindex[6]) or
5846- (len(self.timex)>self.timeindex[6] and (4*60+2 > (tx - self.timex[self.timeindex[6]]) > 4*60)))):
5847- # switch LCD color to "cooling" color (only after 4min cooling we switch to slowcoolingtimer color)
5848- if (tx - self.timex[self.timeindex[6]]) > 4*60:
5849- timer_color = 'slowcoolingtimer'
5850- else:
5851- timer_color = 'rstimer'
5852- self.aw.setTimerColor(timer_color)
5845+ if (self.timeindex[0]!=-1 and self.timeindex[6] != 0 and not self.timeindex[7] and
5846+ len(self.timex) > self.timeindex[6] and (tx - self.timex[self.timeindex[6]]) > 4*60):
5847+ self.aw.setTimerColor('slowcoolingtimer')
58535848
58545849 if self.chargeTimerFlag and self.timeindex[0] == -1 and self.chargeTimerPeriod != 0:
58555850 if self.chargeTimerPeriod > ts:
@@ -15308,6 +15303,7 @@ def markDrop(self, noaction:bool = False) -> None:
1530815303 # we check if this is the first DROP mark on this roast
1530915304 firstDROP = self.timeindex[6] == 0 # on UNDO DROP we do not send the record to plus
1531015305 if self.aw.buttonDROP.isFlat() and self.timeindex[6] > 0:
15306+ self.aw.setTimerColor('timer') # reset cooling timer color back to the default
1531115307 self.autoDropIdx = -1 # disable autoDROP to allow manual re-DROP
1531215308 # undo wrongly set FCs
1531315309 # deactivate autoDROP
@@ -15331,6 +15327,7 @@ def markDrop(self, noaction:bool = False) -> None:
1533115327 if 6 in self.l_annotations_dict:
1533215328 del self.l_annotations_dict[6]
1533315329 elif not self.aw.buttonDROP.isFlat():
15330+ self.aw.setTimerColor('rstimer') # cooling timer color
1533415331 self.incBatchCounter()
1533515332 # generate UUID
1533615333 if self.roastUUID is None: # there might be already one assigned by undo and redo the markDROP!
0 commit comments