Sitelet https://github.com/espressif/esp-rainmaker/compare/master...brainstorm:esp-rainmaker:power_metering
Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: espressif/esp-rainmaker
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: brainstorm/esp-rainmaker
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: power_metering
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 15 commits
  • 11 files changed
  • 1 contributor

Commits on Mar 21, 2022

  1. Add Power Meter device type and related parameters/types

    @brainstorm
    brainstorm committed Mar 21, 2022
    Configuration menu
    Copy the full SHA
    9536a5f View commit details
    Browse the repository at this point in the history

  2. Forgot include for power meter sensor device creation

    @brainstorm
    brainstorm committed Mar 21, 2022
    Configuration menu
    Copy the full SHA
    3643240 View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2022

  1. Switch to float for all power meter parameters, one can always downca… 

    …st to int and most meters w/ Modbus seem to go with floats anyway
    @brainstorm
    brainstorm committed Mar 31, 2022
    Configuration menu
    Copy the full SHA
    16db2d5 View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2022

  1. Fixup esp-rainmaker submodule

    @brainstorm
    brainstorm committed Apr 1, 2022
    Configuration menu
    Copy the full SHA
    c87dea3 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2022

  1. esp-rainmaker cli belongs to espressif, did not fork that myself... yet

    @brainstorm
    brainstorm committed Apr 2, 2022
    Configuration menu
    Copy the full SHA
    c920f1b View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2022

  1. Add ignores for doxygen/xml/man generated docs

    @brainstorm
    brainstorm committed Apr 13, 2022
    Configuration menu
    Copy the full SHA
    0f3353d View commit details
    Browse the repository at this point in the history

Commits on May 30, 2022

  1. Merge branch 'master' of https://github.com/espressif/esp-rainmaker i… 

    …nto power_metering
    @brainstorm
    brainstorm committed May 30, 2022
    Configuration menu
    Copy the full SHA
    585ecba View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2022

  1. Merge

    @brainstorm
    brainstorm committed Oct 12, 2022
    Configuration menu
    Copy the full SHA
    3980d6f View commit details
    Browse the repository at this point in the history

  2. rmaker bump

    @brainstorm
    brainstorm committed Oct 12, 2022
    Configuration menu
    Copy the full SHA
    fee5190 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2022

  1. Merge branch 'master' of https://github.com/espressif/esp-rainmaker i… 

    …nto power_metering
    @brainstorm
    brainstorm committed Oct 15, 2022
    Configuration menu
    Copy the full SHA
    2074fe7 View commit details
    Browse the repository at this point in the history

  2. Add upstream changes fixing issue espressif/esp-insights#12

    @brainstorm
    brainstorm committed Oct 15, 2022
    Configuration menu
    Copy the full SHA
    cd83ca2 View commit details
    Browse the repository at this point in the history

  3. Include upstream esp-insight fixes on logging reported on espressif/e… 

    …sp-insights#12
    @brainstorm
    brainstorm committed Oct 15, 2022
    Configuration menu
    Copy the full SHA
    e3f4c4f View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2023

  1. Update to latest master

    @brainstorm
    brainstorm committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    d493297 View commit details
    Browse the repository at this point in the history

  2. Upgrade to latest esp-idf and refresh rainmaker, fix esp_sntp vs lwip… 

    …/sntp errors
    @brainstorm
    brainstorm committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    7f0e1c5 View commit details
    Browse the repository at this point in the history

  3. esp_sntp fixes

    @brainstorm
    brainstorm committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    67d6cd9 View commit details
    Browse the repository at this point in the history
Loading