Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-26 09:45:21 +03:00
Code Issues Wiki Activity

2.4 BT hardware config (#7434)

Browse source 
Bluetooth added to Radio / Hardware Config
This commit is contained in:
3djc 2020-03-10 17:25:29 +01:00 • committed by GitHub
parent adccf2d107
commit aace40d55d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 71 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

71
radio/src/gui/colorlcd/radio_hardware.cpp
View file

@ -81,6 +81,68 @@ RadioHardwarePage::RadioHardwarePage():
{ {
} }
#if defined(BLUETOOTH)
class BluetoothConfigWindow : public FormGroup
{
public:
BluetoothConfigWindow(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(true), STR_MODE);
btMode = new Choice(this, grid.getFieldSlot(), STR_BLUETOOTH_MODES, BLUETOOTH_OFF, BLUETOOTH_TRAINER, GET_DEFAULT(g_eeGeneral.bluetoothMode), [=](int32_t newValue) {
g_eeGeneral.bluetoothMode = newValue;
update();
SET_DIRTY();
btMode->setFocus();
});
grid.nextLine();
if (g_eeGeneral.bluetoothMode != BLUETOOTH_OFF) {
// Pin code (displayed for information only, not editable)
if (g_eeGeneral.bluetoothMode == BLUETOOTH_TELEMETRY) {
new StaticText(this, grid.getLabelSlot(true), STR_BLUETOOTH_PIN_CODE);
new StaticText(this, grid.getFieldSlot(), "000000");
grid.nextLine();
}
// Local MAC
new StaticText(this, grid.getLabelSlot(true), STR_BLUETOOTH_LOCAL_ADDR);
new StaticText(this, grid.getFieldSlot(), bluetooth.localAddr[0] == '\0' ? "---" : bluetooth.localAddr);
grid.nextLine();
// Remote MAC
new StaticText(this, grid.getLabelSlot(true), STR_BLUETOOTH_DIST_ADDR);
new StaticText(this, grid.getFieldSlot(), bluetooth.distantAddr[0] == '\0' ? "---" : bluetooth.distantAddr);
grid.nextLine();
// BT radio name
new StaticText(this, grid.getLabelSlot(true), STR_NAME);
new TextEdit(this, grid.getFieldSlot(), g_eeGeneral.bluetoothName, LEN_BLUETOOTH_NAME);
grid.nextLine();
}
getParent()->moveWindowsTop(top(), adjustHeight());
getParent()->invalidate(); // TODO should be automatically done
}
protected:
Choice * btMode = nullptr;
};
#endif
void RadioHardwarePage::build(FormWindow * window) void RadioHardwarePage::build(FormWindow * window)
{ {
FormGridLayout grid; FormGridLayout grid;
@ -173,6 +235,15 @@ void RadioHardwarePage::build(FormWindow * window)
grid.nextLine(); grid.nextLine();
#endif #endif
#if defined(BLUETOOTH)
// Bluetooth mode
{
new Subtitle(window, grid.getLineSlot(), STR_BLUETOOTH);
grid.nextLine();
grid.addWindow(new BluetoothConfigWindow(window, {0, grid.getWindowHeight(), LCD_W, 0}));
}
#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));