Merge branch 'master' of https://github.com/kenjones007/ESP32-e-Paper-Weather-Display.git

Author: kenjones007

README.md

@@ -1,25 +1,62 @@
 # ESP32-e-Paper-Weather-Display
 An ESP32 and an ePaper Display reads [Open Weather Map](https://openweathermap.org/) and displays the weather
 
-For standalone use, download the ZIP file to your desktop.
+----
+ORIGINAL DONE BY G6EJD
 
-Go to Sketch > Include Library... > Add .ZIP Library... Then, choose the ZIP file.
+----
 
-After inclusion, Go to File, Examples and scroll down to 'ESP32-e-paperWeather-display' and choose your version/screen size. Make sure to come back to this dialog from time to time to keep each library up to date. Also make sure that you only have one version of each of the libraries installed.
+So please visit his page for the original software: https://github.com/G6EJD/ESP32-e-Paper-Weather-Display
 
-Also see: https://www.arduino.cc/en/Guide/Libraries#toc4
+----
+ORIGINAL DONE BY G6EJD
+
+----
+
+Take a look at the V2 Marani Version. If you like it, download it, if not, take the original one from G6EJD
+
+I just enhanced his version, like:
+- Better alignment of Text and Graphics
+- Better alignment of Forecast Multiline-Text
+- Wind and Gust speeds
+- Multi-Graphs to show more than one value (ex. Rain and Snow)
+- Ajust-Graphs with moving x-axis descriptions for better readout of forecasts
+- Added Moon-Set and Rise times, Distance, Zodiac, Age, Longitude and Latitude and Illumination
+- Changed Battery-Display when no battery used
+- Moved some Status-Infos to better suitable places
+
+
+
+----
+ORIGINAL DONE BY G6EJD
+
+----
+
+
+
+----
+ORIGINAL DONE BY G6EJD
+
+----
+
+
+
+----
+ORIGINAL DONE BY G6EJD
+
+----
+
+
+
+----
+ORIGINAL DONE BY G6EJD
+
+----
 
-- [Arduino JSON](https://github.com/bblanchon/ArduinoJson) (v6 or above) by Benoît Blanchon
 
 Download the software to your Arduino's library directory.
 
 1. From the examples, choose depending on your module either
-   - Waveshare_1_54
-   - Waveshare_2_13
-   - Waveshare_2_7
-   - Waveshare_2_9
-   - Waveshare_4_2
-   - Waveshare_7_5
    - Waveshare_7_5_T7 (newer 800x480 version of the older 640x384)
 
    Code requires [GxEPD2 library](https://github.com/ZinggJM/GxEPD2)
@@ -44,6 +81,10 @@ The Battery monitor assumes the use of a Lolin D32 board which uses GPIO-35 as a
 
 Compile and upload the code - Enjoy!
 
+7.5" V2 Marani 800x480 E-Paper Layout
+
+![alt text width="600"](/Waveshare_7_5_V2_marani.jpg)
+
 7.5" 800x480 E-Paper Layout
 
 ![alt text width="600"](/Waveshare_7_5_new.jpg)
@@ -52,21 +93,6 @@ Compile and upload the code - Enjoy!
 
 ![alt text width="600"](/Waveshare_7_5.jpg)
 
-4.2" 400x300 E-Paper Layout
-
-![alt_text, width="400"](/Waveshare_4_2.jpg)
-
-2.7" 264x176 E-Paper Layout
-
-![alt_text, width="400"](/Waveshare_2_7.jpg)
-
-2.13" 250x122 E-Paper Layout
-
-![alt_text, width="200"](/Waveshare_2_13.jpg)
-
-1.54" 200x200 E-Paper Layout
-
-![alt_text, width="200"](/Waveshare_1_54.jpg)
 
 **** NOTE change needed for latest Waveshare HAT versions ****