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

Timer branch merge #68

Closed
wants to merge 59 commits into from
Closed

Timer branch merge #68

wants to merge 59 commits into from

Commits on Feb 5, 2018

  1. changes from cydynni branch

    @glynhudson
    glynhudson committed Feb 5, 2018
    Configuration menu
    Copy the full SHA
    8dc33c9 View commit details
    Browse the repository at this point in the history

  2. fix LEDpin

    @glynhudson
    glynhudson committed Feb 5, 2018
    Configuration menu
    Copy the full SHA
    e812017 View commit details
    Browse the repository at this point in the history

  3. define ledpin in config

    @glynhudson
    glynhudson committed Feb 5, 2018
    Configuration menu
    Copy the full SHA
    eae351c View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2018

  1. smartplug configuration

    @glynhudson
    glynhudson committed Nov 6, 2018
    Configuration menu
    Copy the full SHA
    b66f570 View commit details
    Browse the repository at this point in the history

  2. changes from master

    @glynhudson
    glynhudson committed Nov 6, 2018
    Configuration menu
    Copy the full SHA
    0a573d1 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2018

  1. image

    @glynhudson
    glynhudson committed Nov 7, 2018
    Configuration menu
    Copy the full SHA
    596aa9c View commit details
    Browse the repository at this point in the history

  2. default nodeid

    @glynhudson
    glynhudson committed Nov 7, 2018
    Configuration menu
    Copy the full SHA
    bc3f430 View commit details
    Browse the repository at this point in the history

  3. Update sonoffS20.md

    @TrystanLea
    TrystanLea authored Nov 7, 2018
    Configuration menu
    Copy the full SHA
    43e1a50 View commit details
    Browse the repository at this point in the history

  4. Update sonoffS20.md

    @TrystanLea
    TrystanLea authored Nov 7, 2018
    Configuration menu
    Copy the full SHA
    2efdb94 View commit details
    Browse the repository at this point in the history

  5. Update sonoffS20.md

    @TrystanLea
    TrystanLea authored Nov 7, 2018
    Configuration menu
    Copy the full SHA
    fd0c0bb View commit details
    Browse the repository at this point in the history

  6. Update sonoffS20.md

    @TrystanLea
    TrystanLea authored Nov 7, 2018
    Configuration menu
    Copy the full SHA
    83e754b View commit details
    Browse the repository at this point in the history

  7. Update sonoffS20.md

    @TrystanLea
    TrystanLea authored Nov 7, 2018
    Configuration menu
    Copy the full SHA
    a76a2dd View commit details
    Browse the repository at this point in the history

  8. Update sonoffS20.md

    @TrystanLea
    TrystanLea authored Nov 7, 2018
    Configuration menu
    Copy the full SHA
    6610f03 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2018

  1. Update sonoffS20.md

    @TrystanLea
    TrystanLea authored Nov 9, 2018
    Configuration menu
    Copy the full SHA
    e721137 View commit details
    Browse the repository at this point in the history

  2. Update sonoffS20.md

    @TrystanLea
    TrystanLea authored Nov 9, 2018
    Configuration menu
    Copy the full SHA
    6389cf4 View commit details
    Browse the repository at this point in the history

  3. Update sonoffS20.md

    @TrystanLea
    TrystanLea authored Nov 9, 2018
    Configuration menu
    Copy the full SHA
    b73f516 View commit details
    Browse the repository at this point in the history

  4. Update sonoffS20.md

    @TrystanLea
    TrystanLea authored Nov 9, 2018
    Configuration menu
    Copy the full SHA
    33198d4 View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2019

  1. add describe endpoint

    @glynhudson
    glynhudson committed Jan 7, 2019
    Configuration menu
    Copy the full SHA
    839379d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'control_merge' of https://github.com/openenergymonitor/… 

    …EmonESP into control_merge
    @glynhudson
    glynhudson committed Jan 7, 2019
    Configuration menu
    Copy the full SHA
    97e37c1 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2019

  1. basic timer implementation for heatpump monitor control

    @glynhudson
    glynhudson committed Jan 17, 2019
    Configuration menu
    Copy the full SHA
    5502e80 View commit details
    Browse the repository at this point in the history

  2. complete timer implementation

    @glynhudson
    glynhudson committed Jan 17, 2019
    Configuration menu
    Copy the full SHA
    0290045 View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2019

  1. include @dgbates factory reset

    @glynhudson
    glynhudson committed Jan 18, 2019
    Configuration menu
    Copy the full SHA
    94d4eb0 View commit details
    Browse the repository at this point in the history

  2. improved UI, hidden tabs

    @glynhudson
    glynhudson committed Jan 18, 2019
    Configuration menu
    Copy the full SHA
    e5ac051 View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2019

  1. timer and voltage output mode for hpmon

    @glynhudson
    glynhudson committed Jan 30, 2019
    Configuration menu
    Copy the full SHA
    0a2a888 View commit details
    Browse the repository at this point in the history

  2. heatpump monitor flow temp

    @glynhudson
    glynhudson committed Jan 30, 2019
    Configuration menu
    Copy the full SHA
    f0a1589 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2019

  1. - turn on/off smartplug with button on front 

    - only show control tab if node_type = smartplug or hpmon
- only show flowT control if node_type = hpmon
    @glynhudson
    glynhudson committed Jan 31, 2019
    Configuration menu
    Copy the full SHA
    b169497 View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2019

  1. extend mqtt sub to handle status,timer,vout & flowT control

    @glynhudson
    glynhudson committed Feb 1, 2019
    Configuration menu
    Copy the full SHA
    4e4ae12 View commit details
    Browse the repository at this point in the history

  2. option to set both timers

    @glynhudson
    glynhudson committed Feb 1, 2019
    Configuration menu
    Copy the full SHA
    50e012c View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2019

  1. publish changes in state via mqtt

    @glynhudson
    glynhudson committed Feb 8, 2019
    Configuration menu
    Copy the full SHA
    94d1460 View commit details
    Browse the repository at this point in the history

  2. default to smartplug

    @glynhudson
    glynhudson committed Feb 8, 2019
    Configuration menu
    Copy the full SHA
    6f38e9f View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2019

  1. Update sonoffS20.md

    @TrystanLea
    TrystanLea authored Feb 20, 2019
    Configuration menu
    Copy the full SHA
    f294d8f View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2019

  1. add ntpclient to libraries

    @glynhudson
    glynhudson committed Feb 23, 2019
    Configuration menu
    Copy the full SHA
    13f5893 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'timer' of https://github.com/openenergymonitor/EmonESP … 

    …into timer
    @glynhudson
    glynhudson committed Feb 23, 2019
    Configuration menu
    Copy the full SHA
    d86e8bf View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2019

  1. compiled for esp8285

    @glynhudson
    glynhudson committed Feb 28, 2019
    Configuration menu
    Copy the full SHA
    42054c9 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2019

  1. Update readme.md

    @TrystanLea
    TrystanLea authored Mar 1, 2019
    Configuration menu
    Copy the full SHA
    c0e9d92 View commit details
    Browse the repository at this point in the history

  2. precompiled esp8266 binary

    @glynhudson
    glynhudson committed Mar 1, 2019
    Configuration menu
    Copy the full SHA
    a31cd00 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'timer' of https://github.com/openenergymonitor/EmonESP … 

    …into timer
    @glynhudson
    glynhudson committed Mar 1, 2019
    Configuration menu
    Copy the full SHA
    28f7927 View commit details
    Browse the repository at this point in the history

  4. Update readme.md

    @TrystanLea
    TrystanLea authored Mar 1, 2019
    Configuration menu
    Copy the full SHA
    888394b View commit details
    Browse the repository at this point in the history

  5. Update readme.md

    @TrystanLea
    TrystanLea authored Mar 1, 2019
    Configuration menu
    Copy the full SHA
    299d6c0 View commit details
    Browse the repository at this point in the history

  6. Update readme.md

    @TrystanLea
    TrystanLea authored Mar 1, 2019
    Configuration menu
    Copy the full SHA
    dfe6f4c View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2019

  1. include faster upload speed

    @glynhudson
    glynhudson committed Mar 4, 2019
    Configuration menu
    Copy the full SHA
    7f9cf1d View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2019

  1. working platformio.ini for sonoff s20

    @glynhudson
    glynhudson committed Mar 5, 2019
    Configuration menu
    Copy the full SHA
    51bc36c View commit details
    Browse the repository at this point in the history

  2. add compiled bin

    @glynhudson
    glynhudson committed Mar 5, 2019
    Configuration menu
    Copy the full SHA
    06d0796 View commit details
    Browse the repository at this point in the history

  3. - use chip id based id 

    - option to set mqtt port
    @glynhudson
    glynhudson committed Mar 5, 2019
    Configuration menu
    Copy the full SHA
    d63a39b View commit details
    Browse the repository at this point in the history

  4. restore lib_deps to platformio

    @glynhudson
    glynhudson authored Mar 5, 2019
    Configuration menu
    Copy the full SHA
    88ff76a View commit details
    Browse the repository at this point in the history

  5. restore version

    @glynhudson
    glynhudson authored Mar 5, 2019
    Configuration menu
    Copy the full SHA
    016415d View commit details
    Browse the repository at this point in the history

  6. add NTPClient lib

    @glynhudson
    glynhudson committed Mar 5, 2019
    Configuration menu
    Copy the full SHA
    d843a73 View commit details
    Browse the repository at this point in the history

  7. simplify platformio.ini

    @glynhudson
    glynhudson committed Mar 5, 2019
    Configuration menu
    Copy the full SHA
    dedee98 View commit details
    Browse the repository at this point in the history

  8. revert to previous platformio.ini file

    @glynhudson
    glynhudson committed Mar 5, 2019
    Configuration menu
    Copy the full SHA
    8e7697a View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2019

  1. Create src.ino.cpp

    @danbates2
    danbates2 committed Mar 11, 2019
    Configuration menu
    Copy the full SHA
    3e81084 View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2019

  1. Update sonoffS20.md

    @TrystanLea
    TrystanLea authored Mar 12, 2019
    Configuration menu
    Copy the full SHA
    45e9670 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2019

  1. add time offset support

    @glynhudson
    glynhudson committed Apr 12, 2019
    Configuration menu
    Copy the full SHA
    af24827 View commit details
    Browse the repository at this point in the history

  2. set time offset

    @glynhudson
    glynhudson committed Apr 12, 2019
    Configuration menu
    Copy the full SHA
    299dde0 View commit details
    Browse the repository at this point in the history

  3. working time offset and chip id improvements

    @glynhudson
    glynhudson committed Apr 12, 2019
    Configuration menu
    Copy the full SHA
    09d6b5f View commit details
    Browse the repository at this point in the history

  4. updated compiled bin

    @glynhudson
    glynhudson committed Apr 12, 2019
    Configuration menu
    Copy the full SHA
    5b2b61f View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2019

  1. fix captive portal

    @danbates2
    danbates2 committed Jul 14, 2019
    Configuration menu
    Copy the full SHA
    00984d9 View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2019

  1. Merge branch 'timer' into timer

    @glynhudson
    glynhudson authored Aug 7, 2019
    Configuration menu
    Copy the full SHA
    ec83283 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #62 from danbates2/timer 

    captive portal fix
    @glynhudson
    glynhudson authored Aug 7, 2019
    Configuration menu
    Copy the full SHA
    0164f2a View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2019

  1. fix missing colon

    @glynhudson
    glynhudson committed Oct 3, 2019
    Configuration menu
    Copy the full SHA
    d5be387 View commit details
    Browse the repository at this point in the history