feat(properties): add barometric pressure property

malokhvii-eduard · Nov 29, 2021 · b610203 · b610203
1 parent 5ef8c12
commit b610203
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 1 deletion.
diff --git a/include/airly/I18n.h b/include/airly/I18n.h
@@ -20,6 +20,8 @@ extern const char* UptimePropertyDescription;
 extern const char* UptimePropertyTitle;
 
 #if defined(THING_HAS_BME280)
+extern const char* BarometricPressurePropertyDescription;
+extern const char* BarometricPressurePropertyTitle;
 extern const char* HumidityPropertyDescription;
 extern const char* HumidityPropertyTitle;
 extern const char* TemperaturePropertyDescription;

diff --git a/include/airly/properties/BarometricPressure.h b/include/airly/properties/BarometricPressure.h
@@ -0,0 +1,13 @@
+#ifndef AIRLY_INCLUDE_AIRLY_PROPERTIES_BAROMETRIC_PRESSURE_H_
+#define AIRLY_INCLUDE_AIRLY_PROPERTIES_BAROMETRIC_PRESSURE_H_
+
+/* Config for WebThings framework */
+#include <WebThingConfig.h>
+
+/* WebThings framework */
+#include <Thing.h>
+
+void describeBarometricPressureProperty(ThingDevice* device);
+void setBarometricPressureProperty(const float barometricPressure);
+
+#endif  // AIRLY_INCLUDE_AIRLY_PROPERTIES_BAROMETRIC_PRESSURE_H_
diff --git a/src/airly/Device.cc b/src/airly/Device.cc
@@ -8,10 +8,12 @@
 
 #if defined(THING_HAS_BME280)
 /* Properties for Bosch Sensortec BME280 */
+#include <airly/properties/BarometricPressure.h>
 #include <airly/properties/Humidity.h>
 #include <airly/properties/Temperature.h>
 
-#define BME280_CAPABILITIES "TemperatureSensor", "HumiditySensor",
+#define BME280_CAPABILITIES \
+  "TemperatureSensor", "HumiditySensor", "BarometricPressureSensor",
 #else
 #define BME280_CAPABILITIES
 #endif
@@ -23,6 +25,7 @@ void describeDevice(WebThingAdapter* adapter) {
 #if defined(THING_HAS_BME280)
   describeTemperatureProperty(&device);
   describeHumidityProperty(&device);
+  describeBarometricPressureProperty(&device);
 #endif
 
   describeUptimeProperty(&device);

diff --git a/src/airly/I18n.cc b/src/airly/I18n.cc
@@ -12,6 +12,8 @@ const char* UptimePropertyDescription = "";
 const char* UptimePropertyTitle = "";
 
 #if defined(THING_HAS_BME280)
+const char* BarometricPressurePropertyDescription = "";
+const char* BarometricPressurePropertyTitle = "";
 const char* HumidityPropertyDescription = "";
 const char* HumidityPropertyTitle = "";
 const char* TemperaturePropertyDescription = "";

diff --git a/src/airly/Thing.cc b/src/airly/Thing.cc
@@ -28,6 +28,7 @@
 #include <Bme280.h>
 
 /* Properties */
+#include <airly/properties/BarometricPressure.h>
 #include <airly/properties/Humidity.h>
 #include <airly/properties/Temperature.h>
 
@@ -53,9 +54,11 @@ static void beginBme280() {
 static bool pollBme280(void *) {
   auto temperature = bme280.getTemperature();
   auto humidity = bme280.getHumidity();
+  auto barometricPressure = bme280.getPressure();
 
   setTemperatureProperty(temperature);
   setHumidityProperty(humidity);
+  setBarometricPressureProperty(barometricPressure);
 
   return true;
 }

diff --git a/src/airly/locales/en-US.cc b/src/airly/locales/en-US.cc
@@ -29,6 +29,9 @@ const char* UptimePropertyDescription PROGMEM =
 const char* UptimePropertyTitle PROGMEM = "Uptime";
 
 #if defined(THING_HAS_BME280)
+const char* BarometricPressurePropertyDescription PROGMEM =
+    "The pressure within the atmosphere of Earth";
+const char* BarometricPressurePropertyTitle PROGMEM = "Barometric pressure";
 const char* HumidityPropertyDescription PROGMEM =
     "The concentration of water vapor present in the air";
 const char* HumidityPropertyTitle PROGMEM = "Humidity";

diff --git a/src/airly/properties/BarometricPressure.cc b/src/airly/properties/BarometricPressure.cc
@@ -0,0 +1,35 @@
+#include <airly/properties/Humidity.h>
+
+/* AVR low-level */
+#include <avr/pgmspace.h>
+
+/* Preprocessor-based localization */
+#include <airly/I18n.h>
+
+// -------------------------------------------------------------------------- //
+// Property: Barometric pressure (hPa)
+// -------------------------------------------------------------------------- //
+#if defined(THING_HAS_BME280)
+
+static const char* propertyId PROGMEM = "barometricPressure";
+static ThingProperty property(propertyId,
+                              i18n::BarometricPressurePropertyDescription,
+                              NUMBER, "BarometricPressureProperty");
+
+void describeBarometricPressureProperty(ThingDevice* device) {
+  property.title = i18n::BarometricPressurePropertyTitle;
+  property.unit = "hectopascal";
+  property.minimum = 300;
+  property.maximum = 1100;
+  property.readOnly = true;
+
+  device->addProperty(&property);
+}
+
+void setBarometricPressureProperty(const float barometricPressure) {
+  auto hectopascals = barometricPressure / 100;
+  property.setValue({.number = hectopascals});
+}
+
+#endif
+// -------------------------------------------------------------------------- //