Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev2

.github/workflows/github-releases-to-discord.yml

@@ -10,6 +10,7 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+
       - name: GitHub Releases To Discord
         uses: SethCohen/[email protected]
         with:

.github/workflows/pre_release.yml

@@ -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
@@ -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]

.github/workflows/sonar_check.yml

@@ -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 }}

.github/workflows/tagged_release.yml

@@ -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
@@ -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:

.gitignore

@@ -65,3 +65,6 @@ interface/tsconfig.tsbuildinfo
 
 # python virtual environment
 venv/
+
+# cspell
+words-found-verbose.txt

.vscode/settings.json

@@ -89,7 +89,6 @@
       "**/ArduinoJson/**"
     ],
     "cSpell.enableFiletypes": [
-      "!typescript",
       "ini",
       "makefile"
     ],

CHANGELOG_LATEST.md

@@ -36,12 +36,17 @@
 - 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 via the WebUI
-- command 'log show' that lists out the log buffer, showing last messages.
+- 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
+- Auto Scroll in WebLog UI - reduced delay so incoming logs are faster
 
 ## 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
 
@@ -59,4 +64,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

README.md

@@ -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**
 
@@ -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 ✨**
 
@@ -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)

cspell.json

@@ -0,0 +1,13 @@
+{
+    "$schema": "https://raw.githubusercontent.com/streetsidesoftware/cspell/main/cspell.schema.json",
+    "version": "0.2",
+    "dictionaryDefinitions": [
+      {
+        "name": "project-words",
+        "path": "./project-words.txt",
+        "addWords": true
+      }
+    ],
+    "dictionaries": ["project-words"],
+    "ignorePaths": ["node_modules", "**/venv/**", "lib/eModbus", "lib/ESPAsyncWebServer", "lib/espMqttClient", "analyse.html", "dist", "**/*.csv", "locale_translations.h", "TZ.tsx", "**/*.txt","build/**", "**/i18n/**", "/project-words.txt"]
+  }

interface/package.json

@@ -1,9 +1,9 @@
 {
   "name": "EMS-ESP",
-  "version": "3.7",
-  "description": "Build the EMS-ESP WebUI",
+  "version": "3.7.0",
+  "description": "EMS-ESP WebUI",
   "homepage": "https://emsesp.org",
-  "author": "proddy",
+  "author": "proddy, emsesp.org",
   "license": "MIT",
   "private": true,
   "type": "module",
@@ -24,8 +24,8 @@
     "@alova/adapter-xhr": "2.0.7",
     "@emotion/react": "^11.13.3",
     "@emotion/styled": "^11.13.0",
-    "@mui/icons-material": "^6.0.2",
-    "@mui/material": "^6.0.2",
+    "@mui/icons-material": "^6.1.0",
+    "@mui/material": "^6.1.0",
     "@table-library/react-table-library": "4.1.7",
     "alova": "3.0.16",
     "async-validator": "^4.2.5",
@@ -43,26 +43,25 @@
   "devDependencies": {
     "@babel/core": "^7.25.2",
     "@eslint/js": "^9.10.0",
-    "@preact/compat": "^17.1.2",
+    "@preact/compat": "^18.3.1",
     "@preact/preset-vite": "^2.9.0",
     "@trivago/prettier-plugin-sort-imports": "^4.3.0",
-    "@types/babel__core": "^7",
     "@types/formidable": "^3",
     "@types/node": "^22.5.4",
     "@types/react": "^18.3.5",
     "@types/react-dom": "^18.3.0",
     "@types/react-router-dom": "^5.3.3",
-    "concurrently": "^9.0.0",
+    "concurrently": "^9.0.1",
     "eslint": "^9.10.0",
     "eslint-config-prettier": "^9.1.0",
     "formidable": "^3.5.1",
     "prettier": "^3.3.3",
     "rollup-plugin-visualizer": "^5.12.0",
     "terser": "^5.32.0",
     "typescript-eslint": "8.5.0",
-    "vite": "^5.4.3",
+    "vite": "^5.4.4",
     "vite-plugin-imagemin": "^0.6.1",
     "vite-tsconfig-paths": "^5.0.1"
   },
-  "packageManager": "[email protected].0"
+  "packageManager": "[email protected].1"
 }

interface/src/api/endpoints.ts

@@ -22,7 +22,7 @@ export const alovaInstance = createAlova({
       method.config.headers.Authorization =
         'Bearer ' + localStorage.getItem(ACCESS_TOKEN);
     }
-    // for simualting vrey slow networks
+    // for simulating vrey slow networks
     // return new Promise((resolve) => {
     //   const random = 3000 + Math.random() * 2000;
     //   setTimeout(resolve, Math.floor(random));

interface/src/api/system.ts

@@ -15,7 +15,6 @@ export const readLogSettings = () =>
   alovaInstance.Get<LogSettings>(`/rest/logSettings`);
 export const updateLogSettings = (data: LogSettings) =>
   alovaInstance.Post('/rest/logSettings', data);
-export const fetchLog = () => alovaInstance.Post('/rest/fetchLog');
 export const fetchLogES = () => alovaInstance.Get('/es/log');
 
 // Get versions from github

interface/src/app/main/Help.tsx

@@ -102,7 +102,7 @@ const Help = () => {
             color="primary"
             onClick={() => callAPI('system', 'info')}
           >
-            {LL.SUPPORT_INFORMATION(0)}
+            {LL.DOWNLOAD(1)} {LL.SUPPORT_INFORMATION(0)}
           </Button>
         </Box>
 
@@ -113,24 +113,24 @@ const Help = () => {
           color="primary"
           onClick={() => callAPI('system', 'allvalues')}
         >
-          {LL.ALLVALUES()}
+          {LL.DOWNLOAD(1)}&nbsp;{LL.ALLVALUES()}
         </Button>
 
-        <Box border={1} p={1} mt={4}>
-          <Typography align="center" variant="subtitle1" color="orange">
-            <b>{LL.HELP_INFORMATION_5()}</b>
+        <Box sx={{ p: 2, mt: 4, border: '1px dashed orange' }}>
+          <Typography align="center" variant="subtitle1">
+            {LL.HELP_INFORMATION_5()}
           </Typography>
-          <Typography align="center">
+          <Typography align="center" mt={1}>
             <Link
               target="_blank"
               href="https://github.com/emsesp/EMS-ESP32"
               color="primary"
             >
-              {'github.com/emsesp/EMS-ESP32'}
+              {'https://github.com/emsesp/EMS-ESP32'}
             </Link>
           </Typography>
-          <Typography color="white" variant="subtitle2" align="center">
-            @proddy @MichaelDvP
+          <Typography color="white" variant="subtitle1" align="center">
+            &copy;&nbsp;emsesp.org
           </Typography>
         </Box>
       </SectionContent>

interface/src/app/settings/ApplicationSettings.tsx

@@ -613,10 +613,10 @@ const ApplicationSettings = () => {
               name="tx_mode"
               label={LL.TX_MODE()}
               value={data.tx_mode}
-              fullWidth
               variant="outlined"
               onChange={updateFormValue}
               margin="normal"
+              sx={{ width: '15ch' }}
               select
             >
               <MenuItem value={1}>EMS</MenuItem>