Completing merge

ArialRounded.h

@@ -19,10 +19,10 @@ See more at https://blog.squix.org
 */
 // Created by http://oleddisplay.squix.ch/ Consider a donation
 // In case of problems make sure that you are using the font file with the correct version!
-const char ArialRoundedMTBold_14[] PROGMEM = { 
+const char ArialRoundedMTBold_14[] PROGMEM = {
   0x0E, // Width: 14
   0x11, // Height: 17
-  0x20, // First Char: 32
+  0x20, // First Char: 32 
   0xE0, // Numbers of Chars: 224
 
   // Jump Table:
@@ -875,5 +875,3 @@ const char ArialRoundedMTBold_36[] PROGMEM = {
   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFC,0xFF,0xFF,0xFF,0x01,0x00,0xFE,0xFF,0xFF,0xFF,0x03,0x00,0xFE,0xFF,0xFF,0xFF,0x03,0x00,0xFE,0xFF,0xFF,0xFF,0x03,0x00,0xFC,0xFF,0xFF,0xFF,0x01,0x00,0x00,0x78,0xF0,0x00,0x00,0x00,0x00,0x1C,0xC0,0x01,0x00,0x00,0x00,0x1E,0xC0,0x03,0x00,0x00,0x00,0x0F,0x80,0x07,0x00,0x00,0x00,0x0F,0x80,0x07,0x00,0x00,0x00,0x0F,0x80,0x07,0x00,0x00,0x00,0x0F,0x80,0x07,0x00,0x00,0x00,0x1F,0xC0,0x07,0x00,0x00,0x00,0x7F,0xF0,0x07,0x00,0x00,0x00,0xFE,0xFF,0x03,0x00,0x00,0x00,0xFE,0xFF,0x03,0x00,0x00,0x00,0xFC,0xFF,0x01,0x00,0x00,0x00,0xF0,0x7F,0x00,0x00,0x00,0x00,0xC0,0x1F,  // 254
   0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0x0E,0x00,0xC0,0x03,0x00,0x00,0x3F,0x00,0xC0,0x03,0x00,0x00,0xFF,0x01,0xC0,0x03,0x00,0x18,0xFF,0x07,0xC0,0x03,0x00,0x3C,0xFC,0x3F,0xE0,0x03,0x00,0x3C,0xE0,0xFF,0xF0,0x03,0x00,0x18,0x00,0xFF,0xFF,0x03,0x00,0x00,0x00,0xF8,0xFF,0x01,0x00,0x00,0x00,0xC0,0xFF,0x00,0x00,0x18,0x00,0xF8,0x3F,0x00,0x00,0x3C,0x00,0xFF,0x0F,0x00,0x00,0x3C,0xC0,0xFF,0x01,0x00,0x00,0x18,0xF8,0x7F,0x00,0x00,0x00,0x00,0xFE,0x0F,0x00,0x00,0x00,0x00,0xFF,0x01,0x00,0x00,0x00,0x00,0x7F,0x00,0x00,0x00,0x00,0x00,0x0E  // 255
 };
-
-

TouchController.cpp

@@ -29,7 +29,7 @@ bool TouchController::loadCalibration() {
 
   }
   f.close();
-  
+
 }
 
 bool TouchController::saveCalibration() {
@@ -68,7 +68,7 @@ void TouchController::continueCalibration() {
     } else if (state == 1) {
       (*calibrationCallback)(230, 310);
       if (touchScreen->touched() && (millis() - lastStateChange > 1000)) {
-        
+
         p2 = p;
         state++;
         lastStateChange = millis();
@@ -103,4 +103,3 @@ TS_Point TouchController::getPoint() {
     p.y = y;
     return p;
 }
-

TouchController.h

@@ -33,4 +33,3 @@ class TouchController {
 };
 
 #endif
-

esp8266-weather-station-color.ino

@@ -49,7 +49,7 @@ See more at https://blog.squix.org
  * Important: see settings.h to configure your settings!!!
  * ***************************/
 #include "settings.h"
-
+ 
 
 #define MINI_BLACK 0
 #define MINI_WHITE 1