mirror of
https://github.com/emsesp/EMS-ESP32.git
synced 2026-01-26 08:39:09 +03:00
update 3.7.3->3.8.0
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
|
||||
For more details go to [docs.emsesp.org](https://docs.emsesp.org/).
|
||||
|
||||
## [3.7.3]
|
||||
## [3.8.0]
|
||||
|
||||
## Added
|
||||
|
||||
@@ -38,6 +38,7 @@ For more details go to [docs.emsesp.org](https://docs.emsesp.org/).
|
||||
- added LWT (Last Will and Testament) to MQTT entities in Home Assistant
|
||||
- added api/metrics endpoint for prometheus integration by @gr3enk [#2774](https://github.com/emsesp/EMS-ESP32/pull/2774)
|
||||
- added RTL8201 to eth phy list [#2800](https://github.com/emsesp/EMS-ESP32/issues/2800)
|
||||
- added partitions to Web UI Version page, so previous firmware versions can be installed [#2837](https://github.com/emsesp/EMS-ESP32/issues/2837)
|
||||
|
||||
## Fixed
|
||||
|
||||
@@ -59,6 +60,7 @@ For more details go to [docs.emsesp.org](https://docs.emsesp.org/).
|
||||
- syslog timestamp [#2704](https://github.com/emsesp/EMS-ESP32/issues/2704)
|
||||
- fixed FS format command [#2720](https://github.com/emsesp/EMS-ESP32/discussions/2720)
|
||||
- dhw priority setting to boiler and mixer, telegrams 0x2CC, 0x2CD, etc.
|
||||
- check for valid GPIOs when board profile is changed [#2841](https://github.com/emsesp/EMS-ESP32/issues/2841)
|
||||
|
||||
## Changed
|
||||
|
||||
@@ -81,3 +83,4 @@ For more details go to [docs.emsesp.org](https://docs.emsesp.org/).
|
||||
- move vectors and lists to PSRAM
|
||||
- removed unused last topic/payload echo-check
|
||||
- added Home Assistant device details to MQTT Discovery for all devices
|
||||
- device_class and state_class changes for HA MQTT Discovery [#2825](https://github.com/emsesp/EMS-ESP32/issues/2825)
|
||||
|
||||
2
Makefile
2
Makefile
@@ -67,7 +67,7 @@ DEFINES += -DARDUINOJSON_ENABLE -DARDUINOJSON_ENABLE_ARDUINO_STRING -DARDUINOJSO
|
||||
DEFINES += -DEMSESP_STANDALONE -DEMSESP_TEST -DEMSESP_DEBUG -DEMC_RX_BUFFER_SIZE=1500
|
||||
DEFINES += $(ARGS)
|
||||
|
||||
DEFAULTS = -DEMSESP_DEFAULT_LOCALE=\"en\" -DEMSESP_DEFAULT_TX_MODE=8 -DEMSESP_DEFAULT_VERSION=\"3.7.3-dev\" -DEMSESP_DEFAULT_BOARD_PROFILE=\"S32S3\"
|
||||
DEFAULTS = -DEMSESP_DEFAULT_LOCALE=\"en\" -DEMSESP_DEFAULT_TX_MODE=8 -DEMSESP_DEFAULT_VERSION=\"3.8.0-dev.0\" -DEMSESP_DEFAULT_BOARD_PROFILE=\"S32S3\"
|
||||
|
||||
#----------------------------------------------------------------------
|
||||
# Sources & Files
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "EMS-ESP",
|
||||
"version": "3.7.3",
|
||||
"version": "3.8.0",
|
||||
"description": "EMS-ESP WebUI",
|
||||
"homepage": "https://emsesp.org",
|
||||
"author": "proddy, emsesp.org",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "mock-api",
|
||||
"version": "3.7.3",
|
||||
"version": "3.8.0",
|
||||
"description": "mock api for EMS-ESP",
|
||||
"author": "proddy, emsesp.org",
|
||||
"license": "MIT",
|
||||
|
||||
@@ -116,7 +116,7 @@ let system_status = {
|
||||
},
|
||||
{
|
||||
partition: 'app1',
|
||||
version: '3.7.3-dev.41',
|
||||
version: '3.7.3-dev.40',
|
||||
install_date: '2025-03-01T13:29:13.999Z',
|
||||
size: 4672
|
||||
},
|
||||
@@ -139,8 +139,8 @@ let system_status = {
|
||||
let DEV_VERSION_IS_UPGRADEABLE: boolean;
|
||||
let STABLE_VERSION_IS_UPGRADEABLE: boolean;
|
||||
let THIS_VERSION: string;
|
||||
let LATEST_STABLE_VERSION = '3.7.3';
|
||||
let LATEST_DEV_VERSION = '3.7.4-dev.2';
|
||||
let LATEST_STABLE_VERSION = '3.8.0';
|
||||
let LATEST_DEV_VERSION = '3.8.1-dev.2';
|
||||
|
||||
// scenarios for testing versioning
|
||||
let version_test = 0; // on latest stable, or switch to dev
|
||||
@@ -171,13 +171,13 @@ switch (version_test as number) {
|
||||
break;
|
||||
case 3:
|
||||
// upgrade dev to latest, or switch to stable
|
||||
THIS_VERSION = '3.7.4-dev.3';
|
||||
THIS_VERSION = '3.8.0-dev.3';
|
||||
STABLE_VERSION_IS_UPGRADEABLE = false;
|
||||
DEV_VERSION_IS_UPGRADEABLE = true;
|
||||
break;
|
||||
case 4:
|
||||
// downgrade to an older dev, or switch back to stable
|
||||
THIS_VERSION = '3.7.3-dev.1';
|
||||
THIS_VERSION = '3.8.0-dev.1';
|
||||
STABLE_VERSION_IS_UPGRADEABLE = true;
|
||||
DEV_VERSION_IS_UPGRADEABLE = false;
|
||||
break;
|
||||
@@ -300,10 +300,10 @@ function updateMask(entity: any, de: any, dd: any) {
|
||||
const old_custom_name = dd.nodes[dd_objIndex].cn;
|
||||
console.log(
|
||||
'comparing names, old (' +
|
||||
old_custom_name +
|
||||
') with new (' +
|
||||
new_custom_name +
|
||||
')'
|
||||
old_custom_name +
|
||||
') with new (' +
|
||||
new_custom_name +
|
||||
')'
|
||||
);
|
||||
if (old_custom_name !== new_custom_name) {
|
||||
changed = true;
|
||||
@@ -399,15 +399,15 @@ function check_upgrade(version: string) {
|
||||
|
||||
console.log(
|
||||
'Upgrade this version (' +
|
||||
THIS_VERSION +
|
||||
') to dev (' +
|
||||
dev_version +
|
||||
') is ' +
|
||||
(DEV_VERSION_IS_UPGRADEABLE ? 'YES' : 'NO') +
|
||||
' and to stable (' +
|
||||
stable_version +
|
||||
') is ' +
|
||||
(STABLE_VERSION_IS_UPGRADEABLE ? 'YES' : 'NO')
|
||||
THIS_VERSION +
|
||||
') to dev (' +
|
||||
dev_version +
|
||||
') is ' +
|
||||
(DEV_VERSION_IS_UPGRADEABLE ? 'YES' : 'NO') +
|
||||
' and to stable (' +
|
||||
stable_version +
|
||||
') is ' +
|
||||
(STABLE_VERSION_IS_UPGRADEABLE ? 'YES' : 'NO')
|
||||
);
|
||||
data = {
|
||||
emsesp_version: THIS_VERSION,
|
||||
|
||||
@@ -228,7 +228,7 @@ build_src_flags =
|
||||
-DEMSESP_STANDALONE -DEMSESP_TEST
|
||||
-DEMSESP_UNITY
|
||||
-DARDUINOJSON_ENABLE_ARDUINO_STRING=1
|
||||
-DEMSESP_DEFAULT_LOCALE=\"en\" -DEMSESP_DEFAULT_TX_MODE=8 -DEMSESP_DEFAULT_VERSION=\"3.7.3-dev.0\" -DEMSESP_DEFAULT_BOARD_PROFILE=\"S32\"
|
||||
-DEMSESP_DEFAULT_LOCALE=\"en\" -DEMSESP_DEFAULT_TX_MODE=8 -DEMSESP_DEFAULT_VERSION=\"3.8.0-dev.0\" -DEMSESP_DEFAULT_BOARD_PROFILE=\"S32\"
|
||||
-std=gnu++17 -Og -ggdb
|
||||
-Wall -Wextra
|
||||
-Wno-unused-parameter -Wno-sign-compare -Wno-missing-braces
|
||||
@@ -284,7 +284,7 @@ build_flags =
|
||||
[env:standalone]
|
||||
extends = env:native
|
||||
build_flags =
|
||||
-DEMSESP_DEFAULT_LOCALE=\"en\" -DEMSESP_DEFAULT_TX_MODE=8 -DEMSESP_DEFAULT_VERSION=\"3.7.3-dev.0\" -DEMSESP_DEFAULT_BOARD_PROFILE=\"S32\"
|
||||
-DEMSESP_DEFAULT_LOCALE=\"en\" -DEMSESP_DEFAULT_TX_MODE=8 -DEMSESP_DEFAULT_VERSION=\"3.8.0-dev.0\" -DEMSESP_DEFAULT_BOARD_PROFILE=\"S32\"
|
||||
|
||||
; Modbus
|
||||
; Creating the modbus registers is a multi-step process. Before it was in a shell script called generate_csv_and_headers.sh
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
sonar.organization=emsesp
|
||||
sonar.projectKey=emsesp_EMS-ESP32
|
||||
sonar.projectName=EMS-ESP32
|
||||
sonar.projectVersion=3.7.3
|
||||
sonar.projectVersion=3.8.0
|
||||
sonar.sources=./src
|
||||
sonar.cfamily.compile-commands=bw-output/compile_commands.json
|
||||
sonar.sourceEncoding=UTF-8
|
||||
|
||||
@@ -1 +1 @@
|
||||
#define EMSESP_APP_VERSION "3.7.3-dev.40"
|
||||
#define EMSESP_APP_VERSION "3.8.0-dev.0"
|
||||
|
||||
@@ -1334,7 +1334,7 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const
|
||||
// log shows first if you can upgrade to dev, and then if you can upgrade to stable
|
||||
// request.url("/rest/action");
|
||||
// std::string LATEST_STABLE_VERSION = "3.7.2";
|
||||
// std::string LATEST_DEV_VERSION = "3.7.3-dev.3";
|
||||
// std::string LATEST_DEV_VERSION = "3.8.0-dev.3";
|
||||
// std::string param = LATEST_DEV_VERSION + "," + LATEST_STABLE_VERSION;
|
||||
// std::string action = "{\"action\":\"checkUpgrade\", \"param\":\"" + param + "\"}";
|
||||
// deserializeJson(doc, action);
|
||||
@@ -1352,7 +1352,7 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const
|
||||
// EMSESP::webStatusService.action(&request, doc.as<JsonVariant>());
|
||||
|
||||
// // case 3: upgrade an older dev to latest dev, no stable upgrades available. So true, false
|
||||
// EMSESP::webStatusService.set_current_version("3.7.3-dev.2");
|
||||
// EMSESP::webStatusService.set_current_version("3.8.0-dev.2");
|
||||
// EMSESP::webStatusService.action(&request, doc.as<JsonVariant>());
|
||||
|
||||
// char data6[] = "{\"device\":\"system\", \"cmd\":\"read\",\"value\":\"8 2 27 1\"}";
|
||||
|
||||
Reference in New Issue
Block a user