Skip to content

Commit 1fc2b9c

Browse files
committed
- update Cropster importer
- updated libs
1 parent 2250d63 commit 1fc2b9c

113 files changed

Lines changed: 55652 additions & 55380 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

src/artisanlib/canvas.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5844,7 +5844,7 @@ def updateLCDtime(self) -> None:
58445844
# if more than max cool (from statistics) past DROP and not yet COOLend turn the time LCD red:
58455845
if (self.timeindex[0]!=-1 and self.timeindex[6] != 0 and not self.timeindex[7] and
58465846
len(self.timex) > self.timeindex[6] and (tx - self.timex[self.timeindex[6]]) > 4*60):
5847-
self.aw.setTimerColor('slowcoolingtimer')
5847+
self.aw.setTimerColor('slowcoolingtimer')
58485848

58495849
if self.chargeTimerFlag and self.timeindex[0] == -1 and self.chargeTimerPeriod != 0:
58505850
if self.chargeTimerPeriod > ts:

src/artisanlib/cropster.py

Lines changed: 195 additions & 80 deletions
Large diffs are not rendered by default.

src/artisanlib/orbiter.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -625,7 +625,7 @@ def saveOrbiter(filename:str, outfile:IO[bytes], profile:ProfileData) -> bool:
625625
title_length:int = 30
626626
title_bytes = to_ascii(title).encode('utf-8')[:title_length].ljust(title_length, b'\00')
627627
preheat_temperature = int(round(temp2[CHARGE_idx] if len(temp2)>CHARGE_idx else 0))
628-
total_time_seconds:int = (int(round(timex[DROP_idx] - timex[CHARGE_idx])) if len(timex)>DROP_idx and len(timex)>CHARGE_idx and DROP_idx>CHARGE_idx else 0)
628+
total_time_seconds:int = (int(round(timex[DROP_idx] - timex[CHARGE_idx])) if len(timex) > DROP_idx > CHARGE_idx else 0)
629629
header = b'\xff\xff'
630630
# header
631631
header_data = b'\x00\x00' + \

src/artisanlib/roast_properties.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -795,7 +795,7 @@ def __init__(self, parent:QWidget, aw:'ApplicationWindow', activeTab:int = 0, st
795795
self.createalarmTableButton.setMaximumSize(self.createalarmTableButton.sizeHint())
796796
self.createalarmTableButton.setMinimumSize(self.createalarmTableButton.minimumSizeHint())
797797
self.createalarmTableButton.clicked.connect(self.createAlarmEventTable)
798-
self.ordereventTableButton = QPushButton(QApplication.translate('Button', 'Order'))
798+
self.ordereventTableButton = QPushButton(QApplication.translate('Button', 'Sort'))
799799
self.ordereventTableButton.setFocusPolicy(Qt.FocusPolicy.NoFocus)
800800
self.ordereventTableButton.setMaximumSize(self.ordereventTableButton.sizeHint())
801801
self.ordereventTableButton.setMinimumSize(self.ordereventTableButton.minimumSizeHint())

src/requirements-dev.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ pytest-datadir==1.8.0
2929
#PyVirtualDisplay==3.0
3030
#pytest-bdd==6.1.1
3131
#pytest-benchmark==4.0.0
32-
hypothesis>=6.151.13
32+
hypothesis>=6.151.14
3333
coverage>=7.13.5
3434
coverage-badge==1.1.2
3535
codespell==2.4.2
3636
# the following 2 packages are not installed along aiohttp on Python3.12 and make mypy complain
3737
async_timeout==5.0.1
3838
cycler==0.12.1
39-
scipy-stubs==1.17.1.3
39+
scipy-stubs==1.17.1.4
4040
#matplotlib-stubs==0.3.11

src/requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@ aiohttp_jinja2==1.6
5959
python-bidi==0.6.7
6060
arabic-reshaper==3.0.0
6161
pillow==12.2.0
62-
pydantic==2.12.5
62+
pydantic==2.13.0
6363
babel==2.18.0
6464
bleak==3.0.1
6565
python-statemachine==3.0.0
66-
yoctopuce==2.1.12413
66+
yoctopuce==2.1.12672
6767
PyQt6==6.11.0
6868
PyQt6-WebEngine==6.11.0
6969
qt6-tools==6.5.0.1.3

src/test/sanity/data/cropster/export-roasts_PR-0001.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

src/test/sanity/data/cropster/export-roasts_PR-0002.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

src/test/sanity/data/cropster/export-roasts_PR-0003.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

src/test/sanity/data/cropster/export-roasts_PR-0004.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)