Mirror/inav
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav.git synced 2025-07-25 17:25:18 +03:00
Code Issues Wiki Activity

Remove debug messages and call vtxCommon functions to update channel and

Browse source 
power levels
This commit is contained in:
Marcelo Bezerra 2023-07-09 00:06:23 +02:00
parent abdbcbae99
commit e7b037cc45
No known key found for this signature in database
GPG key ID: 718A5AC065848530
4 changed files with 30 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/drivers/vtx_common.c
View file

@ -24,6 +24,7 @@
#include "platform.h"
#include "build/debug.h"
#include "common/log.h"
#include "vtx_common.h"
@ -73,8 +74,9 @@ void vtxCommonSetBandAndChannel(vtxDevice_t *vtxDevice, uint8_t band, uint8_t ch
if (!vtxDevice)
return;
if ((band > vtxDevice->capability.bandCount) || (channel > vtxDevice->capability.channelCount))
if ((band > vtxDevice->capability.bandCount) || (channel > vtxDevice->capability.channelCount)) {
return;
}
if (vtxDevice->vTable->setBandAndChannel) {
vtxDevice->vTable->setBandAndChannel(vtxDevice, band, channel);

9
src/main/fc/fc_msp.c
View file

@ -2482,12 +2482,19 @@ static mspResult_e mspFcProcessInCommand(uint16_t cmdMSP, sbuf_t *src)
if (newFrequency <= VTXCOMMON_MSP_BANDCHAN_CHKVAL) { //value is band and channel
const uint8_t newBand = (newFrequency / 8) + 1;
const uint8_t newChannel = (newFrequency % 8) + 1;
if(vtxSettingsConfig()->band != newBand || vtxSettingsConfig()->channel != newChannel) {
vtxCommonSetBandAndChannel(vtxDevice, newBand, newChannel);
}
vtxSettingsConfigMutable()->band = newBand;
vtxSettingsConfigMutable()->channel = newChannel;
}
if (sbufBytesRemaining(src) > 1) {
vtxSettingsConfigMutable()->power = sbufReadU8(src);
uint8_t newPower = sbufReadU8(src);
vtxCommonSetPowerByIndex(vtxDevice, newPower);
vtxSettingsConfigMutable()->power = newPower;
// Delegate pitmode to vtx directly
const uint8_t newPitmode = sbufReadU8(src);
uint8_t currentPitmode = 0;

3
src/main/io/vtx_control.c
View file

@ -18,8 +18,10 @@
// Get target build configuration
#include "platform.h"
#include "build/debug.h"
#include "common/maths.h"
#include "common/log.h"
#include "config/config_eeprom.h"
#include "config/parameter_group.h"
@ -37,7 +39,6 @@
#include "io/osd.h"
#include "io/vtx_control.h"
#if defined(USE_VTX_CONTROL)
PG_REGISTER_WITH_RESET_TEMPLATE(vtxConfig_t, vtxConfig, PG_VTX_CONFIG, 4);

39
src/main/io/vtx_msp.c
View file

@ -48,6 +48,7 @@
#include "io/vtx_msp.h"
#include "io/vtx_control.h"
#include "io/vtx_string.h"
#include "io/vtx_smartaudio.h"
#include "io/vtx.h"
#include "io/displayport_msp_osd.h"
@ -77,6 +78,13 @@ static bool prevLowPowerDisarmedState = false;
static const vtxVTable_t mspVTable; // forward
static vtxDevice_t vtxMsp = {
.vTable = &mspVTable,
.capability.bandCount = VTX_MSP_TABLE_MAX_BANDS,
.capability.channelCount = VTX_MSP_TABLE_MAX_CHANNELS,
.capability.powerCount = VTX_MSP_TABLE_MAX_POWER_LEVELS,
.capability.bandNames = (char **)vtx58BandNames,
.capability.channelNames = (char **)vtx58ChannelNames,
.capability.powerNames = (char**)saPowerNames
};
// Fill table with standard values for SA 1.0 and 2.0
@ -96,13 +104,11 @@ static uint8_t mspVtxPortIdentifier = 255;
static bool isCrsfPortConfig(const serialPortConfig_t *portConfig)
{
LOG_DEBUG(VTX, "msp IsCrsfPortConfig: %c", portConfig->functionMask & FUNCTION_RX_SERIAL && portConfig->functionMask & FUNCTION_VTX_MSP && rxConfig()->serialrx_provider == SERIALRX_CRSF ? 'Y': 'N');
return portConfig->functionMask & FUNCTION_RX_SERIAL && portConfig->functionMask & FUNCTION_VTX_MSP && rxConfig()->serialrx_provider == SERIALRX_CRSF;
}
static bool isLowPowerDisarmed(void)
{
//LOG_DEBUG(VTX, "msp IsLowPowerDisarmed\r\n");
return (!ARMING_FLAG(ARMED) && !failsafeIsActive() &&
(vtxSettingsConfig()->lowPowerDisarm == VTX_LOW_POWER_DISARM_ALWAYS ||
(vtxSettingsConfig()->lowPowerDisarm == VTX_LOW_POWER_DISARM_UNTIL_FIRST_ARM && !ARMING_FLAG(WAS_EVER_ARMED))));
@ -130,25 +136,7 @@ void setMspVtxDeviceStatusReady(const int descriptor)
{
LOG_DEBUG(VTX, "msp setMspVtxDeviceStatusReady\r\n");
UNUSED(descriptor);
/*
vtxDevice_t *vtxDevice = NULL;
uint8_t pBand;
uint8_t pChannel;
uint8_t pIndex;
UNUSED(pBand);
UNUSED(pChannel);
UNUSED(pIndex);
if (mspVtxStatus != MSP_VTX_STATUS_READY && isVtxConfigValid(vtxConfig())) {
#if 0 && defined(USE_MSP_OVER_TELEMETRY)
if (getMspSerialPortDescriptor(mspVtxPortIdentifier) == descriptor || getMspTelemetryDescriptor() == descriptor) {
#else
if (getMspSerialPortDescriptor(mspVtxPortIdentifier) == descriptor) {
#endif
mspVtxStatus = MSP_VTX_STATUS_READY;
}
}
*/
mspVtxStatus = MSP_VTX_STATUS_READY;
mspVtxConfigChanged = true;
}
@ -253,7 +241,15 @@ static void vtxMspProcess(vtxDevice_t *vtxDevice, timeUs_t currentTimeUs)
mspVtxConfigChanged = true;
prevLowPowerDisarmedState = isLowPowerDisarmed();
}
/*
if(mspConfPowerIndex != vtxSettingsConfig()->power - 1) {
mspVtxConfigChanged = true;
}
if(mspConfBand != vtxSettingsConfig()->band || mspConfChannel != vtxSettingsConfig()->channel) {
mspVtxConfigChanged = true;
}
*/
// send an update if stuff has changed with 200ms period
if ((mspVtxConfigChanged) && cmp32(currentTimeUs, mspVtxLastTimeUs) >= MSP_VTX_REQUEST_PERIOD_US) {
@ -315,7 +311,7 @@ static void vtxMspSetBandAndChannel(vtxDevice_t *vtxDevice, uint8_t band, uint8_
{
LOG_DEBUG(VTX, "msp SetBandAndChannel\r\n");
UNUSED(vtxDevice);
if (band != mspConfBand || channel != mspConfChannel /*|| true*/) {
if (band != vtxSettingsConfig()->band || channel != mspConfChannel /*|| true*/) {
LOG_DEBUG(VTX, "msp vtx config changed\r\n");
mspVtxConfigChanged = true;
}
@ -336,7 +332,6 @@ static void vtxMspSetPowerByIndex(vtxDevice_t *vtxDevice, uint8_t index)
mspVtxConfigChanged = true;
}
mspConfPowerIndex = index - 1;
//mspConfPower = mspPowerTable[index].mW;
}
}