piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

fix(radio): don't check ELRS version if crossfire disabled (#5961)

Browse Source
This commit is contained in:
Peter Feerick
2025-03-06 12:08:09 +10:00
committed by GitHub
parent efcc29f2e2
commit be20e2ef2a
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/gui_common.cpp
+1 -1
View File
@@ -1376,7 +1376,7 @@ uint8_t MENU_FIRST_LINE_EDIT(const uint8_t * horTab, uint8_t horTabMax)
uint8_t MODULE_BIND_ROWS(int moduleIdx)
{
if (isModuleELRS(moduleIdx) && (crossfireModuleStatus[moduleIdx].major >= 4 || (crossfireModuleStatus[moduleIdx].major == 3 && crossfireModuleStatus[moduleIdx].minor >= 4)))
if (isModuleELRS(moduleIdx) && CRSF_ELRS_MIN_VER(moduleIdx, 3, 4))
return 1;
if (isModuleCrossfire(moduleIdx))
radio/src/pulses/modules_helpers.h
+1 -1
View File
@@ -619,7 +619,7 @@ inline bool isModuleBindRangeAvailable(uint8_t moduleIdx)
return isModulePXX2(moduleIdx) || isModulePXX1(moduleIdx) ||
isModuleDSM2(moduleIdx) || isModuleMultimodule(moduleIdx) ||
isModuleFlySky(moduleIdx) || isModuleDSMP(moduleIdx) ||
(isModuleELRS(moduleIdx) && (crossfireModuleStatus[moduleIdx].major >= 4 || (crossfireModuleStatus[moduleIdx].major == 3 && crossfireModuleStatus[moduleIdx].minor >= 4)));
(isModuleELRS(moduleIdx) && CRSF_ELRS_MIN_VER(moduleIdx, 3, 4));
}
inline uint32_t getNV14RfFwVersion()
radio/src/telemetry/crossfire.h
+4
View File
@@ -156,11 +156,15 @@ const uint8_t CROSSFIRE_FRAME_PERIODS[] = {
% DIM(CROSSFIRE_BAUDRATES)
#endif
#if defined(CROSSFIRE)
#define CRSF_ELRS_MIN_VER(moduleIdx, maj, min) \
(crossfireModuleStatus[moduleIdx].isELRS \
&& (crossfireModuleStatus[moduleIdx].major > maj \
|| (crossfireModuleStatus[moduleIdx].major == maj \
&& crossfireModuleStatus[moduleIdx].minor >= min)))
#else
#define CRSF_ELRS_MIN_VER(moduleIdx, maj, min) false
#endif
#if defined(HARDWARE_INTERNAL_MODULE)
#define INT_CROSSFIRE_BR_IDX CROSSFIRE_STORE_TO_INDEX(g_eeGeneral.internalModuleBaudrate)