From ee0659e5b9e886378108f5e186c2ac793582037e Mon Sep 17 00:00:00 2001 From: Martin Vladic Date: Thu, 16 Jul 2020 13:47:24 +0200 Subject: [PATCH] Update keyboard.cpp --- src/eez/keyboard.cpp | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/src/eez/keyboard.cpp b/src/eez/keyboard.cpp index a19c12c5c..a08ad5d5f 100644 --- a/src/eez/keyboard.cpp +++ b/src/eez/keyboard.cpp @@ -89,28 +89,26 @@ void onKeyDown(uint16_t param) { } else if (key == KEY_PRINTSCREEN) { takeScreenshot(); } else { - if (!handled) { - if (key >= KEY_1_EXCLAMATION_MARK && key <= KEY_0_CPARENTHESIS) { - if (getActivePageId() == PAGE_ID_MAIN) { - int channelIndex = key - KEY_1_EXCLAMATION_MARK; - if (channelIndex < CH_MAX) { - using namespace psu; - auto &channel = Channel::get(channelIndex); - selectChannel(&channel); - clearFoundWidgetAtDown(); - channelToggleOutput(); - } + if (key >= KEY_1_EXCLAMATION_MARK && key <= KEY_0_CPARENTHESIS) { + if (getActivePageId() == PAGE_ID_MAIN) { + int channelIndex = key - KEY_1_EXCLAMATION_MARK; + if (channelIndex < CH_MAX) { + using namespace psu; + auto &channel = Channel::get(channelIndex); + selectChannel(&channel); + clearFoundWidgetAtDown(); + channelToggleOutput(); } - } else if (key == KEY_HOME) { - goBack(); - } else if (key == KEY_ESCAPE) { - popPage(); - } else if (key == KEY_SPACEBAR || key == KEY_ENTER) { - if (g_focusWidgetCursor) { - if (g_focusWidgetCursor.widget->action) { - setFoundWidgetAtDown(g_focusWidgetCursor); - executeAction(g_focusWidgetCursor.widget->action); - } + } + } else if (key == KEY_HOME) { + goBack(); + } else if (key == KEY_ESCAPE) { + popPage(); + } else if (key == KEY_SPACEBAR || key == KEY_ENTER) { + if (g_focusWidgetCursor) { + if (g_focusWidgetCursor.widget->action) { + setFoundWidgetAtDown(g_focusWidgetCursor); + executeAction(g_focusWidgetCursor.widget->action); } } }