Introduce network status

betaflight · Sep 17, 2024 · ad65bc2 · ad65bc2
1 parent 05d3230
commit ad65bc2
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 22 deletions.
diff --git a/src/components/status-bar/ConnectionStatus.vue b/src/components/status-bar/ConnectionStatus.vue
@@ -1,15 +1,15 @@
 <template>
   <div class="connection">
-    {{ $t("versionLabelConnection") }}: {{ networkSpeed }} Mb/s
+    {{ $t("versionLabelConnection") }}: {{ networkStatus }}
   </div>
 </template>
 
 <script>
 export default {
   props: {
-    networkSpeed: {
-      type: Number,
-      default: 0,
+    networkStatus: {
+      type: String,
+      default: "",
     },
   },
 };

diff --git a/src/components/status-bar/StatusBar.vue b/src/components/status-bar/StatusBar.vue
@@ -22,7 +22,7 @@
       unit="%"
     />
     <ConnectionStatus
-      :network-speed="networkSpeed"
+      :network-status="networkStatus"
     />
     <StatusBarVersion
       :configurator-version="configuratorVersion"
@@ -72,9 +72,9 @@ export default {
       default: 0,
     },
 
-    networkSpeed: {
-      type: Number,
-      default: 0,
+    networkStatus: {
+      type: String,
+      default: "",
     },
 
     configuratorVersion: {

diff --git a/src/index.html b/src/index.html
@@ -177,7 +177,7 @@
             :cycle-time="FC.CONFIG.cycleTime"
             :cpu-load="FC.CONFIG.cpuload"
 
-            :network-speed="CONFIGURATOR.networkSpeed"
+            :network-status="CONFIGURATOR.networkStatus"
 
             :configurator-version="CONFIGURATOR.getDisplayVersion()"
             :firmware-version="FC.CONFIG.flightControllerVersion"

diff --git a/src/js/data_storage.js b/src/js/data_storage.js
@@ -11,7 +11,7 @@ const CONFIGURATOR = {
 
     connectionValid: false,
     connectionValidCliOnly: false,
-    networkSpeed: 0,
+    networkStatus: 'UNKNOWN',
     virtualMode: false,
     virtualApiVersion: '0.0.1',
     cliActive: false,

diff --git a/src/js/utils/connection.js b/src/js/utils/connection.js
@@ -13,21 +13,18 @@ export function ispConnected() {
     const type = navigator.connection.effectiveType;
     const downlink = navigator.connection.downlink;
     const rtt = navigator.connection.rtt;
-    const logHead = '[ISP] ';
 
-    CONFIGURATOR.networkSpeed = downlink;
-
-    if (isMetered) {
-        console.log(`${logHead}Metered connection is enabled`);
+    if (type === 'none' || !connected) {
+        CONFIGURATOR.networkStatus = 'Offline';
         return false;
-    }
-
-    if (type === 'slow-2g' || type === '2g' || downlink < 0.115 || rtt > 1000) {
-        console.log(`${logHead}Slow network detected`);
+    } else if (isMetered) {
+        CONFIGURATOR.networkStatus = 'Metered';
         return false;
-    }
-
-    if (connected) {
+    } else if (type === 'slow-2g' || type === '2g' || downlink < 0.115 || rtt > 1000) {
+        CONFIGURATOR.networkStatus = 'Slow';
+        return false;
+    } else if (connected) {
+        CONFIGURATOR.networkStatus = 'Online';
         return true;
     }
 }