Replaced the WeatherClient with ForecastIOParser.

arduino-ide/weather-station-v2/ForecastIOParser.cpp

@@ -0,0 +1,189 @@
+/**The MIT License (MIT)
+ESP8622 Weather Display v3
+Copyright (c) 2016 by Erdem Umut Altinyurt
+
+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
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+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.
+
+*/
+
+#include "ForecastIOParser.h"
+#include "JsonStreamingParser.h"
+#include "JsonListener.h"
+
+JsonStreamingParser parser;
+ForecastIO forecast;
+
+#include <ESP8266WiFi.h>
+#include <ESP8266HTTPClient.h>
+
+ForecastIO::ForecastIO(){
+  parser.setListener(&forecast);
+  }
+
+void ForecastIO::updateWeatherData( String apiKey, double lat, double lon) {
+  HTTPClient http;
+  Serial.println("Connecting to server: ");
+
+  // We now create a URI for the request
+  String url="https://api.forecast.io/forecast/" + apiKey + "/" + String(lat)+"," + String(lon);
+
+  http.begin( url );
+  Serial.print("Requesting URL: ");
+  Serial.println(url);
+  int httpCode = http.GET();
+  if(httpCode > 0) {
+    // HTTP header has been send and Server response header has been handled
+    Serial.printf("[HTTP] GET... code: %d\n", httpCode);
+
+    // file found at server
+    if(httpCode == HTTP_CODE_OK) {
+      // get lenght of document (is -1 when Server sends no Content-Length header)
+      int len = http.getSize();
+      // create buffer for read
+      char buff[128] = { 0 };
+      // get tcp stream
+      WiFiClient * stream = http.getStreamPtr();
+      // read all data from server
+      Serial.println("Start parsing...");
+      while(http.connected() && (len > 0 || len == -1)) {
+        // get available data size
+        size_t size = stream->available();
+        if(size) {
+          // read up to 128 byte
+          int c = stream->readBytes(buff, ((size > sizeof(buff)) ? sizeof(buff) : size));
+          //Serial.write(buff,c);
+          //Serial.println();
+          for(int i=0;i<c;i++)
+            parser.parse(buff[i]); 
+
+          if(len > 0)
+            len -= c;
+          }
+        delay(1);
+        }
+
+      Serial.println();
+      Serial.println( "Current");
+      Serial.print( "Temperature: ");
+      Serial.println( forecast.current.temperature );
+      Serial.print( "Humidity   : ");
+      Serial.println( forecast.current.humidity );
+      Serial.print( "Icon       : ");
+      Serial.println( forecast.current.icon );
+      Serial.print( "Summary    : ");
+      Serial.println( forecast.current.summary );
+      Serial.println();
+      Serial.println( "Today");
+      Serial.print( "TemperatureMin: ");
+      Serial.println( forecast.today.temperatureMin );
+      Serial.print( "TemperatureMax: ");
+      Serial.println( forecast.today.temperatureMax );
+      Serial.print( "Icon          : ");
+      Serial.println( forecast.today.icon );
+      Serial.print( "Summary       : ");
+      Serial.println( forecast.today.summary );
+      Serial.println();
+      Serial.println( "Tomorrow");
+      Serial.print( "TemperatureMin: ");
+      Serial.println( forecast.tomorrow.temperatureMin );
+      Serial.print( "TemperatureMax: ");
+      Serial.println( forecast.tomorrow.temperatureMax );
+      Serial.print( "Icon          : ");
+      Serial.println( forecast.tomorrow.icon );
+      Serial.print( "Summary       : ");
+      Serial.println( forecast.tomorrow.summary );
+
+      Serial.println();
+      Serial.print("[HTTP] connection closed or file end.\n");
+      }
+    }
+  else
+    Serial.printf("[HTTP] GET... failed, error: %s\n", http.errorToString(httpCode).c_str());
+
+  http.end();
+
+  Serial.println();
+  Serial.println("closing connection");    
+}
+
+void ForecastIO::whitespace(char c) {
+  //Serial.println("whitespace");
+}
+
+void ForecastIO::startDocument() {
+  //Serial.println("start document");
+}
+
+void ForecastIO::key(String key) {
+  //Serial.println("key: " + key);
+  token=key;
+}
+
+void ForecastIO::value(String value){
+  //Serial.println("value: " + value);
+  struct weatherData *a;
+  a=NULL;
+  if(object=="currently")
+    a=&current;
+  else if(object=="daily" && arraynum==1)
+    a=&today;
+  else if(object=="daily" && arraynum==2)
+    a=&tomorrow;
+
+  if(a!=NULL){
+    if(token=="temperatureMax")
+      a->temperatureMax=value;
+    else if(token=="temperatureMin")
+      a->temperatureMin=value;
+    else if(token=="temperature")
+      a->temperature=value;
+    else if(token=="icon")
+      a->icon=value;
+    else if(token=="summary")
+      a->summary=value;
+    else if(token=="humidity")
+      a->humidity=value;
+    }
+}
+
+void ForecastIO::endArray() {
+  //Serial.println("end array. ");
+}
+
+void ForecastIO::endObject() {
+  //Serial.println("end object. ");
+}
+
+void ForecastIO::endDocument() {
+  //Serial.println("end document. ");
+}
+
+void ForecastIO::startArray() {
+   //Serial.println("start array. ");
+   arraynum=0;
+}
+
+void ForecastIO::startObject() {
+   //Serial.println("start object. ");
+   arraynum++;
+   if( token == "currently" || token == "daily" || token == "hourly")
+      object=token;
+   }
+
+

arduino-ide/weather-station-v2/WeatherClient.h → arduino-ide/weather-station-v2/ForecastIOParser.h

@@ -1,6 +1,6 @@
 /**The MIT License (MIT)
-
-Copyright (c) 2015 by Daniel Eichhorn
+ESP8622 Weather Display v3
+Copyright (c) 2016 by Erdem Umut Altinyurt
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -20,47 +20,44 @@ 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
 */
 
-#include <Arduino.h>
+#pragma once
+
+#include "JsonListener.h"
+
+struct weatherData{
+  String temperatureMin;
+  String temperatureMax;
+  String humidity;
+  String temperature;
+  String icon;
+  String summary;
+  };
+
+class ForecastIO: public JsonListener {
+  public:
+    ForecastIO();
+    void updateWeatherData( String apiKey, double lat, double lon);
+
+  public:
+    virtual void whitespace(char c);
+    virtual void startDocument();
+    virtual void key(String key);
+    virtual void value(String value);
+    virtual void endArray();
+    virtual void endObject();
+    virtual void endDocument();
+    virtual void startArray();
+    virtual void startObject();
 
-class WeatherClient {
+  struct weatherData current, today, tomorrow;
+
   private:
-    int currentTemp;
-    int currentHumidity;
-    String currentIcon;
-    String currentSummary;
-    String iconToday;
-    int maxTempToday;
-    int minTempToday;
-    String summaryToday;
-    int maxTempTomorrow;
-    int minTempTomorrow;
-    String iconTomorrow;
-    String summaryTomorrow;
     String apiKey;
-    String myUnits = "auto";
-    String myLanguage;
-
-    String getValue(String line);
-    String getKey(String line);
-
-  public:
-    void updateWeatherData(String apiKey, double lat, double lon); 
-    void setUnits(String units);
-    int getCurrentTemp(void);
-    int getCurrentHumidity(void);
-    String getCurrentIcon(void);
-    String getCurrentSummary(void);
-    String getIconToday(void);
-    int getMaxTempToday(void);
-    int getMinTempToday(void);
-    String getSummaryToday(void);
-    int getMaxTempTomorrow(void);
-    int getMinTempTomorrow(void);
-    String getIconTomorrow(void);
-    String getSummaryTomorrow(void);
-
-
+    String token;
+    String object;
+    int arraynum;
 };
+
+