Starting to move files about, fonts first

Arduino/BTCDieselHeater/Screen.cpp

@@ -1,7 +1,5 @@
 #include <Arduino.h>
 #include "Screen.h"
-#include "128x64OLED.h"
-#include "ScreenManager.h"
 
 // base class functionality for screens
 

Arduino/BTCDieselHeater/Screen4.cpp

@@ -26,7 +26,7 @@
 #include "BTCWifi.h"
 #include "Tahoma8.h"
 #include "FranklinGothic.h"
-#include "Arial.h"
+#include "src/fonts/Arial.h"
 
 ///////////////////////////////////////////////////////////////////////////
 //

Arduino/BTCDieselHeater/Screen5.cpp

@@ -33,7 +33,7 @@
 #include "helpers.h"
 #include "Screen5.h"
 #include "BTCWifi.h"
-#include "Arial.h"
+#include "src/fonts/Arial.h"
 
 
 CScreen5::CScreen5(C128x64_OLED& display, CScreenManager& mgr) : CScreenHeader(display, mgr) 

Arduino/BTCDieselHeater/Screen6.cpp

@@ -32,7 +32,7 @@
 #include "KeyPad.h"
 #include "helpers.h"
 #include "Screen6.h"
-#include "Arial.h"
+#include "src/fonts/Arial.h"
 #include "Clock.h"
 
 

Arduino/BTCDieselHeater/ScreenHeader.cpp

@@ -9,7 +9,7 @@
 #include "helpers.h"
 #include "NVStorage.h"
 #include "Clock.h"
-#include "Arial.h"
+#include "src/fonts/Arial.h"
 
 
 #define MINIFONT miniFontInfo

Arduino/BTCDieselHeater/src/fonts/Arial.h

@@ -1,4 +1,4 @@
-#include "FontTypes.h"
+#include "../../FontTypes.h"
 
 // Font data for Arial 8pt
 extern const uint8_t PROGMEM arial_8ptBitmaps [];