mirror of
https://github.com/meshtastic/firmware.git
synced 2025-08-13 16:55:08 +00:00
Menu wording adjustments
This commit is contained in:
parent
e6ba326876
commit
a395448170
@ -251,17 +251,17 @@ void menuHandler::homeBaseMenu()
|
|||||||
|
|
||||||
if (kb_found) {
|
if (kb_found) {
|
||||||
#ifdef PIN_EINK_EN
|
#ifdef PIN_EINK_EN
|
||||||
static const char *optionsArray[] = {"Back", "Toggle Backlight", "Send Adhoc Ping", "New Preset Msg", "New Freetext Msg"};
|
static const char *optionsArray[] = {"Back", "Toggle Backlight", "Send Position", "New Preset Msg", "New Freetext Msg"};
|
||||||
#else
|
#else
|
||||||
static const char *optionsArray[] = {"Back", "Sleep Screen", "Send Adhoc Ping", "New Preset Msg", "New Freetext Msg"};
|
static const char *optionsArray[] = {"Back", "Sleep Screen", "Send Position", "New Preset Msg", "New Freetext Msg"};
|
||||||
#endif
|
#endif
|
||||||
optionsArrayPtr = optionsArray;
|
optionsArrayPtr = optionsArray;
|
||||||
options = 5;
|
options = 5;
|
||||||
} else {
|
} else {
|
||||||
#ifdef PIN_EINK_EN
|
#ifdef PIN_EINK_EN
|
||||||
static const char *optionsArray[] = {"Back", "Toggle Backlight", "Send Adhoc Ping", "New Preset Msg"};
|
static const char *optionsArray[] = {"Back", "Toggle Backlight", "Send Position", "New Preset Msg"};
|
||||||
#else
|
#else
|
||||||
static const char *optionsArray[] = {"Back", "Sleep Screen", "Send Adhoc Ping", "New Preset Msg"};
|
static const char *optionsArray[] = {"Back", "Sleep Screen", "Send Position", "New Preset Msg"};
|
||||||
#endif
|
#endif
|
||||||
optionsArrayPtr = optionsArray;
|
optionsArrayPtr = optionsArray;
|
||||||
options = 4;
|
options = 4;
|
||||||
@ -280,9 +280,9 @@ void menuHandler::homeBaseMenu()
|
|||||||
} else if (selected == 2) {
|
} else if (selected == 2) {
|
||||||
service->refreshLocalMeshNode();
|
service->refreshLocalMeshNode();
|
||||||
if (service->trySendPosition(NODENUM_BROADCAST, true)) {
|
if (service->trySendPosition(NODENUM_BROADCAST, true)) {
|
||||||
LOG_INFO("Position Update Sent");
|
LOG_INFO("Position Sent");
|
||||||
} else {
|
} else {
|
||||||
LOG_INFO("Node Info Update Sent");
|
LOG_INFO("Node Info Sent");
|
||||||
}
|
}
|
||||||
} else if (selected == 3) {
|
} else if (selected == 3) {
|
||||||
cannedMessageModule->LaunchWithDestination(NODENUM_BROADCAST);
|
cannedMessageModule->LaunchWithDestination(NODENUM_BROADCAST);
|
||||||
@ -317,7 +317,7 @@ void menuHandler::favoriteBaseMenu()
|
|||||||
|
|
||||||
void menuHandler::positionBaseMenu()
|
void menuHandler::positionBaseMenu()
|
||||||
{
|
{
|
||||||
static const char *optionsArray[] = {"Back", "GPS Enable", "Compass Point"};
|
static const char *optionsArray[] = {"Back", "GPS Toggle", "Compass Point"};
|
||||||
screen->showOverlayBanner("Position Options", 30000, optionsArray, 3, [](int selected) -> void {
|
screen->showOverlayBanner("Position Options", 30000, optionsArray, 3, [](int selected) -> void {
|
||||||
if (selected == 1) {
|
if (selected == 1) {
|
||||||
menuQueue = gps_toggle_menu;
|
menuQueue = gps_toggle_menu;
|
||||||
|
@ -100,9 +100,9 @@ int SystemCommandsModule::handleInputEvent(const InputEvent *event)
|
|||||||
case INPUT_BROKER_SEND_PING:
|
case INPUT_BROKER_SEND_PING:
|
||||||
service->refreshLocalMeshNode();
|
service->refreshLocalMeshNode();
|
||||||
if (service->trySendPosition(NODENUM_BROADCAST, true)) {
|
if (service->trySendPosition(NODENUM_BROADCAST, true)) {
|
||||||
IF_SCREEN(screen->showOverlayBanner("Position\nUpdate Sent", 3000));
|
IF_SCREEN(screen->showOverlayBanner("Position\nSent", 3000));
|
||||||
} else {
|
} else {
|
||||||
IF_SCREEN(screen->showOverlayBanner("Node Info\nUpdate Sent", 3000));
|
IF_SCREEN(screen->showOverlayBanner("Node Info\nSent", 3000));
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
// Power control
|
// Power control
|
||||||
|
Loading…
Reference in New Issue
Block a user