mirror of
https://github.com/iNavFlight/inav.git
synced 2025-07-25 17:25:18 +03:00
better unsupported OSD error reporting
This commit is contained in:
parent
2a91517f7f
commit
38ee6fe106
1 changed files with 12 additions and 2 deletions
|
@ -3187,6 +3187,12 @@ static bool mspParameterGroupsCommand(sbuf_t *dst, sbuf_t *src)
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool isOSDTypeSupportedBySimulator(void)
|
||||||
|
{
|
||||||
|
displayPort_t *osdDisplayPort = osdGetDisplayPort();
|
||||||
|
return (osdDisplayPort && osdDisplayPort->cols == 30 && (osdDisplayPort->rows == 13 || osdDisplayPort->rows == 16));
|
||||||
|
}
|
||||||
|
|
||||||
void mspWriteSimulatorOSD(sbuf_t *dst)
|
void mspWriteSimulatorOSD(sbuf_t *dst)
|
||||||
{
|
{
|
||||||
//RLE encoding
|
//RLE encoding
|
||||||
|
@ -3201,7 +3207,7 @@ void mspWriteSimulatorOSD(sbuf_t *dst)
|
||||||
|
|
||||||
displayPort_t *osdDisplayPort = osdGetDisplayPort();
|
displayPort_t *osdDisplayPort = osdGetDisplayPort();
|
||||||
|
|
||||||
if (osdDisplayPort && osdDisplayPort->cols == 30 && (osdDisplayPort->rows == 13 || osdDisplayPort->rows == 16))
|
if (isOSDTypeSupportedBySimulator())
|
||||||
{
|
{
|
||||||
sbufWriteU8(dst, osdPos_y | (osdDisplayPort->rows == 16 ? 128: 0));
|
sbufWriteU8(dst, osdPos_y | (osdDisplayPort->rows == 16 ? 128: 0));
|
||||||
sbufWriteU8(dst, osdPos_x);
|
sbufWriteU8(dst, osdPos_x);
|
||||||
|
@ -3603,7 +3609,11 @@ bool mspFCProcessInOutCommand(uint16_t cmdMSP, sbuf_t *dst, sbuf_t *src, mspResu
|
||||||
simulatorData.debugIndex = 0;
|
simulatorData.debugIndex = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
tmp_u8 = simulatorData.debugIndex | ((mixerConfig()->platformType == PLATFORM_AIRPLANE) ? 128 : 0) | (ARMING_FLAG(ARMED) ? 64 : 0);
|
tmp_u8 = simulatorData.debugIndex |
|
||||||
|
((mixerConfig()->platformType == PLATFORM_AIRPLANE) ? 128 : 0) |
|
||||||
|
(ARMING_FLAG(ARMED) ? 64 : 0) |
|
||||||
|
(!feature(FEATURE_OSD) ? 32: 0) |
|
||||||
|
(!isOSDTypeSupportedBySimulator() ? 16: 0);
|
||||||
sbufWriteU8(dst, tmp_u8 );
|
sbufWriteU8(dst, tmp_u8 );
|
||||||
sbufWriteU32(dst, debug[simulatorData.debugIndex]);
|
sbufWriteU32(dst, debug[simulatorData.debugIndex]);
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue