diff --git a/firmware/config.h b/firmware/config.h index 2703b24..50ffc2b 100644 --- a/firmware/config.h +++ b/firmware/config.h @@ -30,7 +30,7 @@ #define SEALEVELPRESSURE_HPA (1013.25) -#define STATUS_LED_PIN BUILTIN_LED +#define STATUS_LED_PIN LED_BUILTIN #define ANEMOMETER_PIN D7 #define BAT_CHARGED_PIN D6 #define BAT_CHARGING_PIN D5 @@ -39,7 +39,7 @@ #define BME_MISO 12 #define BME_MOSI 11 #define BME_CS 10 -#define BME280_ADDRESS 0x76 +#define BME_ADDRESS 0x76 #define INITIAL_WEBSERVER_TIME 20 diff --git a/firmware/firmware.ino b/firmware/firmware.ino index 14481da..e94218b 100644 --- a/firmware/firmware.ino +++ b/firmware/firmware.ino @@ -114,7 +114,7 @@ void setup() { apds.enableColor(true); //Temperature + pressure - bool status = bme.begin(0x76); + bool status = bme.begin(BME_ADDRESS); if (!status) { #ifdef DEBUG Serial.println("Could not find a valid BME280 sensor, check wiring!"); @@ -158,7 +158,8 @@ void criticalBatCheck() { Serial.println("Bat Voltage: " + String(volt) + " V"); Serial.println("Low battery, going into deep sleep."); #endif - ESP.deepSleep(EMERGENCY_SLEEP_S * 1000000); // battery low, shutting down + // Casting to an unsigned int, so it fits into the integer range + ESP.deepSleep(1U * EMERGENCY_SLEEP_S * 1000000); // battery low, shutting down delay(100); } } diff --git a/firmware/libraries/Adafruit_Unified_Sensor/Adafruit_Sensor.h b/firmware/libraries/Adafruit_Unified_Sensor/Adafruit_Sensor.h index 7742afc..3134ca3 100644 --- a/firmware/libraries/Adafruit_Unified_Sensor/Adafruit_Sensor.h +++ b/firmware/libraries/Adafruit_Unified_Sensor/Adafruit_Sensor.h @@ -143,7 +143,7 @@ class Adafruit_Sensor { virtual ~Adafruit_Sensor() {} // These must be defined by the subclass - virtual void enableAutoRange(bool enabled) {}; + /// NOT USED virtual void enableAutoRange(bool enabled) {}; virtual bool getEvent(sensors_event_t*) = 0; virtual void getSensor(sensor_t*) = 0; diff --git a/firmware/webUpdater.ino b/firmware/webUpdater.ino index c846d61..7c93097 100644 --- a/firmware/webUpdater.ino +++ b/firmware/webUpdater.ino @@ -63,7 +63,7 @@ void showHTMLMain(void) { "light" + String(sensValues[SENSOR_LIGHT]) + "" "windspeed" + String(sensValues[SENSOR_WINDSPEED]) + "" "pressure" + String(sensValues[SENSOR_PRESSURE]) + "" -"batvoltage" + String(sensValues[SENSOR_BAT_VOLTAGE]) + ""; +"batvoltage" + String(sensValues[SENSOR_BAT_VOLTAGE]) + "" "" "";