POC
This commit is contained in:
@@ -136,6 +136,9 @@ enum MenuModelSetupItems {
|
||||
#if defined(HARDWARE_EXTERNAL_MODULE)
|
||||
ITEM_MODEL_SETUP_EXTERNAL_MODULE_LABEL,
|
||||
ITEM_MODEL_SETUP_EXTERNAL_MODULE_TYPE,
|
||||
#if defined(CROSSFIRE)
|
||||
ITEM_MODEL_SETUP_EXTERNAL_MODULE_BAUDRATE,
|
||||
#endif
|
||||
#if defined(MULTIMODULE)
|
||||
ITEM_MODEL_SETUP_EXTERNAL_MODULE_PROTOCOL,
|
||||
ITEM_MODEL_SETUP_EXTERNAL_MODULE_SUBTYPE,
|
||||
@@ -191,6 +194,7 @@ enum MenuModelSetupItems {
|
||||
#define IF_NOT_PXX2_MODULE(module, xxx) (isModulePXX2(module) ? HIDDEN_ROW : (uint8_t)(xxx))
|
||||
#define IF_ACCESS_MODULE_RF(module, xxx) (isModuleRFAccess(module) ? (uint8_t)(xxx) : HIDDEN_ROW)
|
||||
#define IF_NOT_ACCESS_MODULE_RF(module, xxx) (isModuleRFAccess(module) ? HIDDEN_ROW : (uint8_t)(xxx))
|
||||
#define IF_CRSF_MODULE(module, xxx) (isModuleCrossfire(module) ? (uint8_t)(xxx) : HIDDEN_ROW)
|
||||
|
||||
#if defined(PXX2)
|
||||
#define REGISTRATION_ID_ROWS uint8_t((isDefaultModelRegistrationID() || (warningText && popupFunc == runPopupRegister)) ? HIDDEN_ROW : READONLY_ROW),
|
||||
@@ -370,6 +374,7 @@ void editTimerCountdown(int timerIdx, coord_t y, LcdFlags attr, event_t event)
|
||||
#define EXTERNAL_MODULE_ROWS \
|
||||
LABEL(ExternalModule), \
|
||||
MODULE_TYPE_ROWS(EXTERNAL_MODULE), \
|
||||
IF_CRSF_MODULE(EXTERNAL_MODULE, 0), /* Baudrate */ \
|
||||
MULTIMODULE_TYPE_ROWS(EXTERNAL_MODULE) /* PROTOCOL */ \
|
||||
MULTIMODULE_SUBTYPE_ROWS(EXTERNAL_MODULE) /* SUBTYPE */ \
|
||||
MULTIMODULE_STATUS_ROWS(EXTERNAL_MODULE) \
|
||||
@@ -1051,6 +1056,26 @@ void menuModelSetup(event_t event)
|
||||
}
|
||||
break;
|
||||
|
||||
#if defined(CROSSFIRE)
|
||||
case ITEM_MODEL_SETUP_EXTERNAL_MODULE_BAUDRATE: {
|
||||
ModuleData & moduleData = g_model.moduleData[moduleIdx];
|
||||
lcdDrawText( INDENT_WIDTH, y, STR_BAUDRATE);
|
||||
lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, EXT_CROSSFIRE_BAUDRATE,
|
||||
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) {
|
||||
restartExternalModule();
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
|
||||
#if defined(MULTIMODULE)
|
||||
#if defined(HARDWARE_INTERNAL_MODULE)
|
||||
case ITEM_MODEL_SETUP_INTERNAL_MODULE_PROTOCOL:
|
||||
|
||||
@@ -106,6 +106,9 @@ enum MenuModelSetupItems {
|
||||
|
||||
ITEM_MODEL_SETUP_EXTERNAL_MODULE_LABEL,
|
||||
ITEM_MODEL_SETUP_EXTERNAL_MODULE_TYPE,
|
||||
#if defined(CROSSFIRE)
|
||||
ITEM_MODEL_SETUP_EXTERNAL_MODULE_BAUDRATE,
|
||||
#endif
|
||||
#if defined (MULTIMODULE)
|
||||
ITEM_MODEL_SETUP_EXTERNAL_MODULE_PROTOCOL,
|
||||
ITEM_MODEL_SETUP_EXTERNAL_MODULE_STATUS,
|
||||
@@ -313,6 +316,7 @@ inline uint8_t EXTERNAL_MODULE_TYPE_ROW()
|
||||
#define IF_NOT_PXX2_MODULE(module, xxx) (isModulePXX2(module) ? HIDDEN_ROW : (uint8_t)(xxx))
|
||||
#define IF_ACCESS_MODULE_RF(module, xxx) (isModuleRFAccess(module) ? (uint8_t)(xxx) : HIDDEN_ROW)
|
||||
#define IF_NOT_ACCESS_MODULE_RF(module, xxx) (isModuleRFAccess(module) ? HIDDEN_ROW : (uint8_t)(xxx))
|
||||
#define IF_CRSF_MODULE(module, xxx) (isModuleCrossfire(module) ? (uint8_t)(xxx) : HIDDEN_ROW)
|
||||
|
||||
#if defined(PXX2)
|
||||
#define REGISTRATION_ID_ROWS uint8_t((isDefaultModelRegistrationID() || (warningText && popupFunc == runPopupRegister)) ? HIDDEN_ROW : READONLY_ROW),
|
||||
@@ -407,6 +411,7 @@ void menuModelSetup(event_t event)
|
||||
|
||||
LABEL(ExternalModule),
|
||||
EXTERNAL_MODULE_TYPE_ROW(),
|
||||
IF_CRSF_MODULE(EXTERNAL_MODULE, 0), // Baudrate
|
||||
MULTIMODULE_TYPE_ROW(EXTERNAL_MODULE)
|
||||
MULTIMODULE_STATUS_ROWS(EXTERNAL_MODULE)
|
||||
AFHDS3_MODE_ROWS(EXTERNAL_MODULE)
|
||||
@@ -1016,6 +1021,26 @@ void menuModelSetup(event_t event)
|
||||
}
|
||||
break;
|
||||
|
||||
#if defined(CROSSFIRE)
|
||||
case ITEM_MODEL_SETUP_EXTERNAL_MODULE_BAUDRATE: {
|
||||
ModuleData & moduleData = g_model.moduleData[EXTERNAL_MODULE];
|
||||
lcdDrawText( INDENT_WIDTH, y, STR_BAUDRATE);
|
||||
lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, EXT_CROSSFIRE_BAUDRATE,
|
||||
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) {
|
||||
restartExternalModule();
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
|
||||
#if defined(MULTIMODULE)
|
||||
case ITEM_MODEL_SETUP_EXTERNAL_MODULE_PROTOCOL:
|
||||
{
|
||||
|
||||
@@ -608,6 +608,22 @@ class ModuleWindow : public FormGroup {
|
||||
});
|
||||
|
||||
// Module parameters
|
||||
if (moduleIdx== EXTERNAL_MODULE && isModuleCrossfire(moduleIdx)) {
|
||||
grid.nextLine();
|
||||
new StaticText(this, grid.getLabelSlot(true), STR_BAUDRATE, 0,
|
||||
COLOR_THEME_PRIMARY1);
|
||||
new Choice(
|
||||
this, grid.getFieldSlot(1, 0), STR_CRSF_BAUDRATE, 0,
|
||||
CROSSFIRE_MAX_INTERNAL_BAUDRATE,
|
||||
[=]() -> int {
|
||||
return CROSSFIRE_STORE_TO_INDEX(g_model.moduleData[moduleIdx].crsf.telemetryBaudrate);
|
||||
},
|
||||
[=](int newValue) {
|
||||
g_model.moduleData[moduleIdx].crsf.telemetryBaudrate = CROSSFIRE_INDEX_TO_STORE(newValue);
|
||||
SET_DIRTY();
|
||||
restartExternalModule();
|
||||
});
|
||||
}
|
||||
if (isModuleXJT(moduleIdx)) {
|
||||
rfChoice = new Choice(
|
||||
this, grid.getFieldSlot(2, 1), STR_XJT_ACCST_RF_PROTOCOLS,
|
||||
|
||||
@@ -262,6 +262,80 @@ void restartExternalModule()
|
||||
resumeMixerCalculations();
|
||||
}
|
||||
|
||||
class InternalModuleWindow : public FormGroup {
|
||||
public:
|
||||
InternalModuleWindow(FormWindow *parent, const rect_t &rect) :
|
||||
FormGroup(parent, rect, FORWARD_SCROLL | FORM_FORWARD_FOCUS)
|
||||
{
|
||||
update();
|
||||
}
|
||||
|
||||
void update()
|
||||
{
|
||||
FormGridLayout grid;
|
||||
#if LCD_W > LCD_H
|
||||
grid.setLabelWidth(180);
|
||||
#else
|
||||
grid.setLabelWidth(130);
|
||||
#endif
|
||||
clear();
|
||||
|
||||
new StaticText(this, grid.getLabelSlot(), TR_INTERNAL_MODULE, 0,
|
||||
COLOR_THEME_PRIMARY1);
|
||||
auto internalModule = new Choice(this, grid.getFieldSlot(1, 0),
|
||||
STR_INTERNAL_MODULE_PROTOCOLS, MODULE_TYPE_NONE, MODULE_TYPE_COUNT - 1,
|
||||
GET_DEFAULT(g_eeGeneral.internalModule),
|
||||
[=](int moduleType) {
|
||||
if (g_model.moduleData[INTERNAL_MODULE].type != moduleType) {
|
||||
memclear(&g_model.moduleData[INTERNAL_MODULE], sizeof(ModuleData));
|
||||
storageDirty(EE_MODEL);
|
||||
}
|
||||
g_eeGeneral.internalModule = moduleType;
|
||||
SET_DIRTY();
|
||||
});
|
||||
|
||||
internalModule->setAvailableHandler([](int module){
|
||||
return isInternalModuleSupported(module);
|
||||
});
|
||||
|
||||
#if defined(CROSSFIRE)
|
||||
if (isInternalModuleCrossfire()) {
|
||||
grid.nextLine();
|
||||
new StaticText(this, grid.getLabelSlot(), STR_BAUDRATE, 0,
|
||||
COLOR_THEME_PRIMARY1);
|
||||
new Choice(
|
||||
this, grid.getFieldSlot(1, 0), STR_CRSF_BAUDRATE, 0,
|
||||
CROSSFIRE_MAX_INTERNAL_BAUDRATE,
|
||||
[=]() -> int {
|
||||
return CROSSFIRE_STORE_TO_INDEX(g_eeGeneral.InternalModuleBaudrate);
|
||||
},
|
||||
[=](int newValue) {
|
||||
g_eeGeneral.InternalModuleBaudrate = CROSSFIRE_INDEX_TO_STORE(newValue);
|
||||
SET_DIRTY();
|
||||
restartExternalModule();
|
||||
});
|
||||
grid.nextLine();
|
||||
}
|
||||
auto par = getParent();
|
||||
par->moveWindowsTop(top() + 1, adjustHeight());
|
||||
par->adjustInnerHeight();
|
||||
#endif
|
||||
}
|
||||
|
||||
void checkEvents() override
|
||||
{
|
||||
if (g_eeGeneral.internalModule != lastModule) {
|
||||
lastModule = g_eeGeneral.internalModule;
|
||||
update();
|
||||
}
|
||||
|
||||
FormGroup::checkEvents();
|
||||
}
|
||||
|
||||
protected:
|
||||
uint8_t lastModule = 0;
|
||||
};
|
||||
|
||||
void RadioHardwarePage::build(FormWindow * window)
|
||||
{
|
||||
FormGridLayout grid;
|
||||
@@ -273,14 +347,14 @@ void RadioHardwarePage::build(FormWindow * window)
|
||||
grid.spacer(PAGE_PADDING);
|
||||
|
||||
// Calibration
|
||||
new StaticText(window, grid.getLabelSlot(), STR_INPUTS, 0, COLOR_THEME_PRIMARY1 | FONT(BOLD));
|
||||
new StaticText(window, grid.getLabelSlot(), STR_INPUTS, 0,
|
||||
COLOR_THEME_PRIMARY1 | FONT(BOLD));
|
||||
auto calib = new TextButton(window, grid.getFieldSlot(), STR_CALIBRATION);
|
||||
calib->setPressHandler([=]() -> uint8_t {
|
||||
auto calibrationPage = new RadioCalibrationPage();
|
||||
calibrationPage->setCloseHandler([=]() {
|
||||
calib->setFocus(SET_FOCUS_DEFAULT);
|
||||
});
|
||||
return 0;
|
||||
auto calibrationPage = new RadioCalibrationPage();
|
||||
calibrationPage->setCloseHandler(
|
||||
[=]() { calib->setFocus(SET_FOCUS_DEFAULT); });
|
||||
return 0;
|
||||
});
|
||||
grid.nextLine();
|
||||
|
||||
@@ -288,8 +362,11 @@ void RadioHardwarePage::build(FormWindow * window)
|
||||
new Subtitle(window, grid.getLineSlot(), STR_STICKS, 0, COLOR_THEME_PRIMARY1);
|
||||
grid.nextLine();
|
||||
for (int i = 0; i < NUM_STICKS; i++) {
|
||||
new StaticText(window, grid.getLabelSlot(true), TEXT_AT_INDEX(STR_VSRCRAW, (i + 1)), 0, COLOR_THEME_PRIMARY1);
|
||||
new RadioTextEdit(window, grid.getFieldSlot(2,0), g_eeGeneral.anaNames[i], LEN_ANA_NAME);
|
||||
new StaticText(window, grid.getLabelSlot(true),
|
||||
TEXT_AT_INDEX(STR_VSRCRAW, (i + 1)), 0,
|
||||
COLOR_THEME_PRIMARY1);
|
||||
new RadioTextEdit(window, grid.getFieldSlot(2, 0), g_eeGeneral.anaNames[i],
|
||||
LEN_ANA_NAME);
|
||||
grid.nextLine();
|
||||
}
|
||||
|
||||
@@ -299,30 +376,39 @@ void RadioHardwarePage::build(FormWindow * window)
|
||||
for (int i = 0; i < NUM_POTS; i++) {
|
||||
// Display EX3 & EX4 (= last two pots) only when FlySky gimbals are present
|
||||
#if !defined(SIMU) && defined(RADIO_FAMILY_T16)
|
||||
if (!globalData.flyskygimbals && (i >= (NUM_POTS - 2)))
|
||||
continue;
|
||||
if (!globalData.flyskygimbals && (i >= (NUM_POTS - 2))) continue;
|
||||
#endif
|
||||
|
||||
new StaticText(window, grid.getLabelSlot(true), TEXT_AT_INDEX(STR_VSRCRAW, (i + NUM_STICKS + 1)), 0, COLOR_THEME_PRIMARY1);
|
||||
new RadioTextEdit(window, grid.getFieldSlot(2,0), g_eeGeneral.anaNames[i + NUM_STICKS], LEN_ANA_NAME);
|
||||
new Choice(window, grid.getFieldSlot(2,1), STR_POTTYPES, POT_NONE, POT_WITHOUT_DETENT,
|
||||
[=]() -> int {
|
||||
return bfGet<uint32_t>(g_eeGeneral.potsConfig, 2*i, 2);
|
||||
},
|
||||
[=](int newValue) {
|
||||
g_eeGeneral.potsConfig = bfSet<uint32_t>(g_eeGeneral.potsConfig, newValue, 2*i, 2);
|
||||
SET_DIRTY();
|
||||
});
|
||||
new StaticText(window, grid.getLabelSlot(true),
|
||||
TEXT_AT_INDEX(STR_VSRCRAW, (i + NUM_STICKS + 1)), 0,
|
||||
COLOR_THEME_PRIMARY1);
|
||||
new RadioTextEdit(window, grid.getFieldSlot(2, 0),
|
||||
g_eeGeneral.anaNames[i + NUM_STICKS], LEN_ANA_NAME);
|
||||
new Choice(
|
||||
window, grid.getFieldSlot(2, 1), STR_POTTYPES, POT_NONE,
|
||||
POT_WITHOUT_DETENT,
|
||||
[=]() -> int {
|
||||
return bfGet<uint32_t>(g_eeGeneral.potsConfig, 2 * i, 2);
|
||||
},
|
||||
[=](int newValue) {
|
||||
g_eeGeneral.potsConfig =
|
||||
bfSet<uint32_t>(g_eeGeneral.potsConfig, newValue, 2 * i, 2);
|
||||
SET_DIRTY();
|
||||
});
|
||||
grid.nextLine();
|
||||
}
|
||||
|
||||
// Sliders
|
||||
new Subtitle(window, grid.getLineSlot(), STR_SLIDERS, 0, COLOR_THEME_PRIMARY1);
|
||||
new Subtitle(window, grid.getLineSlot(), STR_SLIDERS, 0,
|
||||
COLOR_THEME_PRIMARY1);
|
||||
grid.nextLine();
|
||||
for (int i = 0; i < NUM_SLIDERS; i++) {
|
||||
const int idx = i + NUM_STICKS + NUM_POTS;
|
||||
new StaticText(window, grid.getLabelSlot(true), TEXT_AT_INDEX(STR_VSRCRAW, idx + 1), 0, COLOR_THEME_PRIMARY1);
|
||||
new RadioTextEdit(window, grid.getFieldSlot(2, 0), g_eeGeneral.anaNames[idx], LEN_ANA_NAME);
|
||||
new StaticText(window, grid.getLabelSlot(true),
|
||||
TEXT_AT_INDEX(STR_VSRCRAW, idx + 1), 0,
|
||||
COLOR_THEME_PRIMARY1);
|
||||
new RadioTextEdit(window, grid.getFieldSlot(2, 0),
|
||||
g_eeGeneral.anaNames[idx], LEN_ANA_NAME);
|
||||
new Choice(
|
||||
window, grid.getFieldSlot(2, 1), STR_SLIDERTYPES, SLIDER_NONE,
|
||||
SLIDER_WITH_DETENT,
|
||||
@@ -340,78 +426,58 @@ void RadioHardwarePage::build(FormWindow * window)
|
||||
}
|
||||
|
||||
// Switches
|
||||
new Subtitle(window, grid.getLineSlot(), STR_SWITCHES, 0, COLOR_THEME_PRIMARY1);
|
||||
new Subtitle(window, grid.getLineSlot(), STR_SWITCHES, 0,
|
||||
COLOR_THEME_PRIMARY1);
|
||||
grid.nextLine();
|
||||
for (int i = 0; i < NUM_SWITCHES; i++) {
|
||||
new SwitchDynamicLabel(window, grid.getLabelSlot(true), i);
|
||||
new RadioTextEdit(window, grid.getFieldSlot(2, 0), g_eeGeneral.switchNames[i], LEN_SWITCH_NAME);
|
||||
new Choice(window, grid.getFieldSlot(2, 1), STR_SWTYPES, SWITCH_NONE, SWITCH_TYPE_MAX(i),
|
||||
[=]() -> int {
|
||||
return SWITCH_CONFIG(i);
|
||||
},
|
||||
[=](int newValue) {
|
||||
swconfig_t mask = (swconfig_t) 0x03 << (2 * i);
|
||||
g_eeGeneral.switchConfig = (g_eeGeneral.switchConfig & ~mask) | ((swconfig_t(newValue) & 0x03) << (2 * i));
|
||||
SET_DIRTY();
|
||||
});
|
||||
new RadioTextEdit(window, grid.getFieldSlot(2, 0),
|
||||
g_eeGeneral.switchNames[i], LEN_SWITCH_NAME);
|
||||
new Choice(
|
||||
window, grid.getFieldSlot(2, 1), STR_SWTYPES, SWITCH_NONE,
|
||||
SWITCH_TYPE_MAX(i), [=]() -> int { return SWITCH_CONFIG(i); },
|
||||
[=](int newValue) {
|
||||
swconfig_t mask = (swconfig_t)0x03 << (2 * i);
|
||||
g_eeGeneral.switchConfig = (g_eeGeneral.switchConfig & ~mask) |
|
||||
((swconfig_t(newValue) & 0x03) << (2 * i));
|
||||
SET_DIRTY();
|
||||
});
|
||||
grid.nextLine();
|
||||
}
|
||||
|
||||
// Bat calibration
|
||||
new StaticText(window, grid.getLabelSlot(), STR_BATT_CALIB, 0, COLOR_THEME_PRIMARY1);
|
||||
auto batCal = new NumberEdit(window, grid.getFieldSlot(1,0), -127, 127, GET_SET_DEFAULT(g_eeGeneral.txVoltageCalibration));
|
||||
batCal->setDisplayHandler([](BitmapBuffer * dc, LcdFlags flags, int32_t value) {
|
||||
dc->drawNumber(FIELD_PADDING_LEFT, FIELD_PADDING_TOP, getBatteryVoltage(), flags | PREC2, 0, nullptr, "V");
|
||||
});
|
||||
new StaticText(window, grid.getLabelSlot(), STR_BATT_CALIB, 0,
|
||||
COLOR_THEME_PRIMARY1);
|
||||
auto batCal =
|
||||
new NumberEdit(window, grid.getFieldSlot(1, 0), -127, 127,
|
||||
GET_SET_DEFAULT(g_eeGeneral.txVoltageCalibration));
|
||||
batCal->setDisplayHandler(
|
||||
[](BitmapBuffer *dc, LcdFlags flags, int32_t value) {
|
||||
dc->drawNumber(FIELD_PADDING_LEFT, FIELD_PADDING_TOP,
|
||||
getBatteryVoltage(), flags | PREC2, 0, nullptr, "V");
|
||||
});
|
||||
batCal->setWindowFlags(REFRESH_ALWAYS);
|
||||
grid.nextLine();
|
||||
|
||||
// RTC Batt display
|
||||
new StaticText(window, grid.getLabelSlot(), STR_RTC_BATT, 0, COLOR_THEME_PRIMARY1);
|
||||
new DynamicNumber<uint16_t>(window, grid.getFieldSlot(1,0), [] {
|
||||
return getRTCBatteryVoltage();
|
||||
}, COLOR_THEME_PRIMARY1 | PREC2, nullptr, "V");
|
||||
new StaticText(window, grid.getLabelSlot(), STR_RTC_BATT, 0,
|
||||
COLOR_THEME_PRIMARY1);
|
||||
new DynamicNumber<uint16_t>(
|
||||
window, grid.getFieldSlot(1, 0), [] { return getRTCBatteryVoltage(); },
|
||||
COLOR_THEME_PRIMARY1 | PREC2, nullptr, "V");
|
||||
grid.nextLine();
|
||||
|
||||
// RTC Batt check enable
|
||||
new StaticText(window, grid.getLabelSlot(), STR_RTC_CHECK, 0, COLOR_THEME_PRIMARY1);
|
||||
new CheckBox(window, grid.getFieldSlot(1,0), GET_SET_INVERTED(g_eeGeneral.disableRtcWarning ));
|
||||
new StaticText(window, grid.getLabelSlot(), STR_RTC_CHECK, 0,
|
||||
COLOR_THEME_PRIMARY1);
|
||||
new CheckBox(window, grid.getFieldSlot(1, 0),
|
||||
GET_SET_INVERTED(g_eeGeneral.disableRtcWarning));
|
||||
grid.nextLine();
|
||||
|
||||
#if defined(HARDWARE_INTERNAL_MODULE)
|
||||
new StaticText(window, grid.getLabelSlot(), TR_INTERNAL_MODULE, 0,
|
||||
COLOR_THEME_PRIMARY1);
|
||||
auto internalModule = new Choice(window, grid.getFieldSlot(1, 0),
|
||||
STR_INTERNAL_MODULE_PROTOCOLS, MODULE_TYPE_NONE, MODULE_TYPE_COUNT - 1,
|
||||
GET_DEFAULT(g_eeGeneral.internalModule),
|
||||
[=](int moduleType) {
|
||||
if (g_model.moduleData[INTERNAL_MODULE].type != moduleType) {
|
||||
memclear(&g_model.moduleData[INTERNAL_MODULE], sizeof(ModuleData));
|
||||
storageDirty(EE_MODEL);
|
||||
}
|
||||
g_eeGeneral.internalModule = moduleType;
|
||||
SET_DIRTY();
|
||||
});
|
||||
|
||||
internalModule->setAvailableHandler([](int module){
|
||||
return isInternalModuleSupported(module);
|
||||
});
|
||||
grid.nextLine();
|
||||
#endif
|
||||
|
||||
#if defined(CROSSFIRE)
|
||||
// Max baud for external modules
|
||||
new StaticText(window, grid.getLabelSlot(), STR_MAXBAUDRATE, 0, COLOR_THEME_PRIMARY1);
|
||||
new Choice(window, grid.getFieldSlot(1,0), STR_CRSF_BAUDRATE, 0, DIM(CROSSFIRE_BAUDRATES) - 1,
|
||||
[=]() -> int {
|
||||
return CROSSFIRE_STORE_TO_INDEX(g_eeGeneral.telemetryBaudrate);
|
||||
},
|
||||
[=](int newValue) {
|
||||
g_eeGeneral.telemetryBaudrate = CROSSFIRE_INDEX_TO_STORE(newValue);
|
||||
SET_DIRTY();
|
||||
restartExternalModule();
|
||||
});
|
||||
new Subtitle(window, grid.getLineSlot(), TR_INTERNALRF, 0, COLOR_THEME_PRIMARY1);
|
||||
grid.nextLine();
|
||||
grid.addWindow(new InternalModuleWindow(window, {0, grid.getWindowHeight(), LCD_W, 0}));
|
||||
#endif
|
||||
|
||||
#if defined(BLUETOOTH)
|
||||
|
||||
@@ -97,11 +97,9 @@ enum {
|
||||
#endif
|
||||
|
||||
#if !defined(PCBX9D) && !defined(PCBX9DP) && !defined(PCBX9E)
|
||||
ITEM_RADIO_HARDWARE_INTERNAL_MODULE,
|
||||
#endif
|
||||
|
||||
#if (defined(CROSSFIRE) || defined(GHOST))
|
||||
ITEM_RADIO_HARDWARE_SERIAL_BAUDRATE,
|
||||
ITEM_RADIO_HARDWARE_LABEL_INTERNAL_MODULE,
|
||||
ITEM_RADIO_HARDWARE_INTERNAL_MODULE_TYPE,
|
||||
ITEM_RADIO_HARDWARE_INTERNAL_MODULE_BAUDRATE,
|
||||
#endif
|
||||
|
||||
ITEM_RADIO_HARDWARE_SERIAL_SAMPLE_MODE,
|
||||
@@ -231,17 +229,11 @@ enum {
|
||||
#endif
|
||||
|
||||
#if !defined(PCBX9D) && !defined(PCBX9DP) && !defined(PCBX9E)
|
||||
#define INTERNAL_MODULE_ROWS 0,
|
||||
#define INTERNAL_MODULE_ROWS 0, (isInternalModuleCrossfire() ? (uint8_t ) 0 : HIDDEN_ROW),
|
||||
#else
|
||||
#define INTERNAL_MODULE_ROWS
|
||||
#endif
|
||||
|
||||
#if (defined(CROSSFIRE) || defined(GHOST))
|
||||
#define MAX_BAUD_ROWS 0,
|
||||
#else
|
||||
#define MAX_BAUD_ROWS
|
||||
#endif
|
||||
|
||||
#define SERIAL_SAMPLE_MODE_ROWS 0,
|
||||
|
||||
#if defined(AUX_SERIAL) || defined(USB_SERIAL)
|
||||
@@ -282,21 +274,6 @@ void onFactoryResetConfirm(const char * result)
|
||||
}
|
||||
#endif
|
||||
|
||||
void restartExternalModule()
|
||||
{
|
||||
if (!IS_EXTERNAL_MODULE_ON()) {
|
||||
return;
|
||||
}
|
||||
pauseMixerCalculations();
|
||||
pausePulses();
|
||||
EXTERNAL_MODULE_OFF();
|
||||
RTOS_WAIT_MS(20); // 20ms so that the pulses interrupt will reinit the frame rate
|
||||
telemetryProtocol = 255; // force telemetry port + module reinitialization
|
||||
EXTERNAL_MODULE_ON();
|
||||
resumePulses();
|
||||
resumeMixerCalculations();
|
||||
}
|
||||
|
||||
static bool _isAux1ModeAvailable(int m) { return isSerialModeAvailable(SP_AUX1, m); }
|
||||
static bool _isAux2ModeAvailable(int m) { return isSerialModeAvailable(SP_AUX2, m); }
|
||||
static bool _isVCPModeAvailable(int m) { return isSerialModeAvailable(SP_VCP, m); }
|
||||
@@ -322,8 +299,8 @@ void menuRadioHardware(event_t event)
|
||||
0 /* battery calib */,
|
||||
RTC_ROW
|
||||
TX_CAPACITY_MEASUREMENT_ROWS
|
||||
LABEL(InternalModule),
|
||||
INTERNAL_MODULE_ROWS
|
||||
MAX_BAUD_ROWS
|
||||
SERIAL_SAMPLE_MODE_ROWS
|
||||
BLUETOOTH_ROWS
|
||||
EXTERNAL_ANTENNA_ROW
|
||||
@@ -533,9 +510,13 @@ void menuRadioHardware(event_t event)
|
||||
#endif
|
||||
|
||||
#if !defined(PCBX9D) && !defined(PCBX9DP) && !defined(PCBX9E)
|
||||
case ITEM_RADIO_HARDWARE_INTERNAL_MODULE: {
|
||||
case ITEM_RADIO_HARDWARE_LABEL_INTERNAL_MODULE:
|
||||
lcdDrawTextAlignedLeft(y, STR_INTERNALRF);
|
||||
break;
|
||||
|
||||
case ITEM_RADIO_HARDWARE_INTERNAL_MODULE_TYPE: {
|
||||
g_eeGeneral.internalModule =
|
||||
editChoice(HW_SETTINGS_COLUMN2, y, STR_INTERNAL_MODULE,
|
||||
editChoice(HW_SETTINGS_COLUMN2, y, STR_TYPE,
|
||||
STR_INTERNAL_MODULE_PROTOCOLS,
|
||||
g_eeGeneral.internalModule, MODULE_TYPE_NONE,
|
||||
MODULE_TYPE_MAX, attr, event, isInternalModuleSupported);
|
||||
@@ -548,12 +529,12 @@ void menuRadioHardware(event_t event)
|
||||
} break;
|
||||
#endif
|
||||
|
||||
#if (defined(CROSSFIRE) || defined(GHOST))
|
||||
case ITEM_RADIO_HARDWARE_SERIAL_BAUDRATE:
|
||||
lcdDrawTextAlignedLeft(y, STR_MAXBAUDRATE);
|
||||
lcdDrawNumber(HW_SETTINGS_COLUMN2, y, CROSSFIRE_BAUDRATE, attr|LEFT);
|
||||
#if !defined(PCBX9D) && !defined(PCBX9DP) && !defined(PCBX9E)
|
||||
case ITEM_RADIO_HARDWARE_INTERNAL_MODULE_BAUDRATE:
|
||||
lcdDrawText(INDENT_WIDTH, y, STR_BAUDRATE);
|
||||
lcdDrawNumber(HW_SETTINGS_COLUMN2, y, INT_CROSSFIRE_BAUDRATE, attr|LEFT);
|
||||
if (attr) {
|
||||
g_eeGeneral.telemetryBaudrate = CROSSFIRE_INDEX_TO_STORE(checkIncDecModel(event, CROSSFIRE_STORE_TO_INDEX(g_eeGeneral.telemetryBaudrate), 0, DIM(CROSSFIRE_BAUDRATES) - 1));
|
||||
g_eeGeneral.InternalModuleBaudrate = CROSSFIRE_INDEX_TO_STORE(checkIncDecModel(event, CROSSFIRE_STORE_TO_INDEX(g_eeGeneral.InternalModuleBaudrate), 0, CROSSFIRE_MAX_INTERNAL_BAUDRATE));
|
||||
if (checkIncDec_Ret) {
|
||||
restartExternalModule();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user