Skip to content

Commit

Permalink
Merge branch 'custom-components:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
myhomeiot authored May 16, 2024
2 parents 4b25b25 + a5a8e53 commit 2dc7463
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions custom_components/ble_monitor/config_flow.py
Original file line number Diff line number Diff line change
Expand Up @@ -238,16 +238,16 @@ async def async_step_add_remove_device(self, user_input=None):
)
if self._sel_device:
# Remove device from device registry
device_registry = self.hass.helpers.device_registry.async_get(self.hass)
devreg = device_registry.async_get(self.hass)

conf_key = dict_get_key_or(self._sel_device)
key = dict_get_or(self._sel_device).upper()
device = device_registry.async_get_device({(DOMAIN, key)}, set())
device = devreg.async_get_device({(DOMAIN, key)}, set())
if device is None:
errors[conf_key] = "cannot_delete_device"
else:
_LOGGER.error("Removing BLE monitor device %s from device registry", key)
device_registry.async_remove_device(device.id)
devreg.async_remove_device(device.id)
_LOGGER.error(f"Removing BLE monitor device %s from configuration {device}", key)
del self._devices[key]
return self._show_main_form(errors)
Expand Down Expand Up @@ -487,7 +487,7 @@ async def async_step_init(self, user_input=None):
)
for dev in self.config_entry.options.get(CONF_DEVICES):
self._devices[dict_get_or(dev).upper()] = dev
devreg = self.hass.helpers.device_registry.async_get(self.hass)
devreg = device_registry.async_get(self.hass)
for dev in device_registry.async_entries_for_config_entry(
devreg, self.config_entry.entry_id
):
Expand Down
6 changes: 3 additions & 3 deletions custom_components/ble_monitor/manifest.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"domain": "ble_monitor",
"name": "Passive BLE monitor",
"codeowners": ["@Ernst79", "@Magalex2x14", "@Thrilleratplay"],
"codeowners": ["@Ernst79", "@myhomeiot"],
"config_flow": true,
"dependencies": [],
"documentation": "https://github.com/custom-components/ble_monitor",
"iot_class": "local_polling",
"issue_tracker": "https://github.com/custom-components/ble_monitor/issues",
"requirements": [
"pycryptodomex>=3.18.0",
"pycryptodomex>=3.19.1",
"janus>=1.0.0",
"aioblescan>=0.2.14",
"btsocket>=0.2.0",
"pyric>=0.1.6.3"
],
"version": "12.11.1"
"version": "12.11.2"
}
4 changes: 2 additions & 2 deletions docs/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -211,9 +211,9 @@ GEM
jekyll-feed (~> 0.9)
jekyll-seo-tag (~> 2.1)
minitest (5.19.0)
nokogiri (1.16.2-x64-mingw-ucrt)
nokogiri (1.16.5-x64-mingw-ucrt)
racc (~> 1.4)
nokogiri (1.16.2-x86_64-linux)
nokogiri (1.16.5-x86_64-linux)
racc (~> 1.4)
octokit (4.25.1)
faraday (>= 1, < 3)
Expand Down
2 changes: 1 addition & 1 deletion hacs.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"name": "Passive BLE monitor integration",
"homeassistant": "2023.11.0"
"homeassistant": "2024.4.0"
}

0 comments on commit 2dc7463

Please sign in to comment.