fixup! Add version to image meta

.gitea/workflows/build-container.yml

@@ -10,9 +10,7 @@ jobs:
     steps:
       - name: Checkout repo
         uses: actions/checkout@v4
-        # Required for installing nix
-      - name: Install sudo
-        run: apt-get update && apt-get install -y sudo
+      - run: apt-get update && apt-get install -y sudo
       - name: Install Nix
         uses: cachix/install-nix-action@v31
         with:
@@ -22,7 +20,8 @@ jobs:
       - name: Version check
         run: |
           VERSION=$(cat image-meta/version)
-          [ "$GITHUB_REF_NAME" = v"$VERSION" ]
+          echo "$GITHUB_REF_NAME" == v"$VERSION"
+          test "$GITHUB_REF_NAME" == v"$VERSION"
       - name: Build image
         run: nix build .#image -o image.tar.gz
       - run: docker login -u paul -p "$PASSWORD" git.pbrinkmeier.de

client/client.ino

@@ -1,68 +1,37 @@
 #include <ArduinoJson.h>
-#include <Adafruit_GFX.h>
-#include <Adafruit_ST7735.h>
 #include <ESP8266WiFi.h>
-#include <ESP8266HTTPClient.h>
 #include <SPI.h>
+#include <Wire.h>
+#include <Adafruit_GFX.h>
+#include <Adafruit_SSD1306.h>
+#include <ESP8266HTTPClient.h>
 #include <WiFiClientSecureBearSSL.h>
 
 #include "bitmaps.h"
 #include "wifi_credentials.h"
 
-#define TFT_CS D8
-#define TFT_DC D4
-#define TFT_RESET D3
+// Screen stuff
+#define SCREEN_WIDTH 128 // OLED display width, in pixels
+#define SCREEN_HEIGHT 64 // OLED display height, in pixels
+#define OLED_RESET    -1 // Reset pin # (or -1 if sharing Arduino reset pin)
+#define SCREEN_ADDRESS 0x3C
 
 // Button stuff
 #define BUTTON_PIN D6
 
-// Display stuff
 #define FRAME_DELAY 80
-#define COLOR_BG (rgb(0, 0, 0))
-#define COLOR_DIVIDER (rgb(0xff, 0x60, 0x0d))
-#define COLOR_TEXT (rgb(0xff, 0x60, 0x0d))
-
-// Layout
-
-#define WIDTH 160
-#define HEIGHT 128
-
-#define CX 6
-#define CY 8
-
-#define MARGIN_LEFT 5
-#define MARGIN_RIGHT 5
-
-#define MAIN_X MARGIN_LEFT
-#define MAIN_Y 9
-#define MAIN_WIDTH (WIDTH - 2 * MARGIN_LEFT)
-#define MAIN_HEIGHT (8 * CY)
-
-#define CLOCK_X MARGIN_LEFT
-#define CLOCK_Y 113
-
-#define STATUS_X 95
-#define STATUS_Y CLOCK_Y
-#define STATUS_WIDTH (10 * CX)
-#define STATUS_HEIGHT CY
 
 // Peripherals
 
-Adafruit_ST7735 display(TFT_CS, TFT_DC, TFT_RESET);
+Adafruit_SSD1306 display(SCREEN_WIDTH, SCREEN_HEIGHT, &Wire, OLED_RESET);
 
 // App state
 
-typedef enum {
+enum {
   CONNECTING,
   SHOWING_DEPARTURES
-} State;
-
-State state = CONNECTING;
-State previous_state = state;
+} state = CONNECTING;
 int frame = 0;
-// Use this variable to trigger state enter effects
-int state_changed = 1;
-
 int buttonPushed = false;
 JsonDocument departures;
 
@@ -70,38 +39,27 @@ void ICACHE_RAM_ATTR onButtonFalling() {
   buttonPushed = true;
 }
 
-uint16_t rgb(uint16_t r, uint16_t g, uint16_t b) {
-  // Color layout: RRRRRGGGGGGBBBBB (5, 6, 5)
-  return ((b >> 3) & 0b11111) << 11 | ((g >> 2) & 0b111111) << 5 | ((r >> 3) & 0b11111);
-}
-
-void drawLayout() {
-  display.fillScreen(COLOR_BG);
-  display.drawFastHLine(5, 4, 150, COLOR_DIVIDER);
-  display.drawFastHLine(5, 109, 150, COLOR_DIVIDER);
-  display.drawFastHLine(5, 123, 150, COLOR_DIVIDER);
-  display.setCursor(CLOCK_X, CLOCK_Y);
-  display.print("13:12");
-}
-
 void setup() {
   Serial.begin(9600);
 
-  Serial.println("serial init");
-  display.initR();
-  display.setSPISpeed(40000000);
-  display.setRotation(3);
-  Serial.println("display initialized");
-  Serial.printf("display dimensions: %" PRId16 "x%" PRId16 "\n", display.width(), display.height());
-
-  display.setTextSize(1);
-  display.setTextColor(COLOR_TEXT);
-  drawLayout();
+  // SSD1306_SWITCHCAPVCC = generate display voltage from 3.3V internally
+  if(!display.begin(SSD1306_SWITCHCAPVCC, SCREEN_ADDRESS)) {
+    Serial.println("SSD1306 allocation failed");
+    for(;;); // Don't proceed, loop forever
+  }
+  Serial.println("SSD1306 initialized");
+  display.clearDisplay();
 
   WiFi.begin(WIFI_SSID, WIFI_PASSWORD);
   
   pinMode(BUTTON_PIN, INPUT_PULLUP);
   attachInterrupt(BUTTON_PIN, onButtonFalling, FALLING);
+
+  display.setTextColor(SSD1306_INVERSE);
+  display.setTextSize(1);
+  display.setCursor(0, 0);
+  display.printf("Connecting to\n%s\n", WIFI_SSID);
+  display.display();
   /*
   display.print(" 5 Mannheim    sofort\n"
                 "26 Kirchheim    9 min\n"
@@ -109,6 +67,11 @@ void setup() {
   */
 }
 
+void drawSpinner(int frame) {
+  display.fillRect(120, 56, spinny_dims[0], spinny_dims[1], SSD1306_BLACK);
+  display.drawBitmap(120, 56, spinny[frame % spinny_dims[2]], spinny_dims[0], spinny_dims[1], SSD1306_WHITE);
+}
+
 // TODO: Error handling
 String fetchDepartures() {
   std::unique_ptr<BearSSL::WiFiClientSecure> https(new BearSSL::WiFiClientSecure);
@@ -116,9 +79,10 @@ String fetchDepartures() {
   
   HTTPClient client;
   if (!client.begin(*https, "vrnp.beany.club", 443, "/departures?stop_id=de:08221:1225&platform=A")) {
-    display.fillScreen(COLOR_BG);
+    display.clearDisplay();
     display.setCursor(0, 0);
     display.print("begin failed");
+    display.display();
     for (;;);
   }
 
@@ -126,9 +90,10 @@ String fetchDepartures() {
   client.addHeader("Accept", "application/json");
   int statusCode = client.GET();
   if (statusCode != 200) {
-    display.fillScreen(COLOR_BG);
+    display.clearDisplay();
     display.setCursor(0, 0);
     display.printf("http non-ok: %d\n", statusCode);
+    display.display();
     for (;;);
   }
 
@@ -136,29 +101,20 @@ String fetchDepartures() {
 }
 
 void loop() {
-  if (state != previous_state) {
-    state_changed = 1;
-    previous_state = state;
-  }
-  logic_loop();
-  frame++;
-  state_changed = 0;
-}
-
-void logic_loop() {
   switch (state) {
     case CONNECTING: {
       if (WiFi.status() != WL_CONNECTED) {
-        display.fillRect(STATUS_X, STATUS_Y, STATUS_WIDTH, STATUS_HEIGHT, COLOR_BG);
-        display.setCursor(STATUS_X, STATUS_Y);
-        display.printf(" connect %c", "|/-\\"[frame % 4]);
+        drawSpinner(frame++);
+        display.display();
         delay(FRAME_DELAY);
         return;
       }
-
-      display.fillRect(STATUS_X, STATUS_Y, STATUS_WIDTH, STATUS_HEIGHT, COLOR_BG);
-      display.setCursor(STATUS_X, STATUS_Y);
-      display.print("  fetching");
+      
+      display.clearDisplay();
+      display.fillRect(0, 56, 128, 8, SSD1306_INVERSE);
+      display.setCursor(0, 56);
+      display.print("requesting departures");
+      display.display();
 
       String departuresRaw = fetchDepartures();
       deserializeJson(departures, departuresRaw);
@@ -174,24 +130,48 @@ void logic_loop() {
         return;
       }
 
-      display.fillRect(STATUS_X, STATUS_Y, STATUS_WIDTH, STATUS_HEIGHT, COLOR_BG);
-      display.fillRect(MAIN_X, MAIN_Y, MAIN_WIDTH, MAIN_HEIGHT, COLOR_BG);
+      /*
+      if (buttonPushed) {
+        buttonPushed = false;
+        delay(FRAME_DELAY);
+        return;
+      }
+      */
 
-      int line = 0;
+      // Marquee effect for direction strings longer than 11 characters
+      // Neither particularly efficient nor legible
+      // (This could use some love)
+
+      int availableWidth = 11;
+
+      display.clearDisplay();
+      display.setCursor(0, 0);
       for (JsonVariant departure : departures["departures"].as<JsonArray>()) {
         const char *directionStr = departure["direction"].as<const char *>();
 
-        display.setCursor(MAIN_X, MAIN_Y + (CY + 3) * line);
-        display.printf("%2s %-15.15s %6s",
+        char buf[128] = {0};
+        const char *dirStart;
+
+        if (strlen(directionStr) <= availableWidth || (strlen(directionStr) + 3 + availableWidth) > 127) {
+          dirStart = directionStr;
+        } else {
+          memcpy(buf, directionStr, strlen(directionStr));
+          memcpy(buf + strlen(directionStr), "   ", 3);
+          memcpy(buf + strlen(directionStr) + 3, directionStr, availableWidth);
+          buf[strlen(directionStr) + 3 + availableWidth] = '\0';
+          dirStart = buf + frame % (strlen(directionStr) + 3);
+        }
+
+        display.printf("%2s %-11.11s %6s\n",
           departure["symbol"].as<const char*>(),
-          directionStr,
+          dirStart,
           departure["leaving"].as<const char*>()
         );
-        line++;
       }
+      display.display();
       
-      delay(25000);
-      state = CONNECTING;
+      frame++;
+      delay(500);
       return;
   }
 }

flake.nix

@@ -16,7 +16,7 @@
 
     vrnp-static = pkgs.buildGoModule {
       pname = "vrnp";
-      version = "0.0.5";
+      version = "0.0.4";
       vendorHash = null;
 
       # For building the package, we use only the files not ignored by Git as inputs.

main.go

@@ -117,12 +117,6 @@ func ParseDepartures(response DMResponse, allowedPlatform *string) (Departures,
 			return Departures{}, errors.New("could not parse countdown")
 		}
 
-		matchesPlatform := allowedPlatform == nil || d.Platform == *allowedPlatform
-		isInThePast := countdown < 0
-		if !matchesPlatform || isInThePast {
-			continue
-		}
-
 		if countdown == 0 {
 			leaving = "sofort"
 		}
@@ -134,6 +128,10 @@ func ParseDepartures(response DMResponse, allowedPlatform *string) (Departures,
 			leaving = fmt.Sprintf("%02s:%02s", dt.Hour, dt.Minute)
 		}
 
+		if allowedPlatform != nil && d.Platform != *allowedPlatform {
+			continue
+		}
+
 		ds = append(ds, Departure{
 			d.Platform,
 			d.ServingLine.Symbol,