Skip to content

Commit

Permalink
Merge branch 'dev' into dependabot/pip/coverage-6.4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
fronzbot authored Jun 23, 2022
2 parents da59867 + 07ca567 commit 3f8f9a1
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
4 changes: 3 additions & 1 deletion blinkpy/camera.py
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,9 @@ def extract_config_info(self, config):
self.serial = config.get("serial", None)
self.motion_enabled = config.get("enabled", "unknown")
self.battery_voltage = config.get("battery_voltage", None)
self.battery_state = config.get("battery_state", None)
self.battery_state = config.get("battery_state", None) or config.get(
"battery", None
)
self.temperature = config.get("temperature", None)
self.wifi_strength = config.get("wifi_strength", None)
self.product_type = config.get("type", None)
Expand Down
2 changes: 1 addition & 1 deletion blinkpy/sync_module.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def __init__(self, blink, network_name, network_id, camera_list):
self.available = False
self.type_key_map = {
"mini": "owls",
"lotus": "doorbell",
"lotus": "doorbells",
}

@property
Expand Down
2 changes: 1 addition & 1 deletion requirements_test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ coverage==6.4.1
flake8==3.9.1
flake8-docstrings==1.6.0
pre-commit==2.17.0
pylint==2.10.2
pylint==2.14.3
pydocstyle==6.0.0
pytest==7.1.1
pytest-cov==3.0.0
Expand Down

0 comments on commit 3f8f9a1

Please sign in to comment.