Hardware screen review started
This commit is contained in:
@@ -143,30 +143,55 @@ void RadioHardwarePage::build(FormWindow * window)
|
|||||||
grid.setLabelWidth(130);
|
grid.setLabelWidth(130);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// Bat calibration
|
||||||
|
new StaticText(window, grid.getLabelSlot(), STR_BATT_CALIB);
|
||||||
|
auto batCal = new NumberEdit(window, grid.getFieldSlot(), -127, 127, GET_SET_DEFAULT(g_eeGeneral.txVoltageCalibration));
|
||||||
|
batCal->setDisplayHandler([](BitmapBuffer * dc, LcdFlags flags, int32_t value) {
|
||||||
|
dc->drawNumber(2, 0, getBatteryVoltage(), flags | PREC2, 0, nullptr, "V");
|
||||||
|
});
|
||||||
|
batCal->setWindowFlags(REFRESH_ALWAYS);
|
||||||
|
grid.nextLine();
|
||||||
|
|
||||||
|
// RTC Batt display
|
||||||
|
new StaticText(window, grid.getLabelSlot(), STR_RTC_BATT);
|
||||||
|
div_t qr = div(getRTCBatteryVoltage(), 100);
|
||||||
|
//sprintf(reusableBuffer.hardwareAndSettings.msg, "%d.%02d V", qr.quot, qr.rem);
|
||||||
|
char * tmp;
|
||||||
|
tmp = strAppendUnsigned(reusableBuffer.hardwareAndSettings.msg, qr.quot);
|
||||||
|
tmp = strAppend(tmp,".",1);
|
||||||
|
tmp = strAppendUnsigned(tmp, qr.rem, 2);
|
||||||
|
tmp = strAppend(tmp, " V", 2);
|
||||||
|
auto rtc = new StaticText(window, grid.getFieldSlot(), reusableBuffer.hardwareAndSettings.msg);
|
||||||
|
rtc->setWindowFlags(REFRESH_ALWAYS);
|
||||||
|
grid.nextLine();
|
||||||
|
|
||||||
|
// RTC Batt check enable
|
||||||
|
new StaticText(window, grid.getLabelSlot(), STR_RTC_CHECK);
|
||||||
|
new CheckBox(window, grid.getFieldSlot(), GET_SET_INVERTED(g_eeGeneral.disableRtcWarning ));
|
||||||
|
grid.nextLine();
|
||||||
|
|
||||||
|
#if defined(CROSSFIRE) && SPORT_MAX_BAUDRATE < 400000
|
||||||
|
// Max baud for external modules
|
||||||
|
new StaticText(window, grid.getLabelSlot(), STR_MAXBAUDRATE);
|
||||||
|
new Choice(window, grid.getFieldSlot(1,0), STR_CRSF_BAUDRATE, 0, 1, GET_SET_DEFAULT(g_eeGeneral.telemetryBaudrate));
|
||||||
|
grid.nextLine();
|
||||||
|
#endif
|
||||||
|
|
||||||
// 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(), GET_SET_INVERTED(g_eeGeneral.jitterFilter));
|
||||||
grid.nextLine();
|
grid.nextLine();
|
||||||
|
|
||||||
// Bat calibration
|
// Debugs
|
||||||
new StaticText(window, grid.getLabelSlot(), STR_BATT_CALIB);
|
new StaticText(window, grid.getLabelSlot(), STR_DEBUG, 0, FONT(BOLD));
|
||||||
auto batCal = new NumberEdit(window, grid.getFieldSlot(), -127, 127, GET_SET_DEFAULT(g_eeGeneral.txVoltageCalibration));
|
auto analogs = new TextButton(window, grid.getFieldSlot(2, 0), STR_ANALOGS_BTN);
|
||||||
batCal->setDisplayHandler([](BitmapBuffer * dc, LcdFlags flags, int32_t value) {
|
analogs->setPressHandler([=]() -> uint8_t {
|
||||||
dc->drawNumber(2, 0, getBatteryVoltage(), flags | PREC2, 0, nullptr, "V");
|
//TODO
|
||||||
|
});
|
||||||
|
auto keys = new TextButton(window, grid.getFieldSlot(2, 1), STR_KEYS_BTN);
|
||||||
|
keys->setPressHandler([=]() -> uint8_t {
|
||||||
|
//TODO
|
||||||
});
|
});
|
||||||
batCal->setWindowFlags(REFRESH_ALWAYS);
|
|
||||||
grid.nextLine();
|
|
||||||
|
|
||||||
// Factory reset
|
|
||||||
new TextButton(window, grid.getFieldSlot(), STR_FACTORYRESET,
|
|
||||||
[=]() -> int8_t {
|
|
||||||
new FullScreenDialog(WARNING_TYPE_CONFIRM, STR_CONFIRMRESET, STR_POPUPS_ENTER_EXIT, "", [=]() {
|
|
||||||
storageEraseAll(false);
|
|
||||||
NVIC_SystemReset();
|
|
||||||
return 0;
|
|
||||||
});
|
|
||||||
return 0;
|
|
||||||
});
|
|
||||||
grid.nextLine();
|
grid.nextLine();
|
||||||
|
|
||||||
window->setInnerHeight(grid.getWindowHeight());
|
window->setInnerHeight(grid.getWindowHeight());
|
||||||
|
|||||||
@@ -1158,6 +1158,7 @@ union ReusableBuffer
|
|||||||
uint32_t updateTime;
|
uint32_t updateTime;
|
||||||
ModuleSettings moduleSettings;
|
ModuleSettings moduleSettings;
|
||||||
ReceiverSettings receiverSettings; // when dealing with receiver settings, we also need module settings
|
ReceiverSettings receiverSettings; // when dealing with receiver settings, we also need module settings
|
||||||
|
char msg[64];
|
||||||
} hardwareAndSettings; // moduleOptions, receiverOptions, radioVersion
|
} hardwareAndSettings; // moduleOptions, receiverOptions, radioVersion
|
||||||
|
|
||||||
struct {
|
struct {
|
||||||
|
|||||||
@@ -80,6 +80,7 @@ ISTR(SWTYPES);
|
|||||||
ISTR(POTTYPES);
|
ISTR(POTTYPES);
|
||||||
ISTR(SLIDERTYPES);
|
ISTR(SLIDERTYPES);
|
||||||
ISTR(ANTENNA_MODES);
|
ISTR(ANTENNA_MODES);
|
||||||
|
ISTR(CRSF_BAUDRATE);
|
||||||
|
|
||||||
#if defined(PCBSKY9X) && defined(REVX)
|
#if defined(PCBSKY9X) && defined(REVX)
|
||||||
ISTR(VOUTPUT_TYPE);
|
ISTR(VOUTPUT_TYPE);
|
||||||
|
|||||||
@@ -167,6 +167,7 @@ extern const char STR_ISRM_RF_PROTOCOLS[];
|
|||||||
extern const char STR_R9M_PXX2_RF_PROTOCOLS[];
|
extern const char STR_R9M_PXX2_RF_PROTOCOLS[];
|
||||||
extern const char STR_DSM_PROTOCOLS[];
|
extern const char STR_DSM_PROTOCOLS[];
|
||||||
extern const char STR_FLYSKY_PROTOCOLS[];
|
extern const char STR_FLYSKY_PROTOCOLS[];
|
||||||
|
extern const char STR_CRSF_BAUDRATE[];
|
||||||
|
|
||||||
#if defined(MULTIMODULE)
|
#if defined(MULTIMODULE)
|
||||||
extern const char STR_MULTI_PROTOCOLS[];
|
extern const char STR_MULTI_PROTOCOLS[];
|
||||||
|
|||||||
@@ -81,6 +81,9 @@
|
|||||||
|
|
||||||
#define TR_VSRCRAW "---\0" TR_STICKS_VSRCRAW TR_POTS_VSRCRAW TR_ROTARY_ENCODERS TR_GYR_VSRCRAW "MAX\0" TR_CYC_VSRCRAW TR_TRIMS_VSRCRAW TR_SW_VSRCRAW TR_EXTRA_VSRCRAW
|
#define TR_VSRCRAW "---\0" TR_STICKS_VSRCRAW TR_POTS_VSRCRAW TR_ROTARY_ENCODERS TR_GYR_VSRCRAW "MAX\0" TR_CYC_VSRCRAW TR_TRIMS_VSRCRAW TR_SW_VSRCRAW TR_EXTRA_VSRCRAW
|
||||||
|
|
||||||
|
#define LEN_CRSF_BAUDRATE "\004"
|
||||||
|
#define TR_CRSF_BAUDRATE "115k""400k"
|
||||||
|
|
||||||
#if defined(MODULE_PROTOCOL_FLEX)
|
#if defined(MODULE_PROTOCOL_FLEX)
|
||||||
#define TR_MODULE_R9M_LITE "R9ML\0 "
|
#define TR_MODULE_R9M_LITE "R9ML\0 "
|
||||||
#else
|
#else
|
||||||
|
|||||||
Reference in New Issue
Block a user