Skip to content

Commit

Permalink
Add new camera models (and the concept of an "Outdoor Camera") (#250)
Browse files Browse the repository at this point in the history
* Update camera.py

Added in the model type of the 1080p version of the SimpliCam

* Update camera.py

Removed the CAMERA_MODEL_CAMERA_1080 constant. Added the new outdoor camera's model type.

* Update entity.py

Added the new outdoor camera's entity id number

* Update sphinx-rtd-theme requirement from ^0.5.0 to ^1.0.0 (#254)

* Update sphinx-rtd-theme requirement from ^0.5.0 to ^1.0.0

Updates the requirements on [sphinx-rtd-theme](https://github.com/readthedocs/sphinx_rtd_theme) to permit the latest version.
- [Release notes](https://github.com/readthedocs/sphinx_rtd_theme/releases)
- [Changelog](https://github.com/readthedocs/sphinx_rtd_theme/blob/master/docs/changelog.rst)
- [Commits](readthedocs/sphinx_rtd_theme@0.5.0...1.0.0)

---
updated-dependencies:
- dependency-name: sphinx-rtd-theme
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <[email protected]>

* Fix tests

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Aaron Bach <[email protected]>

* Re-architect library (#255)

* Re-architect library

* Update docs

* Update camera.py

Added in the model type of the 1080p version of the SimpliCam

* Update camera.py

Removed the CAMERA_MODEL_CAMERA_1080 constant. Added the new outdoor camera's model type.

* Update camera.py

Added in the model type of the 1080p version of the SimpliCam

* Update camera.py

Removed the CAMERA_MODEL_CAMERA_1080 constant. Added the new outdoor camera's model type.

* Update AUTHORS

* Add device type

* Fix tests

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Aaron Bach <[email protected]>
  • Loading branch information
3 people authored Sep 27, 2021
1 parent c062b72 commit 6d3b1de
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 2 deletions.
1 change: 1 addition & 0 deletions AUTHORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

## Contributors

- Abductist (https://github.com/Abductist)
- Kendell Richards (https://github.com/KTibow)
- Niccolo Zapponi (https://github.com/nzapponi)
- Scott Newman (https://github.com/greencoder)
Expand Down
1 change: 1 addition & 0 deletions simplipy/device/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ class DeviceTypes(Enum):
siren = 13
doorbell = 15
lock = 16
outdoor_camera = 17
lock_keypad = 253
unknown = 99

Expand Down
3 changes: 3 additions & 0 deletions simplipy/device/camera.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,14 @@

CAMERA_MODEL_CAMERA = "camera"
CAMERA_MODEL_DOORBELL = "doorbell"
CAMERA_MODEL_OUTDOOR_CAMERA = "outdoor camera"
CAMERA_MODEL_UNKNOWN = "unknown"

MODEL_TO_TYPE = {
"SS001": CAMERA_MODEL_CAMERA,
"SS002": CAMERA_MODEL_DOORBELL,
"SS003": CAMERA_MODEL_CAMERA,
"SSOBCM4": CAMERA_MODEL_OUTDOOR_CAMERA,
}


Expand Down
4 changes: 2 additions & 2 deletions tests/fixtures/subscriptions_response.json
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,7 @@
{
"staleSettingsTypes": [],
"upgradeWhitelisted": false,
"model": "SS003",
"model": "ABC1111111",
"uuid": "1234567891",
"uid": 12345,
"sid": 12345,
Expand Down Expand Up @@ -739,4 +739,4 @@
"autoActivation": null
}
]
}
}

0 comments on commit 6d3b1de

Please sign in to comment.