- adds recognition of acaia ISP

- end weight source, estimate by scheduler vs measured, is remembered and persisted with each roast
- lib updates

Author: MAKOMO

src/artisanlib/acaia.py

@@ -392,10 +392,11 @@ async def handle_writes(self, writer: asyncio.StreamWriter, queue: 'asyncio.Queu
     # if serial settings are given, the host/port settings are ignored and communication is handled by the given serial port
     async def connect(self, connect_timeout:float=5) -> None:
         writer:asyncio.StreamWriter|None = None
+        was_connected:bool = False # set by successful connection and used to report ONE disconnect message
         while self._running:
             try:
                 if self._serial is not None:
-                    _log.debug('connecting to serial port: %s ...', self._serial['port'])
+#                    _log.debug('connecting to serial port: %s ...', self._serial['port'])
                     connect = self.open_serial_connection(
                         url = self._serial['port'],
                         baudrate = self._serial['baudrate'],
@@ -415,6 +416,7 @@ async def connect(self, connect_timeout:float=5) -> None:
                     read_handler = asyncio.create_task(self.handle_reads(reader))
                     self._ACK_received = asyncio.Event()
                     _log.debug('connected')
+                    was_connected = True
                     if self._connected_handler is not None:
                         try:
                             self._connected_handler()
@@ -441,14 +443,15 @@ async def connect(self, connect_timeout:float=5) -> None:
 
             except TimeoutError:
                 _log.debug('connection timeout')
-            except SerialException as e:
-                _log.debug('serial exception: %s',e)
+            except SerialException:
+                #_log.debug('serial exception: %s',e)
+                pass
             except Exception as e: # pylint: disable=broad-except
                 _log.error(e)
             finally:
                 self._ACK_received = None
                 self.reset_readings()
-                if self._disconnected_handler is not None:
+                if was_connected and self._disconnected_handler is not None:
                     try:
                         self._disconnected_handler()
                     except Exception as e: # pylint: disable=broad-except
@@ -461,7 +464,7 @@ async def connect(self, connect_timeout:float=5) -> None:
                         _log.debug('serial exception: %s',e)
                     except Exception as e: # pylint: disable=broad-except
                         _log.error(e)
-                await asyncio.sleep(0.5)
+            await asyncio.sleep(1)
 
     def send(self, message:bytes) -> None:
         if self._asyncLoopThread is not None and self._write_queue is not None:

src/artisanlib/async_comm.py

@@ -155,6 +155,7 @@ class ProfileData(TypedDict, total=False):
     plus_blend_spec_labels: list[str]
     beans: str
     weight: list[float|str] # NOTE: internally weight is a typed tuple
+    end_weight_est: int
     volume: list[float|str] # NOTE: internally volume is a typed tuple
     density: list[float|str] # NOTE: internally density is a typed tuple
     density_roasted: list[float|str] # NOTE: internally density_roasted is a typed tuple

src/artisanlib/atypes.py

@@ -303,7 +303,7 @@ class tgraphcanvas(QObject):
         'patheffects', 'graphstyle', 'graphfont', 'buttonvisibility', 'buttonactions', 'buttonactionstrings', 'extrabuttonactions', 'extrabuttonactionstrings',
         'xextrabuttonactions', 'xextrabuttonactionstrings', 'chargeTimerFlag', 'autoChargeFlag', 'autoDropFlag', 'autoChargeMode', 'autoDropMode', 'autoChargeIdx', 'autoDropIdx', 'markTPflag',
         'autoDRYflag', 'autoFCsFlag', 'autoCHARGEenabled', 'autoDRYenabled', 'autoFCsenabled', 'autoDROPenabled', 'projectionconstant',
-        'projectionmode', 'transMappingMode', 'weight', 'roasted_defects_weight', 'volume', 'density', 'roasted_defects_mode', 'density_roasted', 'volumeCalcUnit', 'volumeCalcWeightInStr',
+        'projectionmode', 'transMappingMode', 'weight', 'end_weight_est', 'roasted_defects_weight', 'volume', 'density', 'roasted_defects_mode', 'density_roasted', 'volumeCalcUnit', 'volumeCalcWeightInStr',
         'volumeCalcWeightOutStr', 'container_names', 'container_weights', 'specialevents', 'etypes', 'etypesdefault',
         'alt_etypesdefault', 'default_etypes_set', 'specialeventstype',
         'specialeventsStrings', 'specialeventsvalue', 'eventsGraphflag', 'clampEvents', 'renderEventsDescr', 'eventslabelschars', 'eventsshowflag',
@@ -1746,6 +1746,7 @@ def __init__(self, parent:QWidget, dpi:int, locale:str, aw:'ApplicationWindow')
 
         #[0]weight in, [1]weight out, [2]units (string)
         self.weight:tuple[float,float,str] = (0, 0, weight_units[1])
+        self.end_weight_est:int = 0 # 1: weight out in self.weight[1] is an estimate an not measured or manuel set; 0: otherwise
 
         self.roasted_defects_weight:float = 0.0 # weight of defects sorted from roasted weight in unit self.weight[2] (should always be positive and less than self.weight[1])
 
@@ -1762,7 +1763,7 @@ def __init__(self, parent:QWidget, dpi:int, locale:str, aw:'ApplicationWindow')
 
 
         if platform.system() == 'Darwin':
-            # try to "guess" the users preferred temperature unit
+            # try to "guess" the users preferred weight unit
             try:
                 if not QSettings().value('AppleMetricUnits'):
                     self.weight = (0, 0, weight_units[2])
@@ -8056,6 +8057,8 @@ def reset(self,redraw:bool = True, soundOn:bool = True, keepProperties:bool = Fa
             self.aw.recording_revision = str(__revision__)
             self.aw.recording_build = str(__build__)
 
+            self.end_weight_est = 0
+
             # if we are in KeepON mode, the reset triggered by ON should respect the roastpropertiesflag ("Delete Properties on Reset")
             if self.roastpropertiesflag and (self.flagKeepON or not keepProperties):
                 self.title = QApplication.translate('Scope Title', 'Roaster Scope')
@@ -8306,7 +8309,6 @@ def reset(self,redraw:bool = True, soundOn:bool = True, keepProperties:bool = Fa
 
         self.aw.updatePlusStatus()
 
-        self.aw.set_ui_mode(self.aw.ui_mode)
         self.aw.announce_current_ui_mode()
 
         ### REDRAW  ##

src/artisanlib/canvas.py

@@ -5619,6 +5619,7 @@ def setRecentRoast(self, rr:'RecentRoast') -> None:
         if not self.qmc.flagstart or self.qmc.title_show_always:
             self.qmc.setProfileTitle(self.qmc.title,updatebackground=True)
         self.qmc.weight = (rr['weightIn'],self.qmc.weight[1],rr['weightUnit'])
+        self.qmc.end_weight_est = 0
         if 'weightOut' in rr:
             self.qmc.weight = (self.qmc.weight[0],rr['weightOut'],rr['weightUnit'])
         else:
@@ -6079,6 +6080,7 @@ def openMachineSettings(self, _checked:bool = False) -> None:
                             weight_unit = self.qmc.weight[2]
                             self.qmc.last_batchsize = convertWeight(self.qmc.roastersize_setup,1,0) # nominal batch size in g
                             nominal_batch_size = convertWeight(self.qmc.roastersize_setup,1,weight_units.index(weight_unit))
+                            self.qmc.end_weight_est = 0
                             self.qmc.weight = (nominal_batch_size,0,weight_unit)
                         # size set, ask for heating
                         resi:int|None
@@ -6162,6 +6164,7 @@ def openMachineSettings(self, _checked:bool = False) -> None:
                         self.sendmessage(QApplication.translate('Message','Action canceled'))
                     else:
                         # setup not canceled, we establish the last_batchsize
+                        self.qmc.end_weight_est = 0
                         self.qmc.weight = (convertWeight(self.qmc.last_batchsize,0,weight_units.index(self.qmc.weight[2])),0,self.qmc.weight[2])
                     self.establish_etypes()
                 self.qmc.redraw(False,False)
@@ -7638,7 +7641,7 @@ def curveSimilarity(self) -> tuple[float|None, float|None]: # pylint: disable=no
                 try:
                     # we masked the -1 error values
                     np_etb_masked = numpy.ma.masked_equal(np_etb, -1)
-                    np_timeB_etb_masked = numpy.ma.masked_array(np_timeB, np_etb_masked.mask) # type:ignore[operator,unused-ignore] # ty:ignore[call-non-callable] # pylint:disable=no-member
+                    np_timeB_etb_masked = numpy.ma.masked_array(np_timeB, np_etb_masked.mask) # type:ignore[operator,unused-ignore] # pylint:disable=no-member
                     # ignore the masked error values on computing the interpolation and fill (especially on the left) with -1 values
                     interp_np_etb = numpy.interp(np_timex,np_timeB_etb_masked.compressed(),np_etb_masked.compressed(),left=-1,right=-1) # pyright:ignore[reportUnknownArgumentType]  # pylint:disable=no-member
 
@@ -7663,7 +7666,7 @@ def curveSimilarity(self) -> tuple[float|None, float|None]: # pylint: disable=no
                 try:
                     # we masked the -1 error values
                     np_btb_masked = numpy.ma.masked_equal(np_btb, -1)
-                    np_timeB_btb_masked = numpy.ma.masked_array(np_timeB, np_btb_masked.mask) # type:ignore[operator,unused-ignore] # ty:ignore[call-non-callable] # pylint:disable=no-member
+                    np_timeB_btb_masked = numpy.ma.masked_array(np_timeB, np_btb_masked.mask) # type:ignore[operator,unused-ignore] # pylint:disable=no-member
                     # ignore the masked error values on computing the interpolation and fill (especially on the left) with -1 values
                     interp_np_btb = numpy.interp(np_timex,np_timeB_btb_masked.compressed(),np_btb_masked.compressed(),left=-1,right=-1) # pyright:ignore[reportUnknownArgumentType]  # pylint:disable=no-member
 
@@ -14529,6 +14532,7 @@ def loadbackground(self, filename:str, quiet:bool = True) -> None: # pyright: ig
                 #  - scheduler is not active
                 if self.qmc.setBatchSizeFromBackground and (self.qmc.flagon or not self.curFile) and self.schedule_window is None:
                     self.qmc.weight = (profile['weight'][0],self.qmc.weight[1],profile['weight'][2])
+                    self.qmc.end_weight_est = 1 # this weight out is an estimate as it was not measure nor manual set
 
 
                 message = QApplication.translate('Message', 'Background {0} loaded successfully {1}').format(filename, '')
@@ -16001,8 +16005,10 @@ def setProfile(self, filename:str|None, profile:'ProfileData', quiet:bool = Fals
                     convertWeight(float(weight[0]), weight_unit_idx, current_weight_unit_idx),
                     convertWeight(float(weight[1]), weight_unit_idx, current_weight_unit_idx),
                     self.qmc.weight[2])
+                self.qmc.end_weight_est = profile.get('end_weight_est', 0)
             else:
                 self.qmc.weight = (0., 0., self.qmc.weight[2])
+                self.qmc.end_weight_est = 0
             #
             if 'defects_weight' in profile:
                 defects = profile['defects_weight']
@@ -17028,6 +17034,7 @@ def getProfile(self) -> 'ProfileData':
 
             profile['beans'] = encodeLocalStrict(self.qmc.beans)
             profile['weight'] = [self.qmc.weight[0],self.qmc.weight[1],encodeLocalStrict(self.qmc.weight[2], 'g')]
+            profile['end_weight_est'] = self.qmc.end_weight_est
             profile['defects_weight'] = self.qmc.roasted_defects_weight
             profile['volume'] = [self.qmc.volume[0],self.qmc.volume[1],encodeLocalStrict(self.qmc.volume[2], 'l')]
             profile['density'] = [self.qmc.density[0],encodeLocalStrict(self.qmc.density[1], 'g'),self.qmc.density[2],encodeLocalStrict(self.qmc.density[3], 'l')]
@@ -18437,6 +18444,7 @@ def settingsLoad(self, filename:str|None = None, theme:bool = False, machine:boo
             self.qmc.AUCshowFlag = toBool(settings.value('AUCshowFlag',self.qmc.AUCshowFlag))
             self.keyboardmoveflag = toInt(settings.value('keyboardmoveflag',int(self.keyboardmoveflag)))
             self.ui_mode = UI_MODE(toInt(settings.value('UI_mode',int(self.ui_mode))))
+            self.set_ui_mode(self.ui_mode)
             self.qmc.ambientTempSource = toInt(settings.value('AmbientTempSource',int(self.qmc.ambientTempSource)))
             self.qmc.ambientHumiditySource = toInt(settings.value('AmbientHumiditySource',int(self.qmc.ambientHumiditySource)))
             self.qmc.ambientPressureSource = toInt(settings.value('AmbientPressureSource',int(self.qmc.ambientPressureSource)))