Clean up the adjusted QR code stuff - still WIP
This commit is contained in:
parent
a35095cc94
commit
6669e13aca
|
@ -12,9 +12,9 @@ String buildver="2.3.3";
|
||||||
#define BGCOLOR BLACK
|
#define BGCOLOR BLACK
|
||||||
#define FGCOLOR GREEN
|
#define FGCOLOR GREEN
|
||||||
|
|
||||||
// -=-=- NEMO Portal Language -=- Thanks, @marivaaldo! -=-=-
|
// -=-=- NEMO Language for Menu and Portal -=- Thanks, @marivaaldo and @Mmatuda! -=-=-
|
||||||
//define LANGUAGE_EN_US
|
#define LANGUAGE_EN_US
|
||||||
#define LANGUAGE_PT_BR
|
//#define LANGUAGE_PT_BR
|
||||||
|
|
||||||
#if defined(STICK_C_PLUS)
|
#if defined(STICK_C_PLUS)
|
||||||
#include <M5StickCPlus.h>
|
#include <M5StickCPlus.h>
|
||||||
|
@ -1653,6 +1653,7 @@ void qrmenu_setup() {
|
||||||
qrmenu_drawmenu();
|
qrmenu_drawmenu();
|
||||||
delay(500); // Prevent switching after menu loads up
|
delay(500); // Prevent switching after menu loads up
|
||||||
}
|
}
|
||||||
|
|
||||||
void qrmenu_loop() {
|
void qrmenu_loop() {
|
||||||
if (check_next_press()) {
|
if (check_next_press()) {
|
||||||
cursor++;
|
cursor++;
|
||||||
|
@ -1662,15 +1663,13 @@ void qrmenu_loop() {
|
||||||
delay(250);
|
delay(250);
|
||||||
}
|
}
|
||||||
if (check_select_press()) {
|
if (check_select_press()) {
|
||||||
@@ -1614,8 +1617,9 @@ void qrmenu_loop() {
|
isSwitching = true;
|
||||||
isSwitching = true;
|
current_proc = 1;
|
||||||
current_proc = 1;
|
}else if ( activeQR == false ) {
|
||||||
}else if ( activeQR == false ) {
|
activeQR = true;
|
||||||
activeQR = true;
|
DISP.fillScreen(WHITE);
|
||||||
DISP.fillScreen(WHITE);
|
DISP.qrcode(qrcodes[cursor].url, 0, 0, 80, 5);
|
||||||
DISP.qrcode(qrcodes[cursor].url, 0, 0, 80, 5);
|
DISP.qrcode(qrcodes[cursor].url, (DISP.width() - DISP.height()) / 2, 0, DISP.height(), 5);
|
||||||
DISP.qrcode(qrcodes[cursor].url, (DISP.width() - DISP.height()) / 2, 0, DISP.height(), 5);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue