- changes Gemma 2/6-8 heater register from PV to SV

- adds flatpack changelog - fix cancel of machine setting to preserve host
artisan-roaster-scope · Nov 15, 2024 · 71f570a · 71f570a
1 parent dc71382
commit 71f570a
Show file tree

Hide file tree

Showing 4 changed files with 76 additions and 9 deletions.
diff --git a/src/artisanlib/main.py b/src/artisanlib/main.py
@@ -5408,6 +5408,8 @@ def openMachineSettings(self, _checked:bool = False) -> None:
                         if res2 is not None and res2:
                             res = res2
                             self.modbus.host = host
+                        else:
+                            res = False
                     elif self.qmc.device == 79 or 79 in self.qmc.extradevices: # S7
                         # as default we offer the current settings S7 host, or if this is set to its default as after a factory reset (self.s7.default_host) we take the one from the machine setup
                         defaultS7Host:str = (self.s7.host if org_s7_host == self.s7.default_host else org_s7_host)
@@ -5417,6 +5419,8 @@ def openMachineSettings(self, _checked:bool = False) -> None:
                         if res2 is not None and res2:
                             res = res2
                             self.s7.host = host
+                        else:
+                            res = False
                     elif self.qmc.device == 111 or 111 in self.qmc.extradevices: # WebSocket
                         # as default we offer the current settings WebSocket host, or if this is set to its default as after a factory reset (self.ws.default_host) we take the one from the machine setup
                         defaultWSHost:str = (self.ws.host if org_ws_host == self.ws.default_host else org_ws_host)
@@ -5426,6 +5430,8 @@ def openMachineSettings(self, _checked:bool = False) -> None:
                         if res2 is not None and res2:
                             res = res2
                             self.ws.host = host
+                        else:
+                            res = False
                     elif self.qmc.device == 138 and not self.kaleidoSerial: # Kaleido Network
                         # as default we offer the current settings kaleido host, or if this is set to its default as after a factory reset (self.kaleido_default_host) we take the one from the machine setup
                         defaultKaleidoHost:str = (self.kaleidoHost if org_kaleido_host == self.kaleido_default_host else org_kaleido_host)
@@ -5435,6 +5441,8 @@ def openMachineSettings(self, _checked:bool = False) -> None:
                         if res2 is not None and res2:
                             res = res2
                             self.kaleidoHost = host
+                        else:
+                            res = False
                     elif self.qmc.device == 164: # Mugma
                         # as default we offer the current settings mugma host, or if this is set to its default as after a factory reset (self.mugma_default_host) we take the one from the machine setup
                         defaultMugmaHost:str = (self.mugmaHost if org_mugma_host == self.mugma_default_host else org_mugma_host)
@@ -5444,6 +5452,8 @@ def openMachineSettings(self, _checked:bool = False) -> None:
                         if res2 is not None and res2:
                             res = res2
                             self.mugmaHost = host
+                        else:
+                            res = False
                     elif (self.qmc.device in {0, 9, 19, 53, 101, 115, 126} or ((self.qmc.device == 29 or 29 in self.qmc.extradevices) and self.modbus.type in {0, 1, 2}) or
                             (self.qmc.device == 134 and self.santokerSerial and not self.santokerBLE) or
                             (self.qmc.device == 138 and self.kaleidoSerial)): # Fuji, Center301, TC4, Hottop, Behmor or MODBUS serial, HB/ARC

diff --git a/src/debian/usr/share/metainfo/org.artisan_scope.artisan.metainfo.xml b/src/debian/usr/share/metainfo/org.artisan_scope.artisan.metainfo.xml
@@ -67,6 +67,66 @@
   </branding>
 
   <releases>
+
+    <release version="3.1.ß" date="2024-11-22">
+      <url type="details">https://github.com/artisan-roaster-scope/artisan/releases/tag/v3.1.0</url>
+      <description>
+        <p>ADDITIONS</p>
+        <ul>
+          <li>adds (total) correction to cup profiles and enables column drag-and-drop (Discussion #1690)</li>
+          <li>adds option to manually add a roast to an open schedule item assigned by artisan.plus</li>
+          <li>adds option to synchronization of the Artisan PID SV slider with external MODBUS/S7 PIDs</li>
+          <li>adds symbolic expression `bit(n,x)` which returns the n-th bit of x interpreted as integer</li>
+        </ul>
+        <p>NEW HARDWARE SUPPORT</p>
+        <ul>
+          <li>adds support for the induction heated roasting machines Gemma_2IND, Gemma_6-8IND and Gemma_26-30IND from Sweet Coffee Italia</li>
+          <li>adds support for various newer Santoker machines communicating via Bluetooth like the Cube10, the Bluetooth enabled X, Q and R Master Series as well as the R Series machines (Issue #1088 and Issue #1702)</li>
+          <li>adds experimental support for ColorTrack via serial and bluetooth (Issue #1680)</li>
+          <li>adds support for Primo roasting machines)</li>
+          <li>adds Loring 'auto' setup which picks up CHARGE and DROP events set at the machine</li>
+          <li>adds control function to Diedrich DR machine setup and adds Diedrich CR machine setup</li>
+          <li>adds support for Acaia scales on Windows 11</li>
+          <li>adds support for Phidget Stepper Motor Controllers (Discussion #891 and PR #1715)</li>
+          <li>adds importer for Stronghold profiles exported as XLSX</li>
+        </ul>
+        <p>CHANGES</p>
+        <ul>
+          <li>automatically start of the scheduler while connected to artisan.plus if there are incompleted scheduled items</li>
+          <li>disable items in coffee popups of the Custom Blend dialog without stock in the selected store or, if no store is selected, without stock in every store</li>
+          <li>reduces the size of builds by removing unnecessary files</li>
+          <li>removes the optional delay on reads from serial MODBUS</li>
+          <li>adds optional delay after connect before sending requests to serial MODBUS to allow to wait for Arduino slaves to complete reboot (Issue #1694)</li>
+          <li>upgrades MODBUS communication from sync to async IO</li>
+          <li>limits the visible length of long popup lists in Devices and Statistics Dialog</li>
+          <li>keep Hottop connected after OFF in control mode to prevent the shutdown on disconnect (Issue #1714)</li>
+          <li>PID RS time is reset on PID ON not on CHARGE as in previous releases</li>
+          <li>makes columns in CSV ranking report consistent with Excel variant</li>
+        </ul>
+        <p>FIXES</p>
+        <ul>
+          <li>updates Cropster XLS importer (Issue #1685)</li>
+          <li>fixes regression which broke SV number switching for Fuji PIDs (Discussion #1683)</li>
+          <li>fixes missing statistic content (Discussion #1689)</li>
+          <li>fixes a regression which prevented loading settings written (slightly broken) by Artisan v3.0 (Discussion #1692)</li>
+          <li>fixes a regression communicating with some serial MODBUS devices resulting from a more strict protocol interpretation by the underlying MODBUS pymodbus lib 3.7 introduced in Artisan v3.0.2 (Issue #1694)</li>
+          <li>removes incorrectly reconstructed custom events outside of the CHARGE to DROP period on quitting the designer (Discussion #1696)</li>
+          <li>makes validation of numeric configuration input more robust (Issue #1700)</li>
+          <li>ensures that splitter state in Comparator is properly reset on Factory Reset</li>
+          <li>fixes issue where on save file a PNG was created instead of an PDF Report if "PDF Report" was selected as type under "Save also" in the autosave dialog (Issue #1718)</li>
+          <li>fixes a rare redraw issues on using the zoom function</li>
+          <li>fixes an issue in WebSocket communication where time did not progress with empty `Data Request` (Issue #1737)</li>
+          <li>fixes an issue with the Analyzer result panes disappearing under some conditions (Discussion #1736)</li>
+          <li>fixes saving of designer point which could result in failure on loading (Discussion #1721)</li>
+          <li>fixes Artisan Command `showEvents(1,x)` (Discussion #1741)</li>
+        </ul>
+        <p>REMOVALS</p>
+        <ul>
+          <li>support for the image format BMP has been removed</li>
+        </ul>
+      </description>
+    </release>
+
     <release version="3.0.2" date="2024-08-20">
       <url type="details">https://github.com/artisan-roaster-scope/artisan/releases/tag/v3.0.2</url>
       <description>
@@ -75,7 +135,6 @@
           <li>shift Windows downloads from zip to exe</li>
           <li>switches to native ruff-based bidi algorithm</li>
         </ul>
-
         <p>FIXES</p>
         <ul>
           <li>fixes a build issue on Windows and Linux that could prevent the scheduler to start under certain conditions</li>
@@ -113,13 +172,11 @@
           <li>adds Hottop Command control to activate and deactivate the control function of the machine via event buttons and alarms</li>
           <li>adds compression toggle, detailed device logging, and origin header to WebSocket communication</li>
         </ul>
-
         <p>CHANGES</p>
         <ul>
           <li>only reset roasting notes on RESET if profile is loaded (Issue #1521)</li>
           <li>disable input filtering on device channel of binary or special types like NONE, dummy, and slider values</li>
         </ul>
-
         <p>FIXES</p>
         <ul>
           <li>fixes regression preventing Artisan v2.10.2 and v2.10.4 to connect successfully to Probat Series III machines via WebSockets incl. the Probat Sample Roaster (Issue #1531)</li>

diff --git a/src/includes/Machines/Sweet Coffee Italia/Gemma_2IND.aset b/src/includes/Machines/Sweet Coffee Italia/Gemma_2IND.aset
@@ -133,14 +133,14 @@ input6mode=C
 input6register=4550
 input6slave=0
 input7BCDsAsInt=false
-input7FloatsAsInt=true
-input7Signed=true
+input7FloatsAsInt=false
+input7Signed=false
 input7bcd=false
 input7code=3
 input7div=1
 input7float=false
 input7mode=
-input7register=4650
+input7register=4400
 input7slave=255
 input8BCDsAsInt=false
 input8FloatsAsInt=true

diff --git a/src/includes/Machines/Sweet Coffee Italia/Gemma_6-8IND.aset b/src/includes/Machines/Sweet Coffee Italia/Gemma_6-8IND.aset
@@ -132,14 +132,14 @@ input6mode=C
 input6register=4550
 input6slave=0
 input7BCDsAsInt=false
-input7FloatsAsInt=true
-input7Signed=true
+input7FloatsAsInt=false
+input7Signed=false
 input7bcd=false
 input7code=3
 input7div=1
 input7float=false
 input7mode=
-input7register=4650
+input7register=4400
 input7slave=255
 input8BCDsAsInt=false
 input8FloatsAsInt=true