From 73c02dea5658f1340f97637d5fbc5def5eb5fbd4 Mon Sep 17 00:00:00 2001
From: cyberman54 <cyberman@obh.snafu.de>
Date: Sun, 13 Nov 2022 22:25:48 +0100
Subject: [PATCH] revert faulty merge

---
 include/display.h | 63 ++++++++++++++++++++++++-----------------------
 1 file changed, 32 insertions(+), 31 deletions(-)

diff --git a/include/display.h b/include/display.h
index 926cf90e..c99d2079 100644
--- a/include/display.h
+++ b/include/display.h
@@ -8,19 +8,16 @@
 #include "power.h"
 #include "timekeeper.h"
 
-#if (HAS_DISPLAY) == 1
-#include <OneBitDisplay.h>
-extern ONE_BIT_DISPLAY *dp;
-#elif (HAS_DISPLAY) == 2
-#include <bb_spi_lcd.h>
-extern BB_SPI_LCD *dp;
-#endif
-
 #define DISPLAY_PAGES (7) // number of paxcounter display pages
 #define PLOTBUFFERSIZE (MY_DISPLAY_WIDTH * MY_DISPLAY_HEIGHT / 8)
+#define QR_VERSION 3 // 29 x 29px
 
-// settings for OLED display library
+// Settings for OLED display library
 #if (HAS_DISPLAY) == 1
+
+#include <OneBitDisplay.h>
+extern ONE_BIT_DISPLAY *dp;
+
 #define MY_FONT_SMALL FONT_6x8
 #define MY_FONT_NORMAL FONT_8x8
 #define MY_FONT_LARGE FONT_16x32
@@ -30,17 +27,17 @@ extern BB_SPI_LCD *dp;
 #ifndef MY_DISPLAY_RST
 #define MY_DISPLAY_RST NOT_A_PIN
 #endif
-
 #ifdef MY_DISPLAY_ADDR
 #define OLED_ADDR MY_DISPLAY_ADDR
 #else
 #define OLED_ADDR -1
 #endif
-
 #ifndef OLED_FREQUENCY
 #define OLED_FREQUENCY 400000L
 #endif
-
+#ifndef OLED_TYPE
+#define OLED_TYPE OLED_128x64
+#endif
 #ifndef MY_DISPLAY_FGCOLOR
 #define MY_DISPLAY_FGCOLOR 1 // OLED_WHITE
 #endif
@@ -48,19 +45,15 @@ extern BB_SPI_LCD *dp;
 #define MY_DISPLAY_BGCOLOR 0 // OLED_BLACK
 #endif
 
-// settings for TFT display library
-#elif (HAS_DISPLAY) == 2
+// Settings for TFT display library
+#elif (HAS_DISPLAY) > 1
 
-#define MY_FONT_SMALL 2
-#define MY_FONT_NORMAL 2
-#define MY_FONT_LARGE 2
-#define MY_FONT_STRETCHED 2
-#define MY_DISPLAY_FIRSTLINE 30
+#include <bb_spi_lcd.h>
+extern BB_SPI_LCD *dp;
 
 #ifndef TFT_FREQUENCY
 #define TFT_FREQUENCY 400000L
 #endif
-
 #ifndef MY_DISPLAY_FGCOLOR
 #define MY_DISPLAY_FGCOLOR TFT_YELLOW
 #endif
@@ -70,31 +63,39 @@ extern BB_SPI_LCD *dp;
 
 #endif
 
-// setup display hardware type, default is OLED 128x64
-#ifndef OLED_TYPE
-#define OLED_TYPE OLED_128x64
+// Fonts for large TFT display library
+#if (HAS_DISPLAY) == 2
+#define MY_FONT_SMALL FONT_12x16
+#define MY_FONT_NORMAL FONT_12x16
+#define MY_FONT_LARGE FONT_12x16
+#define MY_FONT_STRETCHED FONT_12x16
+#define MY_DISPLAY_FIRSTLINE 30
 #endif
 
+// Settings for small TFT display library
+#if (HAS_DISPLAY) == 3
+#define MY_FONT_SMALL FONT_6x8
+#define MY_FONT_NORMAL FONT_8x8
+#define MY_FONT_LARGE FONT_16x16
+#define MY_FONT_STRETCHED FONT_12x16
+#define MY_DISPLAY_FIRSTLINE 30
+#endif
+
+// Default settings for all display types
 #ifndef MY_DISPLAY_FLIP
 #define MY_DISPLAY_FLIP 0
 #endif
-
 #ifndef MY_DISPLAY_WIDTH
-#define MY_DISPLAY_WIDTH 128 // Width in pixels of OLED-display, must be 32X
+#define MY_DISPLAY_WIDTH 128
 #endif
 #ifndef MY_DISPLAY_HEIGHT
-#define MY_DISPLAY_HEIGHT 64 // Height in pixels of OLED-display, must be 64X
+#define MY_DISPLAY_HEIGHT 64
 #endif
-
 #ifndef MY_DISPLAY_FIRSTLINE
 #define MY_DISPLAY_FIRSTLINE 0
 #endif
 
-// settings for qr code generator
-#define QR_VERSION 3 // 29 x 29px
-
 const uint8_t QR_SCALEFACTOR = (MY_DISPLAY_HEIGHT - 4) / 29; // 4px borderlines
-
 extern uint8_t DisplayIsOn;
 extern hw_timer_t *displayIRQ;
 extern uint8_t volatile channel; // wifi channel rotation counter