Merge branch 'master' into positionABS

.gitignore

@@ -104,3 +104,6 @@ ENV/
 
 # Rope project settings
 .ropeproject
+
+# Vim temporary files
+*.swp

.travis.yml

@@ -3,14 +3,17 @@ language: python
 matrix:
  fast_finish: true
  include:
- - python: "2.7"
- env: TOXENV=py27
- - python: "3.5"
- env: TOXENV=py35
  - python: "3.6"
  env: TOXENV=py36
- - python: "3.4.2"
- env: TOXENV=lint
+ - python: "3.7"
+ env: TOXENV=py37
+ dist: xenial
+ - python: "3.8"
+ env: TOXENV=py38
+ - python: "3.9"
+ env: TOXENV=py39
+ - python: "3.9"
+ env: TOXENV=mypy
 cache: pip
 install: pip install -U tox coveralls
 script: tox

README.rst

@@ -14,7 +14,7 @@ Python Amcrest
 .. image:: https://img.shields.io/pypi/pyversions/amcrest.svg
  :target: https://pypi.python.org/pypi/amcrest
 
-A Python 2.7/3.x module for `Amcrest Cameras <https://www.amcrest.com/>`_ using the SDK HTTP API.
+A Python 2.7/3.x module for `Amcrest Cameras <https://www.amcrest.com/>`_ using the SDK HTTP API. Amcrest and Dahua devices share similar firmwares. Dahua Cameras and NVRs also work with this module.
 
 Documentation: `http:https://python-amcrest.readthedocs.io/ <http:https://python-amcrest.readthedocs.io/>`_
 
@@ -129,6 +129,9 @@ Pseudo-terminals like xterm, ssh, screen and others WONT WORK.
 Supportability Matrix
 ---------------------
 
+Cameras
+-------
+
 +-------------------------+---------------+----------+-----------------+
 | Model | Tested | Status | Results/Issues |
 +=========================+===============+==========+=================+
@@ -150,11 +153,28 @@ Supportability Matrix
 +-------------------------+---------------+----------+-----------------+
 | IP3M-HX2 | Yes | working | |
 +-------------------------+---------------+----------+-----------------+
+| IP4M-1026B | Yes | working | |
++-------------------------+---------------+----------+-----------------+
 | IP4M-1051B | Yes | working | |
 +-------------------------+---------------+----------+-----------------+
+| IP5M-1176EB | Yes | working | |
++-------------------------+---------------+----------+-----------------+
+| IP8M-2496EB | Yes | working | |
++-------------------------+---------------+----------+-----------------+
 | IP8M-T2499EW-28M | Yes | working | |
 +-------------------------+---------------+----------+-----------------+
 
+
+Network Video Recorders (NVR)
+-----------------------------
+
++-------------------------+---------------+----------+-----------------+
+| Model | Tested | Status | Results/Issues |
++=========================+===============+==========+=================+
+| XVR DAHUA 5104S | Yes | working | |
++-------------------------+---------------+----------+-----------------+
+
+
 If you have different model, feel fee to contribute and report your results.