From 203aa2e42e6751480cbd48cce83bd24cf049985a Mon Sep 17 00:00:00 2001 From: Rob Coleman Date: Sat, 28 May 2022 13:47:15 -0700 Subject: [PATCH] Squashed commit of the following: commit 27eee16137f80d1d16a88426803d19d3c97a5a78 Author: Tim Clipsham Date: Mon Dec 13 17:12:56 2021 +1100 Bump library version to 0.8.0 commit 46d6882c63c81bba4cf0c1e0fc8cb955faeeb7cf Author: Tim Clipsham Date: Sun Dec 12 01:09:23 2021 +1100 Add message type for water reservoir contact commit ca6e173f2f58717e63448c4611e10363d42f64a4 Author: Tim Clipsham Date: Sat Dec 11 22:37:54 2021 +1100 Add detection for water reservoir commit 11f42581c79f7d5f41e97cdb8f1b9b99b5667bb8 Merge: 9b67eba afc09ae Author: rccoleman Date: Sat Oct 23 09:37:47 2021 -0700 Merge pull request #32 from rccoleman/dev Updated requirements to avoid beta 1.x branch of authlib commit 9b67eba5cc073d6bbaaf82d970a9929ab3be118c Merge: 70fd4e8 bdfb0a1 Author: rccoleman Date: Sat Oct 23 09:19:51 2021 -0700 Merge pull request #31 from rccoleman/dev Bump to 0.15.5 and refactor connection code --- lmdirect/msgs.py | 3 +++ setup.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lmdirect/msgs.py b/lmdirect/msgs.py index 4db3c3e..a61b75d 100644 --- a/lmdirect/msgs.py +++ b/lmdirect/msgs.py @@ -59,6 +59,7 @@ KEY_ACTIVE = "key_active" CURRENT_PULSE_COUNT = "current_pulse_count" +WATER_RESERVOIR_CONTACT = "water_reservoir_contact" COFFEE_HEATING_ELEMENT_HOURS = "coffee_heating_element_hours" STEAM_HEATING_ELEMENT_HOURS = "steam_heating_element_hours" @@ -115,6 +116,7 @@ TYPE_COFFEE_TEMP = 4 TYPE_STEAM_TEMP = 5 TYPE_DRINK_STATS = 6 +TYPE_WATER_RESERVOIR_CONTACT = 7 DIVIDE_KEYS = ["temp", "prebrewing_to"] SERIAL_NUMBERS = [MACHINE_SER_NUM, MODULE_SER_NUM] @@ -172,6 +174,7 @@ def type(self): Elem(17): KEY_ACTIVE, Elem(19, 2): CURRENT_PULSE_COUNT, # Elem(23): POWER, + Elem(24): WATER_RESERVOIR_CONTACT, Elem(27): HEATING_STATE, # Elem(28, 2): TEMP_COFFEE, # Elem(30, 2): TEMP_STEAM, diff --git a/setup.py b/setup.py index a396c12..7e5975a 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ setuptools.setup( name="lmdirect", - version="0.7.2", + version="0.8.0", description="A Python implementation of the local La Marzocco API", long_description=readme, long_description_content_type="text/markdown",