Skip to content

Commit

Permalink
flat config
Browse files Browse the repository at this point in the history
  • Loading branch information
@stas-sl
stas-sl committed Oct 7, 2024
1 parent 63ad606 commit 84740df
Show file tree
Hide file tree
Showing 3 changed files with 211 additions and 201 deletions.
244 changes: 139 additions & 105 deletions components/sound_level_meter/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,17 @@

import esphome.codegen as cg
import esphome.config_validation as cv
from esphome import automation
from esphome import automation, core
from esphome.automation import maybe_simple_id
from esphome.components import sensor, i2s
from esphome.const import (
CONF_ID,
CONF_SENSORS,
CONF_FILTERS,
CONF_WINDOW_SIZE,
CONF_UPDATE_INTERVAL,
CONF_TYPE,
UNIT_DECIBEL,
STATE_CLASS_MEASUREMENT
STATE_CLASS_MEASUREMENT,
)

CODEOWNERS = ["@stas-sl"]
Expand All @@ -23,13 +22,21 @@

sound_level_meter_ns = cg.esphome_ns.namespace("sound_level_meter")
SoundLevelMeter = sound_level_meter_ns.class_("SoundLevelMeter", cg.Component)
SoundLevelMeterSensor = sound_level_meter_ns.class_("SoundLevelMeterSensor", sensor.Sensor)
SoundLevelMeterSensorEq = sound_level_meter_ns.class_("SoundLevelMeterSensorEq", SoundLevelMeterSensor, sensor.Sensor)
SoundLevelMeterSensorMax = sound_level_meter_ns.class_("SoundLevelMeterSensorMax", SoundLevelMeterSensor, sensor.Sensor)
SoundLevelMeterSensorMin = sound_level_meter_ns.class_("SoundLevelMeterSensorMin", SoundLevelMeterSensor, sensor.Sensor)
SoundLevelMeterSensor = sound_level_meter_ns.class_(
"SoundLevelMeterSensor", sensor.Sensor
)
SoundLevelMeterSensorEq = sound_level_meter_ns.class_(
"SoundLevelMeterSensorEq", SoundLevelMeterSensor, sensor.Sensor
)
SoundLevelMeterSensorMax = sound_level_meter_ns.class_(
"SoundLevelMeterSensorMax", SoundLevelMeterSensor, sensor.Sensor
)
SoundLevelMeterSensorMin = sound_level_meter_ns.class_(
"SoundLevelMeterSensorMin", SoundLevelMeterSensor, sensor.Sensor
)
SoundLevelMeterSensorPeak = sound_level_meter_ns.class_(
"SoundLevelMeterSensorPeak", SoundLevelMeterSensor, sensor.Sensor)
SensorGroup = sound_level_meter_ns.class_("SensorGroup")
"SoundLevelMeterSensorPeak", SoundLevelMeterSensor, sensor.Sensor
)
Filter = sound_level_meter_ns.class_("Filter")
SOS_Filter = sound_level_meter_ns.class_("SOS_Filter", Filter)
ToggleAction = sound_level_meter_ns.class_("ToggleAction", automation.Action)
Expand All @@ -38,7 +45,6 @@


CONF_I2S_ID = "i2s_id"
CONF_GROUPS = "groups"
CONF_EQ = "eq"
CONF_MAX = "max"
CONF_MIN = "min"
Expand All @@ -54,121 +60,146 @@
CONF_MIC_SENSITIVITY_REF = "mic_sensitivity_ref"
CONF_OFFSET = "offset"
CONF_IS_ON = "is_on"
CONF_DSP_FILTERS = "dsp_filters"

ICON_WAVEFORM = "mdi:waveform"

CONFIG_DSP_FILTER_SCHEMA = cv.typed_schema(
{
CONF_SOS: cv.Schema(
{
cv.GenerateID(): cv.declare_id(SOS_Filter),
cv.Required(CONF_COEFFS): [[cv.float_]],
}
)
}
)

CONFIG_SENSOR_DSP_FILTER_SCHEMA = cv.ensure_list(
cv.Any(cv.use_id(Filter), CONFIG_DSP_FILTER_SCHEMA)
)

CONFIG_SENSOR_SCHEMA = cv.typed_schema(
{
CONF_EQ: sensor.sensor_schema(
SoundLevelMeterSensorEq,
unit_of_measurement=UNIT_DECIBEL,
accuracy_decimals=2,
state_class=STATE_CLASS_MEASUREMENT,
icon=ICON_WAVEFORM
).extend({
cv.Optional(CONF_UPDATE_INTERVAL): cv.positive_time_period_milliseconds
}),
icon=ICON_WAVEFORM,
).extend(
{
cv.Optional(CONF_UPDATE_INTERVAL): cv.positive_time_period_milliseconds,
cv.Optional(
CONF_DSP_FILTERS, default=[]
): CONFIG_SENSOR_DSP_FILTER_SCHEMA,
}
),
CONF_MAX: sensor.sensor_schema(
SoundLevelMeterSensorMax,
unit_of_measurement=UNIT_DECIBEL,
accuracy_decimals=2,
state_class=STATE_CLASS_MEASUREMENT,
icon=ICON_WAVEFORM
).extend({
cv.Optional(CONF_UPDATE_INTERVAL): cv.positive_time_period_milliseconds,
cv.Required(CONF_WINDOW_SIZE): cv.positive_time_period_milliseconds
}),
icon=ICON_WAVEFORM,
).extend(
{
cv.Optional(CONF_UPDATE_INTERVAL): cv.positive_time_period_milliseconds,
cv.Required(CONF_WINDOW_SIZE): cv.positive_time_period_milliseconds,
cv.Optional(
CONF_DSP_FILTERS, default=[]
): CONFIG_SENSOR_DSP_FILTER_SCHEMA,
}
),
CONF_MIN: sensor.sensor_schema(
SoundLevelMeterSensorMin,
unit_of_measurement=UNIT_DECIBEL,
accuracy_decimals=2,
state_class=STATE_CLASS_MEASUREMENT,
icon=ICON_WAVEFORM
).extend({
cv.Optional(CONF_UPDATE_INTERVAL): cv.positive_time_period_milliseconds,
cv.Required(CONF_WINDOW_SIZE): cv.positive_time_period_milliseconds
}),
icon=ICON_WAVEFORM,
).extend(
{
cv.Optional(CONF_UPDATE_INTERVAL): cv.positive_time_period_milliseconds,
cv.Required(CONF_WINDOW_SIZE): cv.positive_time_period_milliseconds,
cv.Optional(
CONF_DSP_FILTERS, default=[]
): CONFIG_SENSOR_DSP_FILTER_SCHEMA,
}
),
CONF_PEAK: sensor.sensor_schema(
SoundLevelMeterSensorPeak,
unit_of_measurement=UNIT_DECIBEL,
accuracy_decimals=2,
state_class=STATE_CLASS_MEASUREMENT,
icon=ICON_WAVEFORM
).extend({
cv.Optional(CONF_UPDATE_INTERVAL): cv.positive_time_period_milliseconds
})
icon=ICON_WAVEFORM,
).extend(
{
cv.Optional(CONF_UPDATE_INTERVAL): cv.positive_time_period_milliseconds,
cv.Optional(
CONF_DSP_FILTERS, default=[]
): CONFIG_SENSOR_DSP_FILTER_SCHEMA,
}
),
}
)

CONFIG_FILTER_SCHEMA = cv.typed_schema(
CONFIG_SCHEMA = cv.Schema(
{
CONF_SOS: cv.Schema({
cv.GenerateID(): cv.declare_id(SOS_Filter),
cv.Required(CONF_COEFFS): [[cv.float_]]
})
cv.GenerateID(): cv.declare_id(SoundLevelMeter),
cv.GenerateID(CONF_I2S_ID): cv.use_id(i2s.I2SComponent),
cv.Optional(
CONF_UPDATE_INTERVAL, default="60s"
): cv.positive_time_period_milliseconds,
cv.Optional(CONF_IS_ON, default=True): cv.boolean,
cv.Optional(CONF_BUFFER_SIZE, default=1024): cv.positive_not_null_int,
cv.Optional(
CONF_WARMUP_INTERVAL, default="500ms"
): cv.positive_time_period_milliseconds,
cv.Optional(CONF_TASK_STACK_SIZE, default=4096): cv.positive_not_null_int,
cv.Optional(CONF_TASK_PRIORITY, default=2): cv.uint8_t,
cv.Optional(CONF_TASK_CORE, default=1): cv.int_range(0, 1),
cv.Optional(CONF_MIC_SENSITIVITY): cv.decibel,
cv.Optional(CONF_MIC_SENSITIVITY_REF): cv.decibel,
cv.Optional(CONF_OFFSET): cv.decibel,
cv.Optional(CONF_DSP_FILTERS, default=[]): [CONFIG_DSP_FILTER_SCHEMA],
cv.Optional(CONF_SENSORS, default=[]): [CONFIG_SENSOR_SCHEMA],
}
).extend(cv.COMPONENT_SCHEMA)

SOUND_LEVEL_METER_ACTION_SCHEMA = maybe_simple_id(
{cv.GenerateID(): cv.use_id(SoundLevelMeter)}
)

def config_group_schema(value):
return CONFIG_GROUP_SCHEMA(value)

CONFIG_GROUP_SCHEMA = (
cv.Schema({
cv.GenerateID(): cv.declare_id(SensorGroup),
cv.Optional(CONF_FILTERS): [CONFIG_FILTER_SCHEMA],
cv.Optional(CONF_SENSORS): [CONFIG_SENSOR_SCHEMA],
cv.Optional(CONF_GROUPS): [config_group_schema]
})
)
async def add_dsp_filter(config, parent):
f = None
if config[CONF_TYPE] == CONF_SOS:
f = cg.new_Pvariable(config[CONF_ID], config[CONF_COEFFS])
assert f is not None
cg.add(parent.add_dsp_filter(f))
return f

CONFIG_SCHEMA = (
cv.Schema(
{
cv.GenerateID(): cv.declare_id(SoundLevelMeter),
cv.GenerateID(CONF_I2S_ID): cv.use_id(i2s.I2SComponent),
cv.Optional(CONF_UPDATE_INTERVAL, default="60s"): cv.positive_time_period_milliseconds,
cv.Optional(CONF_IS_ON, default=True): cv.boolean,
cv.Optional(CONF_BUFFER_SIZE, default=1024): cv.positive_not_null_int,
cv.Optional(CONF_WARMUP_INTERVAL, default="500ms"): cv.positive_time_period_milliseconds,
cv.Optional(CONF_TASK_STACK_SIZE, default=4096): cv.positive_not_null_int,
cv.Optional(CONF_TASK_PRIORITY, default=2): cv.uint8_t,
cv.Optional(CONF_TASK_CORE, default=1): cv.int_range(0, 1),
cv.Optional(CONF_MIC_SENSITIVITY): cv.decibel,
cv.Optional(CONF_MIC_SENSITIVITY_REF): cv.decibel,
cv.Optional(CONF_OFFSET): cv.decibel,
cv.Required(CONF_GROUPS): [CONFIG_GROUP_SCHEMA]
}
)
.extend(cv.COMPONENT_SCHEMA)
)

SOUND_LEVEL_METER_ACTION_SCHEMA = maybe_simple_id({
cv.GenerateID(): cv.use_id(SoundLevelMeter)
})

async def groups_to_code(config, component, parent):
for gc in config:
g = cg.new_Pvariable(gc[CONF_ID])
cg.add(g.set_parent(component))
cg.add(parent.add_group(g))
if CONF_FILTERS in gc:
for fc in gc[CONF_FILTERS]:
f = None
if fc[CONF_TYPE] == CONF_SOS:
f = cg.new_Pvariable(fc[CONF_ID], fc[CONF_COEFFS])
if f is not None:
cg.add(g.add_filter(f))
if CONF_GROUPS in gc:
await groups_to_code(gc[CONF_GROUPS], component, g)
if CONF_SENSORS in gc:
for sc in gc[CONF_SENSORS]:
s = await sensor.new_sensor(sc)
cg.add(s.set_parent(component))
if CONF_WINDOW_SIZE in sc:
cg.add(s.set_window_size(sc[CONF_WINDOW_SIZE]))
if CONF_UPDATE_INTERVAL in sc:
cg.add(s.set_update_interval(sc[CONF_UPDATE_INTERVAL]))
cg.add(g.add_sensor(s))
async def add_sensor(config, parent):
s = await sensor.new_sensor(config)
cg.add(s.set_parent(parent))
if CONF_WINDOW_SIZE in config:
cg.add(s.set_window_size(config[CONF_WINDOW_SIZE]))
if CONF_UPDATE_INTERVAL in config:
cg.add(s.set_update_interval(config[CONF_UPDATE_INTERVAL]))
for fc in config[CONF_DSP_FILTERS]:
f = None
if isinstance(fc, core.ID):
f = await cg.get_variable(fc)
elif isinstance(fc, dict):
f = await add_dsp_filter(fc, parent)
assert f is not None
cg.add(s.add_dsp_filter(f))
cg.add(parent.add_sensor(s))


def get_max_buffers(config):
return max(len(sc[CONF_DSP_FILTERS]) for sc in config[CONF_SENSORS]) + 1


async def to_code(config):
var = cg.new_Pvariable(config[CONF_ID])
Expand All @@ -181,7 +212,7 @@ async def to_code(config):
cg.add(var.set_task_stack_size(config[CONF_TASK_STACK_SIZE]))
cg.add(var.set_task_priority(config[CONF_TASK_PRIORITY]))
cg.add(var.set_task_core(config[CONF_TASK_CORE]))
cg.add(var.set_max_groups_depth(get_groups_depth(config[CONF_GROUPS]) + 1))
cg.add(var.set_max_buffers(get_max_buffers(config)))
if CONF_MIC_SENSITIVITY in config:
cg.add(var.set_mic_sensitivity(config[CONF_MIC_SENSITIVITY]))
if CONF_MIC_SENSITIVITY_REF in config:
Expand All @@ -190,20 +221,23 @@ async def to_code(config):
cg.add(var.set_offset(config[CONF_OFFSET]))
if not config[CONF_IS_ON]:
cg.add(var.turn_off())
await groups_to_code(config[CONF_GROUPS], var, var)

def get_groups_depth(cur):
max_d = 0
for g in cur:
d = int(CONF_FILTERS in g)
if CONF_GROUPS in g:
d += get_groups_depth(g[CONF_GROUPS])
max_d = max(d, max_d)
return max_d

@automation.register_action("sound_level_meter.toggle", ToggleAction, SOUND_LEVEL_METER_ACTION_SCHEMA)
@automation.register_action("sound_level_meter.turn_off", TurnOffAction, SOUND_LEVEL_METER_ACTION_SCHEMA)
@automation.register_action("sound_level_meter.turn_on", TurnOnAction, SOUND_LEVEL_METER_ACTION_SCHEMA)

for fc in config[CONF_DSP_FILTERS]:
await add_dsp_filter(fc, var)

for sc in config[CONF_SENSORS]:
await add_sensor(sc, var)


@automation.register_action(
"sound_level_meter.toggle", ToggleAction, SOUND_LEVEL_METER_ACTION_SCHEMA
)
@automation.register_action(
"sound_level_meter.turn_off", TurnOffAction, SOUND_LEVEL_METER_ACTION_SCHEMA
)
@automation.register_action(
"sound_level_meter.turn_on", TurnOnAction, SOUND_LEVEL_METER_ACTION_SCHEMA
)
async def switch_toggle_to_code(config, action_id, template_arg, args):
paren = await cg.get_variable(config[CONF_ID])
return cg.new_Pvariable(action_id, template_arg, paren)
Loading

0 comments on commit 84740df

Please sign in to comment.