From de1958bad58d2031dd63c099fe4b49e6030f8e56 Mon Sep 17 00:00:00 2001 From: Mark Haslinghuis Date: Wed, 14 May 2025 15:07:54 +0200 Subject: [PATCH] Replace softserialAlt and add default for AT32 --- src/main/cli/settings.c | 1 - src/main/io/vtx.c | 5 ++++- src/main/io/vtx.h | 3 +-- src/main/io/vtx_smartaudio.c | 2 -- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/cli/settings.c b/src/main/cli/settings.c index 665a6c505f..7185381cc8 100644 --- a/src/main/cli/settings.c +++ b/src/main/cli/settings.c @@ -1692,7 +1692,6 @@ const clivalue_t valueTable[] = { { "vtx_channel", VAR_UINT8 | MASTER_VALUE, .config.minmaxUnsigned = { 0, VTX_TABLE_MAX_CHANNELS }, PG_VTX_SETTINGS_CONFIG, offsetof(vtxSettingsConfig_t, channel) }, { "vtx_power", VAR_UINT8 | MASTER_VALUE, .config.minmaxUnsigned = { 0, VTX_TABLE_MAX_POWER_LEVELS - 1 }, PG_VTX_SETTINGS_CONFIG, offsetof(vtxSettingsConfig_t, power) }, { "vtx_low_power_disarm", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_VTX_LOW_POWER_DISARM }, PG_VTX_SETTINGS_CONFIG, offsetof(vtxSettingsConfig_t, lowPowerDisarm) }, - { "vtx_softserial_alt", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_OFF_ON }, PG_VTX_SETTINGS_CONFIG, offsetof(vtxSettingsConfig_t, softserialAlt) }, { "vtx_serial_alt", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_OFF_ON }, PG_VTX_SETTINGS_CONFIG, offsetof(vtxSettingsConfig_t, serialAlt) }, #ifdef VTX_SETTINGS_FREQCMD { "vtx_freq", VAR_UINT16 | MASTER_VALUE, .config.minmaxUnsigned = { 0, VTX_SETTINGS_MAX_FREQUENCY_MHZ }, PG_VTX_SETTINGS_CONFIG, offsetof(vtxSettingsConfig_t, freq) }, diff --git a/src/main/io/vtx.c b/src/main/io/vtx.c index 3269390082..47528a2ba4 100644 --- a/src/main/io/vtx.c +++ b/src/main/io/vtx.c @@ -63,8 +63,11 @@ void pgResetFn_vtxSettingsConfig(vtxSettingsConfig_t *vtxSettingsConfig) #endif vtxSettingsConfig->pitModeFreq = VTX_TABLE_DEFAULT_PITMODE_FREQ; vtxSettingsConfig->lowPowerDisarm = VTX_LOW_POWER_DISARM_OFF; - vtxSettingsConfig->softserialAlt = 0; +#ifdef AT32F4 vtxSettingsConfig->serialAlt = 0; +#else + vtxSettingsConfig->serialAlt = 1; +#endif } typedef enum { diff --git a/src/main/io/vtx.h b/src/main/io/vtx.h index 6114a15b6a..537279eea8 100644 --- a/src/main/io/vtx.h +++ b/src/main/io/vtx.h @@ -39,8 +39,7 @@ typedef struct vtxSettingsConfig_s { uint16_t freq; // sets freq in MHz if band=0 uint16_t pitModeFreq; // sets out-of-range pitmode frequency uint8_t lowPowerDisarm; // min power while disarmed, from vtxLowerPowerDisarm_e - uint8_t softserialAlt; // prepend 0xff before sending frame even with SOFTSERIAL - uint8_t serialAlt; // prepend 0xff before sending frame even with SERIAL + uint8_t serialAlt; // prepend 0xff before sending frame even with [SOFT]SERIAL } vtxSettingsConfig_t; PG_DECLARE(vtxSettingsConfig_t, vtxSettingsConfig); diff --git a/src/main/io/vtx_smartaudio.c b/src/main/io/vtx_smartaudio.c index 4af1051a36..8cfcd9e760 100644 --- a/src/main/io/vtx_smartaudio.c +++ b/src/main/io/vtx_smartaudio.c @@ -495,8 +495,6 @@ static void saSendFrame(uint8_t *buf, int len) bool prepend00; switch (serialType(smartAudioSerialPort->identifier)) { case SERIALTYPE_SOFTSERIAL: - prepend00 = vtxSettingsConfig()->softserialAlt; - break; case SERIALTYPE_UART: case SERIALTYPE_LPUART: // decide HW uarts by MCU type // AT32F4 has a bug in the UART peripheral that causes it to