исправление модкода

This commit is contained in:
Vladislav Ostapov 2025-01-20 13:31:45 +03:00
parent 8813488df8
commit 196f7ae5a2

View File

@ -847,7 +847,7 @@ const static ModcodDef_t ModcodDefs[] = {
static const char* extractModcodModulation(uint32_t modcod, bool defaultQpsk1_4 = true) { static const char* extractModcodModulation(uint32_t modcod, bool defaultQpsk1_4 = true) {
modcod >>= 2; modcod >>= 2;
const auto* d = defaultQpsk1_4 ? ModcodDefs : ModcodDefs + 1; const auto* d = defaultQpsk1_4 ? ModcodDefs : ModcodDefs + 1;
if (modcod < 28) { if (modcod < (sizeof(ModcodDefs) / sizeof(ModcodDef_t))) {
d = ModcodDefs + modcod; d = ModcodDefs + modcod;
} }
return d->modulation; return d->modulation;
@ -856,7 +856,7 @@ static const char* extractModcodModulation(uint32_t modcod, bool defaultQpsk1_4
static const char* extractModcodSpeed(uint32_t modcod, bool defaultQpsk1_4 = true) { static const char* extractModcodSpeed(uint32_t modcod, bool defaultQpsk1_4 = true) {
modcod >>= 2; modcod >>= 2;
const auto* d = defaultQpsk1_4 ? ModcodDefs : ModcodDefs + 1; const auto* d = defaultQpsk1_4 ? ModcodDefs : ModcodDefs + 1;
if (modcod < 28) { if (modcod < (sizeof(ModcodDefs) / sizeof(ModcodDef_t))) {
d = ModcodDefs + modcod; d = ModcodDefs + modcod;
} }
return d->speed; return d->speed;