Merge 6896b06d37 into f0ec900e48

CODEOWNERS

@@ -28,6 +28,7 @@ esphome/components/airthings_ble/* @jeromelaban
 esphome/components/airthings_wave_base/* @jeromelaban @kpfleming @ncareau
 esphome/components/airthings_wave_mini/* @ncareau
 esphome/components/airthings_wave_plus/* @jeromelaban
+esphome/components/airthings_wave_radon/* @willhaines
 esphome/components/alarm_control_panel/* @grahambrown11 @hwstar
 esphome/components/alpha3/* @jan-hofmeier
 esphome/components/am2315c/* @swoboda1337

esphome/components/airthings_wave_radon/__init__.py

@@ -0,0 +1 @@
+CODEOWNERS = ["@willhaines"]

esphome/components/airthings_wave_radon/airthings_wave_radon.cpp

@@ -0,0 +1,71 @@
+#include "airthings_wave_radon.h"
+
+#ifdef USE_ESP32
+
+namespace esphome {
+namespace airthings_wave_radon {
+
+static const char *const TAG = "airthings_wave_radon";
+
+void AirthingsWaveRadon::read_sensors(uint8_t *raw_value, uint16_t value_len) {
+  auto *value = (WaveRadonReadings *) raw_value;
+
+  if (sizeof(WaveRadonReadings) <= value_len) {
+    ESP_LOGD(TAG, "version = %d", value->version);
+
+    if (value->version == 1) {
+      ESP_LOGD(TAG, "ambient light = %d", value->ambientLight);
+
+      if (this->humidity_sensor_ != nullptr) {
+        this->humidity_sensor_->publish_state(value->humidity / 2.0f);
+      }
+
+      if ((this->radon_sensor_ != nullptr) && this->is_valid_radon_value_(value->radon)) {
+        this->radon_sensor_->publish_state(value->radon);
+      }
+
+      if ((this->radon_long_term_sensor_ != nullptr) && this->is_valid_radon_value_(value->radon_lt)) {
+        this->radon_long_term_sensor_->publish_state(value->radon_lt);
+      }
+
+      if (this->temperature_sensor_ != nullptr) {
+        this->temperature_sensor_->publish_state(value->temperature / 100.0f);
+      }
+
+      if (this->pressure_sensor_ != nullptr) {
+        this->pressure_sensor_->publish_state(value->pressure / 50.0f);
+      }
+    } else {
+      ESP_LOGE(TAG, "Invalid payload version (%d != 1, newer version or not a Wave Radon?)", value->version);
+    }
+  }
+
+  this->response_received_();
+}
+
+bool AirthingsWaveRadon::is_valid_radon_value_(uint16_t radon) { return radon <= 16383; }
+
+void AirthingsWaveRadon::dump_config() {
+  // these really don't belong here, but there doesn't seem to be a
+  // practical way to have the base class use LOG_SENSOR and include
+  // the TAG from this component
+  LOG_SENSOR("  ", "Humidity", this->humidity_sensor_);
+  LOG_SENSOR("  ", "Temperature", this->temperature_sensor_);
+  LOG_SENSOR("  ", "Pressure", this->pressure_sensor_);
+  LOG_SENSOR("  ", "Battery Voltage", this->battery_voltage_);
+
+  LOG_SENSOR("  ", "Radon", this->radon_sensor_);
+  LOG_SENSOR("  ", "Radon Long Term", this->radon_long_term_sensor_);
+}
+
+AirthingsWaveRadon::AirthingsWaveRadon() {
+  this->service_uuid_ = espbt::ESPBTUUID::from_raw(SERVICE_UUID);
+  this->sensors_data_characteristic_uuid_ = espbt::ESPBTUUID::from_raw(CHARACTERISTIC_UUID);
+  this->access_control_point_characteristic_uuid_ =
+      espbt::ESPBTUUID::from_raw(ACCESS_CONTROL_POINT_CHARACTERISTIC_UUID);
+}
+
+}  // namespace airthings_wave_radon
+}  // namespace esphome
+
+#endif  // USE_ESP32

esphome/components/airthings_wave_radon/airthings_wave_radon.h

@@ -0,0 +1,48 @@
+#pragma once
+
+#ifdef USE_ESP32
+
+#include "esphome/components/airthings_wave_base/airthings_wave_base.h"
+
+namespace esphome {
+namespace airthings_wave_radon {
+
+namespace espbt = esphome::esp32_ble_tracker;
+
+static const char *const SERVICE_UUID = "b42e4a8e-ade7-11e4-89d3-123b93f75cba";
+static const char *const CHARACTERISTIC_UUID = "b42e4dcc-ade7-11e4-89d3-123b93f75cba";
+static const char *const ACCESS_CONTROL_POINT_CHARACTERISTIC_UUID = "b42e4dcc-ade7-11e4-89d3-123b93f75cba";
+
+class AirthingsWaveRadon : public airthings_wave_base::AirthingsWaveBase {
+ public:
+  AirthingsWaveRadon();
+
+  void dump_config() override;
+
+  void set_radon(sensor::Sensor *radon) { radon_sensor_ = radon; }
+  void set_radon_long_term(sensor::Sensor *radon_long_term) { radon_long_term_sensor_ = radon_long_term; }
+
+ protected:
+  bool is_valid_radon_value_(uint16_t radon);
+
+  void read_sensors(uint8_t *raw_value, uint16_t value_len) override;
+
+  sensor::Sensor *radon_sensor_{nullptr};
+  sensor::Sensor *radon_long_term_sensor_{nullptr};
+
+  struct WaveRadonReadings {
+    uint8_t version;
+    uint8_t humidity;
+    uint8_t ambientLight;
+    uint8_t unused01;
+    uint16_t radon;
+    uint16_t radon_lt;
+    uint16_t temperature;
+    uint16_t pressure;
+  };
+};
+
+}  // namespace airthings_wave_radon
+}  // namespace esphome
+
+#endif  // USE_ESP32

esphome/components/airthings_wave_radon/sensor.py

@@ -0,0 +1,52 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import sensor, airthings_wave_base
+
+from esphome.const import (
+    STATE_CLASS_MEASUREMENT,
+    ICON_RADIOACTIVE,
+    CONF_ID,
+    CONF_RADON,
+    CONF_RADON_LONG_TERM,
+    UNIT_BECQUEREL_PER_CUBIC_METER,
+)
+
+DEPENDENCIES = airthings_wave_base.DEPENDENCIES
+
+AUTO_LOAD = ["airthings_wave_base"]
+
+airthings_wave_radon_ns = cg.esphome_ns.namespace("airthings_wave_radon")
+AirthingsWaveRadon = airthings_wave_radon_ns.class_(
+    "AirthingsWaveRadon", airthings_wave_base.AirthingsWaveBase
+)
+
+
+CONFIG_SCHEMA = airthings_wave_base.BASE_SCHEMA.extend(
+    {
+        cv.GenerateID(): cv.declare_id(AirthingsWaveRadon),
+        cv.Optional(CONF_RADON): sensor.sensor_schema(
+            unit_of_measurement=UNIT_BECQUEREL_PER_CUBIC_METER,
+            icon=ICON_RADIOACTIVE,
+            accuracy_decimals=0,
+            state_class=STATE_CLASS_MEASUREMENT,
+        ),
+        cv.Optional(CONF_RADON_LONG_TERM): sensor.sensor_schema(
+            unit_of_measurement=UNIT_BECQUEREL_PER_CUBIC_METER,
+            icon=ICON_RADIOACTIVE,
+            accuracy_decimals=0,
+            state_class=STATE_CLASS_MEASUREMENT,
+        ),
+    }
+)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await airthings_wave_base.wave_base_to_code(var, config)
+
+    if config_radon := config.get(CONF_RADON):
+        sens = await sensor.new_sensor(config_radon)
+        cg.add(var.set_radon(sens))
+    if config_radon_long_term := config.get(CONF_RADON_LONG_TERM):
+        sens = await sensor.new_sensor(config_radon_long_term)
+        cg.add(var.set_radon_long_term(sens))