Reduce memory footprint, allow setting the number of hours in constructor

sebastian-xyz · sebastian-xyz · commit 5aa732571a24 · 2025-06-02T16:53:40.000+02:00
Move from double -&gt; float
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ platform = espressif32
 board = esp32dev
 framework = arduino
 lib_deps = 
-	https://github.com/sebastian-xyz/ESPWeather.git
+    https://github.com/sebastian-xyz/ESPWeather.git
 ```
 
 
@@ -91,13 +91,15 @@ The `Weather` class provides an interface to retrieve and manage weather data fr
 
 | **Return Type**         | _Function_                                  | Description                                                        |
 |-------------------------|---------------------------------------------|--------------------------------------------------------------------|
-|                         | _Weather(double latitude, double longitude, String user_agent)_ | Constructor to initialize with latitude, longitude, and user agent.|
-|                         | _Weather(double latitude, double longitude, uint16_t altitude, String user_agent)_ | Constructor with latitude, longitude, altitude, and user agent.    |
+|                         | _Weather(float latitude, float longitude)_  | Constructor to initialize with latitude and longitude.             |
+|                         | _Weather(float latitude, float longitude, uint16_t altitude)_ | Constructor with latitude, longitude, and altitude.    |
+|                         | _Weather(uint8_t num_hours, float latitude, float longitude)_ | Constructor with hours, latitude, longitude.         |
+|                         | _Weather(uint8_t num_hours, float latitude, float longitude, uint16_t altitude)_ | Constructor with hours, latitude, longitude, altitude. |
 |                         | _~Weather()_                                | Destructor.                                                        |
 | **bool**                | _is_expired(void)_                          | Checks if the weather data is expired.                             |
 | **void**                | _update_data(void)_                         | Updates the weather data from the API.                             |
-| **void**                | _update_location(double latitude, double longitude)_ | Updates the location (latitude and longitude).              |
-| **void**                | _update_location(double latitude, double longitude, uint16_t altitude)_ | Updates the location with latitude, longitude, and altitude. |
+| **void**                | _update_location(float latitude, float longitude)_ | Updates the location (latitude and longitude).              |
+| **void**                | _update_location(float latitude, float longitude, uint16_t altitude)_ | Updates the location with latitude, longitude, and altitude. |
 | **void**                | _set_utc_offset(int8_t utf_offset)_         | Sets the UTC offset for the location.                              |
 | **void**                | _set_daylight_saving(bool daylight_saving)_ | Sets the daylight saving status.                                   |
 | **WeatherData\***       | _get_temperature()_                         | Returns a pointer to temperature data.                             |
@@ -125,16 +127,16 @@ The `WeatherData` class represents weather parameter data for a set of hours, pr
 | **Return Type** | _Function_                              | Description                                                  |
 |-----------------|-----------------------------------------|--------------------------------------------------------------|
 |                 | _WeatherData(uint8_t num_hours)_        | Constructor that initializes with the number of hours.        |
-|                 | _WeatherData(double *vals)_             | Constructor that initializes with a pointer to values array.  |
+|                 | _WeatherData(float *vals)_              | Constructor that initializes with a pointer to values array.  |
 |                 | _~WeatherData()_                        | Destructor.                                                  |
-| **void**        | _update_vals(double *vals)_             | Updates the internal values array.                            |
-| **double**      | _get_minimum()_                         | Returns the minimum value.                                    |
-| **double**      | _get_maximum()_                         | Returns the maximum value.                                    |
-| **double**      | _get_mean()_                            | Returns the mean value.                                       |
-| **double**      | _get_std()_                             | Returns the standard deviation.                               |
-| **double**      | _get_variance()_                        | Returns the variance.                                         |
-| **double**      | _get_val_at_hour(uint8_t hour)_         | Returns the value at the specified hour.                      |
-| **double**      | _get_current()_                         | Returns the value for the current hour.                       |
+| **void**        | _update_vals(float *vals)_              | Updates the internal values array.                            |
+| **float**       | _get_minimum()_                         | Returns the minimum value.                                    |
+| **float**       | _get_maximum()_                         | Returns the maximum value.                                    |
+| **float**       | _get_mean()_                            | Returns the mean value.                                       |
+| **float**       | _get_std()_                             | Returns the standard deviation.                               |
+| **float**       | _get_variance()_                        | Returns the variance.                                         |
+| **float**       | _get_val_at_hour(uint8_t hour)_         | Returns the value at the specified hour.                      |
+| **float**       | _get_current()_                         | Returns the value for the current hour.                       |
 
 > **Note:**  
 > The WeatherData class does not expose public data members; all access is through its public methods.
diff --git a/include/weather.hpp b/include/weather.hpp
@@ -4,8 +4,12 @@
 #include <Arduino.h>
 #include "weather_data.hpp"
 
-#define NUM_HOURS 24
-#define ESPWeatherUserAgent "github.com/sebastian-xyz/ESPWeather/v1.0"
+#ifndef ESPWeatherNumHours
+#define ESPWeatherNumHours 24
+#endif
+#ifndef ESPWeatherUserAgent
+#define ESPWeatherUserAgent "github.com/sebastian-xyz/ESPWeather/v1.1"
+#endif
 
 class Weather
 {
@@ -15,12 +19,12 @@ class Weather
   String last_modified;
   tm *expired_time;
   tm *local_time;
-  double longitude;
-  double latitude;
+  float longitude;
+  float latitude;
   uint16_t altitude;
   int8_t utc_offset;
   const char *url = "https://api.met.no/weatherapi/locationforecast/2.0/complete";
-  const uint8_t num_hours = NUM_HOURS;
+  const uint8_t num_hours;
   WeatherData *dew_point;
   WeatherData *temperature;
   WeatherData *precipitation;
@@ -35,13 +39,16 @@ class Weather
   bool daylight_saving;
 
 public:
-  Weather(double latitude, double longitude, String user_agent);
-  Weather(double latitude, double longitude, uint16_t altitude, String user_agent);
+  Weather(float latitude, float longitude);
+  Weather(float latitude, float longitude, uint16_t altitude);
+  Weather(uint8_t num_hours, float latitude, float longitude);
+  Weather(uint8_t num_hours, float latitude, float longitude, uint16_t altitude);
+  Weather(float latitude, float longitude, uint16_t altitude);
   ~Weather();
   bool is_expired(void);
   void update_data(void);
-  void update_location(double latitude, double longitude);
-  void update_location(double latitude, double longitude, uint16_t altitude);
+  void update_location(float latitude, float longitude);
+  void update_location(float latitude, float longitude, uint16_t altitude);
   void set_utc_offset(int8_t utf_offset);
   void set_daylight_saving(bool daylight_saving);
   WeatherData *get_temperature();
diff --git a/include/weather_data.hpp b/include/weather_data.hpp
@@ -5,24 +5,24 @@ class WeatherData
 {
 
 private:
-  double *vals;
-  double minimum;
-  double maxmimum;
-  double mean;
-  double variance;
+  float *vals;
+  float minimum;
+  float maxmimum;
+  float mean;
+  float variance;
   uint8_t num_hours;
 
 public:
   WeatherData(uint8_t num_hours);
-  WeatherData(double *vals);
+  WeatherData(float *vals);
   ~WeatherData();
-  void update_vals(double *vals);
-  double get_minimum();
-  double get_maximum();
-  double get_mean();
-  double get_std();
-  double get_variance();
-  double get_val_at_hour(uint8_t hour);
-  double get_current();
+  void update_vals(float *vals);
+  float get_minimum();
+  float get_maximum();
+  float get_mean();
+  float get_std();
+  float get_variance();
+  float get_val_at_hour(uint8_t hour);
+  float get_current();
 };
 #endif
diff --git a/src/weather.cpp b/src/weather.cpp
@@ -1,10 +1,10 @@
-#include "weather.hpp"
 #include "math.h"
 #include <ArduinoJson.h>
 #include <HTTPClient.h>
 #include <WiFiClientSecure.h>
 #include <memory>
 #include <time.h>
+#include "weather.hpp"
 
 const char *root_cert =
     "-----BEGIN CERTIFICATE-----\n"
@@ -42,8 +42,39 @@ const char *root_cert =
     "jjxDah2nGN59PRbxYvnKkKj9\n"
     "-----END CERTIFICATE-----\n";
 
-Weather::Weather(double latitude, double longitude)
+Weather::Weather(float latitude, float longitude)
+{
+  this->num_hours = ESPWeatherNumHours;
+  this->user_agent = ESPWeatherUserAgent;
+  this->longitude = longitude;
+  this->latitude = latitude;
+  this->altitude = 0;
+  this->local_time = new tm;
+  this->expired_time = new tm;
+  this->temperature = new WeatherData(this->num_hours);
+  this->dew_point = new WeatherData(this->num_hours);
+  this->precipitation = new WeatherData(this->num_hours);
+  this->wind_speeds = new WeatherData(this->num_hours);
+  this->wind_direction = new WeatherData(this->num_hours);
+  this->air_pressure = new WeatherData(this->num_hours);
+  this->cloudiness = new WeatherData(this->num_hours);
+  this->relative_humidity = new WeatherData(this->num_hours);
+  this->last_modified = "";
+  this->symbol_code_next_1h = "";
+  this->symbol_code_next_12h = "";
+  this->symbol_code_next_6h = "";
+  this->utc_offset = 0;
+  this->daylight_saving = false;
+  this->expired_time->tm_year = 0; // Years since 1900
+  this->expired_time->tm_mon = 0;  // Months since January (0-11)
+  this->expired_time->tm_mday = 0; // Day of the month
+  this->expired_time->tm_hour = 0;
+  this->expired_time->tm_min = 0;
+  this->expired_time->tm_sec = 0;
+}
+Weather::Weather(uint8_t num_hours, float latitude, float longitude)
 {
+  this->num_hours = num_hours;
   this->user_agent = ESPWeatherUserAgent;
   this->longitude = longitude;
   this->latitude = latitude;
@@ -64,9 +95,46 @@ Weather::Weather(double latitude, double longitude)
   this->symbol_code_next_6h = "";
   this->utc_offset = 0;
   this->daylight_saving = false;
+  this->expired_time->tm_year = 0; // Years since 1900
+  this->expired_time->tm_mon = 0;  // Months since January (0-11)
+  this->expired_time->tm_mday = 0; // Day of the month
+  this->expired_time->tm_hour = 0;
+  this->expired_time->tm_min = 0;
+  this->expired_time->tm_sec = 0;
+}
+Weather::Weather(float latitude, float longitude, uint16_t altitude)
+{
+  this->num_hours = ESPWeatherNumHours;
+  this->user_agent = ESPWeatherUserAgent;
+  this->longitude = longitude;
+  this->latitude = latitude;
+  this->altitude = altitude;
+  this->local_time = new tm;
+  this->expired_time = new tm;
+  this->temperature = new WeatherData(this->num_hours);
+  this->dew_point = new WeatherData(this->num_hours);
+  this->precipitation = new WeatherData(this->num_hours);
+  this->wind_speeds = new WeatherData(this->num_hours);
+  this->wind_direction = new WeatherData(this->num_hours);
+  this->air_pressure = new WeatherData(this->num_hours);
+  this->cloudiness = new WeatherData(this->num_hours);
+  this->relative_humidity = new WeatherData(this->num_hours);
+  this->last_modified = "";
+  this->symbol_code_next_1h = "";
+  this->symbol_code_next_12h = "";
+  this->symbol_code_next_6h = "";
+  this->daylight_saving = false;
+  this->utc_offset = 0;
+  this->expired_time->tm_year = 0; // Years since 1900
+  this->expired_time->tm_mon = 0;  // Months since January (0-11)
+  this->expired_time->tm_mday = 0; // Day of the month
+  this->expired_time->tm_hour = 0;
+  this->expired_time->tm_min = 0;
+  this->expired_time->tm_sec = 0;
 }
-Weather::Weather(double latitude, double longitude, uint16_t altitude)
+Weather::Weather(uint8_t num_hours, float latitude, float longitude, uint16_t altitude)
 {
+  this->num_hours = num_hours;
   this->user_agent = ESPWeatherUserAgent;
   this->longitude = longitude;
   this->latitude = latitude;
@@ -87,6 +155,12 @@ Weather::Weather(double latitude, double longitude, uint16_t altitude)
   this->symbol_code_next_6h = "";
   this->daylight_saving = false;
   this->utc_offset = 0;
+  this->expired_time->tm_year = 0; // Years since 1900
+  this->expired_time->tm_mon = 0;  // Months since January (0-11)
+  this->expired_time->tm_mday = 0; // Day of the month
+  this->expired_time->tm_hour = 0;
+  this->expired_time->tm_min = 0;
+  this->expired_time->tm_sec = 0;
 }
 
 void Weather::set_daylight_saving(bool daylight_saving)
@@ -113,12 +187,12 @@ Weather::~Weather()
   delete this->relative_humidity;
 }
 
-void Weather::update_location(double latitude, double longitude)
+void Weather::update_location(float latitude, float longitude)
 {
   this->longitude = longitude;
   this->latitude = latitude;
 }
-void Weather::update_location(double latitude, double longitude,
+void Weather::update_location(float latitude, float longitude,
                               uint16_t altitude)
 {
   this->longitude = longitude;
@@ -225,8 +299,7 @@ void Weather::update_data(void)
   }
 
   JsonDocument doc;
-  DeserializationError error = deserializeJson(
-      doc, https.getStream(), DeserializationOption::Filter(filter));
+  DeserializationError error = deserializeJson(doc, https.getStream(), DeserializationOption::Filter(filter));
 
 #ifdef DEBUG_WEATHER
   Serial.println("Starting deserialization");
@@ -249,14 +322,14 @@ void Weather::update_data(void)
     return;
   }
   JsonArray timeseries = doc["properties"]["timeseries"];
-  double *temps = new double[this->num_hours + 1];
-  double *precipitation = new double[this->num_hours + 1];
-  double *wind_speeds = new double[this->num_hours + 1];
-  double *wind_directions = new double[this->num_hours + 1];
-  double *air_pressure = new double[this->num_hours + 1];
-  double *cloudiness = new double[this->num_hours + 1];
-  double *relative_humidity = new double[this->num_hours + 1];
-  double *dew_point = new double[this->num_hours + 1];
+  float *temps = new float[this->num_hours + 1];
+  float *precipitation = new float[this->num_hours + 1];
+  float *wind_speeds = new float[this->num_hours + 1];
+  float *wind_directions = new float[this->num_hours + 1];
+  float *air_pressure = new float[this->num_hours + 1];
+  float *cloudiness = new float[this->num_hours + 1];
+  float *relative_humidity = new float[this->num_hours + 1];
+  float *dew_point = new float[this->num_hours + 1];
   JsonObject current_timeseries_data;
   JsonObject current_timeseries_details;
   JsonObject current_timeseries_next_hour_details;
diff --git a/src/weather_data.cpp b/src/weather_data.cpp
@@ -3,40 +3,40 @@
 
 WeatherData::WeatherData(uint8_t num_hours)
 {
-  this->vals = new double[num_hours + 1];
+  this->vals = new float[num_hours + 1];
   this->minimum = 0;
   this->maxmimum = 0;
   this->mean = 0;
   this->variance = 0;
   this->num_hours = num_hours;
 }
 
-double WeatherData::get_minimum()
+float WeatherData::get_minimum()
 {
   return this->minimum;
 }
 
-double WeatherData::get_maximum()
+float WeatherData::get_maximum()
 {
   return this->maxmimum;
 }
 
-double WeatherData::get_mean()
+float WeatherData::get_mean()
 {
   return this->mean;
 }
 
-double WeatherData::get_variance()
+float WeatherData::get_variance()
 {
   return this->variance;
 }
 
-double WeatherData::get_std()
+float WeatherData::get_std()
 {
   return sqrt(this->variance);
 }
 
-double WeatherData::get_val_at_hour(uint8_t hour)
+float WeatherData::get_val_at_hour(uint8_t hour)
 {
   return this->vals[hour];
 }
@@ -46,11 +46,11 @@ WeatherData::~WeatherData()
   delete[] this->vals;
 }
 
-void WeatherData::update_vals(double *vals)
+void WeatherData::update_vals(float *vals)
 {
-  double mean = 0.0;
-  double minimum = vals[0];
-  double maximum = vals[0];
+  float mean = 0.0;
+  float minimum = vals[0];
+  float maximum = vals[0];
   for (uint8_t i = 0; i < this->num_hours + 1; ++i)
   {
     this->vals[i] = vals[i];
@@ -72,7 +72,7 @@ void WeatherData::update_vals(double *vals)
   this->minimum = minimum;
   if (this->num_hours > 1)
   {
-    double var = 0.0;
+    float var = 0.0;
     for (int i = 1; i < this->num_hours + 1; ++i)
     {
       var += pow(vals[i] - this->mean, 2);
@@ -83,7 +83,7 @@ void WeatherData::update_vals(double *vals)
   }
 }
 
-double WeatherData::get_current()
+float WeatherData::get_current()
 {
   return this->vals[0];
 }

Original file line number	Diff line number	Diff line change
`@@ -3,40 +3,40 @@`
`3`	`3`
`4`	`4`	`WeatherData::WeatherData(uint8_t num_hours)`
`5`	`5`	`{`
`6`		`- this->vals = new double[num_hours + 1];`
	`6`	`+ this->vals = new float[num_hours + 1];`
`7`	`7`	`this->minimum = 0;`
`8`	`8`	`this->maxmimum = 0;`
`9`	`9`	`this->mean = 0;`
`10`	`10`	`this->variance = 0;`
`11`	`11`	`this->num_hours = num_hours;`
`12`	`12`	`}`
`13`	`13`
`14`		`-double WeatherData::get_minimum()`
	`14`	`+float WeatherData::get_minimum()`
`15`	`15`	`{`
`16`	`16`	`return this->minimum;`
`17`	`17`	`}`
`18`	`18`
`19`		`-double WeatherData::get_maximum()`
	`19`	`+float WeatherData::get_maximum()`
`20`	`20`	`{`
`21`	`21`	`return this->maxmimum;`
`22`	`22`	`}`
`23`	`23`
`24`		`-double WeatherData::get_mean()`
	`24`	`+float WeatherData::get_mean()`
`25`	`25`	`{`
`26`	`26`	`return this->mean;`
`27`	`27`	`}`
`28`	`28`
`29`		`-double WeatherData::get_variance()`
	`29`	`+float WeatherData::get_variance()`
`30`	`30`	`{`
`31`	`31`	`return this->variance;`
`32`	`32`	`}`
`33`	`33`
`34`		`-double WeatherData::get_std()`
	`34`	`+float WeatherData::get_std()`
`35`	`35`	`{`
`36`	`36`	`return sqrt(this->variance);`
`37`	`37`	`}`
`38`	`38`
`39`		`-double WeatherData::get_val_at_hour(uint8_t hour)`
	`39`	`+float WeatherData::get_val_at_hour(uint8_t hour)`
`40`	`40`	`{`
`41`	`41`	`return this->vals[hour];`
`42`	`42`	`}`
`@@ -46,11 +46,11 @@ WeatherData::~WeatherData()`
`46`	`46`	`delete[] this->vals;`
`47`	`47`	`}`
`48`	`48`
`49`		`-void WeatherData::update_vals(double *vals)`
	`49`	`+void WeatherData::update_vals(float *vals)`
`50`	`50`	`{`
`51`		`- double mean = 0.0;`
`52`		`- double minimum = vals[0];`
`53`		`- double maximum = vals[0];`
	`51`	`+ float mean = 0.0;`
	`52`	`+ float minimum = vals[0];`
	`53`	`+ float maximum = vals[0];`
`54`	`54`	`for (uint8_t i = 0; i < this->num_hours + 1; ++i)`
`55`	`55`	`{`
`56`	`56`	`this->vals[i] = vals[i];`
`@@ -72,7 +72,7 @@ void WeatherData::update_vals(double *vals)`
`72`	`72`	`this->minimum = minimum;`
`73`	`73`	`if (this->num_hours > 1)`
`74`	`74`	`{`
`75`		`- double var = 0.0;`
	`75`	`+ float var = 0.0;`
`76`	`76`	`for (int i = 1; i < this->num_hours + 1; ++i)`
`77`	`77`	`{`
`78`	`78`	`var += pow(vals[i] - this->mean, 2);`
`@@ -83,7 +83,7 @@ void WeatherData::update_vals(double *vals)`
`83`	`83`	`}`
`84`	`84`	`}`
`85`	`85`
`86`		`-double WeatherData::get_current()`
	`86`	`+float WeatherData::get_current()`
`87`	`87`	`{`
`88`	`88`	`return this->vals[0];`
`89`	`89`	`}`