Merge branch 'esphome:dev' into esphome-optional

esphome/components/ade7880/sensor.py

@@ -19,6 +19,7 @@
  CONF_RESET_PIN,
  CONF_REVERSE_ACTIVE_ENERGY,
  CONF_VOLTAGE,
+ CONF_VOLTAGE_GAIN,
  DEVICE_CLASS_APPARENT_POWER,
  DEVICE_CLASS_CURRENT,
  DEVICE_CLASS_ENERGY,
@@ -47,7 +48,6 @@
 CONF_IRQ0_PIN = "irq0_pin"
 CONF_IRQ1_PIN = "irq1_pin"
 CONF_POWER_GAIN = "power_gain"
-CONF_VOLTAGE_GAIN = "voltage_gain"
 
 CONF_NEUTRAL = "neutral"
 

esphome/components/ade7953_base/__init__.py

@@ -6,6 +6,7 @@
  CONF_IRQ_PIN,
  CONF_VOLTAGE,
  CONF_FREQUENCY,
+ CONF_VOLTAGE_GAIN,
  DEVICE_CLASS_CURRENT,
  DEVICE_CLASS_APPARENT_POWER,
  DEVICE_CLASS_POWER,
@@ -36,7 +37,6 @@
 CONF_VOLTAGE_PGA_GAIN = "voltage_pga_gain"
 CONF_CURRENT_PGA_GAIN_A = "current_pga_gain_a"
 CONF_CURRENT_PGA_GAIN_B = "current_pga_gain_b"
-CONF_VOLTAGE_GAIN = "voltage_gain"
 CONF_CURRENT_GAIN_A = "current_gain_a"
 CONF_CURRENT_GAIN_B = "current_gain_b"
 CONF_ACTIVE_POWER_GAIN_A = "active_power_gain_a"

esphome/components/at581x/__init__.py

@@ -22,7 +22,6 @@
 
 
 CONF_SENSING_DISTANCE = "sensing_distance"
-CONF_SENSITIVITY = "sensitivity"
 CONF_POWERON_SELFCHECK_TIME = "poweron_selfcheck_time"
 CONF_PROTECT_TIME = "protect_time"
 CONF_TRIGGER_BASE = "trigger_base"

esphome/components/bl0940/sensor.py

@@ -6,6 +6,7 @@
  CONF_ENERGY,
  CONF_EXTERNAL_TEMPERATURE,
  CONF_ID,
+ CONF_INTERNAL_TEMPERATURE,
  CONF_POWER,
  CONF_VOLTAGE,
  DEVICE_CLASS_CURRENT,
@@ -24,7 +25,6 @@
 
 DEPENDENCIES = ["uart"]
 
-CONF_INTERNAL_TEMPERATURE = "internal_temperature"
 
 bl0940_ns = cg.esphome_ns.namespace("bl0940")
 BL0940 = bl0940_ns.class_("BL0940", cg.PollingComponent, uart.UARTDevice)

esphome/components/bme280_base/__init__.py

@@ -1 +1,108 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import sensor
+from esphome.const import (
+ CONF_HUMIDITY,
+ CONF_ID,
+ CONF_IIR_FILTER,
+ CONF_OVERSAMPLING,
+ CONF_PRESSURE,
+ CONF_TEMPERATURE,
+ DEVICE_CLASS_HUMIDITY,
+ DEVICE_CLASS_PRESSURE,
+ DEVICE_CLASS_TEMPERATURE,
+ STATE_CLASS_MEASUREMENT,
+ UNIT_CELSIUS,
+ UNIT_HECTOPASCAL,
+ UNIT_PERCENT,
+)
+
 CODEOWNERS = ["@esphome/core"]
+
+bme280_ns = cg.esphome_ns.namespace("bme280_base")
+BME280Oversampling = bme280_ns.enum("BME280Oversampling")
+OVERSAMPLING_OPTIONS = {
+ "NONE": BME280Oversampling.BME280_OVERSAMPLING_NONE,
+ "1X": BME280Oversampling.BME280_OVERSAMPLING_1X,
+ "2X": BME280Oversampling.BME280_OVERSAMPLING_2X,
+ "4X": BME280Oversampling.BME280_OVERSAMPLING_4X,
+ "8X": BME280Oversampling.BME280_OVERSAMPLING_8X,
+ "16X": BME280Oversampling.BME280_OVERSAMPLING_16X,
+}
+
+BME280IIRFilter = bme280_ns.enum("BME280IIRFilter")
+IIR_FILTER_OPTIONS = {
+ "OFF": BME280IIRFilter.BME280_IIR_FILTER_OFF,
+ "2X": BME280IIRFilter.BME280_IIR_FILTER_2X,
+ "4X": BME280IIRFilter.BME280_IIR_FILTER_4X,
+ "8X": BME280IIRFilter.BME280_IIR_FILTER_8X,
+ "16X": BME280IIRFilter.BME280_IIR_FILTER_16X,
+}
+
+CONFIG_SCHEMA_BASE = cv.Schema(
+ {
+ cv.Optional(CONF_TEMPERATURE): sensor.sensor_schema(
+ unit_of_measurement=UNIT_CELSIUS,
+ accuracy_decimals=1,
+ device_class=DEVICE_CLASS_TEMPERATURE,
+ state_class=STATE_CLASS_MEASUREMENT,
+ ).extend(
+ {
+ cv.Optional(CONF_OVERSAMPLING, default="16X"): cv.enum(
+ OVERSAMPLING_OPTIONS, upper=True
+ ),
+ }
+ ),
+ cv.Optional(CONF_PRESSURE): sensor.sensor_schema(
+ unit_of_measurement=UNIT_HECTOPASCAL,
+ accuracy_decimals=1,
+ device_class=DEVICE_CLASS_PRESSURE,
+ state_class=STATE_CLASS_MEASUREMENT,
+ ).extend(
+ {
+ cv.Optional(CONF_OVERSAMPLING, default="16X"): cv.enum(
+ OVERSAMPLING_OPTIONS, upper=True
+ ),
+ }
+ ),
+ cv.Optional(CONF_HUMIDITY): sensor.sensor_schema(
+ unit_of_measurement=UNIT_PERCENT,
+ accuracy_decimals=1,
+ device_class=DEVICE_CLASS_HUMIDITY,
+ state_class=STATE_CLASS_MEASUREMENT,
+ ).extend(
+ {
+ cv.Optional(CONF_OVERSAMPLING, default="16X"): cv.enum(
+ OVERSAMPLING_OPTIONS, upper=True
+ ),
+ }
+ ),
+ cv.Optional(CONF_IIR_FILTER, default="OFF"): cv.enum(
+ IIR_FILTER_OPTIONS, upper=True
+ ),
+ }
+).extend(cv.polling_component_schema("60s"))
+
+
+async def to_code_base(config):
+ var = cg.new_Pvariable(config[CONF_ID])
+ await cg.register_component(var, config)
+
+ if temperature_config := config.get(CONF_TEMPERATURE):
+ sens = await sensor.new_sensor(temperature_config)
+ cg.add(var.set_temperature_sensor(sens))
+ cg.add(var.set_temperature_oversampling(temperature_config[CONF_OVERSAMPLING]))
+
+ if pressure_config := config.get(CONF_PRESSURE):
+ sens = await sensor.new_sensor(pressure_config)
+ cg.add(var.set_pressure_sensor(sens))
+ cg.add(var.set_pressure_oversampling(pressure_config[CONF_OVERSAMPLING]))
+
+ if humidity_config := config.get(CONF_HUMIDITY):
+ sens = await sensor.new_sensor(humidity_config)
+ cg.add(var.set_humidity_sensor(sens))
+ cg.add(var.set_humidity_oversampling(humidity_config[CONF_OVERSAMPLING]))
+
+ cg.add(var.set_iir_filter(config[CONF_IIR_FILTER]))
+
+ return var

esphome/components/bme280_i2c/sensor.py

@@ -1,9 +1,10 @@
 import esphome.codegen as cg
+import esphome.config_validation as cv
 from esphome.components import i2c
-from ..bme280_base.sensor import to_code as to_code_base, cv, CONFIG_SCHEMA_BASE
+from ..bme280_base import to_code_base, CONFIG_SCHEMA_BASE
 
-DEPENDENCIES = ["i2c"]
 AUTO_LOAD = ["bme280_base"]
+DEPENDENCIES = ["i2c"]
 
 bme280_ns = cg.esphome_ns.namespace("bme280_i2c")
 BME280I2CComponent = bme280_ns.class_(
@@ -16,4 +17,5 @@
 
 
 async def to_code(config):
- await to_code_base(config, func=i2c.register_i2c_device)
+ var = await to_code_base(config)
+ await i2c.register_i2c_device(var, config)

esphome/components/bme280_spi/__init__.py

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

esphome/components/bme280_spi/bme280_spi.cpp

@@ -4,19 +4,19 @@
 #include "bme280_spi.h"
 #include <esphome/components/bme280_base/bme280_base.h>
 
-int set_bit(uint8_t num, int position) {
+namespace esphome {
+namespace bme280_spi {
+
+uint8_t set_bit(uint8_t num, int position) {
  int mask = 1 << position;
  return num | mask;
 }
 
-int clear_bit(uint8_t num, int position) {
+uint8_t clear_bit(uint8_t num, int position) {
  int mask = 1 << position;
  return num & ~mask;
 }
 
-namespace esphome {
-namespace bme280_spi {
-
 void BME280SPIComponent::setup() {
  this->spi_setup();
  BME280Component::setup();
@@ -30,34 +30,33 @@ void BME280SPIComponent::setup() {
 
 bool BME280SPIComponent::read_byte(uint8_t a_register, uint8_t *data) {
  this->enable();
- // cause: *data = this->delegate_->transfer(tmp) doesnt work
- this->delegate_->transfer(set_bit(a_register, 7));
- *data = this->delegate_->transfer(0);
+ this->transfer_byte(set_bit(a_register, 7));
+ *data = this->transfer_byte(0);
  this->disable();
  return true;
 }
 
 bool BME280SPIComponent::write_byte(uint8_t a_register, uint8_t data) {
  this->enable();
- this->delegate_->transfer(clear_bit(a_register, 7));
- this->delegate_->transfer(data);
+ this->transfer_byte(clear_bit(a_register, 7));
+ this->transfer_byte(data);
  this->disable();
  return true;
 }
 
 bool BME280SPIComponent::read_bytes(uint8_t a_register, uint8_t *data, size_t len) {
  this->enable();
- this->delegate_->transfer(set_bit(a_register, 7));
- this->delegate_->read_array(data, len);
+ this->transfer_byte(set_bit(a_register, 7));
+ this->read_array(data, len);
  this->disable();
  return true;
 }
 
 bool BME280SPIComponent::read_byte_16(uint8_t a_register, uint16_t *data) {
  this->enable();
- this->delegate_->transfer(set_bit(a_register, 7));
- ((uint8_t *) data)[1] = this->delegate_->transfer(0);
- ((uint8_t *) data)[0] = this->delegate_->transfer(0);
+ this->transfer_byte(set_bit(a_register, 7));
+ ((uint8_t *) data)[1] = this->transfer_byte(0);
+ ((uint8_t *) data)[0] = this->transfer_byte(0);
  this->disable();
  return true;
 }

esphome/components/bme280_spi/sensor.py

@@ -1,13 +1,11 @@
 import esphome.codegen as cg
+import esphome.config_validation as cv
 from esphome.components import spi
-from esphome.components.bme280_base.sensor import (
- to_code as to_code_base,
- cv,
- CONFIG_SCHEMA_BASE,
-)
+from ..bme280_base import to_code_base, CONFIG_SCHEMA_BASE
 
-DEPENDENCIES = ["spi"]
 AUTO_LOAD = ["bme280_base"]
+CODEOWNERS = ["@apbodrov"]
+DEPENDENCIES = ["spi"]
 
 
 bme280_spi_ns = cg.esphome_ns.namespace("bme280_spi")
@@ -21,4 +19,5 @@
 
 
 async def to_code(config):
- await to_code_base(config, func=spi.register_spi_device)
+ var = await to_code_base(config)
+ await spi.register_spi_device(var, config)