Merge pull request emsesp#1341 from proddy/dev

fixes from previous checkin
proddy · Oct 17, 2023 · f9a176e · f9a176e
2 parents 8584901 + 24d5ac7
commit f9a176e
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 20 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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,

diff --git 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;
         }
 

diff --git 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 {