This repository has been archived by the owner on Oct 4, 2021. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 97
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/dev' into main
- Loading branch information
Showing
568 changed files
with
18,874 additions
and
33,072 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| name: Build Firmware | ||
|
|
||
| on: | ||
| push: | ||
| branches: | ||
| - dev | ||
| tags: | ||
| # - '*.*.*' | ||
| paths: | ||
| - 'CHANGELOG_LATEST.md' | ||
|
|
||
| jobs: | ||
|
|
||
| release: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v2 | ||
|
|
||
| - name: Version | ||
| id: fetch_version | ||
| run: | | ||
| version=`grep -E '^#define EMSESP_APP_VERSION' ./src/version.h | awk '{print $3}' | sed 's/"//g'` | ||
| echo "::set-output name=s::$version" | ||
| - name: Setup Python | ||
| uses: actions/setup-python@v1 | ||
|
|
||
| - name: Install | ||
| run: | | ||
| python -m pip install --upgrade pip | ||
| pip install -U platformio | ||
| platformio upgrade | ||
| platformio update | ||
| - name: Build web | ||
| run: | | ||
| cd interface | ||
| npm install | ||
| npm run build | ||
| - name: Build images | ||
| run: | | ||
| platformio run -e esp8266 | ||
| platformio run -e esp32 | ||
| - name: Delete | ||
| uses: dev-drprasad/[email protected] | ||
| # if: startsWith(github.ref, 'refs/tags/') | ||
| with: | ||
| delete_release: true | ||
| tag_name: dev | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
|
|
||
| - name: Changelog | ||
| run: cat RELEASENOTES_DEV.md CHANGELOG_LATEST.md > BODY.txt | ||
|
|
||
| - name: Release | ||
| uses: softprops/action-gh-release@v1 | ||
| # if: startsWith(github.ref, 'refs/tags/') | ||
| with: | ||
| body_path: BODY.txt | ||
| name: Development Build v${{steps.fetch_version.outputs.s}} | ||
| tag_name: dev | ||
| prerelease: true | ||
| files: | | ||
| ./build/firmware/*.* | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| name: Code Check | ||
|
|
||
| on: | ||
| push: | ||
| branches: [dev] | ||
| paths: | ||
| - 'src/**' | ||
| pull_request: | ||
| # The branches below must be a subset of the branches above | ||
| branches: [dev] | ||
| schedule: | ||
| - cron: '0 11 * * 5' | ||
|
|
||
| jobs: | ||
| analyze: | ||
| name: Analyze | ||
| runs-on: ubuntu-latest | ||
|
|
||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| # Override automatic language detection by changing the below list | ||
| # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python'] | ||
| language: ['cpp'] | ||
| # Learn more... | ||
| # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection | ||
|
|
||
| steps: | ||
| - name: Checkout repository | ||
| uses: actions/checkout@v2 | ||
| with: | ||
| # We must fetch at least the immediate parents so that if this is | ||
| # a pull request then we can checkout the head. | ||
| fetch-depth: 2 | ||
|
|
||
| # If this run was triggered by a pull request event, then checkout | ||
| # the head of the pull request instead of the merge commit. | ||
| - run: git checkout HEAD^2 | ||
| if: ${{ github.event_name == 'pull_request' }} | ||
|
|
||
| # Initializes the CodeQL tools for scanning. | ||
| - name: Initialize CodeQL | ||
| uses: github/codeql-action/init@v1 | ||
| with: | ||
| languages: ${{ matrix.language }} | ||
|
|
||
| # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). | ||
| # If this step fails, then you should remove it and run the build manually (see below) | ||
| - name: Autobuild | ||
| uses: github/codeql-action/autobuild@v1 | ||
|
|
||
| # ℹ️ Command-line programs to run using the OS shell. | ||
| # 📚 https://git.io/JvXDl | ||
|
|
||
| # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines | ||
| # and modify them (or add more) to build your code if your project | ||
| # uses a compiled language | ||
|
|
||
| #- run: | | ||
| # make bootstrap | ||
| # make release | ||
|
|
||
| - name: Perform CodeQL Analysis | ||
| uses: github/codeql-action/analyze@v1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| name: Release Main | ||
|
|
||
| on: | ||
| workflow_dispatch: | ||
| branches: [ main ] | ||
|
|
||
| jobs: | ||
|
|
||
| release: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v2 | ||
|
|
||
| - name: Version | ||
| id: fetch_version | ||
| run: | | ||
| version=`grep -E '^#define EMSESP_APP_VERSION' ./src/version.h | awk '{print $3}' | sed 's/"//g'` | ||
| echo "::set-output name=s::$version" | ||
| - name: Setup Python | ||
| uses: actions/setup-python@v1 | ||
|
|
||
| - name: Install | ||
| run: | | ||
| python -m pip install --upgrade pip | ||
| pip install -U platformio | ||
| platformio upgrade | ||
| platformio update | ||
| - name: Build web | ||
| run: | | ||
| cd interface | ||
| npm install | ||
| npm run build | ||
| - name: Build images | ||
| run: | | ||
| platformio run -e esp8266 | ||
| platformio run -e esp32 | ||
| - name: Changelog | ||
| run: cat RELEASENOTES.md CHANGELOG_LATEST.md > BODY.txt | ||
|
|
||
| - name: Release | ||
| uses: softprops/action-gh-release@v1 | ||
| with: | ||
| body_path: BODY.txt | ||
| name: EMS-ESP v${{steps.fetch_version.outputs.s}} | ||
| tag_name: v${{steps.fetch_version.outputs.s}} | ||
| prerelease: false | ||
| files: | | ||
| ./build/firmware/*.* | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| name: Standalone Build | ||
|
|
||
| on: | ||
| push: | ||
| branches: [ dev ] | ||
| paths: | ||
| - 'src/**' | ||
|
|
||
| jobs: | ||
| build: | ||
|
|
||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v2 | ||
|
|
||
| - name: make clean | ||
| run: make clean | ||
|
|
||
| - name: make | ||
| run: make | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| # Changelog | ||
|
|
||
| ### Added | ||
| - boiler `heatingactivated`, automatic select parameter telegrams for write | ||
| - boiler `wWType` parameter, in Console and MQTT | ||
| - support for uploading compressed firmware binaries in web UI | ||
| - setting to manually override the MQTT retain flag | ||
| - New API via HTTP REST API to read and set values. See https://emsesp.github.io/docs/#/API | ||
| - `show commands` command | ||
| - exporting of system settings using the `system info` command in Web and Console. Added link into the Web's Settings page. | ||
| - setting to change how booleans are rendered in MQTT (on/off, true/false, 1/0) | ||
| - enable ADC setting, add boiler circulation commands, add thermostat RC300 summermodes | ||
| - Added all device info to web UI for Thermostat and Boiler | ||
| - Added all device values to Home Assistant MQTT Discovery under separate devices and entities | ||
| - Show Rx and Tx quality in Console and Web UI | ||
| - Added button and tooltip to EMS Devices in Web | ||
| - wwtemp and wwtemplow to MQTT, Console and Web | ||
| - summer, winter modes for the CW400 thermostat | ||
| - new command under system called `report`. http://ems-esp/api?device=system&cmd=report to generate a report log for troubleshooting | ||
| - thermostat error codes | ||
| - Console command `publish ha` to also force the creation of the Home Assistant MQTT Discovery topics | ||
| - Heat pump values (dew temperature and relative air humidity) | ||
| - Console up key to repeat last command | ||
| - added RC300 floordrying, building, damped temperature | ||
|
|
||
| ### Fixed | ||
| - fix wwontime readback | ||
| - fixed support for RC300 via MQTT commands (#505) | ||
| - Some minor optimizations to memory handling in the MQTT service | ||
| - Prevent MQTT from publishing empty json payloads | ||
| - Accurate detection of warm water and heating (#515) | ||
| - Fix writing to the Junkers FR120 thermostat | ||
| - support for changing summermode | ||
| - added missing `heatingtype` to thermostat data | ||
| - handle incomming ems+ read requests, ignore F7 telegrams with 3byte-id | ||
| - fix month for setting clock from NTP | ||
|
|
||
| ### Changed | ||
| - renamed wWCircPumpType to wWChargeType | ||
| - Installation and Configuration notes moved to the official EMS-ESP documentation site | ||
| - `call` commands can be done from the Console root for all devices | ||
| - Updated EMS-ESP official documentation (https://emsesp.github.io/docs/#/) | ||
| - JWT Secret renamed to Super User Password | ||
| - EMS Devices in Web UI shows button and tooltip to remind users they can click on a device | ||
| - MQTT topic name changes (see doc) | ||
| - Mixing renamed to Mixer | ||
|
|
||
| ### Removed | ||
| - Console contexts for thermostat and boiler | ||
| - Removed option to enable/disable the MQTT Heartbeat. It's always on. | ||
|
|
Oops, something went wrong.