- ensure that only future events are replayed (note that the set of future events may change on moving the background profile and in consequence an event can be replayed again)

- ramping replay ramps from either the last foreground event set or last background event passed, which ever is in closer distance, to the next background event
- Santoker protocol uses received header for sending commands

Author: MAKOMO

src/artisanlib/canvas.py

@@ -29,7 +29,7 @@
 from artisanlib.util import deltaLabelUTF8, setDeviceDebugLogLevel, argb_colorname2rgba_colorname, rgba_colorname2argb_colorname, toInt
 from artisanlib.dialogs import ArtisanResizeablDialog
 from artisanlib.widgets import MyContentLimitedQComboBox, MyQComboBox, MyQDoubleSpinBox, wait_cursor
-from artisanlib.scale import Scale, SUPPORTED_SCALES, ScaleSpecs
+from artisanlib.scale import SUPPORTED_SCALES, ScaleSpecs
 
 
 _log: Final[logging.Logger] = logging.getLogger(__name__)
@@ -65,6 +65,13 @@ def __init__(self, parent:QWidget, aw:'ApplicationWindow', activeTab:int = 0) ->
         self.org_santokerBLE = self.aw.santokerBLE
         self.org_kaleidoSerial = self.aw.kaleidoSerial
 
+        self.org_scale1_model = self.aw.scale1_model
+        self.org_scale1_name = self.aw.scale1_name
+        self.org_scale1_id = self.aw.scale1_id
+        self.org_scale2_model = self.aw.scale2_model
+        self.org_scale2_name = self.aw.scale2_name
+        self.org_scale2_id = self.aw.scale2_id
+
         ################ TAB 1   WIDGETS
         #ETcurve
         self.ETcurve = QCheckBox(QApplication.translate('CheckBox', 'ET'))
@@ -1446,8 +1453,6 @@ def __init__(self, parent:QWidget, aw:'ApplicationWindow', activeTab:int = 0) ->
 
         self.scale1_devices:ScaleSpecs = [] # discovered scale1 devices
         self.scale2_devices:ScaleSpecs = [] # discovered scale2 devices
-        self.scale1:Optional[Scale] = None
-        self.scale2:Optional[Scale] = None
 
         scale1ModelLabel = QLabel(QApplication.translate('Label','Model'))
         self.scale1ModelComboBox = QComboBox()
@@ -1471,6 +1476,9 @@ def __init__(self, parent:QWidget, aw:'ApplicationWindow', activeTab:int = 0) ->
         self.scale1NameComboBox.currentIndexChanged.connect(self.scale1NameChanged)
         self.scale1ScanButton.clicked.connect(self.scanScale1)
 
+        if self.aw.scale1_name and self.aw.scale1_id:
+            self.updateScale1devices([(self.aw.scale1_name, self.aw.scale1_id)])
+
         scale1Grid = QGridLayout()
         scale1Grid.addWidget(scale1ModelLabel,0,0)
         scale1Grid.addWidget(self.scale1ModelComboBox,0,1)
@@ -1497,11 +1505,17 @@ def __init__(self, parent:QWidget, aw:'ApplicationWindow', activeTab:int = 0) ->
             self.scale2ScanButton.setEnabled(False)
         elif self.aw.scale2_model < len(SUPPORTED_SCALES):
             self.scale2ModelComboBox.setCurrentIndex(self.aw.scale2_model + 1)
-            if self.aw.scale2_name is not None:
+            if self.aw.scale2_name is None:
+                self.scale2NameComboBox.setEnabled(False)
+            else:
                 self.scale2NameComboBox.setEnabled(True)
         self.scale2ModelComboBox.currentIndexChanged.connect(self.scale2ModelChanged)
+        self.scale2NameComboBox.currentIndexChanged.connect(self.scale2NameChanged)
         self.scale2ScanButton.clicked.connect(self.scanScale2)
 
+        if self.aw.scale2_name and self.aw.scale2_id:
+            self.updateScale2devices([(self.aw.scale2_name, self.aw.scale2_id)])
+
         scale2Grid = QGridLayout()
         scale2Grid.addWidget(scale2ModelLabel,0,0)
         scale2Grid.addWidget(self.scale2ModelComboBox,0,1)
@@ -1692,14 +1706,17 @@ def scale1ModelChanged(self, i:int) -> None:
     @pyqtSlot(int)
     def scale1NameChanged(self, i:int) -> None:
         if 0 <= i < len(self.scale1_devices) and self.aw.scale1_model is not None:
-            if self.scale1 is not None:
-                self.scale1.disconnect()
-            self.scale1 = self.aw.scale_manager.get_scale(self.aw.scale1_model, self.scale1_devices[i][1])
-            if self.scale1 is not None:
-                self.scale1.connect()
+            self.aw.scale1_name = self.scale1_devices[i][0]
+            self.aw.scale1_id = self.scale1_devices[i][1]
+            scale = self.aw.scale_manager.get_scale(self.aw.scale1_model, self.scale1_devices[i][1])
+            self.aw.scale_manager.set_scale1(scale)
+            if scale is not None:
+                scale.connect()
         # i == -1 if self.scale1NameComboBox is empty!
-        elif self.scale1 is not None:
-            self.scale1.disconnect()
+        else:
+            scale1 = self.aw.scale_manager.get_scale1()
+            if scale1 is not None:
+                scale1.disconnect()
 
     def updateScale1devices(self, devices:ScaleSpecs) -> None:
         self.scale1_devices = devices
@@ -1734,14 +1751,17 @@ def scale2ModelChanged(self, i:int) -> None:
     @pyqtSlot(int)
     def scale2NameChanged(self, i:int) -> None:
         if 0 <= i < len(self.scale2_devices) and self.aw.scale2_model is not None:
-            if self.scale2 is not None:
-                self.scale2.disconnect()
-            self.scale2 = self.aw.scale_manager.get_scale(self.aw.scale2_model, self.scale2_devices[i][1])
-            if self.scale2 is not None:
-                self.scale2.connect()
+            self.aw.scale2_name = self.scale2_devices[i][0]
+            self.aw.scale2_id = self.scale2_devices[i][1]
+            scale = self.aw.scale_manager.get_scale(self.aw.scale2_model, self.scale2_devices[i][1])
+            self.aw.scale_manager.set_scale2(scale)
+            if scale is not None:
+                scale.connect()
         # i == -1 if self.scale2NameComboBox is empty!
-        elif self.scale2 is not None:
-            self.scale2.disconnect()
+        else:
+            scale2 = self.aw.scale_manager.get_scale2()
+            if scale2 is not None:
+                scale2.disconnect()
 
     def updateScale2devices(self, devices:ScaleSpecs) -> None:
         self.scale2_devices = devices
@@ -2725,13 +2745,19 @@ def setextracolor(self, ll:int, i:int) -> None:
             _t, _e, exc_tb = sys.exc_info()
             self.aw.qmc.adderror((QApplication.translate('Error Message', 'Exception:') + ' setextracolor(): {0}').format(str(e)),getattr(exc_tb, 'tb_lineno', '?'))
 
+    # close is called from OK and CANCEL
     def close(self) -> bool:
         self.closeHelp()
         settings = QSettings()
         #save window geometry
         settings.setValue('DeviceAssignmentGeometry',self.saveGeometry())
         self.aw.DeviceAssignmentDlg_activeTab = self.TabWidget.currentIndex()
 #        self.aw.closeEventSettings() # save all app settings
+
+        if not self.aw.schedule_window:
+            # we disconnect all scales again if scheduler is not active
+            self.aw.scale_manager.disconnect_all()
+
         return True
 
     @pyqtSlot()
@@ -2743,6 +2769,14 @@ def cancelEvent(self) -> None:
         self.aw.santokerSerial = self.org_santokerSerial
         self.aw.santokerBLE = self.org_santokerBLE
         self.aw.kaleidoSerial = self.org_kaleidoSerial
+
+        self.aw.scale1_model = self.org_scale1_model
+        self.aw.scale1_name = self.org_scale1_name
+        self.aw.scale1_id = self.org_scale1_id
+        self.aw.scale2_model = self.org_scale2_model
+        self.aw.scale2_name = self.org_scale2_name
+        self.aw.scale2_id = self.org_scale2_id
+
         self.reject()
 
     @pyqtSlot()

src/artisanlib/devices.py

@@ -13453,11 +13453,6 @@ def loadbackgroundRedraw(self, filename:str) -> None:
                 self.qmc.background = not self.qmc.hideBgafterprofileload
                 self.qmc.timealign(redraw=False)
                 self.qmc.redraw()
-                if self.qmc.backgroundPlaybackEvents:
-                    # first turn playback off to clean previous disabled events
-                    self.qmc.turn_playback_event_OFF()
-                    # turn on again after background load to ignore already passed events
-                    self.qmc.turn_playback_event_ON()
 
             except Exception as e: # pylint: disable=broad-except
                 _log.exception(e)
@@ -20508,6 +20503,10 @@ def stopActivities(self) -> None:
             except Exception as e: # pylint: disable=broad-except
                 _log.exception(e)
             self.qmc.stopPhidgetManager()
+        try:
+            self.scale_manager.disconnect_all()
+        except Exception as e: # pylint: disable=broad-except
+            _log.exception(e)
 
     # returns True if confirmed, False if canceled by the user
     def closeApp(self) -> bool:

src/artisanlib/main.py

@@ -1646,7 +1646,7 @@ def setDutySteps(self, dutySteps:int) -> None:
 
 
     def setSV(self, sv:float, move:bool = True, init:bool = False) -> None:
-        _log.debug('PRINT setSV(%s,%s,%s)',sv,move,init)
+#        _log.debug('PRINT setSV(%s,%s,%s)',sv,move,init)
 #        if not move:
 #            self.aw.sendmessage(QApplication.translate("Message","SV set to %s"%sv))
         if self.externalPIDControl() == 1:

src/artisanlib/pid_control.py

@@ -209,7 +209,7 @@ def register_reading(self, target:bytes, data:bytes) -> None:
         #if self._logging:
         value:int
         # convert data into the integer data
-        if target in (self.BT_ROR, self.ET_ROR):
+        if target in {self.BT_ROR, self.ET_ROR}:
             # first for bits of the RoR data contain the sign of the value
             if len(data) != 2:
                 return
@@ -220,16 +220,16 @@ def register_reading(self, target:bytes, data:bytes) -> None:
                 value = - value
         else:
             value = int.from_bytes(data, 'big')
-        if self._logging:
-            _log.debug('register_reading(%s,%s)',target,value)
+#        if self._logging:
+#            _log.debug('register_reading(%s,%s)',target,value)
         if target == self.BOARD:
             self._board = value / 10.0
-        elif target in (self.BT, self.OLD_BT):
+        elif target in {self.BT, self.OLD_BT}:
             BT = value / 10.0
             self._bt = (BT if self._bt == -1 else (2*BT + self._bt)/3)
             if self._logging:
                 _log.debug('BT: %s',self._bt)
-        elif target in (self.ET, self.OLD_ET):
+        elif target in {self.ET, self.OLD_ET}:
             ET = value / 10.0
             self._et = (ET if self._et == -1 else (2*ET + self._et)/3)
             if self._logging:
@@ -287,10 +287,10 @@ def register_reading(self, target:bytes, data:bytes) -> None:
                 except Exception as e: # pylint: disable=broad-except
                     _log.exception(e)
             self._DROP = b
-        elif self._logging and target in {self.MIN_POWER, self.MAX_POWER, self.BT_CALIB, self.ET_CALIB}:
-            _log.debug('unsupported data target %s', target)
-        elif self._logging:
-            _log.debug('unknown data target %s', target)
+#        elif self._logging and target in {self.MIN_POWER, self.MAX_POWER, self.BT_CALIB, self.ET_CALIB}:
+#            _log.debug('unsupported data target %s', target)
+#        elif self._logging:
+#            _log.debug('unknown data target %s', target)
 
 
     # asyncio read implementation
@@ -302,7 +302,17 @@ async def read_msg(self, stream: Union[asyncio.StreamReader, IteratorReader]) ->
         # check for the second header byte
 #        if await stream.readexactly(1) != self.HEADER[1:2]:
 #            return
-        if await stream.readexactly(1) not in (self.HEADER_BT[1:2], self.HEADER_WIFI[1:2]): # we always accept both headers, the one for WiFi and the one for BT
+#        if await stream.readexactly(1) not in {self.HEADER_BT[1:2], self.HEADER_WIFI[1:2]}: # we always accept both headers, the one for WiFi and the one for BT
+#            return
+        # we accept both headers, BT and WiFi and adjust the self.HEADER to be used on sending messages accordingly
+        # as it seems that some machines connected via bluetooth still send data using the WiFi header and expect that header also on read
+        # so we adjust to the header we receive and use that on sending our messages as well
+        snd_header_byte = await stream.readexactly(1)
+        if snd_header_byte == self.HEADER_BT[1:2]:
+            self.HEADER = self.HEADER_BT
+        elif snd_header_byte == self.HEADER_WIFI[1:2]:
+            self.HEADER = self.HEADER_WIFI
+        else:
             return
         # read the data target (BT, ET,..)
         target = await stream.readexactly(1)

src/artisanlib/santoker.py

@@ -33,7 +33,7 @@
     ('Acaia', 0) # 0
 ]
 
-ScaleSpec = Tuple[str,str]
+ScaleSpec = Tuple[str,str] # scale name, scale id (eg. ble address)
 ScaleSpecs = List[ScaleSpec]
 
 
@@ -59,6 +59,12 @@ def disconnect(self) -> None:
 
 class ScaleManager:
 
+    __slots__ = [ 'scale1', 'scale2' ]
+
+    def __init__(self) -> None:
+        self.scale1: Optional[Scale] = None
+        self.scale2: Optional[Scale] = None
+
     # returns list of discovered devices as (name, address) tuples matching selected scale model
     @staticmethod
     def scan_for_scales(model:int) -> ScaleSpecs:
@@ -86,3 +92,27 @@ def get_scale(model:int, address:str) -> Optional[Scale]:
             scale.set_address(address)
             return scale
         return None
+
+    def set_scale1(self, scale:Optional[Scale]) -> None:
+        if self.scale1 is not None:
+            self.scale1.disconnect()
+        self.scale1 = scale
+
+    def get_scale1(self) -> Optional[Scale]:
+        return self.scale1
+
+    def set_scale2(self, scale:Optional[Scale]) -> None:
+        if self.scale2 is not None:
+            self.scale2.disconnect()
+        self.scale2 = scale
+
+    def get_scale2(self) -> Optional[Scale]:
+        return self.scale2
+
+    def disconnect_all(self) -> None:
+        if self.scale1 is not None:
+            self.scale1.disconnect()
+            self.scale1 = None
+        if self.scale2 is not None:
+            self.scale2.disconnect()
+            self.scale2 = None

src/artisanlib/scale.py

@@ -150,7 +150,7 @@ pidKp=1.1
 pidNegativeTarget=0
 pidOnCHARGE=true
 pidPositiveTarget=4
-pidSource=1
+pidSource=2
 positiveTargetMax=100
 positiveTargetMin=0
 positiveTargetRangeLimit=false

src/includes/Machines/Santoker/Cube_Bluetooth_PID.aset

@@ -13,7 +13,7 @@ types-docutils>=0.21.0.20241128
 lxml-stubs>=0.5.1
 mypy==1.15.0
 pyright==1.1.396
-ruff>=0.10.0
+ruff>=0.11.0
 pylint==3.3.5
 pre-commit>=4.1.0
 pytest>=8.3.5
@@ -25,7 +25,7 @@ pytest-cov==6.0.0
 #pytest-bdd==6.1.1
 #pytest-benchmark==4.0.0
 #pytest-mock==3.11.1
-hypothesis>=6.129.1
+hypothesis>=6.129.3
 coverage>=7.6.12
 coverage-badge==1.1.2
 codespell==2.4.1