fixes replay by temp

Author: MAKOMO

src/artisanlib/acaia.py

@@ -17,7 +17,7 @@
 
 import asyncio
 import logging
-from enum import IntEnum
+from enum import IntEnum, unique
 from typing import Optional, Union, List, Tuple, Final, Callable, TYPE_CHECKING
 
 if TYPE_CHECKING:
@@ -38,6 +38,7 @@
 
 ####
 
+@unique
 class UNIT(IntEnum):
     KG = 1
     G = 2

src/artisanlib/aillio.py

@@ -1137,7 +1137,7 @@ def set_preheat(self, temp: int) -> None:
 if __name__ == '__main__':
     R1 = AillioR1(debug=False)
     try:
-        R1._open_port()
+        R1._open_port() # pylint: disable=protected-access
         print(f"Connected to {R1.model} using protocol V{R1.protocol}")
 
         # Example reading loop
@@ -1157,4 +1157,4 @@ def set_preheat(self, temp: int) -> None:
     except OSError as e:
         print(f"Error: {e}")
     finally:
-        R1._close_port()
+        R1._close_port() # pylint: disable=protected-access

src/artisanlib/canvas.py

@@ -4776,6 +4776,14 @@ def sample_processing(self, local_flagstart:bool, temp1_readings:List[float], te
                                 self.autoChargeIdx = length_of_qmc_timex - b
                                 self.markChargeSignal.emit(False) # this queues an event which forces a realignment/redraw by resetting the cache ax_background and fires the CHARGE action
 
+                        elif self.TPalarmtimeindex is None and self.timeindex[0] > -1 and len(sample_timex)>0 and ((sample_timex[-1] - sample_timex[self.timeindex[0]]) > self.TP_max_roasttime):
+                            try:
+                                # if 2:00min (self.TP_max_roasttime) into the roast and TPalarmtimeindex alarmindex not yet set,
+                                # we place the TPalarmtimeindex at the current index to enable in airoasters without TP the autoDRY and autoFCs functions and activate the TP Phases LCDs
+                                self.TPalarmtimeindex = length_of_qmc_timex - 1
+                            except Exception as e: # pylint: disable=broad-except
+                                _log.exception(e)
+
                         # check for TP event if already CHARGEed and not yet recognized (earliest in the next call to sample())
                         elif self.TPalarmtimeindex is None and self.timeindex[0] > -1 and not self.timeindex[1] and self.timeindex[0]+8 < len(sample_temp2) and self.checkTPalarmtime():
                             try:
@@ -4787,13 +4795,7 @@ def sample_processing(self, local_flagstart:bool, temp1_readings:List[float], te
                                     self.markTPSignal.emit() # queued
                             except Exception as e: # pylint: disable=broad-except
                                 _log.exception(e)
-                            try:
-                                # if 2:30min into the roast and TPalarmtimeindex alarmindex not yet set,
-                                # we place the TPalarmtimeindex at the current index to enable in airoasters without TP the autoDRY and autoFCs functions and activate the TP Phases LCDs
-                                if self.TPalarmtimeindex is None and ((sample_timex[-1] - sample_timex[self.timeindex[0]]) > self.TP_max_roasttime):
-                                    self.TPalarmtimeindex = length_of_qmc_timex - 1
-                            except Exception as e: # pylint: disable=broad-except
-                                _log.exception(e)
+
                         # autodetect DROP event
                         # 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 \
@@ -6155,6 +6157,7 @@ def playbackevent(self) -> None:
                                         last_event_idx = last_registered_foreground_event_idx
                                         last_event_time = last_registered_foreground_event_time
                                         last_event_value = self.eventsInternal2ExternalValue(self.specialeventsvalue[last_registered_foreground_event_idx])
+
                                         # only if there is a last_event after TP we do ramping by temperature
                                         if TP_time is not None and TP_time < last_event_time and len(self.specialevents)>last_event_idx:
                                             last_event_temp1 = self.temp1[self.specialevents[last_event_idx]]
@@ -6188,15 +6191,16 @@ def playbackevent(self) -> None:
 
                                         # compute ramp value if possible
                                         if (self.replayType in {1,2} and last_event_temp is not None and next_event_temp is not None and
-                                                last_event_temp is not None and next_event_temp is not None and
                                                 current_temp is not None):
                                             # if background event target temperature did increase (or decrease) as the foreground, we ramp by temperature
                                             if min(last_event_temp, next_event_temp) <= current_temp <= max(last_event_temp, next_event_temp):
                                                 # we ramp only within the limits
                                                 coefficients = numpy.polyfit([last_event_temp, next_event_temp] , [last_event_value, next_event_value], 1)
                                                 ramps[event_type] = numpy.poly1d(coefficients)(current_temp)
                                         elif (last_event_temp is None and next_event_temp is None and
-                                                (self.replayType == 0 or self.TPalarmtimeindex is None) and # replay by time active
+                                                (self.replayType == 0 or # if replay by time is selected
+                                                    (last_event_temp1 is None and last_event_temp2 is None) or # if TP is not yet passed or no event after TP and now has been set
+                                                    (last_event_temp2 is not None and self.replayType == 1) or (last_event_temp1 is not None and self.replayType == 2)) and # replay by temp, but temp did not increase
                                                 last_event_time is not None and len(self.timeB)>bge):
                                                   # if replay by temp (as one or both of those event_temps is not None), but current temp did not increase we don't
                                                   # ramp by time instead as this would confuse everything.

src/artisanlib/dialogs.py

@@ -711,7 +711,6 @@ def saveTareTable(self) -> None:
 
     @pyqtSlot()
     def weightEdited(self) -> None:
-        _log.debug('PRINT weightEdited')
         sender = self.sender()
         if sender and isinstance(sender, QLineEdit):
             text = sender.text().strip()

src/artisanlib/notifications.py

@@ -29,7 +29,7 @@
 import time
 import logging
 from datetime import datetime, timezone
-from enum import Enum
+from enum import Enum, unique
 from artisanlib.util import getResourcePath
 from artisanlib.qtsingleapplication import QtSingleApplication
 import plus.util
@@ -40,6 +40,7 @@
 
 _log: Final[logging.Logger] = logging.getLogger(__name__)
 
+@unique
 class NotificationType(Enum):
     ARTISAN_SYSTEM = 1 # issued by some internal Artisan activity
     ARTISAN_USER = 2   # issues with notify() Artisan Command

src/artisanlib/pid_control.py

@@ -1435,18 +1435,19 @@ def pidOn(self, send_command:bool = True) -> None:
             self.aw.buttonCONTROL.setStyleSheet(self.aw.pushbuttonstyles['PIDactive'])
         elif self.aw.qmc.Controlbuttonflag:
             # software PID
-            self.aw.qmc.pid.setPID(self.pidKp,self.pidKi,self.pidKd)
-            self.aw.qmc.pid.setLimits((-100 if self.pidNegativeTarget else 0),(100 if self.pidPositiveTarget else 0))
-            self.aw.qmc.pid.setDutySteps(self.dutySteps)
-            self.aw.qmc.pid.setDutyMin(self.dutyMin)
-            self.aw.qmc.pid.setDutyMax(self.dutyMax)
-            self.aw.qmc.pid.setControl(self.setEnergy)
-            self.aw.qmc.pid.setDerivativeFilterLevel(self.derivative_filter)
-            if self.svMode == 0:
-                self.setSV(self.aw.sliderSV.value())
-            self.pidActive = True
-            self.aw.qmc.pid.on()
-            self.aw.buttonCONTROL.setStyleSheet(self.aw.pushbuttonstyles['PIDactive'])
+            if not self.pidActive: # only if not yet active!
+                self.aw.qmc.pid.setPID(self.pidKp,self.pidKi,self.pidKd)
+                self.aw.qmc.pid.setLimits((-100 if self.pidNegativeTarget else 0),(100 if self.pidPositiveTarget else 0))
+                self.aw.qmc.pid.setDutySteps(self.dutySteps)
+                self.aw.qmc.pid.setDutyMin(self.dutyMin)
+                self.aw.qmc.pid.setDutyMax(self.dutyMax)
+                self.aw.qmc.pid.setControl(self.setEnergy)
+                self.aw.qmc.pid.setDerivativeFilterLevel(self.derivative_filter)
+                if self.svMode == 0:
+                    self.setSV(self.aw.sliderSV.value())
+                self.pidActive = True
+                self.aw.qmc.pid.on()
+                self.aw.buttonCONTROL.setStyleSheet(self.aw.pushbuttonstyles['PIDactive'])
         if self.sv is None and self.svMode == 0: # only in manual SV mode we initialize the SV on PID ON
             self.setSV(self.svValue)
 

src/includes/Machines/Santoker/Cube_Bluetooth_PID.aset

@@ -130,7 +130,7 @@ alarmoffset=2, 3, 1, 1, 1, 90, 1
 alarmsetlabel=
 alarmsfile=
 alarmsource=-3, -3, -3, -3, -3, -3, -3
-alarmstrings=60, 90, 1 # replay by time and PID ON, 100, 0, 30, 3 # event replay OFF
+alarmstrings=60, 50, 1 # replay by time and PID ON, 100, 0, 30, 3 # event replay OFF
 alarmtemperature=500, 500, 500, 500, 500, 500, 500
 alarmtime=-1, -1, -1, 6, 6, 10, 6
 loadAlarmsFromBackground=false
@@ -146,9 +146,9 @@ invertControl=false
 negativeTargetMax=100
 negativeTargetMin=0
 negativeTargetRangeLimit=false
-pidKp=0.65
-pidKi=0.025
-pidKd=3.5
+pidKp=1.1
+pidKi=0.09
+pidKd=5
 pidNegativeTarget=0
 pidOnCHARGE=true
 pidPositiveTarget=4