From 1bfc2554f823afd4f1042868966b51c266c30416 Mon Sep 17 00:00:00 2001 From: facelesstech Date: Sun, 3 Dec 2023 16:05:18 +0000 Subject: [PATCH 1/2] fixed the navigation in the menus --- m5stick-nemo.ino | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/m5stick-nemo.ino b/m5stick-nemo.ino index 0dcb20f..5e12836 100644 --- a/m5stick-nemo.ino +++ b/m5stick-nemo.ino @@ -2,9 +2,9 @@ // github.com/n0xa | IG: @4x0nn // -=-=-=-=-=-=- Uncomment the platform you're building for -=-=-=-=-=-=- -#define STICK_C_PLUS +//#define STICK_C_PLUS //#define STICK_C -//#define CARDPUTER +#define CARDPUTER // -=-=- Uncommenting more than one at a time will result in errors -=-=- String buildver="2.0.2"; @@ -149,14 +149,14 @@ void switcher_button_proc() { } } -#if defined(KB) - void check_kb(){ - M5Cardputer.update(); - if (M5Cardputer.Keyboard.isChange()) { - delay(100); - } - } -#endif +//#if defined(KB) +// void check_kb(){ +// M5Cardputer.update(); +// if (M5Cardputer.Keyboard.isChange()) { +// delay(100); +// } +// } +//#endif // Tap the power button from pretty much anywhere to get to the main menu void check_menu_press() { #if defined(AXP) @@ -174,14 +174,16 @@ void check_menu_press() { bool check_next_press(){ #if defined(KB) + M5Cardputer.update(); if (M5Cardputer.Keyboard.isKeyPressed(';')){ // hack to handle the up arrow cursor = cursor - 2; - check_kb(); +// check_kb(); return true; } + M5Cardputer.update(); if (M5Cardputer.Keyboard.isKeyPressed(KEY_TAB) || M5Cardputer.Keyboard.isKeyPressed('.')){ - check_kb(); +// check_kb(); return true; } #else @@ -194,6 +196,7 @@ bool check_next_press(){ bool check_select_press(){ #if defined(KB) + M5Cardputer.update(); if (M5Cardputer.Keyboard.isKeyPressed(KEY_ENTER) || M5Cardputer.Keyboard.isKeyPressed('/')){ return true; @@ -664,7 +667,7 @@ void sendAllCodes() { } #endif #if defined(KB) - check_kb(); +// check_kb(); #endif if (check_select_press()){ Serial.println("endingearly"); @@ -1597,7 +1600,7 @@ void loop() { screen_dim_proc(); #endif #if defined(CARDPUTER) - check_kb(); +// check_kb(); #endif check_menu_press(); From 6723b254a295d97888bf7f812d473bb0a626999e Mon Sep 17 00:00:00 2001 From: facelesstech Date: Sun, 3 Dec 2023 16:07:00 +0000 Subject: [PATCH 2/2] fixed the navigation in the menus and deleted the unused code --- m5stick-nemo.ino | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/m5stick-nemo.ino b/m5stick-nemo.ino index 5e12836..2f15448 100644 --- a/m5stick-nemo.ino +++ b/m5stick-nemo.ino @@ -149,14 +149,6 @@ void switcher_button_proc() { } } -//#if defined(KB) -// void check_kb(){ -// M5Cardputer.update(); -// if (M5Cardputer.Keyboard.isChange()) { -// delay(100); -// } -// } -//#endif // Tap the power button from pretty much anywhere to get to the main menu void check_menu_press() { #if defined(AXP) @@ -178,12 +170,10 @@ bool check_next_press(){ if (M5Cardputer.Keyboard.isKeyPressed(';')){ // hack to handle the up arrow cursor = cursor - 2; -// check_kb(); return true; } M5Cardputer.update(); if (M5Cardputer.Keyboard.isKeyPressed(KEY_TAB) || M5Cardputer.Keyboard.isKeyPressed('.')){ -// check_kb(); return true; } #else @@ -667,7 +657,6 @@ void sendAllCodes() { } #endif #if defined(KB) -// check_kb(); #endif if (check_select_press()){ Serial.println("endingearly"); @@ -1600,7 +1589,6 @@ void loop() { screen_dim_proc(); #endif #if defined(CARDPUTER) -// check_kb(); #endif check_menu_press();