Cosmetics
This commit is contained in:
@@ -1060,14 +1060,9 @@ void menuModelSetup(event_t event)
|
|||||||
case ITEM_MODEL_SETUP_EXTERNAL_MODULE_BAUDRATE: {
|
case ITEM_MODEL_SETUP_EXTERNAL_MODULE_BAUDRATE: {
|
||||||
ModuleData & moduleData = g_model.moduleData[moduleIdx];
|
ModuleData & moduleData = g_model.moduleData[moduleIdx];
|
||||||
lcdDrawText( INDENT_WIDTH, y, STR_BAUDRATE);
|
lcdDrawText( INDENT_WIDTH, y, STR_BAUDRATE);
|
||||||
lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, EXT_CROSSFIRE_BAUDRATE,
|
lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, EXT_CROSSFIRE_BAUDRATE,attr | LEFT);
|
||||||
attr | LEFT);
|
|
||||||
if (attr) {
|
if (attr) {
|
||||||
moduleData.crsf.telemetryBaudrate =
|
moduleData.crsf.telemetryBaudrate = CROSSFIRE_INDEX_TO_STORE(checkIncDecModel(event,CROSSFIRE_STORE_TO_INDEX(moduleData.crsf.telemetryBaudrate), 0,DIM(CROSSFIRE_BAUDRATES) - 1));
|
||||||
CROSSFIRE_INDEX_TO_STORE(checkIncDecModel(
|
|
||||||
event,
|
|
||||||
CROSSFIRE_STORE_TO_INDEX(moduleData.crsf.telemetryBaudrate), 0,
|
|
||||||
DIM(CROSSFIRE_BAUDRATES) - 1));
|
|
||||||
if (checkIncDec_Ret) {
|
if (checkIncDec_Ret) {
|
||||||
restartExternalModule();
|
restartExternalModule();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1023,16 +1023,11 @@ void menuModelSetup(event_t event)
|
|||||||
|
|
||||||
#if defined(CROSSFIRE)
|
#if defined(CROSSFIRE)
|
||||||
case ITEM_MODEL_SETUP_EXTERNAL_MODULE_BAUDRATE: {
|
case ITEM_MODEL_SETUP_EXTERNAL_MODULE_BAUDRATE: {
|
||||||
ModuleData & moduleData = g_model.moduleData[EXTERNAL_MODULE];
|
ModuleData &moduleData = g_model.moduleData[EXTERNAL_MODULE];
|
||||||
lcdDrawText( INDENT_WIDTH, y, STR_BAUDRATE);
|
lcdDrawText(INDENT_WIDTH, y, STR_BAUDRATE);
|
||||||
lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, EXT_CROSSFIRE_BAUDRATE,
|
lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, EXT_CROSSFIRE_BAUDRATE,attr | LEFT);
|
||||||
attr | LEFT);
|
|
||||||
if (attr) {
|
if (attr) {
|
||||||
moduleData.crsf.telemetryBaudrate =
|
moduleData.crsf.telemetryBaudrate = CROSSFIRE_INDEX_TO_STORE(checkIncDecModel(event,CROSSFIRE_STORE_TO_INDEX(moduleData.crsf.telemetryBaudrate),0, DIM(CROSSFIRE_BAUDRATES) - 1));
|
||||||
CROSSFIRE_INDEX_TO_STORE(checkIncDecModel(
|
|
||||||
event,
|
|
||||||
CROSSFIRE_STORE_TO_INDEX(moduleData.crsf.telemetryBaudrate), 0,
|
|
||||||
DIM(CROSSFIRE_BAUDRATES) - 1));
|
|
||||||
if (checkIncDec_Ret) {
|
if (checkIncDec_Ret) {
|
||||||
restartExternalModule();
|
restartExternalModule();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -610,11 +610,8 @@ class ModuleWindow : public FormGroup {
|
|||||||
// Module parameters
|
// Module parameters
|
||||||
if (moduleIdx== EXTERNAL_MODULE && isModuleCrossfire(moduleIdx)) {
|
if (moduleIdx== EXTERNAL_MODULE && isModuleCrossfire(moduleIdx)) {
|
||||||
grid.nextLine();
|
grid.nextLine();
|
||||||
new StaticText(this, grid.getLabelSlot(true), STR_BAUDRATE, 0,
|
new StaticText(this, grid.getLabelSlot(true), STR_BAUDRATE, 0,COLOR_THEME_PRIMARY1);
|
||||||
COLOR_THEME_PRIMARY1);
|
new Choice(this, grid.getFieldSlot(1, 0), STR_CRSF_BAUDRATE, 0,CROSSFIRE_MAX_INTERNAL_BAUDRATE,
|
||||||
new Choice(
|
|
||||||
this, grid.getFieldSlot(1, 0), STR_CRSF_BAUDRATE, 0,
|
|
||||||
CROSSFIRE_MAX_INTERNAL_BAUDRATE,
|
|
||||||
[=]() -> int {
|
[=]() -> int {
|
||||||
return CROSSFIRE_STORE_TO_INDEX(g_model.moduleData[moduleIdx].crsf.telemetryBaudrate);
|
return CROSSFIRE_STORE_TO_INDEX(g_model.moduleData[moduleIdx].crsf.telemetryBaudrate);
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -282,8 +282,7 @@ class InternalModuleWindow : public FormGroup {
|
|||||||
|
|
||||||
new StaticText(this, grid.getLabelSlot(), TR_INTERNAL_MODULE, 0,
|
new StaticText(this, grid.getLabelSlot(), TR_INTERNAL_MODULE, 0,
|
||||||
COLOR_THEME_PRIMARY1);
|
COLOR_THEME_PRIMARY1);
|
||||||
auto internalModule = new Choice(this, grid.getFieldSlot(1, 0),
|
auto internalModule = new Choice(this, grid.getFieldSlot(1, 0),STR_INTERNAL_MODULE_PROTOCOLS, MODULE_TYPE_NONE, MODULE_TYPE_COUNT - 1,
|
||||||
STR_INTERNAL_MODULE_PROTOCOLS, MODULE_TYPE_NONE, MODULE_TYPE_COUNT - 1,
|
|
||||||
GET_DEFAULT(g_eeGeneral.internalModule),
|
GET_DEFAULT(g_eeGeneral.internalModule),
|
||||||
[=](int moduleType) {
|
[=](int moduleType) {
|
||||||
if (g_model.moduleData[INTERNAL_MODULE].type != moduleType) {
|
if (g_model.moduleData[INTERNAL_MODULE].type != moduleType) {
|
||||||
@@ -301,11 +300,8 @@ class InternalModuleWindow : public FormGroup {
|
|||||||
#if defined(CROSSFIRE)
|
#if defined(CROSSFIRE)
|
||||||
if (isInternalModuleCrossfire()) {
|
if (isInternalModuleCrossfire()) {
|
||||||
grid.nextLine();
|
grid.nextLine();
|
||||||
new StaticText(this, grid.getLabelSlot(), STR_BAUDRATE, 0,
|
new StaticText(this, grid.getLabelSlot(), STR_BAUDRATE, 0,COLOR_THEME_PRIMARY1);
|
||||||
COLOR_THEME_PRIMARY1);
|
new Choice(this, grid.getFieldSlot(1, 0), STR_CRSF_BAUDRATE, 0,CROSSFIRE_MAX_INTERNAL_BAUDRATE,
|
||||||
new Choice(
|
|
||||||
this, grid.getFieldSlot(1, 0), STR_CRSF_BAUDRATE, 0,
|
|
||||||
CROSSFIRE_MAX_INTERNAL_BAUDRATE,
|
|
||||||
[=]() -> int {
|
[=]() -> int {
|
||||||
return CROSSFIRE_STORE_TO_INDEX(g_eeGeneral.InternalModuleBaudrate);
|
return CROSSFIRE_STORE_TO_INDEX(g_eeGeneral.InternalModuleBaudrate);
|
||||||
},
|
},
|
||||||
@@ -347,14 +343,14 @@ void RadioHardwarePage::build(FormWindow * window)
|
|||||||
grid.spacer(PAGE_PADDING);
|
grid.spacer(PAGE_PADDING);
|
||||||
|
|
||||||
// Calibration
|
// Calibration
|
||||||
new StaticText(window, grid.getLabelSlot(), STR_INPUTS, 0,
|
new StaticText(window, grid.getLabelSlot(), STR_INPUTS, 0, COLOR_THEME_PRIMARY1 | FONT(BOLD));
|
||||||
COLOR_THEME_PRIMARY1 | FONT(BOLD));
|
|
||||||
auto calib = new TextButton(window, grid.getFieldSlot(), STR_CALIBRATION);
|
auto calib = new TextButton(window, grid.getFieldSlot(), STR_CALIBRATION);
|
||||||
calib->setPressHandler([=]() -> uint8_t {
|
calib->setPressHandler([=]() -> uint8_t {
|
||||||
auto calibrationPage = new RadioCalibrationPage();
|
auto calibrationPage = new RadioCalibrationPage();
|
||||||
calibrationPage->setCloseHandler(
|
calibrationPage->setCloseHandler([=]() {
|
||||||
[=]() { calib->setFocus(SET_FOCUS_DEFAULT); });
|
calib->setFocus(SET_FOCUS_DEFAULT);
|
||||||
return 0;
|
});
|
||||||
|
return 0;
|
||||||
});
|
});
|
||||||
grid.nextLine();
|
grid.nextLine();
|
||||||
|
|
||||||
@@ -362,11 +358,8 @@ void RadioHardwarePage::build(FormWindow * window)
|
|||||||
new Subtitle(window, grid.getLineSlot(), STR_STICKS, 0, COLOR_THEME_PRIMARY1);
|
new Subtitle(window, grid.getLineSlot(), STR_STICKS, 0, COLOR_THEME_PRIMARY1);
|
||||||
grid.nextLine();
|
grid.nextLine();
|
||||||
for (int i = 0; i < NUM_STICKS; i++) {
|
for (int i = 0; i < NUM_STICKS; i++) {
|
||||||
new StaticText(window, grid.getLabelSlot(true),
|
new StaticText(window, grid.getLabelSlot(true), TEXT_AT_INDEX(STR_VSRCRAW, (i + 1)), 0, COLOR_THEME_PRIMARY1);
|
||||||
TEXT_AT_INDEX(STR_VSRCRAW, (i + 1)), 0,
|
new RadioTextEdit(window, grid.getFieldSlot(2,0), g_eeGeneral.anaNames[i], LEN_ANA_NAME);
|
||||||
COLOR_THEME_PRIMARY1);
|
|
||||||
new RadioTextEdit(window, grid.getFieldSlot(2, 0), g_eeGeneral.anaNames[i],
|
|
||||||
LEN_ANA_NAME);
|
|
||||||
grid.nextLine();
|
grid.nextLine();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -376,39 +369,30 @@ void RadioHardwarePage::build(FormWindow * window)
|
|||||||
for (int i = 0; i < NUM_POTS; i++) {
|
for (int i = 0; i < NUM_POTS; i++) {
|
||||||
// Display EX3 & EX4 (= last two pots) only when FlySky gimbals are present
|
// Display EX3 & EX4 (= last two pots) only when FlySky gimbals are present
|
||||||
#if !defined(SIMU) && defined(RADIO_FAMILY_T16)
|
#if !defined(SIMU) && defined(RADIO_FAMILY_T16)
|
||||||
if (!globalData.flyskygimbals && (i >= (NUM_POTS - 2))) continue;
|
if (!globalData.flyskygimbals && (i >= (NUM_POTS - 2)))
|
||||||
|
continue;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
new StaticText(window, grid.getLabelSlot(true),
|
new StaticText(window, grid.getLabelSlot(true), TEXT_AT_INDEX(STR_VSRCRAW, (i + NUM_STICKS + 1)), 0, COLOR_THEME_PRIMARY1);
|
||||||
TEXT_AT_INDEX(STR_VSRCRAW, (i + NUM_STICKS + 1)), 0,
|
new RadioTextEdit(window, grid.getFieldSlot(2,0), g_eeGeneral.anaNames[i + NUM_STICKS], LEN_ANA_NAME);
|
||||||
COLOR_THEME_PRIMARY1);
|
new Choice(window, grid.getFieldSlot(2,1), STR_POTTYPES, POT_NONE, POT_WITHOUT_DETENT,
|
||||||
new RadioTextEdit(window, grid.getFieldSlot(2, 0),
|
[=]() -> int {
|
||||||
g_eeGeneral.anaNames[i + NUM_STICKS], LEN_ANA_NAME);
|
return bfGet<uint32_t>(g_eeGeneral.potsConfig, 2*i, 2);
|
||||||
new Choice(
|
},
|
||||||
window, grid.getFieldSlot(2, 1), STR_POTTYPES, POT_NONE,
|
[=](int newValue) {
|
||||||
POT_WITHOUT_DETENT,
|
g_eeGeneral.potsConfig = bfSet<uint32_t>(g_eeGeneral.potsConfig, newValue, 2*i, 2);
|
||||||
[=]() -> int {
|
SET_DIRTY();
|
||||||
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();
|
grid.nextLine();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Sliders
|
// Sliders
|
||||||
new Subtitle(window, grid.getLineSlot(), STR_SLIDERS, 0,
|
new Subtitle(window, grid.getLineSlot(), STR_SLIDERS, 0, COLOR_THEME_PRIMARY1);
|
||||||
COLOR_THEME_PRIMARY1);
|
|
||||||
grid.nextLine();
|
grid.nextLine();
|
||||||
for (int i = 0; i < NUM_SLIDERS; i++) {
|
for (int i = 0; i < NUM_SLIDERS; i++) {
|
||||||
const int idx = i + NUM_STICKS + NUM_POTS;
|
const int idx = i + NUM_STICKS + NUM_POTS;
|
||||||
new StaticText(window, grid.getLabelSlot(true),
|
new StaticText(window, grid.getLabelSlot(true), TEXT_AT_INDEX(STR_VSRCRAW, idx + 1), 0, COLOR_THEME_PRIMARY1);
|
||||||
TEXT_AT_INDEX(STR_VSRCRAW, idx + 1), 0,
|
new RadioTextEdit(window, grid.getFieldSlot(2, 0), g_eeGeneral.anaNames[idx], LEN_ANA_NAME);
|
||||||
COLOR_THEME_PRIMARY1);
|
|
||||||
new RadioTextEdit(window, grid.getFieldSlot(2, 0),
|
|
||||||
g_eeGeneral.anaNames[idx], LEN_ANA_NAME);
|
|
||||||
new Choice(
|
new Choice(
|
||||||
window, grid.getFieldSlot(2, 1), STR_SLIDERTYPES, SLIDER_NONE,
|
window, grid.getFieldSlot(2, 1), STR_SLIDERTYPES, SLIDER_NONE,
|
||||||
SLIDER_WITH_DETENT,
|
SLIDER_WITH_DETENT,
|
||||||
@@ -426,52 +410,42 @@ void RadioHardwarePage::build(FormWindow * window)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Switches
|
// Switches
|
||||||
new Subtitle(window, grid.getLineSlot(), STR_SWITCHES, 0,
|
new Subtitle(window, grid.getLineSlot(), STR_SWITCHES, 0, COLOR_THEME_PRIMARY1);
|
||||||
COLOR_THEME_PRIMARY1);
|
|
||||||
grid.nextLine();
|
grid.nextLine();
|
||||||
for (int i = 0; i < NUM_SWITCHES; i++) {
|
for (int i = 0; i < NUM_SWITCHES; i++) {
|
||||||
new SwitchDynamicLabel(window, grid.getLabelSlot(true), i);
|
new SwitchDynamicLabel(window, grid.getLabelSlot(true), i);
|
||||||
new RadioTextEdit(window, grid.getFieldSlot(2, 0),
|
new RadioTextEdit(window, grid.getFieldSlot(2, 0), g_eeGeneral.switchNames[i], LEN_SWITCH_NAME);
|
||||||
g_eeGeneral.switchNames[i], LEN_SWITCH_NAME);
|
new Choice(window, grid.getFieldSlot(2, 1), STR_SWTYPES, SWITCH_NONE, SWITCH_TYPE_MAX(i),
|
||||||
new Choice(
|
[=]() -> int {
|
||||||
window, grid.getFieldSlot(2, 1), STR_SWTYPES, SWITCH_NONE,
|
return SWITCH_CONFIG(i);
|
||||||
SWITCH_TYPE_MAX(i), [=]() -> int { return SWITCH_CONFIG(i); },
|
},
|
||||||
[=](int newValue) {
|
[=](int newValue) {
|
||||||
swconfig_t mask = (swconfig_t)0x03 << (2 * i);
|
swconfig_t mask = (swconfig_t) 0x03 << (2 * i);
|
||||||
g_eeGeneral.switchConfig = (g_eeGeneral.switchConfig & ~mask) |
|
g_eeGeneral.switchConfig = (g_eeGeneral.switchConfig & ~mask) | ((swconfig_t(newValue) & 0x03) << (2 * i));
|
||||||
((swconfig_t(newValue) & 0x03) << (2 * i));
|
SET_DIRTY();
|
||||||
SET_DIRTY();
|
});
|
||||||
});
|
|
||||||
grid.nextLine();
|
grid.nextLine();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Bat calibration
|
// Bat calibration
|
||||||
new StaticText(window, grid.getLabelSlot(), STR_BATT_CALIB, 0,
|
new StaticText(window, grid.getLabelSlot(), STR_BATT_CALIB, 0, COLOR_THEME_PRIMARY1);
|
||||||
COLOR_THEME_PRIMARY1);
|
auto batCal = new NumberEdit(window, grid.getFieldSlot(1,0), -127, 127, GET_SET_DEFAULT(g_eeGeneral.txVoltageCalibration));
|
||||||
auto batCal =
|
batCal->setDisplayHandler([](BitmapBuffer * dc, LcdFlags flags, int32_t value) {
|
||||||
new NumberEdit(window, grid.getFieldSlot(1, 0), -127, 127,
|
dc->drawNumber(FIELD_PADDING_LEFT, FIELD_PADDING_TOP, getBatteryVoltage(), flags | PREC2, 0, nullptr, "V");
|
||||||
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);
|
batCal->setWindowFlags(REFRESH_ALWAYS);
|
||||||
grid.nextLine();
|
grid.nextLine();
|
||||||
|
|
||||||
// RTC Batt display
|
// RTC Batt display
|
||||||
new StaticText(window, grid.getLabelSlot(), STR_RTC_BATT, 0,
|
new StaticText(window, grid.getLabelSlot(), STR_RTC_BATT, 0, COLOR_THEME_PRIMARY1);
|
||||||
COLOR_THEME_PRIMARY1);
|
new DynamicNumber<uint16_t>(window, grid.getFieldSlot(1,0), [] {
|
||||||
new DynamicNumber<uint16_t>(
|
return getRTCBatteryVoltage();
|
||||||
window, grid.getFieldSlot(1, 0), [] { return getRTCBatteryVoltage(); },
|
}, COLOR_THEME_PRIMARY1 | PREC2, nullptr, "V");
|
||||||
COLOR_THEME_PRIMARY1 | PREC2, nullptr, "V");
|
|
||||||
grid.nextLine();
|
grid.nextLine();
|
||||||
|
|
||||||
// RTC Batt check enable
|
// RTC Batt check enable
|
||||||
new StaticText(window, grid.getLabelSlot(), STR_RTC_CHECK, 0,
|
new StaticText(window, grid.getLabelSlot(), STR_RTC_CHECK, 0, COLOR_THEME_PRIMARY1);
|
||||||
COLOR_THEME_PRIMARY1);
|
new CheckBox(window, grid.getFieldSlot(1,0), GET_SET_INVERTED(g_eeGeneral.disableRtcWarning ));
|
||||||
new CheckBox(window, grid.getFieldSlot(1, 0),
|
|
||||||
GET_SET_INVERTED(g_eeGeneral.disableRtcWarning));
|
|
||||||
grid.nextLine();
|
grid.nextLine();
|
||||||
|
|
||||||
#if defined(HARDWARE_INTERNAL_MODULE)
|
#if defined(HARDWARE_INTERNAL_MODULE)
|
||||||
|
|||||||
Reference in New Issue
Block a user