From 1c8b3f5b06938d48aa5680cf43d8b934e356a702 Mon Sep 17 00:00:00 2001 From: Stefan Hackenberg Date: Mon, 4 Aug 2025 09:45:34 +0200 Subject: [PATCH 1/2] feat: Update coffee strength --- coffeebuddy/__init__.py | 2 +- coffeebuddy/model.py | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/coffeebuddy/__init__.py b/coffeebuddy/__init__.py index c520aa3..6d5f7ed 100644 --- a/coffeebuddy/__init__.py +++ b/coffeebuddy/__init__.py @@ -8,7 +8,7 @@ from flask_sqlalchemy import SQLAlchemy from sqlalchemy.orm import DeclarativeBase -__version__ = "2.7.1" +__version__ = "2.8.0" logging.basicConfig( diff --git a/coffeebuddy/model.py b/coffeebuddy/model.py index bdeddbf..e59563f 100644 --- a/coffeebuddy/model.py +++ b/coffeebuddy/model.py @@ -554,9 +554,20 @@ class CoffeeVariant(Base, Serializer): "strength": CoffeeSettings( "Strength", min=1, - max=5, + max=10, step=1, - names=["XMild", "Mild", "Normal", "Strong", "XStrong"], + names=[ + "XMild", + "XMild+", + "Mild", + "Mild+", + "Normal", + "Normal+", + "Strong", + "Strong+", + "XStrong", + "XStrong+", + ], ), "grinder_ratio": CoffeeSettings( "Grinder ratio", From c56670cbdd254b72a22471b092ee1d5bd4cb0f53 Mon Sep 17 00:00:00 2001 From: Stefan Hackenberg Date: Mon, 4 Aug 2025 09:48:31 +0200 Subject: [PATCH 2/2] feat: Update jura-ble --- pdm.lock | 8 ++++---- pyproject.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pdm.lock b/pdm.lock index 305ddaf..835c773 100644 --- a/pdm.lock +++ b/pdm.lock @@ -5,7 +5,7 @@ groups = ["default", "coffeemaker", "dev", "pcsc", "rpi"] strategy = [] lock_version = "4.5.0" -content_hash = "sha256:75070fba7dfab3072c5ced017385a2891e5ea85ff898074d489319540459380d" +content_hash = "sha256:4deda5fe1306c8ccdbba3fadefd1581e183aa870dd9249e82170cdbdd281a90d" [[metadata.targets]] requires_python = ">=3.12,<3.14" @@ -525,10 +525,10 @@ files = [ [[package]] name = "jura-ble" -version = "2.0.2" +version = "2.0.3" git = "https://github.com/hackenbergstefan/jura_ble.git" -ref = "v2.0.2" -revision = "be4c01644516f171a7e522721dddc02a53dec9da" +ref = "v2.0.3" +revision = "6cfbaba193e6c402e6d489b6b617c1f8bd12184d" summary = "" dependencies = [ "bleak", diff --git a/pyproject.toml b/pyproject.toml index 1c6fe5e..13d4188 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -26,7 +26,7 @@ license = { text = "MIT" } [dependency-groups] coffeemaker = [ - "jura-ble @ git+https://github.com/hackenbergstefan/jura_ble.git@v2.0.2", + "jura-ble @ git+https://github.com/hackenbergstefan/jura_ble.git@v2.0.3", ] rpi = ["mfrc522>=0.0.7", "pi-rc522>=2.3.0", "pigpio>=1.78", "spidev>=3.6"] pcsc = ["pyscard>=2.2.1"]