From f41bb3671c5c56dd735b348c6aa41ed1a474b5c9 Mon Sep 17 00:00:00 2001 From: Proddy Date: Fri, 24 Nov 2023 07:36:36 +0100 Subject: [PATCH] 3.6.4 --- CHANGELOG.md | 2 +- Makefile | 2 +- interface/package.json | 2 +- interface/yarn.lock | 133 +++++++++++++++++---------------------- mock-api/server.js | 4 +- platformio.ini | 2 +- sonar-project.properties | 2 +- src/system.cpp | 2 +- 8 files changed, 67 insertions(+), 82 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a4013948..c4424ebb5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [3.6.3] November 18 2023 +## [3.6.4] November 24 2023 ## **IMPORTANT! BREAKING CHANGES** diff --git a/Makefile b/Makefile index 64e4b61b5..1beb818c8 100644 --- a/Makefile +++ b/Makefile @@ -42,7 +42,7 @@ DEFINES += -DARDUINOJSON_ENABLE_STD_STRING=1 -DARDUINOJSON_ENABLE_PROGMEM=1 -DAR DEFINES += -DEMSESP_DEBUG -DEMSESP_STANDALONE -DEMSESP_TEST -D__linux__ -DEMC_RX_BUFFER_SIZE=1500 DEFINES += $(ARGS) -DEFAULTS = -DEMSESP_DEFAULT_LOCALE=\"en\" -DEMSESP_DEFAULT_TX_MODE=8 -DEMSESP_DEFAULT_VERSION=\"3.6.3-dev\" -DEMSESP_DEFAULT_BOARD_PROFILE=\"S32\" +DEFAULTS = -DEMSESP_DEFAULT_LOCALE=\"en\" -DEMSESP_DEFAULT_TX_MODE=8 -DEMSESP_DEFAULT_VERSION=\"3.6.4-dev\" -DEMSESP_DEFAULT_BOARD_PROFILE=\"S32\" #---------------------------------------------------------------------- # Sources & Files diff --git a/interface/package.json b/interface/package.json index f8c6bd82a..aca43f728 100644 --- a/interface/package.json +++ b/interface/package.json @@ -1,6 +1,6 @@ { "name": "EMS-ESP", - "version": "3.6.3", + "version": "3.6.4", "description": "build EMS-ESP WebUI", "homepage": "https://emsesp.github.io/docs", "author": "proddy", diff --git a/interface/yarn.lock b/interface/yarn.lock index a897841f0..2a70c86f2 100644 --- a/interface/yarn.lock +++ b/interface/yarn.lock @@ -1129,86 +1129,86 @@ __metadata: languageName: node linkType: hard -"@rollup/rollup-android-arm-eabi@npm:4.5.1": - version: 4.5.1 - resolution: "@rollup/rollup-android-arm-eabi@npm:4.5.1" +"@rollup/rollup-android-arm-eabi@npm:4.5.2": + version: 4.5.2 + resolution: "@rollup/rollup-android-arm-eabi@npm:4.5.2" conditions: os=android & cpu=arm languageName: node linkType: hard -"@rollup/rollup-android-arm64@npm:4.5.1": - version: 4.5.1 - resolution: "@rollup/rollup-android-arm64@npm:4.5.1" +"@rollup/rollup-android-arm64@npm:4.5.2": + version: 4.5.2 + resolution: "@rollup/rollup-android-arm64@npm:4.5.2" conditions: os=android & cpu=arm64 languageName: node linkType: hard -"@rollup/rollup-darwin-arm64@npm:4.5.1": - version: 4.5.1 - resolution: "@rollup/rollup-darwin-arm64@npm:4.5.1" +"@rollup/rollup-darwin-arm64@npm:4.5.2": + version: 4.5.2 + resolution: "@rollup/rollup-darwin-arm64@npm:4.5.2" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@rollup/rollup-darwin-x64@npm:4.5.1": - version: 4.5.1 - resolution: "@rollup/rollup-darwin-x64@npm:4.5.1" +"@rollup/rollup-darwin-x64@npm:4.5.2": + version: 4.5.2 + resolution: "@rollup/rollup-darwin-x64@npm:4.5.2" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"@rollup/rollup-linux-arm-gnueabihf@npm:4.5.1": - version: 4.5.1 - resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.5.1" +"@rollup/rollup-linux-arm-gnueabihf@npm:4.5.2": + version: 4.5.2 + resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.5.2" conditions: os=linux & cpu=arm languageName: node linkType: hard -"@rollup/rollup-linux-arm64-gnu@npm:4.5.1": - version: 4.5.1 - resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.5.1" +"@rollup/rollup-linux-arm64-gnu@npm:4.5.2": + version: 4.5.2 + resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.5.2" conditions: os=linux & cpu=arm64 & libc=glibc languageName: node linkType: hard -"@rollup/rollup-linux-arm64-musl@npm:4.5.1": - version: 4.5.1 - resolution: "@rollup/rollup-linux-arm64-musl@npm:4.5.1" +"@rollup/rollup-linux-arm64-musl@npm:4.5.2": + version: 4.5.2 + resolution: "@rollup/rollup-linux-arm64-musl@npm:4.5.2" conditions: os=linux & cpu=arm64 & libc=musl languageName: node linkType: hard -"@rollup/rollup-linux-x64-gnu@npm:4.5.1": - version: 4.5.1 - resolution: "@rollup/rollup-linux-x64-gnu@npm:4.5.1" +"@rollup/rollup-linux-x64-gnu@npm:4.5.2": + version: 4.5.2 + resolution: "@rollup/rollup-linux-x64-gnu@npm:4.5.2" conditions: os=linux & cpu=x64 & libc=glibc languageName: node linkType: hard -"@rollup/rollup-linux-x64-musl@npm:4.5.1": - version: 4.5.1 - resolution: "@rollup/rollup-linux-x64-musl@npm:4.5.1" +"@rollup/rollup-linux-x64-musl@npm:4.5.2": + version: 4.5.2 + resolution: "@rollup/rollup-linux-x64-musl@npm:4.5.2" conditions: os=linux & cpu=x64 & libc=musl languageName: node linkType: hard -"@rollup/rollup-win32-arm64-msvc@npm:4.5.1": - version: 4.5.1 - resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.5.1" +"@rollup/rollup-win32-arm64-msvc@npm:4.5.2": + version: 4.5.2 + resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.5.2" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"@rollup/rollup-win32-ia32-msvc@npm:4.5.1": - version: 4.5.1 - resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.5.1" +"@rollup/rollup-win32-ia32-msvc@npm:4.5.2": + version: 4.5.2 + resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.5.2" conditions: os=win32 & cpu=ia32 languageName: node linkType: hard -"@rollup/rollup-win32-x64-msvc@npm:4.5.1": - version: 4.5.1 - resolution: "@rollup/rollup-win32-x64-msvc@npm:4.5.1" +"@rollup/rollup-win32-x64-msvc@npm:4.5.2": + version: 4.5.2 + resolution: "@rollup/rollup-win32-x64-msvc@npm:4.5.2" conditions: os=win32 & cpu=x64 languageName: node linkType: hard @@ -1378,24 +1378,9 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"@types/node@npm:*, @types/node@npm:^20.9.4": - version: 20.9.4 - resolution: "@types/node@npm:20.9.4" -======= -"@types/node@npm:*": - version: 20.8.9 - resolution: "@types/node@npm:20.8.9" - dependencies: - undici-types: "npm:~5.26.4" - checksum: 71e0023342272e63c47f3fab6082bd6c89d0b0c4262a1c2d0d52458560077f5c28ef5cfe704306eac43fc2e5111bef4e1cdbf08f565650520fad5e54005a8836 - languageName: node - linkType: hard - -"@types/node@npm:^20.9.5": +"@types/node@npm:*, @types/node@npm:^20.9.5": version: 20.9.5 resolution: "@types/node@npm:20.9.5" ->>>>>>> origin/dev dependencies: undici-types: "npm:~5.26.4" checksum: f7d02ef84a449f079bc77d7494dc96a1d45006b3a7583a41430d8b62ad7dd914bcce8d1ed60584b8725289e609c20288c840aadb21cc52d5b656fa7731c1a528 @@ -2956,9 +2941,9 @@ __metadata: linkType: hard "electron-to-chromium@npm:^1.4.535": - version: 1.4.590 - resolution: "electron-to-chromium@npm:1.4.590" - checksum: 04f54be67d5465432363e6a7cf0813dbd95a23d115f55679662677508d9e068ce241b4a8e1224a53fccc4037094928d38946529c5118c1184090e2609c65cd94 + version: 1.4.593 + resolution: "electron-to-chromium@npm:1.4.593" + checksum: 836463303815c1e599183e4cd84549b76c1451602c68119bfd428f706202c7d2e799cdbf1408e2d154155f84bc85020491b3244b2f5a29614d96fa7d6967b114 languageName: node linkType: hard @@ -5701,9 +5686,9 @@ __metadata: linkType: hard "lru-cache@npm:^10.0.1, lru-cache@npm:^9.1.1 || ^10.0.0": - version: 10.0.3 - resolution: "lru-cache@npm:10.0.3" - checksum: 2fd14d8f828760eb4f1e696d20383bf52bb58a02aebfd08cb8035a66876c6fc1ec244ffdcf93d5a201fdad6d9f8c59de62c4fc5ff5604d67a4f833441f5b5945 + version: 10.1.0 + resolution: "lru-cache@npm:10.1.0" + checksum: 207278d6fa711fb1f94a0835d4d4737441d2475302482a14785b10515e4c906a57ebf9f35bf060740c9560e91c7c1ad5a04fd7ed030972a9ba18bce2a228e95b languageName: node linkType: hard @@ -7140,21 +7125,21 @@ __metadata: linkType: hard "rollup@npm:^4.2.0": - version: 4.5.1 - resolution: "rollup@npm:4.5.1" - dependencies: - "@rollup/rollup-android-arm-eabi": "npm:4.5.1" - "@rollup/rollup-android-arm64": "npm:4.5.1" - "@rollup/rollup-darwin-arm64": "npm:4.5.1" - "@rollup/rollup-darwin-x64": "npm:4.5.1" - "@rollup/rollup-linux-arm-gnueabihf": "npm:4.5.1" - "@rollup/rollup-linux-arm64-gnu": "npm:4.5.1" - "@rollup/rollup-linux-arm64-musl": "npm:4.5.1" - "@rollup/rollup-linux-x64-gnu": "npm:4.5.1" - "@rollup/rollup-linux-x64-musl": "npm:4.5.1" - "@rollup/rollup-win32-arm64-msvc": "npm:4.5.1" - "@rollup/rollup-win32-ia32-msvc": "npm:4.5.1" - "@rollup/rollup-win32-x64-msvc": "npm:4.5.1" + version: 4.5.2 + resolution: "rollup@npm:4.5.2" + dependencies: + "@rollup/rollup-android-arm-eabi": "npm:4.5.2" + "@rollup/rollup-android-arm64": "npm:4.5.2" + "@rollup/rollup-darwin-arm64": "npm:4.5.2" + "@rollup/rollup-darwin-x64": "npm:4.5.2" + "@rollup/rollup-linux-arm-gnueabihf": "npm:4.5.2" + "@rollup/rollup-linux-arm64-gnu": "npm:4.5.2" + "@rollup/rollup-linux-arm64-musl": "npm:4.5.2" + "@rollup/rollup-linux-x64-gnu": "npm:4.5.2" + "@rollup/rollup-linux-x64-musl": "npm:4.5.2" + "@rollup/rollup-win32-arm64-msvc": "npm:4.5.2" + "@rollup/rollup-win32-ia32-msvc": "npm:4.5.2" + "@rollup/rollup-win32-x64-msvc": "npm:4.5.2" fsevents: "npm:~2.3.2" dependenciesMeta: "@rollup/rollup-android-arm-eabi": @@ -7185,7 +7170,7 @@ __metadata: optional: true bin: rollup: dist/bin/rollup - checksum: dbbd4d7b8b0f6814d58b24149d2883ecdfbc2a35f8b206ff8d7d2a6e28666cb385bd0b340b338d70f9493455aafed3be6e7fc5273ff786713d4ac41d37480fb0 + checksum: 7a6d3fbdc72b1aaefce60966425c66dfce90ea24f8b42c3b3af94364226f7fe25e4635739d31f712df2394c88e74d9671256aa344241acbeefd6425b014c4b24 languageName: node linkType: hard diff --git a/mock-api/server.js b/mock-api/server.js index 2dc90b50d..00d35ac25 100644 --- a/mock-api/server.js +++ b/mock-api/server.js @@ -324,7 +324,7 @@ security_settings = { ] }; const features = { - version: 'v3.6.3-demo', + version: 'v3.6.4-demo', // platform: 'ESP32' platform: 'ESP32-S3' }; @@ -355,7 +355,7 @@ const EMSESP_WRITE_ENTITIES_ENDPOINT = REST_ENDPOINT_ROOT + 'entities'; const emsesp_info = { System: { - version: '3.6.3', + version: '3.6.4', uptime: '001+06:40:34.018', 'uptime (seconds)': 110434, freemem: 131, diff --git a/platformio.ini b/platformio.ini index 2fe2a578d..69521fe02 100644 --- a/platformio.ini +++ b/platformio.ini @@ -172,7 +172,7 @@ platform = native build_flags = -DARDUINOJSON_ENABLE_STD_STRING=1 -DARDUINOJSON_ENABLE_PROGMEM=1 -DARDUINOJSON_ENABLE_ARDUINO_STRING -DARDUINOJSON_USE_DOUBLE=0 -DEMSESP_DEBUG -DEMSESP_STANDALONE -DEMSESP_TEST -D__linux__ - -DEMSESP_DEFAULT_LOCALE=\"en\" -DEMSESP_DEFAULT_TX_MODE=8 -DEMSESP_DEFAULT_VERSION=\"3.6.3-dev\" -DEMSESP_DEFAULT_BOARD_PROFILE=\"S32\" + -DEMSESP_DEFAULT_LOCALE=\"en\" -DEMSESP_DEFAULT_TX_MODE=8 -DEMSESP_DEFAULT_VERSION=\"3.6.4-dev\" -DEMSESP_DEFAULT_BOARD_PROFILE=\"S32\" -lpthread -std=gnu++11 -Og -ggdb build_src_flags = diff --git a/sonar-project.properties b/sonar-project.properties index 877b44ec4..019b7fdfc 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -1,7 +1,7 @@ sonar.organization=emsesp sonar.projectKey=emsesp_EMS-ESP32 sonar.projectName=EMS-ESP32 -sonar.projectVersion=3.6.3 +sonar.projectVersion=3.6.4 sonar.sources=./src sonar.cfamily.build-wrapper-output=bw-output sonar.sourceEncoding=UTF-8 diff --git a/src/system.cpp b/src/system.cpp index f1d5b013f..6677c5ff6 100644 --- a/src/system.cpp +++ b/src/system.cpp @@ -1096,7 +1096,7 @@ bool System::check_upgrade(bool factory_settings) { missing_version = (settingsVersion.empty() || (settingsVersion.length() < 5)); if (missing_version) { LOG_WARNING("No version information found (%s)", settingsVersion.c_str()); - settingsVersion = "3.6.3"; // this was the last stable version + settingsVersion = "3.6.4"; // this was the last stable version } }