mirror of
https://github.com/esphome/esphome.git
synced 2026-11-15 17:45:57 +00:00
Compare commits
6
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a88003900b | ||
|
|
eb06dddfc8 | ||
|
|
f7a5950926 | ||
|
|
d51b4c458a | ||
|
|
4160737fe3 | ||
|
|
a3b7430aea |
No files matched your search
@@ -83,6 +83,8 @@ class WizardData:
|
||||
|
||||
# The entities that components gave a role, and the role, in the order they were registered
|
||||
roles: list[tuple[ID, str]] = field(default_factory=list)
|
||||
# The entity ID buffer of each input, by input ID, created on first use
|
||||
buffers: dict[str, cg.MockObj] = field(default_factory=dict)
|
||||
|
||||
|
||||
def _get_data() -> WizardData:
|
||||
@@ -257,6 +259,38 @@ WIZARD_DOMAIN_LIMITED_PLATFORMS = (
|
||||
)
|
||||
|
||||
|
||||
def _wizard_input_size(conf: ConfigType) -> int:
|
||||
return conf.get(CONF_MAX_LENGTH, WIZARD_ENTITY_ID_MAX_LENGTH) + 1
|
||||
|
||||
|
||||
def _wizard_input_buffer(conf: ConfigType) -> cg.MockObj:
|
||||
"""The buffer an input's entity ID is written to, declared once by whichever caller comes first."""
|
||||
input_id = _wizard_input_id(conf)
|
||||
data = _get_data()
|
||||
if (buffer := data.buffers.get(input_id.id)) is None:
|
||||
owner = ID(input_id.id, type=WizardInput)
|
||||
buffer = cg.static_buffer(owner, cg.char, _wizard_input_size(conf))
|
||||
data.buffers[input_id.id] = buffer
|
||||
return buffer
|
||||
|
||||
|
||||
def _linked_inputs(api_config: ConfigType) -> dict[str, ConfigType]:
|
||||
"""The inputs linked to a homeassistant entity, by the entity's ID."""
|
||||
if (wizard := api_config.get(CONF_WIZARD)) is None:
|
||||
return {}
|
||||
return {
|
||||
conf[CONF_ENTITY].id: conf
|
||||
for conf in _wizard_inputs(wizard)
|
||||
if CONF_ENTITY in conf
|
||||
}
|
||||
|
||||
|
||||
def wizard_input_buffer(entity_id: ID) -> cg.MockObj | None:
|
||||
"""The buffer holding the entity ID of a linked wizard input, or None if the entity is not one."""
|
||||
conf = _linked_inputs(CORE.config.get(API_DOMAIN, {})).get(entity_id.id)
|
||||
return None if conf is None else _wizard_input_buffer(conf)
|
||||
|
||||
|
||||
# The C++ base class of each kind of entity a wizard page can show, and the platform an API client
|
||||
# knows it by. An entity key is only unique within its platform, so the wizard sends both.
|
||||
WIZARD_ENTITY_PLATFORMS: dict[str, str] = {
|
||||
@@ -300,11 +334,7 @@ def _wizard_entity_platform(
|
||||
|
||||
def wizard_input_ids(api_config: ConfigType) -> set[str]:
|
||||
"""The IDs of the entities that are linked inputs of the wizard in the given api config."""
|
||||
if (wizard := api_config.get(CONF_WIZARD)) is None:
|
||||
return set()
|
||||
return {
|
||||
conf[CONF_ENTITY].id for conf in _wizard_inputs(wizard) if CONF_ENTITY in conf
|
||||
}
|
||||
return set(_linked_inputs(api_config))
|
||||
|
||||
|
||||
def _wizard_input_declaration(
|
||||
@@ -584,14 +614,13 @@ async def to_code(wizard: ConfigType) -> None:
|
||||
entries: list[cg.RawExpression] = []
|
||||
for conf in _wizard_inputs(wizard):
|
||||
input_id = _wizard_input_id(conf)
|
||||
size = conf.get(CONF_MAX_LENGTH, WIZARD_ENTITY_ID_MAX_LENGTH) + 1
|
||||
buffer = cg.static_buffer(ID(input_id.id, type=WizardInput), cg.char, size)
|
||||
# A linked entity takes its buffer from wizard_input_buffer()
|
||||
buffer = _wizard_input_buffer(conf)
|
||||
if CONF_ID in conf:
|
||||
cg.new_Pvariable(input_id, buffer)
|
||||
else:
|
||||
cg.add((await cg.get_variable(input_id)).set_entity_id(buffer))
|
||||
key = fnv1_hash(input_id.id)
|
||||
if conf[CONF_MULTIPLE]:
|
||||
size = _wizard_input_size(conf)
|
||||
entries.append(cg.RawExpression(f"{{{key}u, {buffer}, {size}}}"))
|
||||
else:
|
||||
entries.append(cg.RawExpression(f"{{{key}u, {buffer}}}"))
|
||||
|
||||
@@ -2,69 +2,191 @@
|
||||
#include "esphome/core/hal.h"
|
||||
#include "esphome/core/log.h"
|
||||
|
||||
#include <cmath>
|
||||
|
||||
namespace esphome::bmi160 {
|
||||
|
||||
ESPHOME_LOG_TAG(TAG, "bmi160");
|
||||
|
||||
static constexpr uint8_t BMI160_REGISTER_CHIPID = 0x00;
|
||||
static constexpr uint8_t BMI160_CHIP_ID = 0xD1;
|
||||
static constexpr uint8_t BMI160_REGISTER_CMD = 0x7E;
|
||||
static constexpr uint8_t BMI160_REGISTER_DATA_GYRO_X_LSB = 0x0C;
|
||||
static constexpr uint8_t BMI160_REGISTER_DATA_TEMP_LSB = 0x20;
|
||||
|
||||
// PMU mode commands: set PMU mode (0b000100xx accel, 0b000101xx gyro) with mode NORMAL (0b01)
|
||||
static constexpr uint8_t CMD_ACCEL_PMU_NORMAL = 0x11;
|
||||
static constexpr uint8_t CMD_GYRO_PMU_NORMAL = 0x15;
|
||||
|
||||
// Accel needs 5 to 10 ms to wake up and no command may be sent meanwhile
|
||||
static constexpr uint32_t ACCEL_WAKEUP_TIMEOUT_MS = 10;
|
||||
// Gyro needs 51 to 81 ms to wake up
|
||||
static constexpr uint32_t GYRO_WAKEUP_TIMEOUT_MS = 100;
|
||||
|
||||
static constexpr uint8_t BMI160_REGISTER_ACCEL_CONFIG = 0x40;
|
||||
static constexpr uint8_t BMI160_REGISTER_ACCEL_RANGE = 0x41;
|
||||
static constexpr uint8_t BMI160_REGISTER_GYRO_CONFIG = 0x42;
|
||||
static constexpr uint8_t BMI160_REGISTER_GYRO_RANGE = 0x43;
|
||||
const uint8_t BMI160_REGISTER_CHIPID = 0x00;
|
||||
|
||||
static constexpr uint8_t ACCEL_FILTER_PERF = 0b10000000;
|
||||
static constexpr uint8_t ACCEL_BANDWIDTH_RES_AVG16 = 0b01000000;
|
||||
static constexpr uint8_t ACCEL_ODR_25_HZ = 0b0110;
|
||||
static constexpr uint8_t ACCEL_RANGE_16G = 0b1100;
|
||||
static constexpr uint8_t GYRO_BANDWIDTH_OSR4 = 0x00;
|
||||
static constexpr uint8_t GYRO_ODR_25_HZ = 0x06;
|
||||
static constexpr uint8_t GYRO_RANGE_2000_DPS = 0x00;
|
||||
|
||||
static constexpr i2c::I2CRegValue BMI160_CONFIG[] PROGMEM = {
|
||||
{BMI160_REGISTER_GYRO_CONFIG, GYRO_BANDWIDTH_OSR4 | GYRO_ODR_25_HZ},
|
||||
{BMI160_REGISTER_GYRO_RANGE, GYRO_RANGE_2000_DPS},
|
||||
{BMI160_REGISTER_ACCEL_CONFIG, ACCEL_FILTER_PERF | ACCEL_BANDWIDTH_RES_AVG16 | ACCEL_ODR_25_HZ},
|
||||
{BMI160_REGISTER_ACCEL_RANGE, ACCEL_RANGE_16G},
|
||||
const uint8_t BMI160_REGISTER_CMD = 0x7E;
|
||||
enum class Cmd : uint8_t {
|
||||
START_FOC = 0x03,
|
||||
ACCL_SET_PMU_MODE = 0b00010000, // last 2 bits are mode
|
||||
GYRO_SET_PMU_MODE = 0b00010100, // last 2 bits are mode
|
||||
MAG_SET_PMU_MODE = 0b00011000, // last 2 bits are mode
|
||||
PROG_NVM = 0xA0,
|
||||
FIFO_FLUSH = 0xB0,
|
||||
INT_RESET = 0xB1,
|
||||
SOFT_RESET = 0xB6,
|
||||
STEP_CNT_CLR = 0xB2,
|
||||
};
|
||||
enum class GyroPmuMode : uint8_t {
|
||||
SUSPEND = 0b00,
|
||||
NORMAL = 0b01,
|
||||
LOW_POWER = 0b10,
|
||||
};
|
||||
enum class AcclPmuMode : uint8_t {
|
||||
SUSPEND = 0b00,
|
||||
NORMAL = 0b01,
|
||||
FAST_STARTUP = 0b11,
|
||||
};
|
||||
enum class MagPmuMode : uint8_t {
|
||||
SUSPEND = 0b00,
|
||||
NORMAL = 0b01,
|
||||
LOW_POWER = 0b10,
|
||||
};
|
||||
|
||||
// Full scale over INT16_MAX for the 2000 deg/s and 16 g ranges set above
|
||||
static constexpr float GYRO_SCALE = 2000.f / INT16_MAX;
|
||||
static constexpr float ACCEL_SCALE = 16 * 9.80665f / INT16_MAX;
|
||||
static constexpr float TEMPERATURE_SCALE = 64.5f / INT16_MAX;
|
||||
static constexpr float TEMPERATURE_OFFSET_C = 23.f;
|
||||
const uint8_t BMI160_REGISTER_ACCEL_CONFIG = 0x40;
|
||||
enum class AcclFilterMode : uint8_t {
|
||||
POWER_SAVING = 0b00000000,
|
||||
PERF = 0b10000000,
|
||||
};
|
||||
enum class AcclBandwidth : uint8_t {
|
||||
OSR4_AVG1 = 0b00000000,
|
||||
OSR2_AVG2 = 0b00010000,
|
||||
NORMAL_AVG4 = 0b00100000,
|
||||
RES_AVG8 = 0b00110000,
|
||||
RES_AVG16 = 0b01000000,
|
||||
RES_AVG32 = 0b01010000,
|
||||
RES_AVG64 = 0b01100000,
|
||||
RES_AVG128 = 0b01110000,
|
||||
};
|
||||
enum class AccelOutputDataRate : uint8_t {
|
||||
HZ_25_32 = 0b0001, // 25/32 Hz
|
||||
HZ_25_16 = 0b0010, // 25/16 Hz
|
||||
HZ_25_8 = 0b0011, // 25/8 Hz
|
||||
HZ_25_4 = 0b0100, // 25/4 Hz
|
||||
HZ_25_2 = 0b0101, // 25/2 Hz
|
||||
HZ_25 = 0b0110, // 25 Hz
|
||||
HZ_50 = 0b0111, // 50 Hz
|
||||
HZ_100 = 0b1000, // 100 Hz
|
||||
HZ_200 = 0b1001, // 200 Hz
|
||||
HZ_400 = 0b1010, // 400 Hz
|
||||
HZ_800 = 0b1011, // 800 Hz
|
||||
HZ_1600 = 0b1100, // 1600 Hz
|
||||
};
|
||||
const uint8_t BMI160_REGISTER_ACCEL_RANGE = 0x41;
|
||||
enum class AccelRange : uint8_t {
|
||||
RANGE_2G = 0b0011,
|
||||
RANGE_4G = 0b0101,
|
||||
RANGE_8G = 0b1000,
|
||||
RANGE_16G = 0b1100,
|
||||
};
|
||||
|
||||
void BMI160Component::setup() {
|
||||
if (!this->check_chip_id(this, BMI160_REGISTER_CHIPID, BMI160_CHIP_ID))
|
||||
return;
|
||||
if (!this->setup_check(this->write_byte(BMI160_REGISTER_CMD, CMD_ACCEL_PMU_NORMAL)))
|
||||
return;
|
||||
this->set_timeout(ACCEL_WAKEUP_TIMEOUT_MS, [this]() {
|
||||
if (!this->setup_check(this->write_byte(BMI160_REGISTER_CMD, CMD_GYRO_PMU_NORMAL)))
|
||||
return;
|
||||
this->set_timeout(GYRO_WAKEUP_TIMEOUT_MS, [this]() {
|
||||
if (!this->setup_check(this->write_registers(BMI160_CONFIG)))
|
||||
return;
|
||||
this->setup_complete_ = true;
|
||||
});
|
||||
});
|
||||
const uint8_t BMI160_REGISTER_GYRO_CONFIG = 0x42;
|
||||
enum class GyroBandwidth : uint8_t {
|
||||
OSR4 = 0x00,
|
||||
OSR2 = 0x10,
|
||||
NORMAL = 0x20,
|
||||
};
|
||||
enum class GyroOutputDataRate : uint8_t {
|
||||
HZ_25 = 0x06,
|
||||
HZ_50 = 0x07,
|
||||
HZ_100 = 0x08,
|
||||
HZ_200 = 0x09,
|
||||
HZ_400 = 0x0A,
|
||||
HZ_800 = 0x0B,
|
||||
HZ_1600 = 0x0C,
|
||||
HZ_3200 = 0x0D,
|
||||
};
|
||||
const uint8_t BMI160_REGISTER_GYRO_RANGE = 0x43;
|
||||
enum class GyroRange : uint8_t {
|
||||
RANGE_2000_DPS = 0x0, // ±2000 °/s
|
||||
RANGE_1000_DPS = 0x1,
|
||||
RANGE_500_DPS = 0x2,
|
||||
RANGE_250_DPS = 0x3,
|
||||
RANGE_125_DPS = 0x4,
|
||||
};
|
||||
|
||||
const uint8_t BMI160_REGISTER_DATA_GYRO_X_LSB = 0x0C;
|
||||
const uint8_t BMI160_REGISTER_DATA_GYRO_X_MSB = 0x0D;
|
||||
const uint8_t BMI160_REGISTER_DATA_GYRO_Y_LSB = 0x0E;
|
||||
const uint8_t BMI160_REGISTER_DATA_GYRO_Y_MSB = 0x0F;
|
||||
const uint8_t BMI160_REGISTER_DATA_GYRO_Z_LSB = 0x10;
|
||||
const uint8_t BMI160_REGISTER_DATA_GYRO_Z_MSB = 0x11;
|
||||
const uint8_t BMI160_REGISTER_DATA_ACCEL_X_LSB = 0x12;
|
||||
const uint8_t BMI160_REGISTER_DATA_ACCEL_X_MSB = 0x13;
|
||||
const uint8_t BMI160_REGISTER_DATA_ACCEL_Y_LSB = 0x14;
|
||||
const uint8_t BMI160_REGISTER_DATA_ACCEL_Y_MSB = 0x15;
|
||||
const uint8_t BMI160_REGISTER_DATA_ACCEL_Z_LSB = 0x16;
|
||||
const uint8_t BMI160_REGISTER_DATA_ACCEL_Z_MSB = 0x17;
|
||||
const uint8_t BMI160_REGISTER_DATA_TEMP_LSB = 0x20;
|
||||
const uint8_t BMI160_REGISTER_DATA_TEMP_MSB = 0x21;
|
||||
|
||||
const float GRAVITY_EARTH = 9.80665f;
|
||||
|
||||
void BMI160Component::internal_setup_(int stage) {
|
||||
if (!this->setup_stage_(stage))
|
||||
this->mark_failed(LOG_STR(ESP_LOG_MSG_COMM_FAIL));
|
||||
}
|
||||
|
||||
bool BMI160Component::setup_stage_(int stage) {
|
||||
switch (stage) {
|
||||
case 0: {
|
||||
uint8_t chipid;
|
||||
if (!this->read_byte(BMI160_REGISTER_CHIPID, &chipid) || (chipid != 0b11010001)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
ESP_LOGV(TAG, " Bringing accelerometer out of sleep");
|
||||
if (!this->write_byte(BMI160_REGISTER_CMD, (uint8_t) Cmd::ACCL_SET_PMU_MODE | (uint8_t) AcclPmuMode::NORMAL)) {
|
||||
return false;
|
||||
}
|
||||
ESP_LOGV(TAG, " Waiting for accelerometer to wake up");
|
||||
// need to wait (max delay in datasheet) because we can't send commands while another is in progress
|
||||
// min 5ms, 10ms
|
||||
this->set_timeout(10, [this]() { this->internal_setup_(1); });
|
||||
break;
|
||||
}
|
||||
case 1:
|
||||
ESP_LOGV(TAG, " Bringing gyroscope out of sleep");
|
||||
if (!this->write_byte(BMI160_REGISTER_CMD, (uint8_t) Cmd::GYRO_SET_PMU_MODE | (uint8_t) GyroPmuMode::NORMAL)) {
|
||||
return false;
|
||||
}
|
||||
ESP_LOGV(TAG, " Waiting for gyroscope to wake up");
|
||||
// wait between 51 & 81ms, doing 100 to be safe
|
||||
this->set_timeout(GYRO_WAKEUP_TIMEOUT_MS, [this]() { this->internal_setup_(2); });
|
||||
break;
|
||||
|
||||
case 2: {
|
||||
ESP_LOGV(TAG, " Setting up Gyro Config");
|
||||
uint8_t gyro_config = (uint8_t) GyroBandwidth::OSR4 | (uint8_t) GyroOutputDataRate::HZ_25;
|
||||
ESP_LOGV(TAG, " Output gyro_config: 0b" BYTE_TO_BINARY_PATTERN, BYTE_TO_BINARY(gyro_config));
|
||||
if (!this->write_byte(BMI160_REGISTER_GYRO_CONFIG, gyro_config)) {
|
||||
return false;
|
||||
}
|
||||
ESP_LOGV(TAG, " Setting up Gyro Range");
|
||||
uint8_t gyro_range = (uint8_t) GyroRange::RANGE_2000_DPS;
|
||||
ESP_LOGV(TAG, " Output gyro_range: 0b" BYTE_TO_BINARY_PATTERN, BYTE_TO_BINARY(gyro_range));
|
||||
if (!this->write_byte(BMI160_REGISTER_GYRO_RANGE, gyro_range)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
ESP_LOGV(TAG, " Setting up Accel Config");
|
||||
uint8_t accel_config =
|
||||
(uint8_t) AcclFilterMode::PERF | (uint8_t) AcclBandwidth::RES_AVG16 | (uint8_t) AccelOutputDataRate::HZ_25;
|
||||
ESP_LOGV(TAG, " Output accel_config: 0b" BYTE_TO_BINARY_PATTERN, BYTE_TO_BINARY(accel_config));
|
||||
if (!this->write_byte(BMI160_REGISTER_ACCEL_CONFIG, accel_config)) {
|
||||
return false;
|
||||
}
|
||||
ESP_LOGV(TAG, " Setting up Accel Range");
|
||||
uint8_t accel_range = (uint8_t) AccelRange::RANGE_16G;
|
||||
ESP_LOGV(TAG, " Output accel_range: 0b" BYTE_TO_BINARY_PATTERN, BYTE_TO_BINARY(accel_range));
|
||||
if (!this->write_byte(BMI160_REGISTER_ACCEL_RANGE, accel_range)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
this->setup_complete_ = true;
|
||||
break;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
void BMI160Component::setup() { this->internal_setup_(0); }
|
||||
void BMI160Component::dump_config() {
|
||||
ESP_LOGCONFIG(TAG, "BMI160:");
|
||||
LOG_I2C_DEVICE(this);
|
||||
@@ -83,24 +205,22 @@ void BMI160Component::update() {
|
||||
return;
|
||||
}
|
||||
|
||||
ESP_LOGV(TAG, " Updating BMI160");
|
||||
int16_t data[6];
|
||||
if (!this->status_comm_check(this->read_bytes_16_le(BMI160_REGISTER_DATA_GYRO_X_LSB, data, 6)))
|
||||
return;
|
||||
float temperature = NAN;
|
||||
if (this->temperature_sensor_ != nullptr) {
|
||||
int16_t raw_temperature;
|
||||
if (!this->status_comm_check(this->read_bytes_16_le(BMI160_REGISTER_DATA_TEMP_LSB, &raw_temperature, 1)))
|
||||
return;
|
||||
temperature = raw_temperature * TEMPERATURE_SCALE + TEMPERATURE_OFFSET_C;
|
||||
}
|
||||
this->status_clear_warning();
|
||||
|
||||
const float gyro_x = data[0] * GYRO_SCALE;
|
||||
const float gyro_y = data[1] * GYRO_SCALE;
|
||||
const float gyro_z = data[2] * GYRO_SCALE;
|
||||
const float accel_x = data[3] * ACCEL_SCALE;
|
||||
const float accel_y = data[4] * ACCEL_SCALE;
|
||||
const float accel_z = data[5] * ACCEL_SCALE;
|
||||
float gyro_x = (float) data[0] / (float) INT16_MAX * 2000.f;
|
||||
float gyro_y = (float) data[1] / (float) INT16_MAX * 2000.f;
|
||||
float gyro_z = (float) data[2] / (float) INT16_MAX * 2000.f;
|
||||
float accel_x = (float) data[3] / (float) INT16_MAX * 16 * GRAVITY_EARTH;
|
||||
float accel_y = (float) data[4] / (float) INT16_MAX * 16 * GRAVITY_EARTH;
|
||||
float accel_z = (float) data[5] / (float) INT16_MAX * 16 * GRAVITY_EARTH;
|
||||
|
||||
int16_t raw_temperature;
|
||||
if (!this->status_comm_result(this->read_bytes_16_le(BMI160_REGISTER_DATA_TEMP_LSB, &raw_temperature, 1)))
|
||||
return;
|
||||
float temperature = (float) raw_temperature / (float) INT16_MAX * 64.5f + 23.f;
|
||||
|
||||
ESP_LOGD(TAG,
|
||||
"Got accel={x=%.3f m/s², y=%.3f m/s², z=%.3f m/s²}, "
|
||||
|
||||
@@ -7,10 +7,6 @@
|
||||
namespace esphome::bmi160 {
|
||||
|
||||
class BMI160Component final : public PollingComponent, public i2c::I2CDevice {
|
||||
protected:
|
||||
// First so it packs into the padding after I2CDevice::address_
|
||||
bool setup_complete_{false};
|
||||
|
||||
SUB_SENSOR(accel_x)
|
||||
SUB_SENSOR(accel_y)
|
||||
SUB_SENSOR(accel_z)
|
||||
@@ -24,6 +20,12 @@ class BMI160Component final : public PollingComponent, public i2c::I2CDevice {
|
||||
void dump_config() override;
|
||||
|
||||
void update() override;
|
||||
|
||||
protected:
|
||||
void internal_setup_(int stage);
|
||||
/// Run one setup stage; false on an I2C failure.
|
||||
bool setup_stage_(int stage);
|
||||
bool setup_complete_{false};
|
||||
};
|
||||
|
||||
} // namespace esphome::bmi160
|
||||
@@ -6,7 +6,7 @@ import esphome.config_validation as cv
|
||||
from esphome.const import CONF_ATTRIBUTE, CONF_ENTITY_ID, CONF_ID, CONF_INTERNAL
|
||||
from esphome.core import CORE, coroutine_with_priority
|
||||
from esphome.coroutine import CoroPriority
|
||||
from esphome.cpp_generator import MockObj
|
||||
from esphome.cpp_generator import Expression, MockObj
|
||||
import esphome.final_validate as fv
|
||||
from esphome.types import ConfigType
|
||||
|
||||
@@ -81,11 +81,19 @@ async def _emit_state_subscription_count_define() -> None:
|
||||
cg.add_define("HOMEASSISTANT_STATE_SUBSCRIPTION_COUNT", count)
|
||||
|
||||
|
||||
def home_assistant_entity_id(config: ConfigType) -> Expression:
|
||||
"""The entity ID as a C string: a literal, or the API's buffer for a wizard input."""
|
||||
from esphome.components.api import wizard
|
||||
|
||||
if (buffer := wizard.wizard_input_buffer(config[CONF_ID])) is not None:
|
||||
return buffer
|
||||
return cg.safe_exp(config[CONF_ENTITY_ID])
|
||||
|
||||
|
||||
def setup_home_assistant_entity(
|
||||
var: MockObj, config: ConfigType, state_subscription_count: int = 1
|
||||
) -> None:
|
||||
# A wizard input has no entity_id; the api wizard sets it
|
||||
cg.add_optional(var.set_entity_id, config.get(CONF_ENTITY_ID))
|
||||
cg.add(var.set_entity_id(home_assistant_entity_id(config)))
|
||||
cg.add_optional(var.set_attribute, config.get(CONF_ATTRIBUTE))
|
||||
cg.add_define("USE_API_HOMEASSISTANT_STATES")
|
||||
if state_subscription_count > 0:
|
||||
|
||||
@@ -6,8 +6,7 @@ from esphome.types import ConfigType
|
||||
from .. import (
|
||||
HOME_ASSISTANT_IMPORT_CONTROL_SCHEMA,
|
||||
final_validate_entity_id,
|
||||
homeassistant_ns,
|
||||
setup_home_assistant_entity,
|
||||
home_assistant_entity_id,
|
||||
validate_entity_domain,
|
||||
)
|
||||
|
||||
@@ -19,14 +18,11 @@ SUPPORTED_DOMAINS = [
|
||||
"input_button",
|
||||
]
|
||||
|
||||
HomeassistantButton = homeassistant_ns.class_(
|
||||
"HomeassistantButton", button.Button, cg.Component
|
||||
)
|
||||
|
||||
CONFIG_SCHEMA = cv.All(
|
||||
button.button_schema(HomeassistantButton)
|
||||
.extend(HOME_ASSISTANT_IMPORT_CONTROL_SCHEMA)
|
||||
.extend(cv.COMPONENT_SCHEMA),
|
||||
button.button_schema(button.ApplyButton).extend(
|
||||
HOME_ASSISTANT_IMPORT_CONTROL_SCHEMA
|
||||
),
|
||||
validate_entity_domain("button", SUPPORTED_DOMAINS),
|
||||
)
|
||||
|
||||
@@ -35,7 +31,10 @@ FINAL_VALIDATE_SCHEMA = final_validate_entity_id
|
||||
|
||||
async def to_code(config: ConfigType) -> None:
|
||||
cg.add_define("USE_API_HOMEASSISTANT_SERVICES")
|
||||
var = await button.new_button(config)
|
||||
await cg.register_component(var, config)
|
||||
# Button only calls services, does not subscribe to state
|
||||
setup_home_assistant_entity(var, config, state_subscription_count=0)
|
||||
cg.add_define("USE_API_HOMEASSISTANT_STATES")
|
||||
entity_id = home_assistant_entity_id(config)
|
||||
await button.sub_buttons(config).create(
|
||||
config,
|
||||
None,
|
||||
apply=f"homeassistant::press_button_entity(entity, {entity_id})",
|
||||
)
|
||||
@@ -12,22 +12,15 @@ namespace esphome::homeassistant {
|
||||
|
||||
ESPHOME_LOG_TAG(TAG, "homeassistant.button");
|
||||
|
||||
void HomeassistantButton::dump_config() {
|
||||
LOG_BUTTON("", "Homeassistant Button", this);
|
||||
ESP_LOGCONFIG(TAG, " Entity ID: '%s'", this->entity_id_);
|
||||
}
|
||||
|
||||
float HomeassistantButton::get_setup_priority() const { return setup_priority::AFTER_CONNECTION; }
|
||||
|
||||
void HomeassistantButton::press_action() {
|
||||
void press_button_entity([[maybe_unused]] button::Button *button, const char *entity_id) {
|
||||
if (!api::global_api_server->is_connected()) {
|
||||
ESP_LOGE(TAG, "No clients connected to API server");
|
||||
return;
|
||||
}
|
||||
|
||||
#ifdef USE_API_WIZARD_LINKED_INPUTS
|
||||
if (this->entity_id_[0] == '\0') {
|
||||
ESP_LOGW(TAG, "'%s': No entity ID set yet", LOG_STR_ARG(this->get_log_name()));
|
||||
if (entity_id[0] == '\0') {
|
||||
ESP_LOGW(TAG, "'%s': No entity ID set yet", LOG_STR_ARG(button->get_log_name()));
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
@@ -39,14 +32,14 @@ void HomeassistantButton::press_action() {
|
||||
|
||||
api::HomeassistantActionRequest resp;
|
||||
// An input helper entity id starts with the "input_" its action name starts with
|
||||
const bool input_helper = ESPHOME_strncmp_P(this->entity_id_, SERVICE_INPUT_BUTTON, sizeof("input_") - 1) == 0;
|
||||
const bool input_helper = ESPHOME_strncmp_P(entity_id, SERVICE_INPUT_BUTTON, sizeof("input_") - 1) == 0;
|
||||
resp.service =
|
||||
input_helper ? ProgmemStringRef::from_lit(SERVICE_INPUT_BUTTON) : ProgmemStringRef::from_lit(SERVICE_BUTTON);
|
||||
|
||||
resp.data.init(1);
|
||||
auto &entity_id_kv = resp.data.emplace_back();
|
||||
entity_id_kv.key = ProgmemStringRef::from_lit(ENTITY_ID_KEY);
|
||||
entity_id_kv.value = ProgmemStringRef(StringRef(this->entity_id_));
|
||||
entity_id_kv.value = ProgmemStringRef(StringRef(entity_id));
|
||||
|
||||
api::global_api_server->send_homeassistant_action(resp);
|
||||
}
|
||||
|
||||
@@ -1,21 +1,10 @@
|
||||
#pragma once
|
||||
|
||||
#include "esphome/components/button/button.h"
|
||||
#include "esphome/core/component.h"
|
||||
|
||||
namespace esphome::homeassistant {
|
||||
|
||||
class HomeassistantButton final : public button::Button, public Component {
|
||||
public:
|
||||
void set_entity_id(const char *entity_id) { this->entity_id_ = entity_id; }
|
||||
|
||||
void dump_config() override;
|
||||
float get_setup_priority() const override;
|
||||
|
||||
protected:
|
||||
void press_action() override;
|
||||
|
||||
const char *entity_id_{nullptr};
|
||||
};
|
||||
/// Ask Home Assistant to press entity_id, with input_button.press for an input_button helper.
|
||||
void press_button_entity(button::Button *button, const char *entity_id);
|
||||
|
||||
} // namespace esphome::homeassistant
|
||||
@@ -651,6 +651,18 @@ def _buffer(main_cpp: str, input_id: str) -> str:
|
||||
return re.search(rf"\{{{fnv1_hash(input_id)}u, (\w+)", main_cpp)[1]
|
||||
|
||||
|
||||
def _button_press_call(button_id: str, main_cpp: str) -> str:
|
||||
"""The one statement of the generated press function of an ApplyButton."""
|
||||
fn = re.search(rf"new\({button_id}\) button::ApplyButton<(\w+)>\(\);", main_cpp)
|
||||
assert fn is not None
|
||||
body = re.search(
|
||||
rf"static void {fn.group(1)}\(button::Button \* entity\) \{{\n (.*?)\n\}}",
|
||||
main_cpp,
|
||||
)
|
||||
assert body is not None
|
||||
return body.group(1)
|
||||
|
||||
|
||||
def test_text_select_and_button_default_to_their_domains(
|
||||
tmp_path: Path, generate_main: Callable[[str | Path], str]
|
||||
) -> None:
|
||||
@@ -669,8 +681,11 @@ def test_text_select_and_button_default_to_their_domains(
|
||||
# A number takes number and input_number entities, and the other sensors take anything
|
||||
assert filters[fnv1_hash("ha_number")] == [{"domain": ["input_number", "number"]}]
|
||||
assert filters[fnv1_hash("ha_binary")] is None
|
||||
for entity in ("ha_txt", "ha_select", "ha_button"):
|
||||
for entity in ("ha_txt", "ha_select"):
|
||||
assert f"{entity}->set_entity_id({_buffer(main_cpp, entity)});" in main_cpp
|
||||
assert _button_press_call("ha_button", main_cpp) == (
|
||||
f"homeassistant::press_button_entity(entity, {_buffer(main_cpp, 'ha_button')});"
|
||||
)
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
@@ -885,7 +900,13 @@ def test_inputs_have_buffers_hashes_and_a_table(
|
||||
assert len(set(buffers.values())) == len(entities)
|
||||
assert get_define_value("API_WIZARD_INPUT_COUNT") == str(len(entities))
|
||||
for entity in entities[:-2]:
|
||||
if entity == "ha_button":
|
||||
continue
|
||||
assert f"{entity}->set_entity_id({buffers[entity]});" in main_cpp
|
||||
# The button's generated press function reads the buffer, which is declared before it
|
||||
call = f"homeassistant::press_button_entity(entity, {buffers['ha_button']});"
|
||||
assert _button_press_call("ha_button", main_cpp) == call
|
||||
assert main_cpp.index(f"static char {buffers['ha_button']}[") < main_cpp.index(call)
|
||||
# The standalone inputs are objects that read the same buffer
|
||||
assert f"WizardInput({buffers['weather_input']})" in main_cpp
|
||||
assert f"WizardInput({buffers['unset_input']})" in main_cpp
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
from collections.abc import Callable
|
||||
from pathlib import Path
|
||||
import re
|
||||
|
||||
import pytest
|
||||
|
||||
@@ -15,9 +16,16 @@ def test_button_valid_domains(generate_main: Callable[[str | Path], str]) -> Non
|
||||
"""Both button and input_button entities are accepted and wired up."""
|
||||
main_cpp = generate_main(DIR / "button_valid.yaml")
|
||||
|
||||
assert "homeassistant::HomeassistantButton" in main_cpp
|
||||
assert 'ha_button->set_entity_id("button.example");' in main_cpp
|
||||
assert 'ha_input_button->set_entity_id("input_button.example");' in main_cpp
|
||||
for button_id, entity_id in (
|
||||
("ha_button", "button.example"),
|
||||
("ha_input_button", "input_button.example"),
|
||||
):
|
||||
fn = re.search(rf"new\({button_id}\) button::ApplyButton<(\w+)>\(\);", main_cpp)
|
||||
assert fn is not None
|
||||
assert (
|
||||
f"static void {fn.group(1)}(button::Button * entity) {{\n"
|
||||
f' homeassistant::press_button_entity(entity, "{entity_id}");\n}}'
|
||||
) in main_cpp
|
||||
assert any(d.name == "USE_API_HOMEASSISTANT_SERVICES" for d in CORE.defines)
|
||||
assert any(d.name == "USE_API_HOMEASSISTANT_STATES" for d in CORE.defines)
|
||||
|
||||
|
||||
@@ -1,17 +1,18 @@
|
||||
sensor:
|
||||
- platform: bmi160
|
||||
i2c_id: i2c_bus
|
||||
address: 0x68
|
||||
acceleration_x:
|
||||
name: BMI160 Accel X
|
||||
acceleration_y:
|
||||
name: BMI160 Accel Y
|
||||
acceleration_z:
|
||||
name: BMI160 Accel Z
|
||||
name: BMI160 Accel z
|
||||
gyroscope_x:
|
||||
name: BMI160 Gyro X
|
||||
gyroscope_y:
|
||||
name: BMI160 Gyro Y
|
||||
gyroscope_z:
|
||||
name: BMI160 Gyro Z
|
||||
name: BMI160 Gyro z
|
||||
temperature:
|
||||
name: BMI160 Temperature
|
||||
@@ -1,3 +1,4 @@
|
||||
packages:
|
||||
i2c: !include ../../test_build_components/common/i2c/esp32-idf.yaml
|
||||
bmi160: !include common.yaml
|
||||
|
||||
<<: !include common.yaml
|
||||
@@ -1,3 +1,4 @@
|
||||
packages:
|
||||
i2c: !include ../../test_build_components/common/i2c/esp8266-ard.yaml
|
||||
bmi160: !include common.yaml
|
||||
|
||||
<<: !include common.yaml
|
||||
@@ -1,3 +1,4 @@
|
||||
packages:
|
||||
i2c: !include ../../test_build_components/common/i2c/rp2040-ard.yaml
|
||||
bmi160: !include common.yaml
|
||||
|
||||
<<: !include common.yaml
|
||||
Reference in new issue
Block a user