From c42ead995e129efd02167833370aaff9c484e9ae Mon Sep 17 00:00:00 2001 From: Proddy Date: Tue, 17 Oct 2023 21:18:23 +0200 Subject: [PATCH 1/3] fix rollup mangle that prevented table clicks --- .github/workflows/pre_release.yml | 2 ++ .github/workflows/tagged_release.yml | 2 ++ .github/workflows/test_release.yml | 2 ++ interface/vite.config.ts | 12 ++++++------ 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pre_release.yml b/.github/workflows/pre_release.yml index 67f914652..06c09b0ff 100644 --- a/.github/workflows/pre_release.yml +++ b/.github/workflows/pre_release.yml @@ -14,6 +14,8 @@ jobs: steps: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 + with: + python-version: '3.11' - uses: actions/setup-node@v3 with: node-version: '18' diff --git a/.github/workflows/tagged_release.yml b/.github/workflows/tagged_release.yml index edca1c8ae..a480a8bd5 100644 --- a/.github/workflows/tagged_release.yml +++ b/.github/workflows/tagged_release.yml @@ -13,6 +13,8 @@ jobs: steps: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 + with: + python-version: '3.11' - uses: actions/setup-node@v3 with: node-version: '18' diff --git a/.github/workflows/test_release.yml b/.github/workflows/test_release.yml index 69467540e..d932ad6d4 100644 --- a/.github/workflows/test_release.yml +++ b/.github/workflows/test_release.yml @@ -14,6 +14,8 @@ jobs: steps: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 + with: + python-version: '3.11' - uses: actions/setup-node@v3 with: node-version: '18' diff --git a/interface/vite.config.ts b/interface/vite.config.ts index ddb9cfb1b..32a86cd5c 100644 --- a/interface/vite.config.ts +++ b/interface/vite.config.ts @@ -78,7 +78,7 @@ export default defineConfig(({ command, mode }) => { ], build: { - target: 'es2022', + // target: 'es2022', outDir: 'dist', reportCompressedSize: false, chunkSizeWarningLimit: 1024, @@ -94,11 +94,11 @@ export default defineConfig(({ command, mode }) => { sequences: true }, mangle: { - toplevel: true, - module: true, - properties: { - regex: /^_/ - } + // toplevel: true + // module: true + // properties: { + // regex: /^_/ + // } }, ecma: 5, enclose: false, From 558fa20283d024158e9636b128db93dfb7817cf8 Mon Sep 17 00:00:00 2001 From: Proddy Date: Tue, 17 Oct 2023 21:20:08 +0200 Subject: [PATCH 2/3] remove left over debug comments --- src/telegram.h | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/src/telegram.h b/src/telegram.h index 2cd0f49d7..96f1dd6ab 100644 --- a/src/telegram.h +++ b/src/telegram.h @@ -125,20 +125,21 @@ class Telegram { uint8_t num_bytes = (!s) ? sizeof(Value) : s; // check for out of bounds, if so don't modify the value auto msg_size = (index - this->offset + num_bytes - 1); - // TODO remove - Serial.print(" index: "); - Serial.print(index); - Serial.print(" offset: "); - Serial.print(offset); - Serial.print(" index: "); - Serial.print(" message_length: "); - Serial.print(this->message_length); - Serial.print(" msg_size: "); - Serial.print(msg_size); - Serial.println(); + +#ifdef EMSESP_DEBUG +// Serial.print(" index: "); +// Serial.print(index); +// Serial.print(" offset: "); +// Serial.print(offset); +// Serial.print(" index: "); +// Serial.print(" message_length: "); +// Serial.print(this->message_length); +// Serial.print(" msg_size: "); +// Serial.print(msg_size); +// Serial.println(); +#endif if ((index < this->offset) || (msg_size >= this->message_length) || (msg_size > EMS_MAX_TELEGRAM_MESSAGE_LENGTH)) { - Serial.println("Rejedcting!"); // TODO: remove return false; } From 24d5ac7656d674d5c9e91c68677affdd656aff0d Mon Sep 17 00:00:00 2001 From: Proddy Date: Tue, 17 Oct 2023 21:20:43 +0200 Subject: [PATCH 3/3] default test is general --- src/test/test.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/test.h b/src/test/test.h index c9ba676ca..1ae7a5a83 100644 --- a/src/test/test.h +++ b/src/test/test.h @@ -26,7 +26,7 @@ namespace emsesp { -// #define EMSESP_DEBUG_DEFAULT "general" +#define EMSESP_DEBUG_DEFAULT "general" // #define EMSESP_DEBUG_DEFAULT "thermostat" // #define EMSESP_DEBUG_DEFAULT "solar" @@ -56,7 +56,7 @@ namespace emsesp { // #define EMSESP_DEBUG_DEFAULT "memory" // #define EMSESP_DEBUG_DEFAULT "coldshot" // #define EMSESP_DEBUG_DEFAULT "custom_entities" -#define EMSESP_DEBUG_DEFAULT "heat_exchange" +// #define EMSESP_DEBUG_DEFAULT "heat_exchange" class Test {