3.6.3 (refershed)

This commit is contained in:
Proddy
2023-11-19 21:24:01 +01:00
5 changed files with 160 additions and 167 deletions

View File

@@ -29,7 +29,7 @@
"@table-library/react-table-library": "4.1.7",
"@types/imagemin": "^8.0.4",
"@types/lodash-es": "^4.17.11",
"@types/node": "^20.9.1",
"@types/node": "^20.9.2",
"@types/react": "^18.2.37",
"@types/react-dom": "^18.2.15",
"@types/react-router-dom": "^5.3.3",

View File

@@ -5,7 +5,6 @@ import viteImagemin from 'vite-plugin-imagemin';
import { visualizer } from 'rollup-plugin-visualizer';
export default defineConfig(({ command, mode }) => {
// standalone build for development - runs the server
if (command === 'serve') {
console.log('Preparing for standalone build with server, mode=' + mode);
return {
@@ -30,9 +29,17 @@ export default defineConfig(({ command, mode }) => {
};
}
if (command === 'build' && mode === 'hosted') {
return {
plugins: [preact(), viteTsconfigPaths()],
build: {
chunkSizeWarningLimit: 1024
}
};
}
// production build, both for hosted and building the firmware
if (command === 'build') {
console.log('Preparing for production build, mode is ' + mode);
return {
plugins: [
preact(),
@@ -79,11 +86,7 @@ export default defineConfig(({ command, mode }) => {
build: {
// target: 'es2022',
outDir: 'dist',
reportCompressedSize: false,
chunkSizeWarningLimit: 1024,
sourcemap: false,
manifest: false,
minify: 'terser',
terserOptions: {
compress: {
@@ -109,16 +112,6 @@ export default defineConfig(({ command, mode }) => {
nameCache: null,
safari10: false,
toplevel: false
},
rollupOptions: {
// Ignore "use client" waning since we are not using SSR
onwarn(warning, warn) {
if (warning.code === 'MODULE_LEVEL_DIRECTIVE' && warning.message.includes(`"use client"`)) {
return;
}
warn(warning);
}
}
}
};

View File

@@ -462,72 +462,72 @@ __metadata:
languageName: node
linkType: hard
"@esbuild/android-arm64@npm:0.19.5":
version: 0.19.5
resolution: "@esbuild/android-arm64@npm:0.19.5"
"@esbuild/android-arm64@npm:0.19.6":
version: 0.19.6
resolution: "@esbuild/android-arm64@npm:0.19.6"
conditions: os=android & cpu=arm64
languageName: node
linkType: hard
"@esbuild/android-arm@npm:0.19.5":
version: 0.19.5
resolution: "@esbuild/android-arm@npm:0.19.5"
"@esbuild/android-arm@npm:0.19.6":
version: 0.19.6
resolution: "@esbuild/android-arm@npm:0.19.6"
conditions: os=android & cpu=arm
languageName: node
linkType: hard
"@esbuild/android-x64@npm:0.19.5":
version: 0.19.5
resolution: "@esbuild/android-x64@npm:0.19.5"
"@esbuild/android-x64@npm:0.19.6":
version: 0.19.6
resolution: "@esbuild/android-x64@npm:0.19.6"
conditions: os=android & cpu=x64
languageName: node
linkType: hard
"@esbuild/darwin-arm64@npm:0.19.5":
version: 0.19.5
resolution: "@esbuild/darwin-arm64@npm:0.19.5"
"@esbuild/darwin-arm64@npm:0.19.6":
version: 0.19.6
resolution: "@esbuild/darwin-arm64@npm:0.19.6"
conditions: os=darwin & cpu=arm64
languageName: node
linkType: hard
"@esbuild/darwin-x64@npm:0.19.5":
version: 0.19.5
resolution: "@esbuild/darwin-x64@npm:0.19.5"
"@esbuild/darwin-x64@npm:0.19.6":
version: 0.19.6
resolution: "@esbuild/darwin-x64@npm:0.19.6"
conditions: os=darwin & cpu=x64
languageName: node
linkType: hard
"@esbuild/freebsd-arm64@npm:0.19.5":
version: 0.19.5
resolution: "@esbuild/freebsd-arm64@npm:0.19.5"
"@esbuild/freebsd-arm64@npm:0.19.6":
version: 0.19.6
resolution: "@esbuild/freebsd-arm64@npm:0.19.6"
conditions: os=freebsd & cpu=arm64
languageName: node
linkType: hard
"@esbuild/freebsd-x64@npm:0.19.5":
version: 0.19.5
resolution: "@esbuild/freebsd-x64@npm:0.19.5"
"@esbuild/freebsd-x64@npm:0.19.6":
version: 0.19.6
resolution: "@esbuild/freebsd-x64@npm:0.19.6"
conditions: os=freebsd & cpu=x64
languageName: node
linkType: hard
"@esbuild/linux-arm64@npm:0.19.5":
version: 0.19.5
resolution: "@esbuild/linux-arm64@npm:0.19.5"
"@esbuild/linux-arm64@npm:0.19.6":
version: 0.19.6
resolution: "@esbuild/linux-arm64@npm:0.19.6"
conditions: os=linux & cpu=arm64
languageName: node
linkType: hard
"@esbuild/linux-arm@npm:0.19.5":
version: 0.19.5
resolution: "@esbuild/linux-arm@npm:0.19.5"
"@esbuild/linux-arm@npm:0.19.6":
version: 0.19.6
resolution: "@esbuild/linux-arm@npm:0.19.6"
conditions: os=linux & cpu=arm
languageName: node
linkType: hard
"@esbuild/linux-ia32@npm:0.19.5":
version: 0.19.5
resolution: "@esbuild/linux-ia32@npm:0.19.5"
"@esbuild/linux-ia32@npm:0.19.6":
version: 0.19.6
resolution: "@esbuild/linux-ia32@npm:0.19.6"
conditions: os=linux & cpu=ia32
languageName: node
linkType: hard
@@ -539,86 +539,86 @@ __metadata:
languageName: node
linkType: hard
"@esbuild/linux-loong64@npm:0.19.5":
version: 0.19.5
resolution: "@esbuild/linux-loong64@npm:0.19.5"
"@esbuild/linux-loong64@npm:0.19.6":
version: 0.19.6
resolution: "@esbuild/linux-loong64@npm:0.19.6"
conditions: os=linux & cpu=loong64
languageName: node
linkType: hard
"@esbuild/linux-mips64el@npm:0.19.5":
version: 0.19.5
resolution: "@esbuild/linux-mips64el@npm:0.19.5"
"@esbuild/linux-mips64el@npm:0.19.6":
version: 0.19.6
resolution: "@esbuild/linux-mips64el@npm:0.19.6"
conditions: os=linux & cpu=mips64el
languageName: node
linkType: hard
"@esbuild/linux-ppc64@npm:0.19.5":
version: 0.19.5
resolution: "@esbuild/linux-ppc64@npm:0.19.5"
"@esbuild/linux-ppc64@npm:0.19.6":
version: 0.19.6
resolution: "@esbuild/linux-ppc64@npm:0.19.6"
conditions: os=linux & cpu=ppc64
languageName: node
linkType: hard
"@esbuild/linux-riscv64@npm:0.19.5":
version: 0.19.5
resolution: "@esbuild/linux-riscv64@npm:0.19.5"
"@esbuild/linux-riscv64@npm:0.19.6":
version: 0.19.6
resolution: "@esbuild/linux-riscv64@npm:0.19.6"
conditions: os=linux & cpu=riscv64
languageName: node
linkType: hard
"@esbuild/linux-s390x@npm:0.19.5":
version: 0.19.5
resolution: "@esbuild/linux-s390x@npm:0.19.5"
"@esbuild/linux-s390x@npm:0.19.6":
version: 0.19.6
resolution: "@esbuild/linux-s390x@npm:0.19.6"
conditions: os=linux & cpu=s390x
languageName: node
linkType: hard
"@esbuild/linux-x64@npm:0.19.5":
version: 0.19.5
resolution: "@esbuild/linux-x64@npm:0.19.5"
"@esbuild/linux-x64@npm:0.19.6":
version: 0.19.6
resolution: "@esbuild/linux-x64@npm:0.19.6"
conditions: os=linux & cpu=x64
languageName: node
linkType: hard
"@esbuild/netbsd-x64@npm:0.19.5":
version: 0.19.5
resolution: "@esbuild/netbsd-x64@npm:0.19.5"
"@esbuild/netbsd-x64@npm:0.19.6":
version: 0.19.6
resolution: "@esbuild/netbsd-x64@npm:0.19.6"
conditions: os=netbsd & cpu=x64
languageName: node
linkType: hard
"@esbuild/openbsd-x64@npm:0.19.5":
version: 0.19.5
resolution: "@esbuild/openbsd-x64@npm:0.19.5"
"@esbuild/openbsd-x64@npm:0.19.6":
version: 0.19.6
resolution: "@esbuild/openbsd-x64@npm:0.19.6"
conditions: os=openbsd & cpu=x64
languageName: node
linkType: hard
"@esbuild/sunos-x64@npm:0.19.5":
version: 0.19.5
resolution: "@esbuild/sunos-x64@npm:0.19.5"
"@esbuild/sunos-x64@npm:0.19.6":
version: 0.19.6
resolution: "@esbuild/sunos-x64@npm:0.19.6"
conditions: os=sunos & cpu=x64
languageName: node
linkType: hard
"@esbuild/win32-arm64@npm:0.19.5":
version: 0.19.5
resolution: "@esbuild/win32-arm64@npm:0.19.5"
"@esbuild/win32-arm64@npm:0.19.6":
version: 0.19.6
resolution: "@esbuild/win32-arm64@npm:0.19.6"
conditions: os=win32 & cpu=arm64
languageName: node
linkType: hard
"@esbuild/win32-ia32@npm:0.19.5":
version: 0.19.5
resolution: "@esbuild/win32-ia32@npm:0.19.5"
"@esbuild/win32-ia32@npm:0.19.6":
version: 0.19.6
resolution: "@esbuild/win32-ia32@npm:0.19.6"
conditions: os=win32 & cpu=ia32
languageName: node
linkType: hard
"@esbuild/win32-x64@npm:0.19.5":
version: 0.19.5
resolution: "@esbuild/win32-x64@npm:0.19.5"
"@esbuild/win32-x64@npm:0.19.6":
version: 0.19.6
resolution: "@esbuild/win32-x64@npm:0.19.6"
conditions: os=win32 & cpu=x64
languageName: node
linkType: hard
@@ -1378,12 +1378,12 @@ __metadata:
languageName: node
linkType: hard
"@types/node@npm:*, @types/node@npm:^20.9.1":
version: 20.9.1
resolution: "@types/node@npm:20.9.1"
"@types/node@npm:*, @types/node@npm:^20.9.2":
version: 20.9.2
resolution: "@types/node@npm:20.9.2"
dependencies:
undici-types: "npm:~5.26.4"
checksum: b2b3f9ee31db63ccd3d48e5597d359c3385879679f37a749e473b47068aae181d0e280f39f153d75ce704640b3ec09d029aecd2a686e5658fb866254dc7e781b
checksum: 8bab2870bfc02efc988c53dfb0149634f8feb824132cc7f20b36f3d55d89ef893e3a43d545524a5cb3a284f4ce68ae4181d75a4a39cee6b79c586d719e6b7461
languageName: node
linkType: hard
@@ -1627,7 +1627,7 @@ __metadata:
"@table-library/react-table-library": "npm:4.1.7"
"@types/imagemin": "npm:^8.0.4"
"@types/lodash-es": "npm:^4.17.11"
"@types/node": "npm:^20.9.1"
"@types/node": "npm:^20.9.2"
"@types/react": "npm:^18.2.37"
"@types/react-dom": "npm:^18.2.15"
"@types/react-router-dom": "npm:^5.3.3"
@@ -3334,31 +3334,31 @@ __metadata:
linkType: hard
"esbuild@npm:^0.19.3":
version: 0.19.5
resolution: "esbuild@npm:0.19.5"
version: 0.19.6
resolution: "esbuild@npm:0.19.6"
dependencies:
"@esbuild/android-arm": "npm:0.19.5"
"@esbuild/android-arm64": "npm:0.19.5"
"@esbuild/android-x64": "npm:0.19.5"
"@esbuild/darwin-arm64": "npm:0.19.5"
"@esbuild/darwin-x64": "npm:0.19.5"
"@esbuild/freebsd-arm64": "npm:0.19.5"
"@esbuild/freebsd-x64": "npm:0.19.5"
"@esbuild/linux-arm": "npm:0.19.5"
"@esbuild/linux-arm64": "npm:0.19.5"
"@esbuild/linux-ia32": "npm:0.19.5"
"@esbuild/linux-loong64": "npm:0.19.5"
"@esbuild/linux-mips64el": "npm:0.19.5"
"@esbuild/linux-ppc64": "npm:0.19.5"
"@esbuild/linux-riscv64": "npm:0.19.5"
"@esbuild/linux-s390x": "npm:0.19.5"
"@esbuild/linux-x64": "npm:0.19.5"
"@esbuild/netbsd-x64": "npm:0.19.5"
"@esbuild/openbsd-x64": "npm:0.19.5"
"@esbuild/sunos-x64": "npm:0.19.5"
"@esbuild/win32-arm64": "npm:0.19.5"
"@esbuild/win32-ia32": "npm:0.19.5"
"@esbuild/win32-x64": "npm:0.19.5"
"@esbuild/android-arm": "npm:0.19.6"
"@esbuild/android-arm64": "npm:0.19.6"
"@esbuild/android-x64": "npm:0.19.6"
"@esbuild/darwin-arm64": "npm:0.19.6"
"@esbuild/darwin-x64": "npm:0.19.6"
"@esbuild/freebsd-arm64": "npm:0.19.6"
"@esbuild/freebsd-x64": "npm:0.19.6"
"@esbuild/linux-arm": "npm:0.19.6"
"@esbuild/linux-arm64": "npm:0.19.6"
"@esbuild/linux-ia32": "npm:0.19.6"
"@esbuild/linux-loong64": "npm:0.19.6"
"@esbuild/linux-mips64el": "npm:0.19.6"
"@esbuild/linux-ppc64": "npm:0.19.6"
"@esbuild/linux-riscv64": "npm:0.19.6"
"@esbuild/linux-s390x": "npm:0.19.6"
"@esbuild/linux-x64": "npm:0.19.6"
"@esbuild/netbsd-x64": "npm:0.19.6"
"@esbuild/openbsd-x64": "npm:0.19.6"
"@esbuild/sunos-x64": "npm:0.19.6"
"@esbuild/win32-arm64": "npm:0.19.6"
"@esbuild/win32-ia32": "npm:0.19.6"
"@esbuild/win32-x64": "npm:0.19.6"
dependenciesMeta:
"@esbuild/android-arm":
optional: true
@@ -3406,7 +3406,7 @@ __metadata:
optional: true
bin:
esbuild: bin/esbuild
checksum: f8ffe0cbab8a80ec63b6962b7d722da9e3dbe79a57d3cd998e107e35792068facd6f63e58ae19e919891456ed6cb73114a9777f0e7353ec8613b4fc75571d56d
checksum: 4f9436af2c2a8625cc2f8dbf34cc14c79617f6e42f107f2cc53e3503e8b43ac34afb8d7d9e02d7eb690835e8f93af42261c5437e4f54ab3737b1e5b9794ca104
languageName: node
linkType: hard
@@ -5686,11 +5686,9 @@ __metadata:
linkType: hard
"lru-cache@npm:^10.0.1, lru-cache@npm:^9.1.1 || ^10.0.0":
version: 10.0.2
resolution: "lru-cache@npm:10.0.2"
dependencies:
semver: "npm:^7.3.5"
checksum: a675b71a19f4b23186549e343792c3eb6196a5fca2a96b59e31a44289459b7e166b3c6cb08952f45ac29d8cfe561cabee88d906fdd5c98fb7cbda8f5d47431a3
version: 10.0.3
resolution: "lru-cache@npm:10.0.3"
checksum: 2fd14d8f828760eb4f1e696d20383bf52bb58a02aebfd08cb8035a66876c6fc1ec244ffdcf93d5a201fdad6d9f8c59de62c4fc5ff5604d67a4f833441f5b5945
languageName: node
linkType: hard

View File

@@ -353,6 +353,54 @@ const EMSESP_RESET_CUSTOMIZATIONS_ENDPOINT = REST_ENDPOINT_ROOT + 'resetCustomiz
const EMSESP_WRITE_SCHEDULE_ENDPOINT = REST_ENDPOINT_ROOT + 'schedule';
const EMSESP_WRITE_ENTITIES_ENDPOINT = REST_ENDPOINT_ROOT + 'entities';
const emsesp_info = {
System: {
version: '3.6.3',
uptime: '001+06:40:34.018',
'uptime (seconds)': 110434,
freemem: 131,
'reset reason': 'Software reset CPU / Software reset CPU',
'Sensor sensors': 3
},
Network: {
connection: 'Ethernet',
hostname: 'ems-esp',
MAC: 'A8:03:2A:62:64:CF',
'IPv4 address': '192.168.1.134/255.255.255.0',
'IPv4 gateway': '192.168.1.1',
'IPv4 nameserver': '192.168.1.1'
},
Status: {
'bus status': 'connected',
'bus protocol': 'Buderus',
'telegrams received': 84986,
'read requests sent': 14748,
'write requests sent': 3,
'incomplete telegrams': 8,
'tx fails': 0,
'rx line quality': 100,
'tx line quality': 100,
MQTT: 'connected',
'MQTT publishes': 46336,
'MQTT publish fails': 0,
'Sensor reads': 22086,
'Sensor fails': 0
},
Devices: [
{
type: 'Boiler',
name: 'Nefit GBx72/Trendline/Cerapur/Greenstar Si/27i (DeviceID:0x08 ProductID:123, Version:06.01)',
handlers:
'0x10 0x11 0xC2 0x14 0x15 0x1C 0x18 0x19 0x1A 0x35 0x16 0x33 0x34 0x26 0x2A 0xD1 0xE3 0xE4 0xE5 0xE6 0xE9 0xEA'
},
{
type: 'Thermostat',
name: 'RC20/Moduline 300 (DeviceID:0x17, ProductID:77, Version:03.03)',
handlers: '0xA3 0x06 0xA2 0x12 0x91 0xA8'
}
]
};
settings = {
locale: 'en',
tx_mode: 4,
@@ -2638,53 +2686,6 @@ rest_server.get(EMSESP_BOARDPROFILE_ENDPOINT, (req, res) => {
});
// EMS-ESP API specific
const emsesp_info = {
System: {
version: '3.6.3',
uptime: '001+06:40:34.018',
'uptime (seconds)': 110434,
freemem: 131,
'reset reason': 'Software reset CPU / Software reset CPU',
'Sensor sensors': 3
},
Network: {
connection: 'Ethernet',
hostname: 'ems-esp',
MAC: 'A8:03:2A:62:64:CF',
'IPv4 address': '192.168.1.134/255.255.255.0',
'IPv4 gateway': '192.168.1.1',
'IPv4 nameserver': '192.168.1.1'
},
Status: {
'bus status': 'connected',
'bus protocol': 'Buderus',
'telegrams received': 84986,
'read requests sent': 14748,
'write requests sent': 3,
'incomplete telegrams': 8,
'tx fails': 0,
'rx line quality': 100,
'tx line quality': 100,
MQTT: 'connected',
'MQTT publishes': 46336,
'MQTT publish fails': 0,
'Sensor reads': 22086,
'Sensor fails': 0
},
Devices: [
{
type: 'Boiler',
name: 'Nefit GBx72/Trendline/Cerapur/Greenstar Si/27i (DeviceID:0x08 ProductID:123, Version:06.01)',
handlers:
'0x10 0x11 0xC2 0x14 0x15 0x1C 0x18 0x19 0x1A 0x35 0x16 0x33 0x34 0x26 0x2A 0xD1 0xE3 0xE4 0xE5 0xE6 0xE9 0xEA'
},
{
type: 'Thermostat',
name: 'RC20/Moduline 300 (DeviceID:0x17, ProductID:77, Version:03.03)',
handlers: '0xA3 0x06 0xA2 0x12 0x91 0xA8'
}
]
};
rest_server.post(API_ENDPOINT_ROOT, (req, res) => {
console.log('Generic API POST');

View File

@@ -83,8 +83,8 @@ extra_scripts = scripts/rename_fw.py
board = esp32dev
board_build.partitions = esp32_partition_4M.csv
board_build.extra_flags = -DBOARD_HAS_PSRAM
build_flags = ${common.build_flags}
build_unflags = ${common.unbuild_flags}
build_flags = ${common.build_flags}
[env:ci_s3]
extends = espressi32_base
@@ -93,10 +93,11 @@ board = lolin_s3
board_build.f_cpu = 240000000L
board_upload.flash_size = 16MB
board_build.partitions = esp32_partition_16M.csv
build_unflags = ${common.unbuild_flags}
build_flags =
${common.build_flags}
-O2
build_unflags = ${common.unbuild_flags}
'-DEMSESP_DEFAULT_BOARD_PROFILE="S32S3"'
[env:esp32_4M]
extends = espressi32_base_tasmota