system hardware menu, aligned it really looks much better

This commit is contained in:
olliw42
2021-05-18 23:49:55 +02:00
committed by Raphael Coeffic
parent 0939d1bdff
commit 97c94f9101
+6 -11
View File
@@ -152,9 +152,9 @@ void RadioHardwarePage::build(FormWindow * window)
{ {
FormGridLayout grid; FormGridLayout grid;
#if LCD_W > LCD_H #if LCD_W > LCD_H
grid.setLabelWidth(130); grid.setLabelWidth(180);
#else #else
grid.setLabelWidth(100); grid.setLabelWidth(130);
#endif #endif
grid.spacer(6); grid.spacer(6);
@@ -233,15 +233,10 @@ void RadioHardwarePage::build(FormWindow * window)
}); });
grid.nextLine(); grid.nextLine();
} }
#if LCD_W > LCD_H
grid.setLabelWidth(180);
#else
grid.setLabelWidth(130);
#endif
// Bat calibration // Bat calibration
new StaticText(window, grid.getLabelSlot(), STR_BATT_CALIB); new StaticText(window, grid.getLabelSlot(), STR_BATT_CALIB);
auto batCal = new NumberEdit(window, grid.getFieldSlot(), -127, 127, GET_SET_DEFAULT(g_eeGeneral.txVoltageCalibration)); 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) { batCal->setDisplayHandler([](BitmapBuffer * dc, LcdFlags flags, int32_t value) {
dc->drawNumber(FIELD_PADDING_LEFT, FIELD_PADDING_TOP, getBatteryVoltage(), flags | PREC2, 0, nullptr, "V"); dc->drawNumber(FIELD_PADDING_LEFT, FIELD_PADDING_TOP, getBatteryVoltage(), flags | PREC2, 0, nullptr, "V");
}); });
@@ -250,14 +245,14 @@ void RadioHardwarePage::build(FormWindow * window)
// RTC Batt display // RTC Batt display
new StaticText(window, grid.getLabelSlot(), STR_RTC_BATT); new StaticText(window, grid.getLabelSlot(), STR_RTC_BATT);
new DynamicNumber<uint16_t>(window, grid.getFieldSlot(), [] { new DynamicNumber<uint16_t>(window, grid.getFieldSlot(1,0), [] {
return getRTCBatteryVoltage(); return getRTCBatteryVoltage();
}, PREC2, nullptr, "V"); }, PREC2, nullptr, "V");
grid.nextLine(); grid.nextLine();
// RTC Batt check enable // RTC Batt check enable
new StaticText(window, grid.getLabelSlot(), STR_RTC_CHECK); new StaticText(window, grid.getLabelSlot(), STR_RTC_CHECK);
new CheckBox(window, grid.getFieldSlot(), 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(CROSSFIRE) && SPORT_MAX_BAUDRATE < 400000 #if defined(CROSSFIRE) && SPORT_MAX_BAUDRATE < 400000
@@ -301,7 +296,7 @@ void RadioHardwarePage::build(FormWindow * window)
// ADC filter // ADC filter
new StaticText(window, grid.getLabelSlot(), STR_JITTER_FILTER); new StaticText(window, grid.getLabelSlot(), STR_JITTER_FILTER);
new CheckBox(window, grid.getFieldSlot(), GET_SET_INVERTED(g_eeGeneral.jitterFilter)); new CheckBox(window, grid.getFieldSlot(1,0), GET_SET_INVERTED(g_eeGeneral.jitterFilter));
grid.nextLine(); grid.nextLine();
// Debugs // Debugs