Merge pull request #1164 from custom-components/remove_rounding

BREAKING CHANGE - Remove rounding option

Author: Ernst79

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -14,15 +14,15 @@ body:
     attributes:
       label: What happened?
       description: Explain the bug you found?
-      placeholder: 
+      placeholder:
     validations:
       required: true
   - type: input
     id: sensortype
     attributes:
       label: Sensor type
       description: If the bug is related to a specific sensor, describe the sensor type.
-      placeholder: 
+      placeholder:
     validations:
       required: false
   - type: textarea

.github/ISSUE_TEMPLATE/new_sensor.yml

@@ -8,7 +8,7 @@ body:
   - type: markdown
     attributes:
       value: |
-        Use this form to request support for a new sensor only. Bugs can be reported with a normal issue. 
+        Use this form to request support for a new sensor only. Bugs can be reported with a normal issue.
   - type: input
     id: sensor
     attributes:

.github/workflows/test_commit.yml

@@ -30,7 +30,7 @@ jobs:
       - name: Setup Python
         uses: "actions/setup-python@v4"
         with:
-          python-version: "3.9"
+          python-version: "3.10"
       - name: Install requirements
         run: python3 -m pip install -r requirements_test.txt
       - name: Run pytest

.pre-commit-config.yaml

@@ -0,0 +1,7 @@
+repos:
+-   repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v2.3.0
+    hooks:
+    -   id: end-of-file-fixer
+    -   id: check-yaml
+    -   id: trailing-whitespace

.vscode/settings.json

@@ -25,4 +25,4 @@
     "python.testing.pytestArgs": [
         "custom_components"
     ]
-}
+}

custom_components/ble_monitor/__init__.py

@@ -37,8 +37,6 @@
     CONF_BATT_ENTITIES,
     CONF_BT_AUTO_RESTART,
     CONF_BT_INTERFACE,
-    CONF_DECIMALS,
-    CONF_DEVICE_DECIMALS,
     CONF_DEVICE_ENCRYPTION_KEY,
     CONF_DEVICE_USE_MEDIAN,
     CONF_DEVICE_REPORT_UNKNOWN,
@@ -60,8 +58,6 @@
     DEFAULT_ACTIVE_SCAN,
     DEFAULT_BATT_ENTITIES,
     DEFAULT_BT_AUTO_RESTART,
-    DEFAULT_DECIMALS,
-    DEFAULT_DEVICE_DECIMALS,
     DEFAULT_DEVICE_REPORT_UNKNOWN,
     DEFAULT_DEVICE_RESTORE_STATE,
     DEFAULT_DEVICE_RESET_TIMER,
@@ -113,9 +109,6 @@
             cv.matches_regex(AES128KEY24_REGEX), cv.matches_regex(AES128KEY32_REGEX)
         ),
         vol.Optional(CONF_TEMPERATURE_UNIT): cv.temperature_unit,
-        vol.Optional(CONF_DEVICE_DECIMALS, default=DEFAULT_DEVICE_DECIMALS): vol.In(
-            [DEFAULT_DEVICE_DECIMALS, 0, 1, 2, 3, 4]
-        ),
         vol.Optional(CONF_DEVICE_USE_MEDIAN, default=DEFAULT_DEVICE_USE_MEDIAN): vol.In(
             [DEFAULT_DEVICE_USE_MEDIAN, True, False]
         ),
@@ -153,9 +146,6 @@
                     vol.Optional(
                         CONF_BT_AUTO_RESTART, default=DEFAULT_BT_AUTO_RESTART
                     ): cv.boolean,
-                    vol.Optional(
-                        CONF_DECIMALS, default=DEFAULT_DECIMALS
-                    ): cv.positive_int,
                     vol.Optional(CONF_PERIOD, default=DEFAULT_PERIOD): cv.positive_int,
                     vol.Optional(
                         CONF_LOG_SPIKES, default=DEFAULT_LOG_SPIKES
@@ -439,22 +429,6 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry):
 
 async def async_migrate_entry(hass, config_entry):
     """Migrate config entry to new version."""
-    if config_entry.version == 2:
-        options = dict(config_entry.options)
-        options[CONF_REPORT_UNKNOWN] = "Off"
-
-        config_entry.version = 3
-        hass.config_entries.async_update_entry(config_entry, options=options)
-        _LOGGER.info("Migrated config entry to version %d", config_entry.version)
-
-    if config_entry.version == 3:
-        options = dict(config_entry.options)
-        if options[CONF_BT_INTERFACE] == ["00:00:00:00:00:00"]:
-            options[CONF_BT_INTERFACE] = ["disable"]
-
-        config_entry.version = 4
-        hass.config_entries.async_update_entry(config_entry, options=options)
-        _LOGGER.info("Migrated config entry to version %d", config_entry.version)
 
     if config_entry.version == 4:
         options = dict(config_entry.options)

custom_components/ble_monitor/binary_sensor.py

@@ -115,9 +115,9 @@ async def async_add_binary_sensor(key, device_model, firmware, auto_sensors, man
                     if key not in sensors_by_key:
                         sensors_by_key[key] = {}
                     if measurement not in sensors_by_key[key]:
-                        description = [item for item in BINARY_SENSOR_TYPES if item.key is measurement][0]
-                        sensors[measurement] = globals()[description.sensor_class](
-                            self.config, key, device_model, firmware, description, manufacturer
+                        entity_description = [item for item in BINARY_SENSOR_TYPES if item.key is measurement][0]
+                        sensors[measurement] = globals()[entity_description.sensor_class](
+                            self.config, key, device_model, firmware, entity_description, manufacturer
                         )
                         self.add_entities([sensors[measurement]])
                         sensors_by_key[key].update(sensors)
@@ -129,9 +129,9 @@ async def async_add_binary_sensor(key, device_model, firmware, auto_sensors, man
                     sensors = {}
                     sensors_by_key[key] = {}
                     for measurement in device_sensors:
-                        description = [item for item in BINARY_SENSOR_TYPES if item.key is measurement][0]
-                        sensors[measurement] = globals()[description.sensor_class](
-                            self.config, key, device_model, firmware, description, manufacturer
+                        entity_description = [item for item in BINARY_SENSOR_TYPES if item.key is measurement][0]
+                        sensors[measurement] = globals()[entity_description.sensor_class](
+                            self.config, key, device_model, firmware, entity_description, manufacturer
                         )
                         self.add_entities([sensors[measurement]])
                     sensors_by_key[key] = sensors
@@ -288,11 +288,11 @@ def __init__(
         key: str,
         devtype: str,
         firmware: str,
-        description: BLEMonitorBinarySensorEntityDescription,
+        entity_description: BLEMonitorBinarySensorEntityDescription,
         manufacturer=None
     ) -> None:
         """Initialize the binary sensor."""
-        self.entity_description = description
+        self.entity_description = entity_description
         self._config = config
         self._type = detect_conf_type(key)
 
@@ -321,10 +321,10 @@ def __init__(
         self._reset_timer = self._device_settings["reset_timer"]
         self._newstate = None
 
-        self._attr_name = f"{description.name} {self._device_name}"
-        self._attr_unique_id = f"{description.unique_id}{self._device_name}"
+        self._attr_name = f"{self.entity_description.name} {self._device_name}"
+        self._attr_unique_id = f"{self.entity_description.unique_id}{self._device_name}"
         self._attr_should_poll = False
-        self._attr_force_update = description.force_update
+        self._attr_force_update = self.entity_description.force_update
         self._attr_extra_state_attributes = self._extra_state_attributes
 
         self._attr_device_info = {
@@ -512,9 +512,9 @@ async def async_update(self):
 class MotionBinarySensor(BaseBinarySensor):
     """Representation of a Motion Binary Sensor."""
 
-    def __init__(self, config, key, devtype, firmware, description, manufacturer=None):
+    def __init__(self, config, key, devtype, firmware, entity_description, manufacturer=None):
         """Initialize the sensor."""
-        super().__init__(config, key, devtype, firmware, description, manufacturer)
+        super().__init__(config, key, devtype, firmware, entity_description, manufacturer)
         self._start_timer = None
 
     def reset_state(self, event=None):

custom_components/ble_monitor/ble_parser/sensirion.py

@@ -70,7 +70,7 @@ def parse_sensirion(self, data, complete_local_name, source_mac, rssi):
 
 '''
 The following functions are based on Sensirion_GadgetBle_Lib.cpp from  https://github.com/Sensirion/arduino-ble-gadget/
-support from other devices should be easily added by looking at GadgetBle::setDataType and updating _parse_data_type 
+support from other devices should be easily added by looking at GadgetBle::setDataType and updating _parse_data_type
 accordingly. Note that the device name also has to be added to the SENSIRION_DEVICES list.
 '''
 

custom_components/ble_monitor/config_flow.py

@@ -30,9 +30,7 @@
     CONF_ACTIVE_SCAN,
     CONF_BT_AUTO_RESTART,
     CONF_BT_INTERFACE,
-    CONF_DECIMALS,
     CONF_DEVICE_ENCRYPTION_KEY,
-    CONF_DEVICE_DECIMALS,
     CONF_DEVICE_USE_MEDIAN,
     CONF_DEVICE_REPORT_UNKNOWN,
     CONF_DEVICE_RESTORE_STATE,
@@ -50,8 +48,6 @@
     CONFIG_IS_FLOW,
     DEFAULT_ACTIVE_SCAN,
     DEFAULT_BT_AUTO_RESTART,
-    DEFAULT_DECIMALS,
-    DEFAULT_DEVICE_DECIMALS,
     DEFAULT_DEVICE_ENCRYPTION_KEY,
     DEFAULT_DEVICE_MAC,
     DEFAULT_DEVICE_UUID,
@@ -93,9 +89,6 @@
         vol.Optional(CONF_TEMPERATURE_UNIT, default=TEMP_CELSIUS): vol.In(
             [TEMP_CELSIUS, TEMP_FAHRENHEIT]
         ),
-        vol.Optional(CONF_DEVICE_DECIMALS, default=DEFAULT_DEVICE_DECIMALS): vol.In(
-            [DEFAULT_DEVICE_DECIMALS, 0, 1, 2, 3]
-        ),
         vol.Optional(CONF_DEVICE_USE_MEDIAN, default=DEFAULT_DEVICE_USE_MEDIAN): vol.In(
             [DEFAULT_DEVICE_USE_MEDIAN, True, False]
         ),
@@ -134,7 +127,6 @@
         vol.Optional(CONF_DISCOVERY, default=DEFAULT_DISCOVERY): cv.boolean,
         vol.Optional(CONF_USE_MEDIAN, default=DEFAULT_USE_MEDIAN): cv.boolean,
         vol.Optional(CONF_PERIOD, default=DEFAULT_PERIOD): cv.positive_int,
-        vol.Optional(CONF_DECIMALS, default=DEFAULT_DECIMALS): cv.positive_int,
         vol.Optional(CONF_LOG_SPIKES, default=DEFAULT_LOG_SPIKES): cv.boolean,
         vol.Optional(CONF_RESTORE_STATE, default=DEFAULT_RESTORE_STATE): cv.boolean,
         vol.Optional(CONF_REPORT_UNKNOWN, default=DEFAULT_REPORT_UNKNOWN): vol.In(
@@ -245,10 +237,6 @@ async def async_step_add_remove_device(self, user_input=None):
                             CONF_TEMPERATURE_UNIT,
                             default=user_input[CONF_TEMPERATURE_UNIT],
                         ): vol.In([TEMP_CELSIUS, TEMP_FAHRENHEIT]),
-                        vol.Optional(
-                            CONF_DEVICE_DECIMALS,
-                            default=user_input[CONF_DEVICE_DECIMALS],
-                        ): vol.In([DEFAULT_DEVICE_DECIMALS, 0, 1, 2, 3]),
                         vol.Optional(
                             CONF_DEVICE_USE_MEDIAN,
                             default=user_input[CONF_DEVICE_USE_MEDIAN],
@@ -329,12 +317,6 @@ async def async_step_add_remove_device(self, user_input=None):
                         CONF_TEMPERATURE_UNIT, TEMP_CELSIUS
                     ),
                 ): vol.In([TEMP_CELSIUS, TEMP_FAHRENHEIT]),
-                vol.Optional(
-                    CONF_DEVICE_DECIMALS,
-                    default=self._sel_device.get(
-                        CONF_DEVICE_DECIMALS, DEFAULT_DEVICE_DECIMALS
-                    ),
-                ): vol.In([DEFAULT_DEVICE_DECIMALS, 0, 1, 2, 3]),
                 vol.Optional(
                     CONF_DEVICE_USE_MEDIAN,
                     default=self._sel_device.get(
@@ -488,12 +470,6 @@ def _show_main_form(self, errors=None):
                         CONF_USE_MEDIAN, DEFAULT_USE_MEDIAN
                     ),
                 ): cv.boolean,
-                vol.Optional(
-                    CONF_DECIMALS,
-                    default=self.config_entry.options.get(
-                        CONF_DECIMALS, DEFAULT_DECIMALS
-                    ),
-                ): cv.positive_int,
                 vol.Optional(
                     CONF_LOG_SPIKES,
                     default=self.config_entry.options.get(