Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

msp: expose number of vtx power levels, bands and channels #10395

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

msp: expose number of vtx power levels, bands and channels #10395

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 30 additions & 1 deletion src/main/fc/fc_msp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1487,11 +1487,18 @@ static bool mspFcProcessOutCommand(uint16_t cmdMSP, sbuf_t *dst, mspPostProcessF
sbufWriteU8(dst, vtxSettingsConfig()->channel);
sbufWriteU8(dst, vtxSettingsConfig()->power);
sbufWriteU8(dst, pitmode);
// technically there is bug here, we are missing the 16bit
// freqency bf is transmitting
// sbufWriteU16(dst, vtxSettingsConfig()->freq);

// Betaflight < 4 doesn't send these fields
sbufWriteU8(dst, vtxCommonDeviceIsReady(vtxDevice) ? 1 : 0);
sbufWriteU8(dst, vtxSettingsConfig()->lowPowerDisarm);
// future extensions here...

sbufWriteU8(dst, 1); // vtxtable is available
sbufWriteU8(dst, vtxDevice->capability.bandCount);
sbufWriteU8(dst, vtxDevice->capability.channelCount);
sbufWriteU8(dst, vtxDevice->capability.powerCount);
}
else {
sbufWriteU8(dst, VTXDEV_UNKNOWN); // no VTX configured
Expand Down Expand Up @@ -4098,6 +4105,28 @@ bool mspFCProcessInOutCommand(uint16_t cmdMSP, sbuf_t *dst, sbuf_t *src, mspResu
break;
#endif

case MSP_VTXTABLE_POWERLEVEL: {
vtxDevice_t *vtxDevice = vtxCommonDevice();
if (!vtxDevice) {
return MSP_RESULT_ERROR;
}

const uint8_t powerLevel = sbufBytesRemaining(src) ? sbufReadU8(src) : 0;
if (powerLevel == 0 || powerLevel > vtxDevice->capability.powerCount) {
return MSP_RESULT_ERROR;
}

sbufWriteU8(dst, powerLevel);
sbufWriteU16(dst, 0);

const char *str = vtxDevice->capability.powerNames[powerLevel - 1];
const uint32_t str_len = strnlen(str, 5); // these _should_ all be null-terminated
sbufWriteU8(dst, str_len);
for (uint32_t i = 0; i < str_len; i++)
sbufWriteU8(dst, str[i]);

} break;

default:
// Not handled
return false;
Expand Down
Loading