Merged changes from master

README.md

@@ -9,28 +9,43 @@ Since it was sometimes complicated to find the right parts I created a kit which
 https://blog.squix.org/product/esp8266-wifi-color-display-kit-2-4
 By buying the kit from me you are supporting future development. Thank you!
 
+[![Squix ESP8266 Color Display Kit](resources/ESP8266ColorDisplayKit.png)](https://blog.squix.org/product/esp8266-wifi-color-display-kit-2-4)
+
 
 
 ## Software Requirements/ Libraries
-
+ * Mini Grafx by Daniel Eichhorn
-* Arduino IDE with ESP8266 platform installed
+ * ESP8266 WeatherStation by Daniel Eichhorn
-* [Weather Station Library](https://github.com/squix78/esp8266-weather-station) or through Library Manager
+ * Json Streaming Parser by Daniel Eichhorn
-* [Adafruit ILI9341](https://github.com/adafruit/Adafruit_ILI9341) or through Library Manager
+ * simpleDSTadjust by neptune2
-* [Adafruit GFX](https://github.com/adafruit/Adafruit-GFX-Library) or through Library Manager
-* [WifiManager](https://github.com/tzapu/WiFiManager)
 
 You also need to get an API key for the Wunderground data: https://www.wunderground.com/
 
+## Settings
+Please have a good look at the settings.h file. There you can:
+ * set your location for the weather information
+ * Set the clock mode: 12hour (am/pm) or 24hour mode
+ * Metric system for temperature
+ * Timezone and daytime saving options
+ * API key for the wunderground service
+
 ## Wiring
 
-| ILI9341       | NodeMCU      |
+![Wiring](resources/PlaneSpotterWiring.png)
+
+| Wemos D1 Mini | ILI9341      |
 | ------------- |:-------------:|
-| MISO          | -             |
+| D4            | T_IRQ         |
-| LED           | 3V3           |
+| D6            | T_DO          |
-| SCK           | D5            |
+| D7            | T_DIN         |
-| MOSI          | D7            |
+| D3            | T_CS          |
-| DC/RS         | D4            |
+| D5            | T_CLK         |
-| RESET         | RST           |
+| D6            | SDO           |
-| CS            | D2            |
+| D8            | LED           |
+| D5            | SCK           |
+| D7            | SDI           |
+| D2            | D/C           |
+| RST           | RESET         |
+| D1            | CS            |
 | GND           | GND           |
-| VCC           | 3V3           |
+| 3V3           | VCC           |

esp8266-weather-station-color.ino

@@ -72,8 +72,9 @@ int BITS_PER_PIXEL = 2; // 2^2 =  4 colors
 
 ADC_MODE(ADC_VCC);
 
-// HOSTNAME for OTA update
+#include "ArialRounded.h"
-#define HOSTNAME "ESP8266-OTA-"
+#include "moonphases.h"
+#include "weathericons.h"
 
 
 ILI9341_SPI tft = ILI9341_SPI(TFT_CS, TFT_DC);
@@ -593,5 +594,3 @@ const String getShortText(String iconText) {
 
   return "-";
 }
-
-