Fix QR code, add battery debug serial messages for cardputer

This commit is contained in:
Noah Axon 2024-01-16 19:05:30 -06:00
parent 6669e13aca
commit dcb4f2f6e5
1 changed files with 17 additions and 9 deletions

View File

@ -2,10 +2,10 @@
// 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_PLUS2 //#define STICK_C_PLUS2
//#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.3.3"; String buildver="2.3.3";
@ -627,6 +627,7 @@ int rotation = 1;
DISP.println("%"); DISP.println("%");
DISP.println(TXT_EXIT); DISP.println(TXT_EXIT);
} }
void battery_setup() { // void battery_setup() { //
rstOverride = false; rstOverride = false;
pinMode(VBAT_PIN, INPUT); pinMode(VBAT_PIN, INPUT);
@ -649,6 +650,7 @@ int rotation = 1;
if (battery != oldbattery){ if (battery != oldbattery){
Serial.println("Battery level:"); Serial.println("Battery level:");
Serial.println(battery); Serial.println(battery);
Serial.printf("Raw: %d\n", analogRead(VBAT_PIN));
battery_drawmenu(battery); battery_drawmenu(battery);
} }
if (check_select_press()) { if (check_select_press()) {
@ -1663,13 +1665,19 @@ void qrmenu_loop() {
delay(250); delay(250);
} }
if (check_select_press()) { if (check_select_press()) {
isSwitching = true; if (qrcodes[cursor].url.length() < 1){
current_proc = 1; current_proc = 1;
}else if ( activeQR == false ) { isSwitching = true;
activeQR = true; }else if ( activeQR == false ) {
DISP.fillScreen(WHITE); activeQR = true;
DISP.qrcode(qrcodes[cursor].url, 0, 0, 80, 5); DISP.fillScreen(WHITE);
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);
delay(500);
} else {
isSwitching = true;
activeQR = false;
delay(250);
}
} }
} }