Skip to content

Commit

Permalink
Merge pull request #1991 from proddy/dev
Browse files Browse the repository at this point in the history
some minor fixes
  • Loading branch information
proddy authored Sep 11, 2024
2 parents 837bdf3 + 9ba9ffc commit 694f1f0
Show file tree
Hide file tree
Showing 60 changed files with 1,040 additions and 898 deletions.
1 change: 1 addition & 0 deletions .github/workflows/github-releases-to-discord.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4

- name: GitHub Releases To Discord
uses: SethCohen/[email protected]
with:
Expand Down
20 changes: 15 additions & 5 deletions .github/workflows/pre_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,33 @@ jobs:
name: 'Automatic pre-release build'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Checkout repository
uses: actions/checkout@v4

- name: Enable Corepack
run: corepack enable
- uses: actions/setup-python@v5

- name: Install python 3.11
uses: actions/setup-python@v5
with:
python-version: '3.11'
- name: Use Node.js 20.x

- name: Install Node.js 20
uses: actions/setup-node@v4
with:
node-version: '20.x'
- name: Get EMS-ESP source code and version

- name: Get EMS-ESP version
id: build_info
run: |
version=`grep -E '^#define EMSESP_APP_VERSION' ./src/version.h | awk -F'"' '{print $2}'`
echo "VERSION=$version" >> $GITHUB_OUTPUT
- name: Install PlatformIO
run: |
python -m pip install --upgrade pip
pip install -U platformio
- name: Build WebUI
run: |
cd interface
Expand All @@ -38,9 +46,11 @@ jobs:
sed -i "s/= 'pl'/= 'en'/" ./src/i18n/i18n-util.ts
yarn build
yarn webUI
- name: Build all target environments from default_envs
- name: Build all PIO target environments from default_envs
run: |
platformio run
- name: Create GitHub Release
id: 'automatic_releases'
uses: emsesp/[email protected]
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/sonar_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,17 @@ jobs:
env:
BUILD_WRAPPER_OUT_DIR: bw-output
steps:
- uses: actions/checkout@v4
- name: Checkout repository
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Install sonar-scanner and build-wrapper
uses: SonarSource/sonarcloud-github-c-cpp@v2

- name: Run build-wrapper
run: build-wrapper-linux-x86-64 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} make all

- name: Run sonar-scanner
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
19 changes: 13 additions & 6 deletions .github/workflows/tagged_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,27 @@ jobs:
name: 'Tagged Release'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Checkout repository
uses: actions/checkout@v4

- name: Enable Corepack
run: corepack enable
- uses: actions/setup-python@v5

- name: Install python 3.11
uses: actions/setup-python@v5
with:
python-version: '3.11'
- name: Use Node.js 20.x

- name: Install Node.js 20
uses: actions/setup-node@v4
with:
node-version: '20.x'

- name: Install PlatformIO
run: |
python -m pip install --upgrade pip
pip install -U platformio
platformio upgrade
pio pkg update
- name: Build WebUI
run: |
cd interface
Expand All @@ -35,9 +40,11 @@ jobs:
sed -i "s/= 'pl'/= 'en'/" ./src/i18n/i18n-util.ts
yarn build
yarn webUI
- name: Build all target environments from default_envs
- name: Build all PIO target environments from default_envs
run: |
platformio run
- name: Create GitHub Release
uses: emsesp/[email protected]
with:
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
.vscode/c_cpp_properties.json
.vscode/extensions.json
.vscode/launch.json
#.vscode/settings.json
.vscode/settings.json

# c++ compiling
.clang_complete
Expand Down
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@
"**/ArduinoJson/**"
],
"cSpell.enableFiletypes": [
"!typescript"
"ini",
"makefile"
],
"typescript.preferences.preferTypeOnlyAutoImports": true
}
10 changes: 8 additions & 2 deletions CHANGELOG_LATEST.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,17 @@
- RC310 cooling parameters [#1857](https://github.com/emsesp/EMS-ESP32/issues/1857)
- command `api/device/entities` [#1897](https://github.com/emsesp/EMS-ESP32/issues/1897)
- switchprogmode [#1903]<https://github.com/emsesp/EMS-ESP32/discussions/1903>
- Autodetect and download firmware upgrades
- Autodetect and download firmware upgrades via the WebUI
- command 'show log' that lists out the current weblog buffer, showing last messages.
- default web log buffer to 25 lines for ESP32s with no PSRAM
- Try and determine correct board profile if none is set

## Fixed

- remote thermostat emulation for RC200 on Rego2000/3000 thermostats [#1691](https://github.com/emsesp/EMS-ESP32/discussions/1691)
- log shows data for F7/F9 requests
- Detection of LittleFS for factory setting wasn't working
- Check for bad GPIOs with Ethernet before the ethernet is initialized

## Changed

Expand All @@ -58,4 +63,5 @@
- Change key-names in JSON to be compliant and consistent [#1860](https://github.com/emsesp/EMS-ESP32/issues/1860)
- Updates to webUI [#1920](https://github.com/emsesp/EMS-ESP32/issues/1920)
- Correct firmware naming #1933 [#1933](https://github.com/emsesp/EMS-ESP32/issues/1933)

- Don't start Serial console if not connected to a Serial port. Will initiate manually after a CTRL-C
- WebLog UI matches color schema of the terminal console correctly
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ CPPFLAGS += -g3
CPPFLAGS += -Os

CFLAGS += $(CPPFLAGS)
CFLAGS += -Wall -Wextra -Werror -Wswitch-enum -Wno-unused-parameter -Wno-inconsistent-missing-override -Wno-missing-braces -Wno-unused-lambda-capture -Wno-sign-compare

CFLAGS += -Wall -Wextra -Werror -Wswitch-enum
CFLAGS += -Wno-tautological-constant-out-of-range-compare -Wno-unused-parameter -Wno-inconsistent-missing-override -Wno-missing-braces -Wno-unused-lambda-capture -Wno-sign-compare
CXXFLAGS += $(CFLAGS) -MMD

#----------------------------------------------------------------------
Expand Down
10 changes: 7 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,13 @@
- Easy first-time configuration via a web Captive Portal
- Support for more than [120+ EMS devices](https://emsesp.org/All-Devices/) (boilers, thermostats, solar modules, mixer modules, heat pumps, gateways, switches, heat sources)

## **Installing**

Go to [install.emsesp.org](https://install.emsesp.org) or look at the documentation link below on the different ways to install EMS-ESP.

## **Documentation**

For the complete documentation on how to install, configure and get support visit the [EMS-ESP Wiki](https://emsesp.org).
For the complete documentation on how to install, configure and get support visit the [documentation at emsesp.org](https://emsesp.org).

## **Support**

Expand All @@ -35,7 +39,7 @@ If you like **EMS-ESP**, please give it a star, or fork it and contribute or off

## **Demo**

For a live demo of the Web UI click [here](https://demo.emsesp.org) and log in with any username/password.
For a live demo of the Web UI click [demo.emsesp.org](https://demo.emsesp.org) and log in with any username/password, and change the language to English.

## **Contributors ✨**

Expand Down Expand Up @@ -67,6 +71,6 @@ This program is licensed under GPL-3.0

![Console](media/console0.png)

### In Home Assistant
### Home Assistant

![Home Assistant](media/ha_lovelace.png)
Loading

0 comments on commit 694f1f0

Please sign in to comment.