Channel-on-goggles-via-data-packet

Author: Jesus Lopez Garcia

ipk/goggle/data/opt/etc/dinit.d/msp-osd-goggles

@@ -1,3 +1,4 @@
 type = scripted
 command = modmanager enable diy_glasses displayport_osd_shim
-stop-command = modmanager disable diy_glasses displayport_osd_shim
+stop-command = modmanager disable diy_glasses displayport_osd_shim
+logfile = /blackbox/msp-osd.log

jni/Android.mk

@@ -23,7 +23,6 @@ LOCAL_SRC_FILES := \
 	json/parson.c \
 	lz4/lz4.c \
 	msp/msp_displayport.c \
-	msp/msp_vtx.c \
 	msp/msp.c \
 	net/network.c \
 	osd_dji_overlay_udp.c \
@@ -44,7 +43,6 @@ LOCAL_SRC_FILES:= \
 	msp_displayport_mux.c \
 	msp/msp.c \
 	msp/msp_displayport.c \
-	msp/msp_vtx.c \
 	net/network.c \
 	net/serial.c \
 	util/fs_util.c \

jni/msp/msp.h

@@ -19,7 +19,6 @@
 
 // https://github.com/betaflight/betaflight/blob/master/src/main/msp/msp_protocol.h#L201C1-L202C50
 #define MSP_CMD_VTX_CONFIG 88 // out from FC
-#define MSP_CMD_SET_VTX_CONFIG 89 // in message to FC (To setup config or to ask for it?)
 
 typedef enum {
     MSP_ERR_NONE,
@@ -62,4 +61,4 @@ typedef struct msp_state_s {
 
 uint16_t msp_data_from_msg(uint8_t message_buffer[], msp_msg_t *msg);
 msp_error_e construct_msp_command(uint8_t message_buffer[], uint8_t command, uint8_t payload[], uint8_t size, msp_direction_e direction);
-msp_error_e msp_process_data(msp_state_t *msp_state, uint8_t dat);
+msp_error_e msp_process_data(msp_state_t *msp_state, uint8_t dat);

jni/msp/msp_displayport.c

@@ -1,6 +1,5 @@
 #include "msp.h"
 #include "msp_displayport.h"
-#include "msp_vtx.h"
 
 static void process_draw_string(displayport_vtable_t *display_driver, uint8_t *payload) {
     if(!display_driver || !display_driver->draw_character) return;
@@ -53,11 +52,6 @@ int displayport_process_message(displayport_vtable_t *display_driver, msp_msg_t
     if (msg->direction != MSP_INBOUND) {
         return 1;
     }
-    if(msg->cmd == MSP_CMD_VTX_CONFIG) {
-        //INFO: HERE IF VTX_CONFIG
-        process_vtx_message(msg);
-        return 1;
-    }
     if (msg->cmd != MSP_CMD_DISPLAYPORT) {
         return 1;
     }

jni/msp/msp_vtx.c

@@ -74,6 +74,8 @@ static uint8_t serial_passthrough = 1;
 static uint8_t compress = 0;
 static uint8_t no_btfl_hd = 0;
 
+uint16_t fc_vtx_channel = -1;
+
 static void sig_handler(int _)
 {
     quit = 1;
@@ -219,8 +221,8 @@ static void rx_msp_callback(msp_msg_t *msp_message)
         case MSP_CMD_VTX_CONFIG: {
             printf("Received VTX CONFIG message...\n");
             printf("data: %d %d %d \n", msp_message->payload[0],  msp_message->payload[1],  msp_message->payload[2]);
-            //INFO: Write the message to the socket
-            // write(socket_fd, &msp_message, sizeof(msp_message));
+            //TODO: Damage control accessing to index 2 if not exists
+            fc_vtx_channel = msp_message->payload[2];
         }
         default: {
             uint16_t size = msp_data_from_msg(message_buffer, msp_message);
@@ -266,8 +268,9 @@ static void send_data_packet(int data_socket_fd, dji_shm_state_t *dji_shm) {
     data.version_specifier = 0xFFFF;
     data.tx_temperature = get_int_from_fs(CPU_TEMP_PATH);
     data.tx_voltage = get_int_from_fs(AU_VOLTAGE_PATH);
+    data.fc_vtx_channel = fc_vtx_channel;
     memcpy(data.fc_variant, current_fc_identifier, sizeof(current_fc_identifier));
-    DEBUG_PRINT("got voltage %f V temp %d C variant %.4s\n", (float)(data.tx_voltage / 64.0f), data.tx_temperature, data.fc_variant);
+    DEBUG_PRINT("got voltage %f V temp %d C variant %.4s and channel %d\n", (float)(data.tx_voltage / 64.0f), data.tx_temperature, data.fc_variant, data.fc_vtx_channel);
     //INFO: Write the message to the socket
     write(data_socket_fd, &data, sizeof(data));
 }

jni/msp/msp_vtx.h

@@ -4,6 +4,7 @@ typedef struct packet_data_s {
     uint16_t tx_temperature;
     uint16_t version_specifier; // Used to be bitrate! Danger! 0xFFFF means V2 (no bitrate) for now.
     uint16_t tx_voltage;
+    uint16_t fc_vtx_channel;
     char fc_variant[4];
 } __attribute__((packed)) packet_data_t;
 

jni/msp_displayport_mux.c

@@ -485,7 +485,7 @@ static void check_is_au_overlay_enabled()
 
 static void process_data_packet(uint8_t *buf, int len, dji_shm_state_t *radio_shm) {
     packet_data_t *packet = (packet_data_t *)buf;
-    DEBUG_PRINT("got data %04X version spec %d C %f V variant %.4s\n", packet->version_specifier, packet->tx_temperature, packet->tx_voltage / 64.0f, packet->fc_variant);
+    DEBUG_PRINT("got data %04X version spec %d C %f V variant %.4s and vtx channel %d\n", packet->version_specifier, packet->tx_temperature, packet->tx_voltage / 64.0f, packet->fc_variant, packet->fc_vtx_channel);
     char str[8];
     clear_overlay();
     if(au_overlay_enabled) {
@@ -494,6 +494,8 @@ static void process_data_packet(uint8_t *buf, int len, dji_shm_state_t *radio_sh
         snprintf(str, 8, "A %2.1fV", packet->tx_voltage / 64.0f);
         display_print_string(overlay_display_info.char_width - 7, overlay_display_info.char_height - 7, str, 7);
     }
+    // TODO: Call channel change HERE!!!!!
+    // changeChannel(packet->fc_vtx_channel);
     if(len > 6) {
         DEBUG_PRINT("Got new packet with variant %.4s\n", packet->fc_variant);
         // should have FC type