From 64fafa1d3633d0feb446ad68d4e59669d3dc3fce Mon Sep 17 00:00:00 2001
From: lumapu <lp@lufami.de>
Date: Mon, 11 Sep 2023 23:29:43 +0200
Subject: [PATCH] 0.7.49 moved convertHtml.py to script directory

---
 src/web/html/convert.py => scripts/convertHtml.py | 7 ++-----
 src/hm/miPayload.h                                | 3 ++-
 src/platformio.ini                                | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)
 rename src/web/html/convert.py => scripts/convertHtml.py (97%)

diff --git a/src/web/html/convert.py b/scripts/convertHtml.py
similarity index 97%
rename from src/web/html/convert.py
rename to scripts/convertHtml.py
index c4471f3f..70d5f6e2 100644
--- a/src/web/html/convert.py
+++ b/scripts/convertHtml.py
@@ -147,9 +147,7 @@ def convert2Header(inFile, version):
     f.close()
 
 # delete all files in the 'h' dir
-wd = 'h'
-if os.getcwd()[-4:] != "html":
-    wd = "web/html/" + wd
+wd = 'web/html/h'
 
 if os.path.exists(wd):
     for f in os.listdir(wd):
@@ -160,8 +158,7 @@ if os.path.exists(wd):
         os.remove(os.path.join(wd, f))
 
 # grab all files with following extensions
-if os.getcwd()[-4:] != "html":
-    os.chdir('./web/html')
+os.chdir('./web/html')
 types = ('*.html', '*.css', '*.js', '*.ico') # the tuple of file types
 files_grabbed = []
 for files in types:
diff --git a/src/hm/miPayload.h b/src/hm/miPayload.h
index ddef9c99..022f55f9 100644
--- a/src/hm/miPayload.h
+++ b/src/hm/miPayload.h
@@ -585,12 +585,13 @@ class MiPayload {
 
             if(!*complete) {
                 //we got some delayed status msgs?!?
-                if (txCmd == 0x09 || txCmd == 0x11)
+                if ((txCmd == 0x09) || (txCmd == 0x11)) {
                     if (mPayload[iv->id].stsAB[CH0] && mPayload[iv->id].dataAB[CH0]) {
                       miComplete(iv);
                       return true;
                     }
                     return false;
+                }
 
                 DPRINTLN(DBG_VERBOSE, F("incomlete, txCmd is 0x") + String(txCmd, HEX));
                 if (txCmd >= 0x36 && txCmd <= 0x39) {
diff --git a/src/platformio.ini b/src/platformio.ini
index 85c4cf67..77b8e724 100644
--- a/src/platformio.ini
+++ b/src/platformio.ini
@@ -20,7 +20,7 @@ monitor_speed = 115200
 
 extra_scripts =
     pre:../scripts/auto_firmware_version.py
-    pre:web/html/convert.py
+    pre:../scripts/convertHtml.py
     pre:../scripts/applyPatches.py
 
 lib_deps =