Merge branch 'development'

.github/workflows/build.yml

@@ -5,8 +5,6 @@ on:
     paths-ignore:
       - docs/**
       - '**/*.md'
-    tags-ignore:        
-      - v*
   pull_request:
     paths-ignore:
       - docs/**

include/WebApi_ws_vedirect_live.h

@@ -23,4 +23,5 @@ private:
     uint32_t _lastVedirectUpdateCheck = 0;
     uint32_t _lastWsCleanup = 0;
     uint32_t _newestVedirectTimestamp = 0;
+    static constexpr uint16_t _responseSize = 1024 + 128;
 };

pio-scripts/auto_firmware_version.py

@@ -18,14 +18,18 @@ from dulwich import porcelain
 def get_firmware_specifier_build_flag():
     try:
         build_version = porcelain.describe('.')  # '.' refers to the repository root dir
-        branch_name = porcelain.active_branch('.').decode('utf-8')
+    except Exception as err:
-    except:
+        print(f"Unexpected {err=}, {type(err)=}")
         build_version = "g0000000"
+    try:
+        branch_name = porcelain.active_branch('.').decode('utf-8')  # '.' refers to the repository root dir
+    except Exception as err:
+        print(f"Unexpected {err=}, {type(err)=}")
         branch_name = ""
     build_flag = "-D AUTO_GIT_HASH=\\\"" + build_version + "\\\" "
     build_flag += "-D AUTO_GIT_BRANCH=\\\"" + branch_name + "\\\""
-    print ("Firmware Revision: " + build_version)
+    print("Firmware Revision: " + build_version)
-    print ("Firmware build on branch: " + branch_name)
+    print("Firmware build on branch: " + branch_name)
     return (build_flag)
 
 env.Append(

src/WebApi_ws_vedirect_live.cpp

@@ -61,7 +61,7 @@ void WebApiWsVedirectLiveClass::loop()
             String buffer;
             // free JsonDocument as soon as possible
             {
-                DynamicJsonDocument root(2048);
+                DynamicJsonDocument root(_responseSize);
                 JsonVariant var = root;
                 generateJsonResponse(var);
                 serializeJson(root, buffer);
@@ -173,7 +173,7 @@ void WebApiWsVedirectLiveClass::onLivedataStatus(AsyncWebServerRequest* request)
         return;
     }
     try {
-        AsyncJsonResponse* response = new AsyncJsonResponse(false, 1024U);
+        AsyncJsonResponse* response = new AsyncJsonResponse(false, _responseSize);
         JsonVariant root = response->getRoot();
 
         generateJsonResponse(root);

webapp/src/views/HomeView.vue

@@ -114,13 +114,9 @@
                 </div>
             </div>
         </div>
-        <VedirectView v-show="liveData.vedirect.enabled" />
+        <VedirectView v-if="liveData.vedirect.enabled" />
-        <div v-show="liveData.battery.enabled" >
+        <BatteryView v-if="liveData.battery.enabled" />
-          <BatteryView/>
+        <HuaweiView v-if="liveData.huawei.enabled" />
-        </div>
-        <div v-show="liveData.huawei.enabled" >
-          <HuaweiView/>
-        </div>
     </BasePage>
    
     <div class="modal" id="eventView" tabindex="-1">