OpenWeatherMapClient Ctor is now parameterless, as it should. Cleanup commented out code.

Neither of the previous arguments are meaningfull at object construction.

Author: rob040

marquee/OpenWeatherMapClient.cpp

@@ -15,13 +15,11 @@
 #include "TimeStr.h"
 #include "Translations.h"
 
-OpenWeatherMapClient::OpenWeatherMapClient(const String &ApiKey, bool isMetric) {
+OpenWeatherMapClient::OpenWeatherMapClient() {
   myGeoLocation = "";
   myGeoLocation_CityID = 0;
   myGeoLocationType = LOC_UNSET;
-  myApiKey = ApiKey;
-  //this->isMetric = isMetric; // Deprecated!
-  (void)isMetric; // suppress unused parameter warning
+  myApiKey = "";
   dataGetRetryCount = 0;
   weather.isValid = false;
 }
@@ -144,8 +142,6 @@ void OpenWeatherMapClient::updateWeather() {
   }
   apiGetData += F("&units=metric&lang=");
   apiGetData += myLanguage;
-  //apiGetData += F("&units=");
-  //apiGetData += String((isMetric) ? F("metric") : F("imperial"));
   apiGetData += F("&APPID=");
   apiGetData += myApiKey + F(" HTTP/1.1");
   Serial.println(F("Getting Weather Data"));
@@ -276,30 +272,6 @@ void OpenWeatherMapClient::updateWeather() {
 #endif
 }
 
-/* deprecated; shall be language specific
-String OpenWeatherMapClient::getWindDirectionText() {
-  //int val = floor((weather.windDirection / 22.5) + 0.5);
-  //int val =  int((weather.windDirection*16 + 180) / 360) % 16;
-  // N, NNE, NE, ENE, E, ESE, SE, SSE, S, SSW, SW, WSW, W, WNW, NW, NNW ;
-  //String arr[] = {"N", "NNE", "NE", "ENE", "E", "ESE", "SE", "SSE", "S", "SSW", "SW", "WSW", "W", "WNW", "NW", "NNW"};
-  //return arr[(val % 16)];
-  return getWindDirectionString(weather.windDirection);
-}*/
-
-/* deprecated; shall be language specific
-String OpenWeatherMapClient::getWeekDay() {
-  String rtnValue = "";
-  long timestamp = weather.reportTimestamp;
-  long day = 0;
-  if (timestamp != 0) {
-    // Add timezone from OWM
-    timestamp += weather.timeZone;
-    day = ((timestamp / 86400) + 4) % 7;
-    rtnValue = getDayName(day);
-  }
-  return rtnValue;
-}*/
-
 String OpenWeatherMapClient::getWeatherIcon() {
   // match weather condition codes to OLED icon in the weatherstation font
   // see https://openweathermap.org/weather-conditions

marquee/OpenWeatherMapClient.h

@@ -84,19 +84,17 @@ class OpenWeatherMapClient {
     bool isValid;       // Weather report is valid
   } weather;
 
-  //bool isMetric;   // Weather request format Metric or Imperial
   const int dataGetRetryCountError = 10; // Amount of data get timeouts until we invalidate all data
   int dataGetRetryCount;
   String errorMsg; // Weather request error message
 
 
 public:
-  OpenWeatherMapClient(const String &ApiKey, bool isMetric);
+  OpenWeatherMapClient();
   int setGeoLocation(const String &location);
   int setLanguage(const String &languageCode); // set language for weather description (en, fr, de, ...)
   void updateWeather();
   inline void setWeatherApiKey(const String &ApiKey) {myApiKey = ApiKey;};
-  inline void setMetric(bool isMetric) {};//{this->isMetric = isMetric;};  // DEPRECATED!
 
   inline float getLat() {return weather.lat;};
   inline float getLon() {return weather.lon;};
@@ -127,8 +125,6 @@ class OpenWeatherMapClient {
   inline int getTimeZoneSeconds() {return weather.timeZone;};
   inline uint32_t getSunRise() {return weather.sunRise;};
   inline uint32_t getSunSet() {return weather.sunSet;};
-  //String getWeekDay(); // deprecated
-  //String getWindDirectionText(); //deprecated
   String getWeatherIcon();
 
   float convTemperature(float temp_celcius, temperatureUnits_t tu);
@@ -138,5 +134,3 @@ class OpenWeatherMapClient {
 };
 
 extern String EncodeUrlSpecialChars(const char *msg);
-extern String getWindDirectionString(int windDirectionDegrees);
-//extern String getTranslationStr(int msg_id);

marquee/marquee.ino

@@ -151,7 +151,7 @@ enum loopState_e loopState, lastState;
 #define SCHEDULE_INTERVAL_START(_var,_delay) {_var=millis()-(_delay);}
 
 // Weather Client
-OpenWeatherMapClient weatherClient(owmApiKey, true);
+OpenWeatherMapClient weatherClient;
 
 #if COMPILE_MQTT
 // Mqtt Client
@@ -2025,7 +2025,6 @@ void readConfiguration() {
   Serial.println(F("ReadConfigFile EOF"));
   matrix.setIntensity(displayIntensity);
   weatherClient.setWeatherApiKey(owmApiKey);
-  //weatherClient.setMetric(isMetric);
   weatherClient.setGeoLocation(geoLocation);
   #if COMPILE_MQTT
   mqttClient.updateMqttClient(MqttServer, MqttPort, MqttTopic, MqttAuthUser, MqttAuthPass);