From 1a1dab926fcb3bac4eceb3afe5d3a747ddc6fea0 Mon Sep 17 00:00:00 2001
From: Laura Hausmann <laura@hausmann.dev>
Date: Fri, 10 Feb 2023 01:25:54 +0100
Subject: [PATCH] Display git revision information on MateCard terminal

---
 AfRApay.MateCard/platformio.ini | 1 +
 AfRApay.MateCard/src/oled.cpp   | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/AfRApay.MateCard/platformio.ini b/AfRApay.MateCard/platformio.ini
index 7eee53e..5e4cf26 100644
--- a/AfRApay.MateCard/platformio.ini
+++ b/AfRApay.MateCard/platformio.ini
@@ -26,3 +26,4 @@ lib_deps =
 check_tool = clangtidy
 check_flags = 
 	clangtidy: --checks=*,-cppcoreguidelines-avoid-magic-numbers,-readability-magic-numbers,-modernize-macro-to-enum
+build_flags = !echo '-DAFRAPAY_REVISION=\\"'$(git describe --long --always --dirty --exclude=* --abbrev=8)'\\"'
diff --git a/AfRApay.MateCard/src/oled.cpp b/AfRApay.MateCard/src/oled.cpp
index e6ae049..bd0466a 100644
--- a/AfRApay.MateCard/src/oled.cpp
+++ b/AfRApay.MateCard/src/oled.cpp
@@ -4,6 +4,7 @@
 #include "U8g2lib.h"
 #include "logos.h"
 #include "utils.h"
+#include "vars.h"
 
 void drawCurvedLineV(U8G2 u8g2, int xStart, int yStart, int vert, int horiz) {
 	u8g2.drawVLine(xStart, yStart + 1, vert);
@@ -126,5 +127,8 @@ void updateOLED(U8G2 u8g2, e_state state, String statusText, String statusTextRi
 
 void updateOLED(U8G2 u8g2, e_state state) {
 	String time = DateTime.format(DateFormatter::TIME_ONLY);
-	updateOLED(u8g2, state, time, WiFi.localIP().toString());
+	if (!digitalRead(PIN_INTERRUPT_CANCEL) || millis()%10000 < 5000)
+		updateOLED(u8g2, state, time, AFRAPAY_REVISION);
+	else
+		updateOLED(u8g2, state, time, WiFi.localIP().toString());
 }