Add configuration to enable/disable VTX MSP. Default: disabled

fpv-wtf · Sep 23, 2023 · f3a8bc4 · f3a8bc4
1 parent 9b0fbd7
commit f3a8bc4
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 4 deletions.
diff --git a/config/goggles/config.json b/config/goggles/config.json
@@ -10,5 +10,6 @@
     "fakehd_columns": "S",
     "fakehd_rows": "WWWWWWCCWWWWWWWD",
     "rec_enabled": true,
-    "rec_pb_enabled": true
+    "rec_pb_enabled": true,
+    "vtx_msp": false
 }
diff --git a/config/goggles/schema.json b/config/goggles/schema.json
@@ -60,6 +60,10 @@
 		"hide_diagnostics": {
 			"name": "Hide diagnostic information",
 			"widget": "checkbox"
+		},
+		"vtx_msp": {
+			"name": "Enable VTX MSP",
+			"widget": "checkbox"
 		}
 	},
 	"units": [

diff --git a/config/goggles/schemaV2.json b/config/goggles/schemaV2.json
@@ -58,7 +58,16 @@
                 true,
                 false
             ]
-        }
+        },
+        "vtx_msp": {
+            "type": "boolean",
+            "title": "Enable VTX MSP",
+            "description": "Control video channel from Betaflight or ELRS Lua script VTX admin",
+            "enum": [
+                true,
+                false
+            ]
+		}
     },
     "dependencies": {
         "fakehd_enable": {

diff --git a/config/goggles/uiSchemaV2.json b/config/goggles/uiSchemaV2.json
@@ -31,5 +31,8 @@
     },
     "fakehd_rows": {
         "ui:help": "FakeHD row alignment config, each character configures the alignment for one row. [Read more](https://github.com/fpv-wtf/msp-osd#customising-the-default-fakehd-grid)"
-    }
+    },
+    "vtx_msp": {
+        "ui:help": "Enable VTX MSP protocol to control the video channel from Betaflight or ELRS Lua script VTX admin"
+    },
 }
diff --git a/jni/util/vtx_manager.c b/jni/util/vtx_manager.c
@@ -1,8 +1,9 @@
 #include <stdlib.h>
 #include <dlfcn.h>
+#include "json/osd_config.h"
 #include "util/debug.h"
 
-
+#define VTX_MPS_CONFIG_KEY "vtx_msp"
 
 static void *tp1801_gui_lib = NULL;
 static uint32_t (* setChannelPilotOriginal)(void *this,unsigned short param_1, bool param_2) = 0;
@@ -11,6 +12,10 @@ static uint32_t userSettingsInstance = 0;
 static int8_t currentChannel = -1;
 
 void changeChannel(int8_t channel) {
+    if(!get_boolean_config_value(VTX_MPS_CONFIG_KEY)) {
+        return;
+    }
+
     //Load SetPilotChannel original
     setChannelPilotOriginal = dlsym (RTLD_NEXT, "_ZN17GlassUserSettings15setPilotChannelEtb");
     if (setChannelPilotOriginal == NULL) {