Cleaning up code

2017-06-25 08:30:19 +02:00
parent e71c5408ca
commit eb560a2797
17 changed files with 6036 additions and 1876 deletions
--- a/esp8266-weather-station-color.ino
+++ b/esp8266-weather-station-color.ino
@@ -1,5 +1,5 @@
 /**The MIT License (MIT)
-Copyright (c) 2015 by Daniel Eichhorn
+Copyright (c) 2017 by Daniel Eichhorn
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
@@ -15,38 +15,50 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-See more at http://blog.squix.ch
+See more at https://blog.squix.org
 */

 #include <Arduino.h>

-#include <Adafruit_GFX.h>    // Core graphics library
-#include "ILI9341.h" // Hardware-specific library
 #include <SPI.h>
-// Additional UI functions
-#include "GfxUi.h"
-
-// Fonts created by http://oleddisplay.squix.ch/
-#include "ArialRoundedMTBold_14.h"
-#include "ArialRoundedMTBold_36.h"
-
-// Download helper
-#include "WebResource.h"
+#include "MiniGrafx.h"
+#include "Carousel.h"
+#include "ILI9341_SPI.h"
+#include "ArialRounded.h"
+#include "moonphases.h"
+#include "weathericons.h"

 #include <ESP8266WiFi.h>
-#include <ArduinoOTA.h>
-#include <ESP8266mDNS.h>
-#include <DNSServer.h>
-#include <ESP8266WebServer.h>

-// Helps with connecting to internet
-#include <WiFiManager.h>

-// check settings.h for adapting to your needs
 #include "settings.h"
 #include <JsonListener.h>
-#include <WundergroundClient.h>
-#include "TimeClient.h"
+#include <WundergroundConditions.h>
+#include <WundergroundForecast.h>
+#include <WundergroundAstronomy.h>
+#include <TimeClient.h>
+#include "CalendarParser.h"
+
+#define TFT_DC D2
+#define TFT_CS D1
+#define TFT_LED D8
+
+#define MINI_BLACK 0
+#define MINI_WHITE 1
+#define MINI_YELLOW 2
+#define MINI_BLUE 3
+
+#define MAX_FORECASTS 12
+
+// defines the colors usable in the paletted 16 color frame buffer
+uint16_t palette[] = {ILI9341_BLACK, // 0
+                      ILI9341_WHITE, // 1
+                      ILI9341_YELLOW, // 2
+                      0x7E3C/*ILI9341_BLUE*/}; //3
+
+int SCREEN_WIDTH = 240;
+int SCREEN_HEIGHT = 320;
+int BITS_PER_PIXEL = 2; // 2^2 =  4 colors

 // HOSTNAME for OTA update
 #define HOSTNAME "ESP8266-OTA-"
@@ -55,74 +67,66 @@ See more at http://blog.squix.ch
 * Important: see settings.h to configure your settings!!!
 * ***************************/

-Adafruit_ILI9341 tft = Adafruit_ILI9341(TFT_CS, TFT_DC);
-GfxUi ui = GfxUi(&tft);
+ILI9341_SPI tft = ILI9341_SPI(TFT_CS, TFT_DC);
+MiniGrafx gfx = MiniGrafx(&tft, BITS_PER_PIXEL, palette);
+Carousel carousel(&gfx, 0, 0, 240, 100);

-
-WebResource webResource;
 TimeClient timeClient(UTC_OFFSET);

-// Set to false, if you prefere imperial/inches, Fahrenheit
-WundergroundClient wunderground(IS_METRIC);

-//declaring prototypes
-void configModeCallback (WiFiManager *myWiFiManager);
-void downloadCallback(String filename, int16_t bytesDownloaded, int16_t bytesTotal);
-ProgressCallback _downloadCallback = downloadCallback;
-void downloadResources();
+WGConditions conditions;
+WGForecast forecasts[MAX_FORECASTS];
+WGAstronomy astronomy;
+
 void updateData();
 void drawProgress(uint8_t percentage, String text);
 void drawTime();
 void drawCurrentWeather();
 void drawForecast();
 void drawForecastDetail(uint16_t x, uint16_t y, uint8_t dayIndex);
-String getMeteoconIcon(String iconText);
 void drawAstronomy();
 void drawSeparator(uint16_t y);
-
+const char* getMeteoconIconFromProgmem(String iconText);
+const char* getMiniMeteoconIconFromProgmem(String iconText);
+void drawForecast1(MiniGrafx *display, CarouselState* state, int16_t x, int16_t y);
+void drawForecast2(MiniGrafx *display, CarouselState* state, int16_t x, int16_t y);
+FrameCallback frames[] = { drawForecast1, drawForecast2 };
+int frameCount = 2;
 long lastDownloadUpdate = millis();

+void updateCalendar();
+
 void setup() {
  Serial.begin(115200);

  // The LED pin needs to set HIGH
  // Use this pin to save energy
-  pinMode(LED_PIN, D8);
-  digitalWrite(LED_PIN, HIGH);
-  
-  tft.begin();
-  tft.fillScreen(ILI9341_BLACK);
-  tft.setFont(&ArialRoundedMTBold_14);
-  ui.setTextColor(ILI9341_ORANGE, ILI9341_BLACK);
-  ui.setTextAlignment(CENTER);
-  ui.drawString(120, 160, "Connecting to WiFi");
+  // Turn on the background LED
+  pinMode(TFT_LED, OUTPUT);
+  digitalWrite(TFT_LED, HIGH);

+  gfx.init();
+  gfx.fillBuffer(MINI_BLACK);
+  gfx.setFont(ArialRoundedMTBold_14);
+  gfx.setColor(MINI_YELLOW);
+  gfx.setTextAlignment(TEXT_ALIGN_CENTER);
+  gfx.drawString(120, 160, "Connecting to WiFi");
+  gfx.commit();
+  carousel.setFrames(frames, frameCount);
    //WiFiManager
-  //Local intialization. Once its business is done, there is no need to keep it around
-  WiFiManager wifiManager;
-  // Uncomment for testing wifi manager
-  //wifiManager.resetSettings();
-  wifiManager.setAPCallback(configModeCallback);
-
-  //or use this for auto generated name ESP + ChipID
-  wifiManager.autoConnect();
+  Serial.print("Free heap: ");
+  Serial.println(ESP.getFreeHeap());

  //Manual Wifi
-  //WiFi.begin(WIFI_SSID, WIFI_PWD);
+  WiFi.begin("yourssid", "yourpassw0rd");
+  while (WiFi.status() != WL_CONNECTED) {
+    delay(500);
+    Serial.print(".");
+  }
+  Serial.println(ESP.getFreeHeap());
+  //calendar.updateCalendar(G_SCRIPT_ID);
+  //updateCalendar();

-  // OTA Setup
-  String hostname(HOSTNAME);
-  hostname += String(ESP.getChipId(), HEX);
-  WiFi.hostname(hostname);
-  ArduinoOTA.setHostname((const char *)hostname.c_str());
-  ArduinoOTA.begin();
-  SPIFFS.begin();
-  
-  //Uncomment if you want to update all internet resources
-  //SPIFFS.format();
-
-  // download images from the net. If images already exist don't download
-  downloadResources();

  // load the weather information
  updateData();
@@ -130,14 +134,21 @@ void setup() {

 long lastDrew = 0;
 void loop() {
-  // Handle OTA update requests
-  ArduinoOTA.handle();
+  gfx.fillBuffer(MINI_BLACK);
+  drawTime();
+  drawCurrentWeather();
+  //drawForecast();
+  int remainingTimeBudget = carousel.update();

-  // Check if we should update the clock
-  if (millis() - lastDrew > 30000 && wunderground.getSeconds() == "00") {
-    drawTime();
-    lastDrew = millis();
+  if (remainingTimeBudget > 0) {
+    // You can do some work here
+    // Don't do stuff if you are below your
+    // time budget.
+    delay(remainingTimeBudget);
  }
+  drawAstronomy();
+  gfx.commit();
+

  // Check if we should update weather information
  if (millis() - lastDownloadUpdate > 1000 * UPDATE_INTERVAL_SECS) {
@@ -146,200 +157,285 @@ void loop() {
  }
 }

-// Called if WiFi has not been configured yet
-void configModeCallback (WiFiManager *myWiFiManager) {
-  ui.setTextAlignment(CENTER);
-  tft.setFont(&ArialRoundedMTBold_14);
-  tft.setTextColor(ILI9341_ORANGE);
-  ui.drawString(120, 28, "Wifi Manager");
-  ui.drawString(120, 42, "Please connect to AP");
-  tft.setTextColor(ILI9341_WHITE);
-  ui.drawString(120, 56, myWiFiManager->getConfigPortalSSID());
-  tft.setTextColor(ILI9341_ORANGE);
-  ui.drawString(120, 70, "To setup Wifi Configuration");
-}
-
-// callback called during download of files. Updates progress bar
-void downloadCallback(String filename, int16_t bytesDownloaded, int16_t bytesTotal) {
-  Serial.println(String(bytesDownloaded) + " / " + String(bytesTotal));
-
-  int percentage = 100 * bytesDownloaded / bytesTotal;
-  if (percentage == 0) {
-    ui.drawString(120, 160, filename);
-  }
-  if (percentage % 5 == 0) {
-    ui.setTextAlignment(CENTER);
-    ui.setTextColor(ILI9341_ORANGE, ILI9341_BLACK);
-    //ui.drawString(120, 160, String(percentage) + "%");
-    ui.drawProgressBar(10, 165, 240 - 20, 15, percentage, ILI9341_WHITE, ILI9341_BLUE);
-  }
-
-}
-
-// Download the bitmaps
-void downloadResources() {
-  tft.fillScreen(ILI9341_BLACK);
-  tft.setFont(&ArialRoundedMTBold_14);
-  char id[5];
-  for (int i = 0; i < 21; i++) {
-    sprintf(id, "%02d", i);
-    tft.fillRect(0, 120, 240, 40, ILI9341_BLACK);
-    webResource.downloadFile("http://www.squix.org/blog/wunderground/" + wundergroundIcons[i] + ".bmp", wundergroundIcons[i] + ".bmp", _downloadCallback);
-  }
-  for (int i = 0; i < 21; i++) {
-    sprintf(id, "%02d", i);
-    tft.fillRect(0, 120, 240, 40, ILI9341_BLACK);
-    webResource.downloadFile("http://www.squix.org/blog/wunderground/mini/" + wundergroundIcons[i] + ".bmp", "/mini/" + wundergroundIcons[i] + ".bmp", _downloadCallback);
-  }
-  for (int i = 0; i < 24; i++) {
-    tft.fillRect(0, 120, 240, 40, ILI9341_BLACK);
-    webResource.downloadFile("http://www.squix.org/blog/moonphase_L" + String(i) + ".bmp", "/moon" + String(i) + ".bmp", _downloadCallback);
-  }
-}
-
 // Update the internet based information and update screen
 void updateData() {
-  tft.fillScreen(ILI9341_BLACK);
-  tft.setFont(&ArialRoundedMTBold_14);
+  Serial.print("Free heap, before bit change: ");
+  Serial.println(ESP.getFreeHeap());
+  gfx.changeBitDepth(1, palette);
+  Serial.print("Free heap, after bit change: ");
+  Serial.println(ESP.getFreeHeap());
+  gfx.fillBuffer(MINI_BLACK);
+  gfx.setFont(ArialRoundedMTBold_14);
+  free(conditions);
+  free(forecasts);
+  free(astronomy);
+  drawProgress(10, "Updating calendar...");
+  /*CalendarParser calendar = new Calendar();
+  calendar->updateCalendar(G_SCRIPT_ID);
+  calendar = nullptr;*/
+  //updateCalendar();
+  
  drawProgress(20, "Updating time...");
  timeClient.updateTime();
+  
  drawProgress(50, "Updating conditions...");
-  wunderground.updateConditions(WUNDERGRROUND_API_KEY, WUNDERGRROUND_LANGUAGE, WUNDERGROUND_COUNTRY, WUNDERGROUND_CITY);
-  drawProgress(70, "Updating forecasts...");
-  wunderground.updateForecast(WUNDERGRROUND_API_KEY, WUNDERGRROUND_LANGUAGE, WUNDERGROUND_COUNTRY, WUNDERGROUND_CITY);
-  drawProgress(90, "Updating astronomy...");
-  wunderground.updateAstronomy(WUNDERGRROUND_API_KEY, WUNDERGRROUND_LANGUAGE, WUNDERGROUND_COUNTRY, WUNDERGROUND_CITY);
-  //lastUpdate = timeClient.getFormattedTime();
-  //readyForWeatherUpdate = false;
-  drawProgress(100, "Done...");
+  conditions = (WGConditions *) malloc(sizeof(WGConditions));
+  Serial.println("Allocating");
+  delay(1000);
+  conditions->currentTemp = "hello";
+  Serial.println("Allocated");
+  delay(1000);
+  WundergroundConditions *conditionsClient = new WundergroundConditions(IS_METRIC);
+  conditionsClient->updateConditions(conditions, WUNDERGRROUND_API_KEY, WUNDERGRROUND_LANGUAGE, WUNDERGROUND_COUNTRY, WUNDERGROUND_CITY);
+  delete conditionsClient;
+  conditionsClient = nullptr;
+  
+  drawProgress(70, "Updating forecasts...");
+  forecasts = (WGForecast*) malloc(sizeof(WGForecast) * MAX_FORECASTS);
+  WundergroundForecast *forecastClient = new WundergroundForecast(IS_METRIC);
+  forecastClient->updateForecast(forecasts, MAX_FORECASTS, WUNDERGRROUND_API_KEY, WUNDERGRROUND_LANGUAGE, WUNDERGROUND_COUNTRY, WUNDERGROUND_CITY);
+  delete forecastClient;
+  forecastClient = nullptr;
+  drawProgress(80, "Updating astronomy...");
+
+  astronomy = (WGAstronomy*) malloc(sizeof(WGAstronomy));
+  WundergroundAstronomy *astronomyClient = new WundergroundAstronomy(USE_PM);
+  astronomyClient->updateAstronomy(astronomy, WUNDERGRROUND_API_KEY, WUNDERGRROUND_LANGUAGE, WUNDERGROUND_COUNTRY, WUNDERGROUND_CITY);
+  delete astronomyClient;
+  astronomyClient = nullptr;
+
+  drawProgress(100, "Done...");
+  Serial.print("Free heap, before bit change: ");
+  Serial.println(ESP.getFreeHeap());
+  gfx.changeBitDepth(2, palette);
+  
+  Serial.print("Free heap, after bit change: ");
+  Serial.println(ESP.getFreeHeap());
  delay(1000);
-  tft.fillScreen(ILI9341_BLACK);
-  drawTime();
-  drawCurrentWeather();
-  drawForecast();
-  drawAstronomy();
 }

 // Progress bar helper
 void drawProgress(uint8_t percentage, String text) {
-  ui.setTextAlignment(CENTER);
-  ui.setTextColor(ILI9341_ORANGE, ILI9341_BLACK);
-  tft.fillRect(0, 140, 240, 45, ILI9341_BLACK);
-  ui.drawString(120, 160, text);
-  ui.drawProgressBar(10, 165, 240 - 20, 15, percentage, ILI9341_WHITE, ILI9341_BLUE);
+  gfx.fillBuffer(MINI_BLACK);
+  gfx.setFont(ArialRoundedMTBold_14);
+  gfx.setTextAlignment(TEXT_ALIGN_CENTER);
+  gfx.setColor(MINI_YELLOW);
+
+  gfx.drawString(120, 146, text);
+  gfx.setColor(MINI_WHITE);
+  gfx.drawRect(10, 165, 240 - 20, 15);
+  gfx.setColor(MINI_BLUE);
+  gfx.fillRect(12, 167, 216 * percentage / 100, 11);
+  //ui.drawProgressBar(10, 165, 240 - 20, 15, percentage, ILI9341_WHITE, ILI9341_BLUE);
+  gfx.commit();
 }

 // draws the clock
 void drawTime() {
-  ui.setTextAlignment(CENTER);
-  ui.setTextColor(ILI9341_WHITE, ILI9341_BLACK);
-  tft.setFont(&ArialRoundedMTBold_14);
-  String date = wunderground.getDate();
-  ui.drawString(120, 20, date);
+
+  gfx.setTextAlignment(TEXT_ALIGN_CENTER);
+  gfx.setColor(MINI_WHITE);
+  gfx.setFont(ArialRoundedMTBold_14);
+  String date = conditions->date;
+  gfx.drawString(120, 6, date);
  
-  tft.setFont(&ArialRoundedMTBold_36);
-  String time = timeClient.getHours() + ":" + timeClient.getMinutes();
-  ui.drawString(120, 56, time);
-  drawSeparator(65);
+  gfx.setFont(ArialRoundedMTBold_36);
+  String time = timeClient.getHours() + ":" + timeClient.getMinutes() + ":" + timeClient.getSeconds();
+  gfx.drawString(120, 20, time);
+}
+
+void updateCalendar() {
+  Serial.print("Free heap: ");
+  Serial.println(ESP.getFreeHeap());
+  const char* host = "script.google.com";
+  // Replace with your own script id to make server side changes
+  const char *GScriptId = "AKfycbwdOi6zab7cLU5fEr0AL6KrAMpygUoFHOtSrgnKfccyHHkpZPo";
+  
+  const int httpsPort = 443;
+  String url = String("/macros/s/") + GScriptId + "/exec";
+  // echo | openssl s_client -connect script.google.com:443 |& openssl x509 -fingerprint -noout
+  const char* fingerprint = "08:9E:B2:B8:77:37:3E:85:26:09:CA:29:13:D2:B0:57:26:DE:C4:6D";
+  
+   // Use HTTPSRedirect class to create a new TLS connection
+  HTTPSRedirect *client = new HTTPSRedirect(httpsPort);
+  client->setPrintResponseBody(true);
+  client->setContentTypeHeader("application/json");
+  Serial.print("Connecting to ");
+  Serial.println(host);
+
+  // Try to connect for a maximum of 5 times
+  bool flag = false;
+  for (int i=0; i<5; i++){
+    Serial.println(".");
+    delay(1000);
+    int retval = client->connect(host, httpsPort);
+    if (retval == 1) {
+       flag = true;
+       break;
+    }
+    else
+      Serial.println("Connection failed. Retrying...");
+  }
+ 
+  if (!flag){
+    Serial.print("Could not connect to server: ");
+    Serial.println(host);
+    Serial.println("Exiting...");
+    return;
+  }
+  
+  if (client->verify(fingerprint, host)) {
+    Serial.println("Certificate match.");
+  } else {
+    Serial.println("Certificate mis-match");
+  }
+
+  // fetch spreadsheet data
+  client->GET(url, host);
+
+
+  delete client;
+  client = nullptr;
 }

 // draws current weather information
 void drawCurrentWeather() {
  // Weather Icon
-  String weatherIcon = getMeteoconIcon(wunderground.getTodayIcon());
-  ui.drawBmp(weatherIcon + ".bmp", 0, 55);
  
+  gfx.setTransparentColor(MINI_BLACK);
+  //gfx.drawBmpFromFile(weatherIcon + ".bmp", 0, 55);
+  gfx.drawPalettedBitmapFromPgm(0, 55, getMeteoconIconFromProgmem(conditions->weatherIcon));
  // Weather Text
-  tft.setFont(&ArialRoundedMTBold_14);
-  ui.setTextColor(ILI9341_ORANGE, ILI9341_BLACK);
-  ui.setTextAlignment(RIGHT);
-  ui.drawString(220, 90, wunderground.getWeatherText());
+  gfx.setFont(ArialRoundedMTBold_14);
+  gfx.setColor(MINI_YELLOW);
+  gfx.setTextAlignment(TEXT_ALIGN_RIGHT);
+  gfx.drawString(220, 76, conditions->weatherText);

-  tft.setFont(&ArialRoundedMTBold_36);
-  ui.setTextColor(ILI9341_ORANGE, ILI9341_BLACK);
-  ui.setTextAlignment(RIGHT);
-  String degreeSign = "F";
+  gfx.setFont(ArialRoundedMTBold_36);
+  gfx.setColor(MINI_WHITE);
+  gfx.setTextAlignment(TEXT_ALIGN_RIGHT);
+  String degreeSign = "°F";
  if (IS_METRIC) {
-    degreeSign = "C";
+    degreeSign = "°C";
  }
-  String temp = wunderground.getCurrentTemp() + degreeSign;
-  ui.drawString(220, 125, temp);
-  drawSeparator(135);
+  String temp = conditions->currentTemp + degreeSign;
+  gfx.drawString(220, 89, temp);

 }

+void drawForecast1(MiniGrafx *display, CarouselState* state, int16_t x, int16_t y) {
+  drawForecastDetail(x + 10, y + 165, 0);
+  drawForecastDetail(x + 95, y + 165, 2);
+  drawForecastDetail(x + 180, y + 165, 4);
+}
+void drawForecast2(MiniGrafx *display, CarouselState* state, int16_t x, int16_t y) {
+  drawForecastDetail(x + 10, y + 165, 6);
+  drawForecastDetail(x + 95, y + 165, 8);
+  drawForecastDetail(x + 180, y + 165, 10); 
+}
 // draws the three forecast columns
 void drawForecast() {
-  drawForecastDetail(10, 165, 0);
-  drawForecastDetail(95, 165, 2);
-  drawForecastDetail(180, 165, 4);
-  drawSeparator(165 + 65 + 10);
+
 }

 // helper for the forecast columns
 void drawForecastDetail(uint16_t x, uint16_t y, uint8_t dayIndex) {
-  ui.setTextColor(ILI9341_ORANGE, ILI9341_BLACK);
-  tft.setFont(&ArialRoundedMTBold_14);
-  ui.setTextAlignment(CENTER);
-  String day = wunderground.getForecastTitle(dayIndex).substring(0, 3);
+  gfx.setColor(MINI_YELLOW);
+  gfx.setFont(ArialRoundedMTBold_14);
+  gfx.setTextAlignment(TEXT_ALIGN_CENTER);
+  String day = forecasts[dayIndex].forecastTitle.substring(0, 3);
  day.toUpperCase();
-  ui.drawString(x + 25, y, day);
+  gfx.drawString(x + 25, y - 15, day);

-  ui.setTextColor(ILI9341_WHITE, ILI9341_BLACK);
-  ui.drawString(x + 25, y + 14, wunderground.getForecastLowTemp(dayIndex) + "|" + wunderground.getForecastHighTemp(dayIndex));
-  
-  String weatherIcon = getMeteoconIcon(wunderground.getForecastIcon(dayIndex));
-  ui.drawBmp("/mini/" + weatherIcon + ".bmp", x, y + 15);
-    
+  gfx.setColor(MINI_WHITE);
+  gfx.drawString(x + 25, y, forecasts[dayIndex].forecastLowTemp + "|" + forecasts[dayIndex].forecastHighTemp);
+
+  gfx.drawPalettedBitmapFromPgm(x, y + 15, getMiniMeteoconIconFromProgmem(forecasts[dayIndex].forecastIcon));
 }

 // draw moonphase and sunrise/set and moonrise/set
 void drawAstronomy() {
-  int moonAgeImage = 24 * wunderground.getMoonAge().toInt() / 30.0;
-  ui.drawBmp("/moon" + String(moonAgeImage) + ".bmp", 120 - 30, 255);
+  char moonAgeImage = 65 + 26 * astronomy->moonAge.toInt() / 30.0;
+  gfx.setFont(MoonPhases_Regular_36);
+  gfx.setColor(MINI_WHITE);
+  gfx.setTextAlignment(TEXT_ALIGN_CENTER);
+  gfx.drawString(120, 270, String(moonAgeImage));
+  //gfx.drawBmpFromFile("/moon" + String(moonAgeImage) + ".bmp", 120 - 30, 255);
  
-  ui.setTextColor(ILI9341_WHITE, ILI9341_BLACK);
-  tft.setFont(&ArialRoundedMTBold_14);  
-  ui.setTextAlignment(LEFT);
-  ui.setTextColor(ILI9341_ORANGE, ILI9341_BLACK);
-  ui.drawString(20, 270, "Sun");
-  ui.setTextColor(ILI9341_WHITE, ILI9341_BLACK);
-  ui.drawString(20, 285, wunderground.getSunriseTime());
-  ui.drawString(20, 300, wunderground.getSunsetTime());
+  gfx.setColor(MINI_WHITE);
+  gfx.setFont(ArialRoundedMTBold_14); 
+  gfx.setTextAlignment(TEXT_ALIGN_CENTER);
+  gfx.setColor(MINI_YELLOW);
+  gfx.drawString(120, 245, astronomy->moonPhase); 
+  gfx.setTextAlignment(TEXT_ALIGN_LEFT);
+  gfx.setColor(MINI_YELLOW);
+  gfx.drawString(10, 245, "Sun");
+  gfx.setColor(MINI_WHITE);
+  astronomy->sunriseTime.trim();
+  astronomy->sunriseTime.trim();
+  gfx.drawString(10, 276, astronomy->sunriseTime);
+  gfx.drawString(10, 291, astronomy->sunsetTime);

-  ui.setTextAlignment(RIGHT);
-  ui.setTextColor(ILI9341_ORANGE, ILI9341_BLACK);
-  ui.drawString(220, 270, "Moon");
-  ui.setTextColor(ILI9341_WHITE, ILI9341_BLACK);
-  ui.drawString(220, 285, wunderground.getMoonriseTime());
-  ui.drawString(220, 300, wunderground.getMoonsetTime());
+  gfx.setTextAlignment(TEXT_ALIGN_RIGHT);
+  gfx.setColor(MINI_YELLOW);
+  gfx.drawString(230, 245, "Moon");
+  gfx.setColor(MINI_WHITE);
+  astronomy->moonriseTime.trim();
+  astronomy->moonsetTime.trim();
+  gfx.drawString(230, 276, astronomy->moonriseTime);
+  gfx.drawString(230, 291, astronomy->moonsetTime);
  
 }

 // Helper function, should be part of the weather station library and should disappear soon
-String getMeteoconIcon(String iconText) {
-  if (iconText == "F") return "chanceflurries";
-  if (iconText == "Q") return "chancerain";
-  if (iconText == "W") return "chancesleet";
-  if (iconText == "V") return "chancesnow";
-  if (iconText == "S") return "chancetstorms";
-  if (iconText == "B") return "clear";
-  if (iconText == "Y") return "cloudy";
-  if (iconText == "F") return "flurries";
-  if (iconText == "M") return "fog";
-  if (iconText == "E") return "hazy";
-  if (iconText == "Y") return "mostlycloudy";
-  if (iconText == "H") return "mostlysunny";
-  if (iconText == "H") return "partlycloudy";
-  if (iconText == "J") return "partlysunny";
-  if (iconText == "W") return "sleet";
-  if (iconText == "R") return "rain";
-  if (iconText == "W") return "snow";
-  if (iconText == "B") return "sunny";
-  if (iconText == "0") return "tstorms";
+const char* getMeteoconIconFromProgmem(String iconText) {
+  
+  if (iconText == "chanceflurries") return chanceflurries;
+  if (iconText == "chancerain") return chancerain;
+  if (iconText == "chancesleet") return chancesleet;
+  if (iconText == "chancesnow") return chancesnow;
+  if (iconText == "chancetstorms") return chancestorms;
+  if (iconText == "cloudy") return clear;
+  if (iconText == "cloudy") return cloudy;
+  if (iconText == "flurries") return flurries;
+  if (iconText == "fog") return fog;
+  if (iconText == "hazy") return hazy;
+  if (iconText == "mostlycloudy") return mostlycloudy;
+  if (iconText == "mostlysunny") return mostlysunny;
+  if (iconText == "partlycloudy") return partlycloudy;
+  if (iconText == "partlysunny") return partlysunny;
+  if (iconText == "sleet") return sleet;
+  if (iconText == "rain") return rain;
+  if (iconText == "snow") return snow;
+  if (iconText == "sunny") return sunny;
+  if (iconText == "tstorms") return tstorms;
  

-  return "unknown";
+  return unknown;
+}
+const char* getMiniMeteoconIconFromProgmem(String iconText) {
+  if (iconText == "chanceflurries") return minichanceflurries;
+  if (iconText == "chancerain") return minichancerain;
+  if (iconText == "chancesleet") return minichancesleet;
+  if (iconText == "chancesnow") return minichancesnow;
+  if (iconText == "chancetstorms") return minichancestorms;
+  if (iconText == "clear") return miniclear;
+  if (iconText == "cloudy") return minicloudy;
+  if (iconText == "flurries") return miniflurries;
+  if (iconText == "fog") return minifog;
+  if (iconText == "hazy") return minihazy;
+  if (iconText == "mostlycloudy") return minimostlycloudy;
+  if (iconText == "mostlysunny") return minimostlysunny;
+  if (iconText == "partlycloudy") return minipartlycloudy;
+  if (iconText == "partlysunny") return minipartlysunny;
+  if (iconText == "sleet") return minisleet;
+  if (iconText == "rain") return minirain;
+  if (iconText == "snow") return minisnow;
+  if (iconText == "sunny") return minisunny;
+  if (iconText == "tstorms") return minitstorms;
+  
+
+  return miniunknown;
 }

 // if you want separators, uncomment the tft-line