Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
85ec31d
Added support to enable/disable motion detection for foscam cameras. …
viswa-swami Jul 13, 2017
3e0aa26
Fixed the violation identified by hound-bot
viswa-swami Jul 13, 2017
ced2cc2
Fixed the comment posted by HoundCI-Bot regarding using imperative mo…
viswa-swami Jul 13, 2017
5d03fe1
Fixed the error that travis-ci bot found.
viswa-swami Jul 13, 2017
254cda2
Merge branch 'enable_disable_motion_detection_foscam_cameras' of http…
viswa-swami Jul 20, 2017
32922a5
As per comment from @balloob, Instead of directly using the URL to ta…
viswa-swami Jul 20, 2017
00ef36b
Lint
balloob Jul 24, 2017
06f0093
Removed the requests library import which is not used anymore
viswa-swami Jul 26, 2017
7b97327
Updating requirements_all.txt based on the code-base of home assistan…
viswa-swami Jul 28, 2017
d11fa0b
Merge branch 'dev' into dev
viswa-swami Jul 28, 2017
942fb21
Updating requirements_all.txt and requirements_test_all.txt generated…
viswa-swami Jul 28, 2017
411b406
Updated requirements_all.txt with script
viswa-swami Jul 28, 2017
c450677
Updated the foscam camera code to fix lint errors
viswa-swami Jul 31, 2017
565a737
Fixed houndci violation
viswa-swami Jul 31, 2017
50cf61f
Merge branch 'dev' of https://github.com/home-assistant/home-assistan…
viswa-swami Aug 1, 2017
9c17a44
Merge remote-tracking branch 'upstream/master' into dev
viswa-swami Sep 11, 2017
8ad1893
Merge remote-tracking branch 'upstream/dev' into dev
viswa-swami Sep 11, 2017
77f809e
Updating the foscam library dependency/requirements.
viswa-swami Sep 11, 2017
ea851a4
Fixing the requirements_all file. Somehow when i generated, it genera…
viswa-swami Sep 11, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions homeassistant/components/camera/foscam.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

_LOGGER = logging.getLogger(__name__)

REQUIREMENTS = ['pyfoscam==1.2']
REQUIREMENTS = ['libpyfoscam==1.0']

CONF_IP = 'ip'

Expand Down Expand Up @@ -53,7 +53,7 @@ def __init__(self, device_info):
self._name = device_info.get(CONF_NAME)
self._motion_status = False

from foscam.foscam import FoscamCamera
from libpyfoscam import FoscamCamera

self._foscam_session = FoscamCamera(ip_address, port, self._username,
self._password, verbose=False)
Expand Down
6 changes: 3 additions & 3 deletions requirements_all.txt
Original file line number Diff line number Diff line change
Expand Up @@ -368,6 +368,9 @@ libnacl==1.5.2
# homeassistant.components.dyson
libpurecoollink==0.4.2

# homeassistant.components.camera.foscam
libpyfoscam==1.0

# homeassistant.components.device_tracker.mikrotik
librouteros==1.0.2

Expand Down Expand Up @@ -599,9 +602,6 @@ pyfido==1.0.1
# homeassistant.components.climate.flexit
pyflexit==0.3

# homeassistant.components.camera.foscam
pyfoscam==1.2

# homeassistant.components.ifttt
pyfttt==0.3

Expand Down