Skip to content

Commit 9a4c5af

Browse files
committed
- increases Recent Roasts list from 25 to 40 entries
- fixes a state issue with NEW - adds Prisma USB+PLC and Nordic PLC machine setups
1 parent b0f61b6 commit 9a4c5af

9 files changed

Lines changed: 479 additions & 314 deletions

File tree

src/artisanlib/main.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1896,7 +1896,7 @@ def __init__(self, parent:Optional[QWidget] = None, *, locale:str, WebEngineSupp
18961896

18971897
# recent roasts, an ordered list (first-in, first-out) of dictionaries holding partial roast-properties and a link to the background profile if any
18981898
self.recentRoasts:List[RecentRoast] = []
1899-
self.maxRecentRoasts = 25 # the maximum number of recent roasts held
1899+
self.maxRecentRoasts = 40 # the maximum number of recent roasts held
19001900

19011901
#lcd1 = time, lcd2 = met, lcd3 = bt, lcd4 = roc et, lcd5 = roc bt, lcd6 = sv (extra devices lcd same as sv settings)
19021902
self.lcdpaletteB:Dict[str,str] = {
@@ -13149,13 +13149,8 @@ def newRoast(self, _:bool = False) -> bool:
1314913149
self.qmc.ToggleRecorder()
1315013150
if filename is not None:
1315113151
self.sendmessage(QApplication.translate('Message','{0} has been saved. New roast has started').format(filename))
13152-
elif len(self.qmc.timex) > 1:
13152+
elif len(self.qmc.timex) > 1 or self.qmc.reset():
1315313153
self.qmc.ToggleRecorder()
13154-
else:
13155-
if self.qmc.flagon:
13156-
self.qmc.OffMonitor()
13157-
if self.qmc.reset():
13158-
self.qmc.ToggleRecorder()
1315913154
self.qmc.flagKeepON = tmpKeepON
1316013155
return True
1316113156

src/artisanlib/scale.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
# AUTHOR
1616
# Marko Luther, 2025
1717

18+
import math
19+
import platform
1820
import time as libtime
1921
import logging
2022
from typing import Final, List, Tuple, Optional, Callable
@@ -24,15 +26,17 @@
2426
except ImportError:
2527
from PyQt5.QtCore import Qt, QObject, pyqtSignal, pyqtSlot, QTimer # type: ignore # @UnusedImport @Reimport @UnresolvedImport
2628

29+
from artisanlib.util import toFloat
2730

2831
_log: Final[logging.Logger] = logging.getLogger(__name__)
2932

3033

3134

3235
# tuples (model name, connection type) with connection type from {0: BT, 1: WiFi, 2: Serial}
33-
SUPPORTED_SCALES:Final[List[Tuple[str,int]]] = [
36+
SUPPORTED_SCALES:Final[List[Tuple[str,int]]] = (
37+
[
3438
('Acaia', 0) # 0
35-
]
39+
] if not (platform.system() == 'Windows' and math.floor(toFloat(platform.release())) < 10) else [])
3640

3741
ScaleSpec = Tuple[str,str] # scale name, scale id (eg. ble address)
3842
ScaleSpecs = List[ScaleSpec]

src/includes/Machines/Nordic/PLC Delta.aset

Lines changed: 0 additions & 151 deletions
This file was deleted.

src/includes/Machines/Nordic/PLC Microchip.aset

Lines changed: 0 additions & 151 deletions
This file was deleted.

0 commit comments

Comments
 (0)