Remove global var for wireless power, add wl channel menu

This commit is contained in:
John Stäck 2019-07-23 10:32:33 +02:00
parent 33bfc9ea08
commit def0dcacd0
5 changed files with 37 additions and 10 deletions

View file

@ -530,15 +530,29 @@ const MenuEntrySub fastBootMenu = {
, nullptr
};
static uint16_t wireless_power=0;
static uint16_t wireless_channel=4;
const MenuEntrySub wlPowerMenu = {
MenuType::ESub, "WL POWER", "WL POWER", &wlPower, 0, 3, MenuEntryFlags::ENone,
MenuType::ESub, "WL POWER", "WL POWER", &wireless_power, 0, 3, MenuEntryFlags::ENone,
[](SubMenuRef __unused, char* out, const char** __unused unit) {
numToString(-6*wlPower, out, true);
numToString(-6*wireless_power, out, true);
},
[](SubMenuRef __unused) { sendWLPower(wlPower); }
[](SubMenuRef __unused) { sendWLPower(wireless_power); }
, nullptr
};
const MenuEntrySub wlChannelMenu = {
MenuType::ESub, "WL CHAN", "WL CHAN", &wireless_channel, 4, 80, MenuEntryFlags::ENone,
[](SubMenuRef __unused, char* out, const char** __unused unit) {
numToString(wireless_channel, out, false);
},
[](SubMenuRef __unused) { sendWLChannel(wireless_channel); }
, nullptr
};
const MenuEntry* extrasMenuEntries[] = {
(MenuEntry*)&legacyPBMenu,
(MenuEntry*)&legacyBRMenu,
@ -549,6 +563,7 @@ const MenuEntry* extrasMenuEntries[] = {
(MenuEntry*)&dacModeMenu,
(MenuEntry*)&fastBootMenu,
(MenuEntry*)&wlPowerMenu,
(MenuEntry*)&wlChannelMenu,
};
const MenuPage extrasMenuPage = {