Possible dead code in radio/src/gui/212x64/model_setup.cpp

[wingunder]

Hi,
I was trying to compile an image with GHOST enabled and CROSSFIRE disabled and apart from some other problems, stumbled over the following code:

edgetx/radio/src/gui/212x64/model_setup.cpp

Lines 1043 to 1068 in 29c0f29

	case ITEM_MODEL_SETUP_EXTERNAL_MODULE_BAUDRATE: {
	ModuleData &moduleData = g_model.moduleData[EXTERNAL_MODULE];
	lcdDrawText(INDENT_WIDTH, y, STR_BAUDRATE);
	if (isModuleCrossfire(EXTERNAL_MODULE)) {
	lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_CRSF_BAUDRATE, CROSSFIRE_STORE_TO_INDEX(moduleData.crsf.telemetryBaudrate),attr | LEFT);
	if (attr) {
	moduleData.crsf.telemetryBaudrate =CROSSFIRE_INDEX_TO_STORE(checkIncDecModel(event,CROSSFIRE_STORE_TO_INDEX(moduleData.crsf.telemetryBaudrate),0, DIM(CROSSFIRE_BAUDRATES) - 1));
	if (checkIncDec_Ret) {
	restartModule(EXTERNAL_MODULE);
	}
	}
	}
	break;
	#if SPORT_MAX_BAUDRATE < 400000
	else {
	lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, CROSSFIRE_BAUDRATES[CROSSFIRE_STORE_TO_INDEX(g_model.moduleData[EXTERNAL_MODULE].ghost.telemetryBaudrate)],attr | LEFT);
	if (attr) {
	moduleData.ghost.telemetryBaudrate = CROSSFIRE_INDEX_TO_STORE(checkIncDecModel(event,CROSSFIRE_STORE_TO_INDEX(moduleData.ghost.telemetryBaudrate),0, 1));
	if (checkIncDec_Ret) {
	restartModule(EXTERNAL_MODULE);
	}
	}
	}
	break;
	#endif
	}

To me, the code from line 1056 to 1067 seems to be unreachable, due to the break on line 1055.
Was this intentional, or is it a bug?
Regards

[raphaelcoeffic]

@wingunder that looks indeed like something that will never even compile in case SPORT_MAX_BAUDRATE < 400000.

[wingunder]

@raphaelcoeffic Indeed, when (GHOST and CROSSFIRE are disabled) and (SPORT_MAX_BAUDRATE < 400000), it won't compile. I guess it slipped through all the tests, as GHOST and CROSSFIRE must also be disabled to hit this bug.

BTW, I have a fix for this, but I based it on your no-multimodule branch. Should I make a pull request for this?

[raphaelcoeffic]

That would be nice, yes.