mirror of https://github.com/esphome/esphome.git
SPI & I2C python update
This commit is contained in:
parent
387fc625a0
commit
6e74c8381e
|
@ -1 +0,0 @@
|
||||||
CODEOWNERS = ["@latonita"]
|
|
|
@ -1,5 +1,7 @@
|
||||||
import esphome.config_validation as cv
|
import esphome.config_validation as cv
|
||||||
|
|
||||||
|
CODEOWNERS = ["@latonita"]
|
||||||
|
|
||||||
CONFIG_SCHEMA = CONFIG_SCHEMA = cv.invalid(
|
CONFIG_SCHEMA = CONFIG_SCHEMA = cv.invalid(
|
||||||
"The ens160 sensor component has been renamed to ens160_i2c."
|
"The ens160 sensor component has been renamed to ens160_i2c."
|
||||||
)
|
)
|
||||||
|
|
|
@ -1 +1,78 @@
|
||||||
|
import esphome.codegen as cg
|
||||||
|
import esphome.config_validation as cv
|
||||||
|
from esphome.components import sensor
|
||||||
|
from esphome.const import (
|
||||||
|
CONF_ECO2,
|
||||||
|
CONF_HUMIDITY,
|
||||||
|
CONF_ID,
|
||||||
|
CONF_TEMPERATURE,
|
||||||
|
CONF_TVOC,
|
||||||
|
DEVICE_CLASS_AQI,
|
||||||
|
DEVICE_CLASS_CARBON_DIOXIDE,
|
||||||
|
DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS_PARTS,
|
||||||
|
ICON_CHEMICAL_WEAPON,
|
||||||
|
ICON_MOLECULE_CO2,
|
||||||
|
ICON_RADIATOR,
|
||||||
|
STATE_CLASS_MEASUREMENT,
|
||||||
|
UNIT_PARTS_PER_BILLION,
|
||||||
|
UNIT_PARTS_PER_MILLION,
|
||||||
|
)
|
||||||
|
|
||||||
CODEOWNERS = ["@vincentscode", "@latonita"]
|
CODEOWNERS = ["@vincentscode", "@latonita"]
|
||||||
|
|
||||||
|
ens160_ns = cg.esphome_ns.namespace("ens160_base")
|
||||||
|
|
||||||
|
CONF_AQI = "aqi"
|
||||||
|
CONF_COMPENSATION = "compensation"
|
||||||
|
UNIT_INDEX = "index"
|
||||||
|
|
||||||
|
CONFIG_SCHEMA_BASE = cv.Schema(
|
||||||
|
{
|
||||||
|
cv.Required(CONF_ECO2): sensor.sensor_schema(
|
||||||
|
unit_of_measurement=UNIT_PARTS_PER_MILLION,
|
||||||
|
icon=ICON_MOLECULE_CO2,
|
||||||
|
accuracy_decimals=0,
|
||||||
|
device_class=DEVICE_CLASS_CARBON_DIOXIDE,
|
||||||
|
state_class=STATE_CLASS_MEASUREMENT,
|
||||||
|
),
|
||||||
|
cv.Required(CONF_TVOC): sensor.sensor_schema(
|
||||||
|
unit_of_measurement=UNIT_PARTS_PER_BILLION,
|
||||||
|
icon=ICON_RADIATOR,
|
||||||
|
accuracy_decimals=0,
|
||||||
|
device_class=DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS_PARTS,
|
||||||
|
state_class=STATE_CLASS_MEASUREMENT,
|
||||||
|
),
|
||||||
|
cv.Required(CONF_AQI): sensor.sensor_schema(
|
||||||
|
icon=ICON_CHEMICAL_WEAPON,
|
||||||
|
accuracy_decimals=0,
|
||||||
|
device_class=DEVICE_CLASS_AQI,
|
||||||
|
state_class=STATE_CLASS_MEASUREMENT,
|
||||||
|
),
|
||||||
|
cv.Optional(CONF_COMPENSATION): cv.Schema(
|
||||||
|
{
|
||||||
|
cv.Required(CONF_TEMPERATURE): cv.use_id(sensor.Sensor),
|
||||||
|
cv.Required(CONF_HUMIDITY): cv.use_id(sensor.Sensor),
|
||||||
|
}
|
||||||
|
),
|
||||||
|
}
|
||||||
|
).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)
|
||||||
|
|
||||||
|
sens = await sensor.new_sensor(config[CONF_ECO2])
|
||||||
|
cg.add(var.set_co2(sens))
|
||||||
|
sens = await sensor.new_sensor(config[CONF_TVOC])
|
||||||
|
cg.add(var.set_tvoc(sens))
|
||||||
|
sens = await sensor.new_sensor(config[CONF_AQI])
|
||||||
|
cg.add(var.set_aqi(sens))
|
||||||
|
|
||||||
|
if compensation_config := config.get(CONF_COMPENSATION):
|
||||||
|
sens = await cg.get_variable(compensation_config[CONF_TEMPERATURE])
|
||||||
|
cg.add(var.set_temperature(sens))
|
||||||
|
sens = await cg.get_variable(compensation_config[CONF_HUMIDITY])
|
||||||
|
cg.add(var.set_humidity(sens))
|
||||||
|
|
||||||
|
return var
|
||||||
|
|
|
@ -1,78 +0,0 @@
|
||||||
import esphome.codegen as cg
|
|
||||||
import esphome.config_validation as cv
|
|
||||||
from esphome.components import sensor
|
|
||||||
from esphome.const import (
|
|
||||||
CONF_ECO2,
|
|
||||||
CONF_HUMIDITY,
|
|
||||||
CONF_ID,
|
|
||||||
CONF_TEMPERATURE,
|
|
||||||
CONF_TVOC,
|
|
||||||
DEVICE_CLASS_AQI,
|
|
||||||
DEVICE_CLASS_CARBON_DIOXIDE,
|
|
||||||
DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS_PARTS,
|
|
||||||
ICON_CHEMICAL_WEAPON,
|
|
||||||
ICON_MOLECULE_CO2,
|
|
||||||
ICON_RADIATOR,
|
|
||||||
STATE_CLASS_MEASUREMENT,
|
|
||||||
UNIT_PARTS_PER_BILLION,
|
|
||||||
UNIT_PARTS_PER_MILLION,
|
|
||||||
)
|
|
||||||
|
|
||||||
CODEOWNERS = ["@vincentscode", "@latonita"]
|
|
||||||
|
|
||||||
ens160_ns = cg.esphome_ns.namespace("ens160_base")
|
|
||||||
|
|
||||||
CONF_AQI = "aqi"
|
|
||||||
CONF_COMPENSATION = "compensation"
|
|
||||||
UNIT_INDEX = "index"
|
|
||||||
|
|
||||||
CONFIG_SCHEMA_BASE = cv.Schema(
|
|
||||||
{
|
|
||||||
cv.Required(CONF_ECO2): sensor.sensor_schema(
|
|
||||||
unit_of_measurement=UNIT_PARTS_PER_MILLION,
|
|
||||||
icon=ICON_MOLECULE_CO2,
|
|
||||||
accuracy_decimals=0,
|
|
||||||
device_class=DEVICE_CLASS_CARBON_DIOXIDE,
|
|
||||||
state_class=STATE_CLASS_MEASUREMENT,
|
|
||||||
),
|
|
||||||
cv.Required(CONF_TVOC): sensor.sensor_schema(
|
|
||||||
unit_of_measurement=UNIT_PARTS_PER_BILLION,
|
|
||||||
icon=ICON_RADIATOR,
|
|
||||||
accuracy_decimals=0,
|
|
||||||
device_class=DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS_PARTS,
|
|
||||||
state_class=STATE_CLASS_MEASUREMENT,
|
|
||||||
),
|
|
||||||
cv.Required(CONF_AQI): sensor.sensor_schema(
|
|
||||||
icon=ICON_CHEMICAL_WEAPON,
|
|
||||||
accuracy_decimals=0,
|
|
||||||
device_class=DEVICE_CLASS_AQI,
|
|
||||||
state_class=STATE_CLASS_MEASUREMENT,
|
|
||||||
),
|
|
||||||
cv.Optional(CONF_COMPENSATION): cv.Schema(
|
|
||||||
{
|
|
||||||
cv.Required(CONF_TEMPERATURE): cv.use_id(sensor.Sensor),
|
|
||||||
cv.Required(CONF_HUMIDITY): cv.use_id(sensor.Sensor),
|
|
||||||
}
|
|
||||||
),
|
|
||||||
}
|
|
||||||
).extend(cv.polling_component_schema("60s"))
|
|
||||||
|
|
||||||
|
|
||||||
async def to_code(config, func=None):
|
|
||||||
var = cg.new_Pvariable(config[CONF_ID])
|
|
||||||
await cg.register_component(var, config)
|
|
||||||
if func is not None:
|
|
||||||
await func(var, config)
|
|
||||||
|
|
||||||
sens = await sensor.new_sensor(config[CONF_ECO2])
|
|
||||||
cg.add(var.set_co2(sens))
|
|
||||||
sens = await sensor.new_sensor(config[CONF_TVOC])
|
|
||||||
cg.add(var.set_tvoc(sens))
|
|
||||||
sens = await sensor.new_sensor(config[CONF_AQI])
|
|
||||||
cg.add(var.set_aqi(sens))
|
|
||||||
|
|
||||||
if compensation_config := config.get(CONF_COMPENSATION):
|
|
||||||
sens = await cg.get_variable(compensation_config[CONF_TEMPERATURE])
|
|
||||||
cg.add(var.set_temperature(sens))
|
|
||||||
sens = await cg.get_variable(compensation_config[CONF_HUMIDITY])
|
|
||||||
cg.add(var.set_humidity(sens))
|
|
|
@ -1 +0,0 @@
|
||||||
CODEOWNERS = ["@latonita"]
|
|
|
@ -1,11 +1,13 @@
|
||||||
import esphome.codegen as cg
|
import esphome.codegen as cg
|
||||||
from esphome.components import i2c
|
from esphome.components import i2c
|
||||||
from ..ens160_base.sensor import to_code as to_code_base, cv, CONFIG_SCHEMA_BASE
|
from ..ens160_base import to_code_base, cv, CONFIG_SCHEMA_BASE
|
||||||
|
|
||||||
DEPENDENCIES = ["i2c"]
|
|
||||||
AUTO_LOAD = ["ens160_base"]
|
AUTO_LOAD = ["ens160_base"]
|
||||||
|
CODEOWNERS = ["@latonita"]
|
||||||
|
DEPENDENCIES = ["i2c"]
|
||||||
|
|
||||||
ens160_ns = cg.esphome_ns.namespace("ens160_i2c")
|
ens160_ns = cg.esphome_ns.namespace("ens160_i2c")
|
||||||
|
|
||||||
ENS160I2CComponent = ens160_ns.class_(
|
ENS160I2CComponent = ens160_ns.class_(
|
||||||
"ENS160I2CComponent", cg.PollingComponent, i2c.I2CDevice
|
"ENS160I2CComponent", cg.PollingComponent, i2c.I2CDevice
|
||||||
)
|
)
|
||||||
|
@ -16,4 +18,5 @@ CONFIG_SCHEMA = CONFIG_SCHEMA_BASE.extend(
|
||||||
|
|
||||||
|
|
||||||
async def to_code(config):
|
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)
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
CODEOWNERS = ["@latonita"]
|
|
|
@ -4,19 +4,19 @@
|
||||||
#include "ens160_spi.h"
|
#include "ens160_spi.h"
|
||||||
#include <esphome/components/ens160_base/ens160_base.h>
|
#include <esphome/components/ens160_base/ens160_base.h>
|
||||||
|
|
||||||
int set_bit(uint8_t num, int position) {
|
namespace esphome {
|
||||||
int mask = 1 << position;
|
namespace ens160_spi {
|
||||||
|
|
||||||
|
uint8_t set_bit(uint8_t num, uint8_t position) {
|
||||||
|
uint8_t mask = 1 << position;
|
||||||
return num | mask;
|
return num | mask;
|
||||||
}
|
}
|
||||||
|
|
||||||
int clear_bit(uint8_t num, int position) {
|
uint8_t clear_bit(uint8_t num, uint8_t position) {
|
||||||
int mask = 1 << position;
|
uint8_t mask = 1 << position;
|
||||||
return num & ~mask;
|
return num & ~mask;
|
||||||
}
|
}
|
||||||
|
|
||||||
namespace esphome {
|
|
||||||
namespace ens160_spi {
|
|
||||||
|
|
||||||
void ENS160SPIComponent::setup() {
|
void ENS160SPIComponent::setup() {
|
||||||
this->spi_setup();
|
this->spi_setup();
|
||||||
ENS160Component::setup();
|
ENS160Component::setup();
|
||||||
|
@ -30,33 +30,32 @@ void ENS160SPIComponent::setup() {
|
||||||
|
|
||||||
bool ENS160SPIComponent::read_byte(uint8_t a_register, uint8_t *data) {
|
bool ENS160SPIComponent::read_byte(uint8_t a_register, uint8_t *data) {
|
||||||
this->enable();
|
this->enable();
|
||||||
// cause: *data = this->delegate_->transfer(tmp) doesnt work
|
this->transfer_byte(set_bit(a_register, 7));
|
||||||
this->delegate_->transfer(set_bit(a_register, 7));
|
*data = this->transfer_byte(0);
|
||||||
*data = this->delegate_->transfer(0);
|
|
||||||
this->disable();
|
this->disable();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool ENS160SPIComponent::write_byte(uint8_t a_register, uint8_t data) {
|
bool ENS160SPIComponent::write_byte(uint8_t a_register, uint8_t data) {
|
||||||
this->enable();
|
this->enable();
|
||||||
this->delegate_->transfer(clear_bit(a_register, 7));
|
this->transfer_byte(clear_bit(a_register, 7));
|
||||||
this->delegate_->transfer(data);
|
this->transfer_byte(data);
|
||||||
this->disable();
|
this->disable();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool ENS160SPIComponent::read_bytes(uint8_t a_register, uint8_t *data, size_t len) {
|
bool ENS160SPIComponent::read_bytes(uint8_t a_register, uint8_t *data, size_t len) {
|
||||||
this->enable();
|
this->enable();
|
||||||
this->delegate_->transfer(set_bit(a_register, 7));
|
this->transfer_byte(set_bit(a_register, 7));
|
||||||
this->delegate_->read_array(data, len);
|
this->read_array(data, len);
|
||||||
this->disable();
|
this->disable();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool ENS160SPIComponent::write_bytes(uint8_t a_register, uint8_t *data, size_t len) {
|
bool ENS160SPIComponent::write_bytes(uint8_t a_register, uint8_t *data, size_t len) {
|
||||||
this->enable();
|
this->enable();
|
||||||
this->delegate_->transfer(clear_bit(a_register, 7));
|
this->transfer_byte(clear_bit(a_register, 7));
|
||||||
this->delegate_->transfer(data, len);
|
this->transfer_array(data, len);
|
||||||
this->disable();
|
this->disable();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,16 +1,13 @@
|
||||||
import esphome.codegen as cg
|
import esphome.codegen as cg
|
||||||
from esphome.components import spi
|
from esphome.components import spi
|
||||||
from esphome.components.ens160_base.sensor import (
|
from ..ens160_base import to_code_base, cv, CONFIG_SCHEMA_BASE
|
||||||
to_code as to_code_base,
|
|
||||||
cv,
|
|
||||||
CONFIG_SCHEMA_BASE,
|
|
||||||
)
|
|
||||||
|
|
||||||
DEPENDENCIES = ["spi"]
|
|
||||||
AUTO_LOAD = ["ens160_base"]
|
AUTO_LOAD = ["ens160_base"]
|
||||||
|
CODEOWNERS = ["@latonita"]
|
||||||
|
DEPENDENCIES = ["spi"]
|
||||||
|
|
||||||
ens160_spi_ns = cg.esphome_ns.namespace("ens160_spi")
|
ens160_spi_ns = cg.esphome_ns.namespace("ens160_spi")
|
||||||
|
|
||||||
ENS160SPIComponent = ens160_spi_ns.class_(
|
ENS160SPIComponent = ens160_spi_ns.class_(
|
||||||
"ENS160SPIComponent", cg.PollingComponent, spi.SPIDevice
|
"ENS160SPIComponent", cg.PollingComponent, spi.SPIDevice
|
||||||
)
|
)
|
||||||
|
@ -21,4 +18,5 @@ CONFIG_SCHEMA = CONFIG_SCHEMA_BASE.extend(spi.spi_device_schema()).extend(
|
||||||
|
|
||||||
|
|
||||||
async def to_code(config):
|
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)
|
||||||
|
|
Loading…
Reference in New Issue