Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DSMR sensor #4309

Merged
merged 22 commits into from
Nov 23, 2016
Merged

DSMR sensor #4309

merged 22 commits into from
Nov 23, 2016

Commits on Nov 8, 2016

  1. Initial implemenation of DSMR component.

    Johan Bloemberg committed Nov 8, 2016
    Configuration menu
    Copy the full SHA
    3c1fd15 View commit details
    Browse the repository at this point in the history

  2. Fix linting

    Johan Bloemberg committed Nov 8, 2016
    Configuration menu
    Copy the full SHA
    5b3f0ba View commit details
    Browse the repository at this point in the history

  3. Remove protocol V2.2 support until merged upstream.

    Johan Bloemberg committed Nov 8, 2016
    Configuration menu
    Copy the full SHA
    aed7627 View commit details
    Browse the repository at this point in the history

  4. Generate requirements using script.

    Johan Bloemberg committed Nov 8, 2016
    Configuration menu
    Copy the full SHA
    4544685 View commit details
    Browse the repository at this point in the history

  5. Use updated dsmr-parser with protocol 2.2 support.

    Johan Bloemberg committed Nov 8, 2016
    Configuration menu
    Copy the full SHA
    ce70497 View commit details
    Browse the repository at this point in the history

  6. Add tests.

    Johan Bloemberg committed Nov 8, 2016
    Configuration menu
    Copy the full SHA
    fc6e732 View commit details
    Browse the repository at this point in the history

  7. Isort and input validation.

    Johan Bloemberg committed Nov 8, 2016
    Configuration menu
    Copy the full SHA
    9c86d0a View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2016

  1. Add entities for gas and actual meter reading. Error handling. Use Th… 

    …rottle.
    Johan Bloemberg committed Nov 10, 2016
    Configuration menu
    Copy the full SHA
    e4594f1 View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2016

  1. Implement non-blocking serial reader.

    Johan Bloemberg committed Nov 12, 2016
    Configuration menu
    Copy the full SHA
    27a4e01 View commit details
    Browse the repository at this point in the history

  2. Improve logging.

    Johan Bloemberg committed Nov 12, 2016
    Configuration menu
    Copy the full SHA
    1cf1341 View commit details
    Browse the repository at this point in the history

  3. Merge entities into one, add icons, fix tests for asyncio.

    Johan Bloemberg committed Nov 12, 2016
    Configuration menu
    Copy the full SHA
    aabbe6e View commit details
    Browse the repository at this point in the history

  4. Add error logging for serial reader.

    Johan Bloemberg committed Nov 12, 2016
    Configuration menu
    Copy the full SHA
    c5de690 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2016

  1. Refactoring and documentation. 

    - refactor asyncio reader task to make sure it stops with HA
- document general principle of this component
- refactor entity reading to be more clear
- remove cruft from split entity implementation
    Johan Bloemberg committed Nov 13, 2016
    Configuration menu
    Copy the full SHA
    8f30b51 View commit details
    Browse the repository at this point in the history

  2. Use port configuration key.

    Johan Bloemberg committed Nov 13, 2016
    Configuration menu
    Copy the full SHA
    42d7e23 View commit details
    Browse the repository at this point in the history

  3. DSMR V2.2 seems to conflict in explaining which tariff is high and low. 

    http://www.netbeheernederland.nl/themas/hotspot/hotspot-documenten/?dossierid=11010056&title=Slimme%20meter&onderdeel=Documenten
> DSMR v2.2 Final P1
>> 6.1: table vs table note

    Meter Reading electricity delivered to client normal tariff) in 0,01 kWh - 1-0:1.8.1.255
    Meter Reading electricity delivered to client (low tariff) in 0,01 kWh - 1-0:1.8.2.255

    Note: Tariff code 1 is used for low tariff and tariff code 2 is used for normal tariff.
    Johan Bloemberg committed Nov 13, 2016
    Configuration menu
    Copy the full SHA
    5367334 View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2016

  1. Refactor to use asyncio.Protocol instead of loop+queue.

    Johan Bloemberg committed Nov 21, 2016
    Configuration menu
    Copy the full SHA
    873cbd4 View commit details
    Browse the repository at this point in the history

  2. Fix requirements

    Johan Bloemberg committed Nov 21, 2016
    Configuration menu
    Copy the full SHA
    749de01 View commit details
    Browse the repository at this point in the history

  3. Close transport when HA stops.

    Johan Bloemberg committed Nov 21, 2016
    Configuration menu
    Copy the full SHA
    30137d4 View commit details
    Browse the repository at this point in the history

  4. Cleanup.

    Johan Bloemberg committed Nov 21, 2016
    Configuration menu
    Copy the full SHA
    95e5a83 View commit details
    Browse the repository at this point in the history

  5. Include as dependency for testing (until merged upstream.)

    Johan Bloemberg committed Nov 21, 2016
    Configuration menu
    Copy the full SHA
    eb6c853 View commit details
    Browse the repository at this point in the history

  6. Fix style.

    Johan Bloemberg committed Nov 21, 2016
    Configuration menu
    Copy the full SHA
    f5e9ccc View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2016

  1. Update setup.cfg

    @balloob
    balloob committed Nov 23, 2016
    Configuration menu
    Copy the full SHA
    0762fca View commit details
    Browse the repository at this point in the history