merged S3-usb-stick into build workflow

include/display.h

@@ -86,6 +86,10 @@ extern BB_SPI_LCD *dp;
 #define MY_DISPLAY_HEIGHT 64 // Height in pixels of OLED-display, must be 64X
 #endif
 
+#ifndef MY_DISPLAY_FIRSTLINE
+#define MY_DISPLAY_FIRSTLINE 0
+#endif
+
 // settings for qr code generator
 #define QR_VERSION 3 // 29 x 29px
 

include/i2c.h

@@ -4,6 +4,15 @@
 #include <Arduino.h>
 #include <Wire.h>
 #include <BitBang_I2C.h>
+#include <Wire.h>
+
+#ifndef MY_DISPLAY_SDA
+#define MY_DISPLAY_SDA SDA
+#endif
+
+#ifndef MY_DISPLAY_SCL
+#define MY_DISPLAY_SCL SCL
+#endif
 
 #define SSD1306_PRIMARY_ADDRESS (0x3D)
 #define SSD1306_SECONDARY_ADDRESS (0x3C)
@@ -14,14 +23,6 @@
 #define MCP_24AA02E64_PRIMARY_ADDRESS (0x50)
 #define QUECTEL_GPS_PRIMARY_ADDRESS (0x10)
 
-#ifndef MY_DISPLAY_SDA
-#define MY_DISPLAY_SDA SDA
-#endif
-
-#ifndef MY_DISPLAY_SCL
-#define MY_DISPLAY_SCL SCL
-#endif
-
 extern SemaphoreHandle_t I2Caccess;
 
 void i2c_init(void);