VtxDevice over msp - FULL PR 11705 as of 08/19/2022

Author: phobos-

docs/Serial.md

@@ -100,27 +100,30 @@ Other devices can be added starting from id 50.
 
 ### 2. Serial Port Function
 
-| Function                     | Value |
-| ---------------------------- | ----- |
-| FUNCTION_NONE                | 0     |
-| FUNCTION_MSP                 | 1     |
-| FUNCTION_GPS                 | 2     |
-| FUNCTION_TELEMETRY_FRSKY_HUB | 4     |
-| FUNCTION_TELEMETRY_HOTT      | 8     |
-| FUNCTION_TELEMETRY_LTM       | 16    |
-| FUNCTION_TELEMETRY_SMARTPORT | 32    |
-| FUNCTION_RX_SERIAL           | 64    |
-| FUNCTION_BLACKBOX            | 128   |
-| FUNCTION_TELEMETRY_MAVLINK   | 512   |
-| FUNCTION_ESC_SENSOR          | 1024  |
-| FUNCTION_VTX_SMARTAUDIO      | 2048  |
-| FUNCTION_TELEMETRY_IBUS      | 4096  |
-| FUNCTION_VTX_TRAMP           | 8192  |
-| FUNCTION_RCDEVICE            | 16384 |
-| FUNCTION_LIDAR_TF            | 32768 |
-| FUNCTION_FRSKY_OSD           | 65536 |
+| Function                     | Value  | Bit |
+| ---------------------------- | ------ | --- |
+| FUNCTION_NONE                | 0      | 0   |
+| FUNCTION_MSP                 | 1      | 1 << 0 |
+| FUNCTION_GPS                 | 2      | 1 << 1 |
+| FUNCTION_TELEMETRY_FRSKY_HUB | 4      | 1 << 2 |
+| FUNCTION_TELEMETRY_HOTT      | 8      | 1 << 3 |
+| FUNCTION_TELEMETRY_LTM       | 16     | 1 << 4 |
+| FUNCTION_TELEMETRY_SMARTPORT | 32     | 1 << 5 |
+| FUNCTION_RX_SERIAL           | 64     | 1 << 6 |
+| FUNCTION_BLACKBOX            | 128    | 1 << 7 |
+| NOT USED                     | 256    | 1 << 8 |
+| FUNCTION_TELEMETRY_MAVLINK   | 512    | 1 << 9 |
+| FUNCTION_ESC_SENSOR          | 1024   | 1 << 10 |
+| FUNCTION_VTX_SMARTAUDIO      | 2048   | 1 << 11 |
+| FUNCTION_TELEMETRY_IBUS      | 4096   | 1 << 12 |
+| FUNCTION_VTX_TRAMP           | 8192   | 1 << 13 |
+| FUNCTION_RCDEVICE            | 16384  | 1 << 14 |
+| FUNCTION_LIDAR_TF            | 32768  | 1 << 15 |
+| FUNCTION_FRSKY_OSD           | 65536  | 1 << 16 |
+| FUNCTION_VTX_MSP             | 131072 | 1 << 17 |
 
 Note: `FUNCTION_FRSKY_OSD` = `(1<<16)` requires 17 bits.
+Note2: We can use up to 32 bits (1<<32) here.
 
 ### 3. MSP Baudrates
 

make/source.mk

@@ -201,6 +201,8 @@ COMMON_SRC = \
             io/vtx_smartaudio.c \
             io/vtx_tramp.c \
             io/vtx_control.c \
+            io/vtx_msp.c \
+            cms/cms_menu_vtx_msp.c
 
 COMMON_DEVICE_SRC = \
             $(CMSIS_SRC) \
@@ -362,7 +364,9 @@ SIZE_OPTIMISED_SRC := $(SIZE_OPTIMISED_SRC) \
             osd/osd.c \
             osd/osd_elements.c \
             osd/osd_warnings.c \
-            rx/rx_bind.c
+            rx/rx_bind.c \
+            io/vtx_msp.c \
+            cms/cms_menu_vtx_msp.c
 
 # Gyro driver files that only contain initialization and configuration code - not runtime code
 SIZE_OPTIMISED_SRC := $(SIZE_OPTIMISED_SRC) \

src/main/build/debug.c

@@ -99,5 +99,6 @@ const char * const debugModeNames[DEBUG_COUNT] = {
     "TIMING_ACCURACY",
     "RX_EXPRESSLRS_SPI",
     "RX_EXPRESSLRS_PHASELOCK",
-    "RX_STATE_TIME"
+    "RX_STATE_TIME",
+    "VTX_MSP"
 };

src/main/build/debug.h

@@ -98,6 +98,7 @@ typedef enum {
     DEBUG_RX_EXPRESSLRS_SPI,
     DEBUG_RX_EXPRESSLRS_PHASELOCK,
     DEBUG_RX_STATE_TIME,
+    DEBUG_VTX_MSP,
     DEBUG_COUNT
 } debugType_e;
 

src/main/cli/settings.c

@@ -88,6 +88,7 @@
 #include "pg/max7456.h"
 #include "pg/mco.h"
 #include "pg/motor.h"
+#include "pg/msp.h"
 #include "pg/pg.h"
 #include "pg/pg_ids.h"
 #include "pg/pinio.h"
@@ -1644,6 +1645,8 @@ const clivalue_t valueTable[] = {
     { "scheduler_relax_rx",  VAR_UINT16  | HARDWARE_VALUE, .config.minmaxUnsigned = { 0, 500 }, PG_SCHEDULER_CONFIG, PG_ARRAY_ELEMENT_OFFSET(schedulerConfig_t, 0, rxRelaxDeterminism) },
     { "scheduler_relax_osd", VAR_UINT16  | HARDWARE_VALUE, .config.minmaxUnsigned = { 0, 500 }, PG_SCHEDULER_CONFIG, PG_ARRAY_ELEMENT_OFFSET(schedulerConfig_t, 0, osdRelaxDeterminism) },
 
+    { "serialmsp_halfduplex", VAR_UINT8  | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_OFF_ON }, PG_MSP_CONFIG, offsetof(mspConfig_t, halfDuplex) },
+
 // PG_TIMECONFIG
 #ifdef USE_RTC_TIME
     { "timezone_offset_minutes",  VAR_INT16 | MASTER_VALUE, .config.minmax = { TIMEZONE_OFFSET_MINUTES_MIN, TIMEZONE_OFFSET_MINUTES_MAX }, PG_TIME_CONFIG, offsetof(timeConfig_t, tz_offsetMinutes) },

src/main/cms/cms_menu_main.c

@@ -82,7 +82,7 @@ static const OSD_Entry menuFeaturesEntries[] =
     {"BLACKBOX", OME_Submenu, cmsMenuChange, &cmsx_menuBlackbox},
 #endif
 #if defined(USE_VTX_CONTROL)
-#if defined(USE_VTX_RTC6705) || defined(USE_VTX_SMARTAUDIO) || defined(USE_VTX_TRAMP)
+#if defined(USE_VTX_RTC6705) || defined(USE_VTX_SMARTAUDIO) || defined(USE_VTX_TRAMP) || defined(USE_VTX_MSP)
     {"VTX", OME_Funcall, cmsSelectVtx, NULL},
 #endif
 #endif // VTX_CONTROL

src/main/cms/cms_menu_vtx_common.c

@@ -24,14 +24,15 @@
 
 #include "platform.h"
 
-#if defined(USE_CMS) && defined(USE_VTX_CONTROL) && (defined(USE_VTX_TRAMP) || defined(USE_VTX_SMARTAUDIO) || defined(USE_VTX_RTC6705))
+#if defined(USE_CMS) && defined(USE_VTX_CONTROL) && (defined(USE_VTX_TRAMP) || defined(USE_VTX_SMARTAUDIO) || defined(USE_VTX_RTC6705) || defined(USE_VTX_MSP))
 
 #include "common/printf.h"
 
 #include "cms/cms.h"
 #include "cms/cms_menu_vtx_rtc6705.h"
 #include "cms/cms_menu_vtx_smartaudio.h"
 #include "cms/cms_menu_vtx_tramp.h"
+#include "cms/cms_menu_vtx_msp.h"
 #include "cms/cms_types.h"
 
 #include "drivers/vtx_common.h"
@@ -118,7 +119,12 @@ const void *cmsSelectVtx(displayPort_t *pDisplay, const void *ptr)
 
             break;
 #endif
+#if defined(USE_VTX_MSP)
+        case VTXDEV_MSP:
+            cmsMenuChange(pDisplay, &cmsx_menuVtxMsp);
 
+            break;
+#endif
         default:
             cmsMenuChange(pDisplay, &cmsx_menuVtxError);