python-ember-mug 1.3.0b6__tar.gz → 1.3.1__tar.gz

{python_ember_mug-1.3.0b6 → python_ember_mug-1.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-ember-mug
-Version: 1.3.0b6
+Version: 1.3.1
 Summary: Python Library for Ember Mugs.
 Project-URL: Changelog, https://sopelj.github.io/python-ember-mug/changelog/
 Project-URL: Documentation, https://sopelj.github.io/python-ember-mug/

{python_ember_mug-1.3.0b6 → python_ember_mug-1.3.1}/ember_mug/__init__.py

@@ -5,5 +5,5 @@ from .mug import EmberMug
 __all__ = ("EmberMug",)
 
 __author__ = """Jesse Sopel"""
-__email__ = "jesse.sopel@gmail.com"
-__version__ = "1.3.0b6"
+__email__ = "jesse@sopelj.ca"
+__version__ = "1.3.1"

{python_ember_mug-1.3.0b6 → python_ember_mug-1.3.1}/ember_mug/cli/commands.py

@@ -12,7 +12,7 @@ from typing import TYPE_CHECKING, ClassVar
 
 from bleak import AdvertisementData, BleakError
 
-from ember_mug.consts import ATTR_LABELS, EMBER_BLE_SIG, EXTRA_ATTRS, IS_LINUX, VolumeLevel
+from ember_mug.consts import ATTR_LABELS, EMBER_BLE_SIG, EXTRA_ATTRS, IS_LINUX, TESTING_BLE_SIG, VolumeLevel
 from ember_mug.data import Colour, DeviceModel
 from ember_mug.mug import EmberMug
 from ember_mug.scanner import discover_devices, find_device
@@ -33,9 +33,10 @@ get_attribute_names = [n.replace("_", "-") for n in all_attrs]
 async def get_device(args: Namespace) -> EmberMug:
     """Help to get the devices based on command args."""
     device, advertisement = await find_device_cmd(args)
+    manufacturer_data = advertisement.manufacturer_data
     model_info = get_model_info_from_advertiser_data(advertisement)
     if model_info.model == DeviceModel.UNKNOWN_DEVICE and not args.raw:
-        data = advertisement.manufacturer_data.get(EMBER_BLE_SIG, None)
+        data = manufacturer_data.get(EMBER_BLE_SIG, manufacturer_data.get(TESTING_BLE_SIG, None))
         print(f"Warning: No model found matching advertisement data: {data!r}")
 
     mug = EmberMug(

{python_ember_mug-1.3.0b6 → python_ember_mug-1.3.1}/ember_mug/consts.py

@@ -14,6 +14,7 @@ UUID_TEMPLATE = "fc54{:0>4x}-236c-4c94-8fa9-944a3e5353fa"
 
 # Registered SIG for BLE Manufacturer Data
 EMBER_BLE_SIG = 0x03C1
+TESTING_BLE_SIG = 0xFFFF
 DEFAULT_NAME = "Ember Device"
 
 

{python_ember_mug-1.3.0b6 → python_ember_mug-1.3.1}/ember_mug/mug.py

@@ -313,7 +313,7 @@ class EmberMug:
         unit = TemperatureUnit.FAHRENHEIT if self.data.use_metric is False else TemperatureUnit.CELSIUS
         min_temp, max_temp = MIN_MAX_TEMPS[unit]
         if target_temp != 0 and not (min_temp <= target_temp <= max_temp):
-            raise ValueError(f"Temperature should be between {min_temp} and {max_temp} or 0.")
+            raise ValueError(f"Temperature '{target_temp}' is not between {min_temp} and {max_temp} or 0.")
 
         target_temp = self._convert_to_device_unit(target_temp)
         target = bytearray(round(target_temp / 0.01).to_bytes(2, "little"))

{python_ember_mug-1.3.0b6 → python_ember_mug-1.3.1}/ember_mug/utils.py

@@ -10,7 +10,7 @@ from typing import TYPE_CHECKING, Any
 
 from bleak import AdvertisementData, BleakError
 
-from ember_mug.consts import EMBER_BLE_SIG, TRAVEL_MUG_SERVICE_UUIDS, DeviceColour, DeviceModel
+from ember_mug.consts import EMBER_BLE_SIG, TESTING_BLE_SIG, TRAVEL_MUG_SERVICE_UUIDS, DeviceColour, DeviceModel
 
 if TYPE_CHECKING:
     from bleak import BleakClient
@@ -67,13 +67,13 @@ def get_colour_from_int(colour_id: int) -> DeviceColour | None:  # noqa: PLR0911
         return DeviceColour.BLACK
     if colour_id in (-126, -62, 2):
         return DeviceColour.WHITE
-    if colour_id in (8, 11, -56, -63, -120, -117, -53):
+    if colour_id in (-120, -117, -63, -56, -53, 8, 11):
         return DeviceColour.RED
-    if colour_id in (-131, -125, -61, 3, 83):
+    if colour_id in (-131, -125, -61, 3, 51, 83):
         return DeviceColour.COPPER
     if colour_id in (-124, -60):
         return DeviceColour.ROSE_GOLD
-    if colour_id in (-59, -123):
+    if colour_id in (-123, -59):
         return DeviceColour.STAINLESS_STEEL
     return {
         -51: DeviceColour.SANDSTONE,
@@ -95,7 +95,7 @@ def get_model_from_single_int_and_services(  # noqa PLR0911
         return DeviceModel.MUG_1_10_OZ
     if model_id == 65:
         return DeviceModel.MUG_1_14_OZ
-    if model_id in (-51, -59, -63, -61, -62):
+    if model_id in (-51, -59, -63, -61, -62, 120):
         return DeviceModel.MUG_2_14_OZ
     if model_id == -60:
         return DeviceModel.CUP_6_OZ
@@ -108,7 +108,7 @@ def get_model_from_id_and_gen(model_id: int, generation: int) -> DeviceModel | N
     """Extract model from identifier in advertiser data."""
     if model_id == 1:
         return DeviceModel.MUG_1_10_OZ if generation < 2 else DeviceModel.MUG_2_10_OZ
-    if model_id == 2:
+    if model_id in (2, 120):
         return DeviceModel.MUG_1_14_OZ if generation < 2 else DeviceModel.MUG_2_14_OZ
     if model_id == 3:
         return DeviceModel.TRAVEL_MUG_12_OZ
@@ -134,7 +134,9 @@ def get_model_info_from_advertiser_data(advertisement: AdvertisementData) -> Mod
     """Extract model info from manufacturer data in advertiser data."""
     from ember_mug.data import ModelInfo  # noqa: PLC0415
 
-    model_data = advertisement.manufacturer_data.get(EMBER_BLE_SIG, None)
+    manufacturer_data = advertisement.manufacturer_data
+
+    model_data = manufacturer_data.get(EMBER_BLE_SIG, manufacturer_data.get(TESTING_BLE_SIG, None))
     if model_data is not None:
         if len(model_data) < 4:
             model_id = bytes_to_big_int(model_data, signed=True)