Reserve statusbar for something else

betaflight · Sep 18, 2024 · 45b59d2 · 45b59d2
1 parent 8f6ffd5
commit 45b59d2
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 63 deletions.
diff --git a/locales/en/messages.json b/locales/en/messages.json
@@ -667,9 +667,6 @@
     "versionLabelFirmware": {
         "message": "Firmware"
     },
-    "versionLabelConnection": {
-        "message": "ISP"
-    },
     "versionLabelConfigurator": {
         "message": "Configurator"
     },

diff --git a/src/components/status-bar/ConnectionStatus.vue b/src/components/status-bar/ConnectionStatus.vue
diff --git a/src/components/status-bar/StatusBar.vue b/src/components/status-bar/StatusBar.vue
@@ -21,9 +21,6 @@
       :value="cpuLoad"
       unit="%"
     />
-    <ConnectionStatus
-      :network-status="networkStatus"
-    />
     <StatusBarVersion
       :configurator-version="configuratorVersion"
       :firmware-version="firmwareVersion"
@@ -36,14 +33,12 @@
 <script>
 import StatusBarVersion from "./StatusBarVersion.vue";
 import ReadingStat from "./ReadingStat.vue";
-import ConnectionStatus from "./ConnectionStatus.vue";
 import PortUtilization from "./PortUtilization.vue";
 
 export default {
   components: {
     PortUtilization,
     ReadingStat,
-    ConnectionStatus,
     StatusBarVersion,
   },
   props: {
@@ -72,11 +67,6 @@ export default {
       default: 0,
     },
 
-    networkStatus: {
-      type: String,
-      default: "",
-    },
-
     configuratorVersion: {
       type: String,
       default: "",

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

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

diff --git a/src/js/main.js b/src/js/main.js
@@ -99,15 +99,6 @@ function startProcess() {
     gui_log(i18n.getMessage('infoVersionOs', { operatingSystem: GUI.operating_system }));
     gui_log(i18n.getMessage('infoVersionConfigurator', { configuratorVersion: CONFIGURATOR.getDisplayVersion() }));
 
-    if (navigator.connection) {
-        console.log(`[ISP] Network connection type: ${navigator.connection.type}`);
-        console.log(`[ISP] Effective network type: ${navigator.connection.effectiveType}`);
-        console.log(`[ISP] Downlink Speed: ${navigator.connection.downlink}Mb/s`);
-        console.log(`[ISP] Round Trip Time: ${navigator.connection.rtt}ms`);
-    } else {
-        console.log(`[ISP] Navigator Connection API not supported`);
-    }
-
     $('.connect_b a.connect').removeClass('disabled');
     // with Vue reactive system we don't need to call these,
     // our view is reactive to model changes

diff --git a/src/js/utils/connection.js b/src/js/utils/connection.js
@@ -1,29 +1,17 @@
 import { get as getConfig } from "../ConfigStorage";
-import CONFIGURATOR from "../data_storage";
 
 export function ispConnected() {
     const connected = navigator.onLine;
     const isMetered = getConfig('meteredConnection').meteredConnection;
 
-    // navigator.connection is not available
     if (!navigator.connection) {
         return connected && !isMetered;
     }
 
-    // navigator.connection is available
-    const type = navigator.connection.effectiveType;
-    const downlink = navigator.connection.downlink;
-    const rtt = navigator.connection.rtt;
-
-    if (isMetered || type === 'none' || !connected) {
-        CONFIGURATOR.networkStatus = 'Offline';
+    if (isMetered || navigator.connection.effectiveType === 'none' || !connected) {
         return false;
-    } else if (type === 'slow-2g' || type === '2g' || downlink < 0.115 || rtt > 1000) {
-        CONFIGURATOR.networkStatus = 'Slow';
-        return true;
     }
 
-    CONFIGURATOR.networkStatus = 'Online';
     return true;
 }