adil
/
m5stick-nemo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #26 from facelesstech/main 

Fixed the double presses in the menu when using the card computer keyboard
This commit is contained in:
Noah Axon 2023-12-19 21:59:15 -06:00 committed by GitHub
parent 7249522016 6723b254a2
commit 0c0dfe195d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
m5stick-nemo.ino
View File

@ -2,9 +2,9 @@
// github.com/n0xa | IG: @4x0nn // github.com/n0xa | IG: @4x0nn
// -=-=-=-=-=-=- Uncomment the platform you're building for -=-=-=-=-=-=- // -=-=-=-=-=-=- Uncomment the platform you're building for -=-=-=-=-=-=-
#define STICK_C_PLUS //#define STICK_C_PLUS
//#define STICK_C //#define STICK_C
//#define CARDPUTER #define CARDPUTER
// -=-=- Uncommenting more than one at a time will result in errors -=-=- // -=-=- Uncommenting more than one at a time will result in errors -=-=-
String buildver="2.0.2"; String buildver="2.0.2";
@ -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 // Tap the power button from pretty much anywhere to get to the main menu
void check_menu_press() { void check_menu_press() {
#if defined(AXP) #if defined(AXP)
@ -174,14 +166,14 @@ void check_menu_press() {
bool check_next_press(){ bool check_next_press(){
#if defined(KB) #if defined(KB)
M5Cardputer.update();
if (M5Cardputer.Keyboard.isKeyPressed(';')){ if (M5Cardputer.Keyboard.isKeyPressed(';')){
// hack to handle the up arrow // hack to handle the up arrow
cursor = cursor - 2; cursor = cursor - 2;
check_kb();
return true; return true;
} }
M5Cardputer.update();
if (M5Cardputer.Keyboard.isKeyPressed(KEY_TAB) || M5Cardputer.Keyboard.isKeyPressed('.')){ if (M5Cardputer.Keyboard.isKeyPressed(KEY_TAB) || M5Cardputer.Keyboard.isKeyPressed('.')){
check_kb();
return true; return true;
} }
#else #else
@ -194,6 +186,7 @@ bool check_next_press(){
bool check_select_press(){ bool check_select_press(){
#if defined(KB) #if defined(KB)
M5Cardputer.update();
if (M5Cardputer.Keyboard.isKeyPressed(KEY_ENTER) || M5Cardputer.Keyboard.isKeyPressed('/')){ if (M5Cardputer.Keyboard.isKeyPressed(KEY_ENTER) || M5Cardputer.Keyboard.isKeyPressed('/')){
return true; return true;
@ -664,7 +657,6 @@ void sendAllCodes() {
} }
#endif #endif
#if defined(KB) #if defined(KB)
check_kb();
#endif #endif
if (check_select_press()){ if (check_select_press()){
Serial.println("endingearly"); Serial.println("endingearly");
@ -1597,7 +1589,6 @@ void loop() {
screen_dim_proc(); screen_dim_proc();
#endif #endif
#if defined(CARDPUTER) #if defined(CARDPUTER)
check_kb();
#endif #endif
check_menu_press(); check_menu_press();