add qr, menu, settings

Author: dni

.github/workflows/arduino.yml

@@ -29,6 +29,7 @@ jobs:
             - --warnings="none"
           libraries: |
             - name: TFT_eSPI
+            - name: QRCodeGenerator
 
       - uses: actions/upload-artifact@v4
         with:

genericInstaller/100_config.ino

@@ -76,6 +76,7 @@ String getConfigValue(String &fileContent, const char* name, String defaultValue
         endIndex = fileContent.length();
     }
     String value = fileContent.substring(index + strlen(name) + 1, endIndex);
+    value.trim();
     if (config_boot_lock == 0) {
       Serial.println(String(name) + "=" + value);
     }

genericInstaller/200_wifi.ino

@@ -9,6 +9,7 @@ void setupWifi() {
     printHome();
     Serial.println("Connecting to WiFi...");
     WiFi.begin(config_wifi_ssid.c_str(), config_wifi_password.c_str());
+    wifiLastReconnectAttempt = millis();
 }
 
 void loopWifi() {

genericInstaller/300_tft.ino

@@ -6,9 +6,15 @@ void printHome() {}
 void printConfig() {}
 void printBoot() {}
 void printDeleteWarning() {}
+void printInstaller() {}
+void printMenu() {}
+void printQrCode(String data) {}
+void printSettings() {}
+void printInfo() {}
 #else
 #include "config.h"
 #include <TFT_eSPI.h>
+#include <QRCodeGenerator.h>
 
 #define LINE_HEIGHT 20
 #define PADDING_X 12
@@ -38,6 +44,7 @@ void setupTFT() {
   tft.setTextSize(5);
   tft.setCursor(PADDING_X, 58);
   tft.println("LNbits");
+  delay(200);
 }
 void printTFT(String message, int x, int y) {
   tft.setTextSize(2);
@@ -113,18 +120,36 @@ void printHome() {
     tft.setCursor(VERSION_PADDING_X, FOOTER_PADDING_Y);
     tft.println(String(VERSION));
     if (wifi_connected) {
-        printTFT("WiFi connected", PADDING_X, PADDING_Y);
+        // printTFT("WiFi connected", PADDING_X, PADDING_Y);
         int8_t quality = getWifiQuality();
         drawWifiBars(196, HEADER_PADDING_Y, quality);
     } else {
-        printTFT("No WiFi", PADDING_X, PADDING_Y);
+        // printTFT("No WiFi", PADDING_X, PADDING_Y);
         drawWifiBars(196, HEADER_PADDING_Y, 0);
     }
     if (config_boot_lock == 1) {
-        printTFT("BOOT LOCKED", PADDING_X, PADDING_Y + LINE_HEIGHT);
+        // printTFT("BOOT LOCKED", PADDING_X, PADDING_Y + LINE_HEIGHT);
         drawKey(172, HEADER_PADDING_Y);
     } else {
-        printTFT("BOOT UNLOCKED", PADDING_X, PADDING_Y + LINE_HEIGHT);
+        // printTFT("BOOT UNLOCKED", PADDING_X, PADDING_Y + LINE_HEIGHT);
+    }
+
+    switch (currentScreen) {
+      case SCREEN_HOME:
+        printMenu();
+        break;
+      case SCREEN_QR:
+        printQrCode("[email protected]");
+        break;
+      case SCREEN_SETTINGS:
+        printSettings();
+        break;
+      case SCREEN_INFO:
+        printInfo();
+        break;
+      default:
+        Serial.println("Switches to screen" + String(currentScreen));
+        break;
     }
 }
 
@@ -136,4 +161,85 @@ void printDeleteWarning() {
     printTFT("TO ERASE", PADDING_X, 63);
     printTFT("CONFIG", PADDING_X, 84);
 }
+
+void printMenu() {
+  // Draw menu items
+  int y = PADDING_Y;
+  tft.setTextSize(2);
+  tft.setCursor(PADDING_X, y);
+  if (currentMenuItem == SCREEN_QR) tft.setTextColor(TFT_YELLOW); else tft.setTextColor(TFT_WHITE);
+  tft.println("Show QR Code");
+
+  y += LINE_HEIGHT;
+  tft.setCursor(PADDING_X, y);
+  if (currentMenuItem == SCREEN_SETTINGS) tft.setTextColor(TFT_YELLOW); else tft.setTextColor(TFT_WHITE);
+  tft.println("Settings");
+
+  y += LINE_HEIGHT;
+  tft.setCursor(PADDING_X, y);
+  if (currentMenuItem == SCREEN_INFO) tft.setTextColor(TFT_YELLOW); else tft.setTextColor(TFT_WHITE);
+  tft.println("Device Info");
+}
+
+void printQrCode(String data)
+{
+  const int brightness = 200; // 0-255
+  uint16_t qrScreenBgColour = tft.color565(brightness, brightness, brightness);
+  tft.fillScreen(qrScreenBgColour);
+  const char *qrDataChar = data.c_str();
+
+  QRCode qrcoded;
+  uint8_t qrcodeData[qrcode_getBufferSize(20)];
+  qrcode_initText(&qrcoded, qrcodeData, 6, 0, qrDataChar);
+
+  unsigned int pixSize = 3;
+  unsigned int offsetTop = 5;
+  unsigned int offsetLeft = 65;
+
+  for (uint8_t y = 0; y < qrcoded.size; y++)
+  {
+    for (uint8_t x = 0; x < qrcoded.size; x++)
+    {
+      if (qrcode_getModule(&qrcoded, x, y))
+      {
+        tft.fillRect(offsetLeft + pixSize * x, offsetTop + pixSize * y, pixSize, pixSize, TFT_BLACK);
+      }
+      else
+      {
+        tft.fillRect(offsetLeft + pixSize * x, offsetTop + pixSize * y, pixSize, pixSize, qrScreenBgColour);
+      }
+    }
+  }
+}
+
+void printInfo() {
+    tft.setTextSize(3);
+    tft.setTextColor(TFT_WHITE);
+    tft.setCursor(PADDING_X, 14);
+    tft.println("Info");
+    tft.setTextSize(2);
+    tft.setCursor(PADDING_X, 52);
+    tft.println("WiFi: " + String(config_wifi_ssid));
+    tft.setCursor(PADDING_X, 72);
+    tft.println("IP: " + String(WiFi.localIP().toString()));
+    tft.setCursor(PADDING_X, 92);
+    tft.println("LED Pin: " + String(config_led_pin));
+}
+
+void printSettings() {
+    tft.setTextSize(3);
+    tft.setTextColor(TFT_WHITE);
+    tft.setCursor(PADDING_X, 14);
+    tft.println("Settings");
+    tft.setTextSize(2);
+    int y = 52;
+    tft.setCursor(PADDING_X, y);
+    if (currentSetting == SETTING_ENABLE_BLINK) tft.setTextColor(TFT_YELLOW); else tft.setTextColor(TFT_WHITE);
+    tft.println("Enable Blink: " + String(enable_blink ? "YES" : "NO"));
+    y += LINE_HEIGHT;
+    tft.setCursor(PADDING_X, y);
+    if (currentSetting == SETTING_BOOT_LOCK) tft.setTextColor(TFT_YELLOW); else tft.setTextColor(TFT_WHITE);
+    tft.println("Bootlock: " + String(config_boot_lock == 1 ? "LOCKED" : "UNLOCKED"));
+}
+
 #endif

genericInstaller/400_buttons.ino

@@ -13,19 +13,72 @@ void setupButtons() {
 }
 
 void loopButtons() {
-
   if (bothPressed > 0 && digitalRead(BTN_1) == HIGH && digitalRead(BTN_2) == HIGH) {
     Serial.println("Both buttons released after " + String(millis() - bothPressed) + " ms");
     bothPressed = 0;
     executedUnlock = false;
     showWarning = false;
     printHome();
   } else if (firstPressed > 0 && digitalRead(BTN_1) == HIGH) {
-    Serial.println("Button 1 released after " + String(millis() - firstPressed) + " ms");
+    // button 1 released after
+    const int releaseTime = millis() - firstPressed;
+    Serial.println("Button 1 released after " + String(releaseTime) + " ms");
     firstPressed = 0;
+    switch (currentScreen) {
+      case SCREEN_HOME:
+        currentMenuItem++;
+        // last screen in enum is SCREEN_INFO, first is SCREEN_QR
+        if (currentMenuItem > SCREEN_INFO) currentMenuItem = SCREEN_QR;
+        break;
+      case SCREEN_QR:
+        Serial.println("Show QR Code press");
+        break;
+      case SCREEN_SETTINGS:
+        if (releaseTime < 500) {
+          currentSetting++;
+          if (currentSetting > SETTING_BOOT_LOCK) currentSetting = SETTING_ENABLE_BLINK;
+        } else {
+          // long press, toggle setting
+          switch (currentSetting) {
+            case SETTING_ENABLE_BLINK:
+              enable_blink = !enable_blink;
+              Serial.println("Enable blink: " + String(enable_blink));
+              break;
+            case SETTING_BOOT_LOCK:
+              if (config_boot_lock == 1) {
+                config_boot_lock = 0;
+              } else {
+                config_boot_lock = 1;
+              }
+              Serial.println("Boot lock: " + String(config_boot_lock));
+              writeConfig();
+              break;
+          }
+        }
+        break;
+        Serial.println("Show QR Code press");
+        break;
+      default:
+        Serial.println("Other screen press 1");
+        break;
+    }
+    printHome();
   } else if (secondPressed > 0 && digitalRead(BTN_2) == HIGH) {
     Serial.println("Button 2 released after " + String(millis() - secondPressed) + " ms");
     secondPressed = 0;
+    switch (currentScreen) {
+      // toggle through menu items
+      case SCREEN_HOME:
+        Serial.println("Go to selected menu item: " + String(currentMenuItem));
+        currentScreen = currentMenuItem;
+        break;
+      // cancel and go back to home screen
+      default:
+        Serial.println("Cancel from screen " + String(currentScreen));
+        currentScreen = SCREEN_HOME;
+        break;
+    }
+    printHome();
   }
 
   if (digitalRead(BTN_1) == LOW && digitalRead(BTN_2) == LOW) {

genericInstaller/500_menu.ino

@@ -7,6 +7,26 @@ int config_led_pin;
 int config_boot_lock;
 
 int wifi_connected = false;
+int enable_blink = true;
+
+// enum for menu items
+enum Screen {
+  SCREEN_HOME,
+  SCREEN_QR,
+  SCREEN_SETTINGS,
+  SCREEN_INFO,
+};
+
+int currentMenuItem = SCREEN_QR;
+int currentScreen = SCREEN_HOME;
+
+// settings menu
+enum SettingsMenu {
+    SETTING_ENABLE_BLINK,
+    SETTING_BOOT_LOCK,
+};
+int currentSetting = SETTING_ENABLE_BLINK;
+
 
 void setup() {
     Serial.begin(115200);
@@ -24,7 +44,7 @@ void loop() {
     loopButtons();
 
     // blink led or backlight on tdisplay
-    blinkLed(config_led_pin);
+    if (enable_blink) blinkLed(config_led_pin);
 }
 
 int lastBlink = 0;

genericInstaller/genericInstaller.ino

@@ -7,4 +7,4 @@ arduino-cli core update-index
 # also change in release workflow
 arduino-cli core install esp32:esp32
 arduino-cli upgrade
-arduino-cli lib install TFT_eSPI
+arduino-cli lib install TFT_eSPI QrCodeGenerator