From 7cf8f23dbea6b4e67aef14dd1313a89be90bec77 Mon Sep 17 00:00:00 2001 From: Jonathan Haylett Date: Mon, 11 Mar 2024 16:02:22 +0000 Subject: [PATCH] feat: reorganise display mode transitions --- HAL/pico/src/display/ConfigMenu.cpp | 4 ++-- HAL/pico/src/display/InputDisplay.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/HAL/pico/src/display/ConfigMenu.cpp b/HAL/pico/src/display/ConfigMenu.cpp index 32548596..901adb2f 100644 --- a/HAL/pico/src/display/ConfigMenu.cpp +++ b/HAL/pico/src/display/ConfigMenu.cpp @@ -116,7 +116,7 @@ ConfigMenu::ConfigMenu(Config &config, CommunicationBackend **backends, size_t b }, }, { - .text = "Return", + .text = "Input Viewer", .action = []( IntegratedDisplay *display_backend, ConfigMenu *menu, @@ -227,7 +227,7 @@ void ConfigMenu::HandleControls( if (_backends[0] != nullptr) { _backends[0]->SetGameMode(instance->CurrentGameMode()); } - instance->SetDisplayMode(DISPLAY_MODE_VIEWER); + instance->SetDisplayMode(DISPLAY_MODE_BUTTON_HINTS); return; } diff --git a/HAL/pico/src/display/InputDisplay.cpp b/HAL/pico/src/display/InputDisplay.cpp index 016b2a2c..0922da9f 100644 --- a/HAL/pico/src/display/InputDisplay.cpp +++ b/HAL/pico/src/display/InputDisplay.cpp @@ -22,7 +22,7 @@ void InputDisplay::HandleControls( const DisplayControls &controls, Button button ) { - if (button == controls.enter) { + if (button == controls.back) { instance->SetDisplayMode(DISPLAY_MODE_CONFIG); } }