mirror of
https://github.com/Threnklyn/esphome-dev.git
synced 2026-06-06 21:09:53 +02:00
🏗 Merge C++ into python codebase (#504)
## Description: Move esphome-core codebase into esphome (and a bunch of other refactors). See https://github.com/esphome/feature-requests/issues/97 Yes this is a shit ton of work and no there's no way to automate it :( But it will be worth it 👍 Progress: - Core support (file copy etc): 80% - Base Abstractions (light, switch): ~50% - Integrations: ~10% - Working? Yes, (but only with ported components). Other refactors: - Moves all codegen related stuff into a single class: `esphome.codegen` (imported as `cg`) - Rework coroutine syntax - Move from `component/platform.py` to `domain/component.py` structure as with HA - Move all defaults out of C++ and into config validation. - Remove `make_...` helpers from Application class. Reason: Merge conflicts with every single new integration. - Pointer Variables are stored globally instead of locally in setup(). Reason: stack size limit. Future work: - Rework const.py - Move all `CONF_...` into a conf class (usage `conf.UPDATE_INTERVAL` vs `CONF_UPDATE_INTERVAL`). Reason: Less convoluted import block - Enable loading from `custom_components` folder. **Related issue (if applicable):** https://github.com/esphome/feature-requests/issues/97 **Pull request in [esphome-docs](https://github.com/esphome/esphome-docs) with documentation (if applicable):** esphome/esphome-docs#<esphome-docs PR number goes here> ## Checklist: - [ ] The code change is tested and works locally. - [ ] Tests have been added to verify that the new code works (under `tests/` folder). If user exposed functionality or configuration variables are added/changed: - [ ] Documentation added/updated in [esphomedocs](https://github.com/OttoWinter/esphomedocs).
This commit is contained in:
Otto Winter
@@ -0,0 +1,91 @@
|
||||
#include "hlw8012.h"
|
||||
#include "esphome/core/log.h"
|
||||
|
||||
namespace esphome {
|
||||
namespace hlw8012 {
|
||||
|
||||
static const char *TAG = "hlw8012";
|
||||
|
||||
static const uint32_t HLW8012_CLOCK_FREQUENCY = 3579000;
|
||||
static const float HLW8012_REFERENCE_VOLTAGE = 2.43f;
|
||||
|
||||
void HLW8012Component::setup() {
|
||||
ESP_LOGCONFIG(TAG, "Setting up HLW8012...");
|
||||
this->sel_pin_->setup();
|
||||
this->sel_pin_->digital_write(this->current_mode_);
|
||||
this->cf_store_.setup(this->cf_pin_);
|
||||
this->cf1_store_.setup(this->cf1_pin_);
|
||||
}
|
||||
void HLW8012Component::dump_config() {
|
||||
ESP_LOGCONFIG(TAG, "HLW8012:");
|
||||
LOG_PIN(" SEL Pin: ", this->sel_pin_)
|
||||
LOG_PIN(" CF Pin: ", this->cf_pin_)
|
||||
LOG_PIN(" CF1 Pin: ", this->cf1_pin_)
|
||||
ESP_LOGCONFIG(TAG, " Change measurement mode every %u", this->change_mode_every_);
|
||||
ESP_LOGCONFIG(TAG, " Current resistor: %.1f mΩ", this->current_resistor_ * 1000.0f);
|
||||
ESP_LOGCONFIG(TAG, " Voltage Divider: %.1f", this->voltage_divider_);
|
||||
LOG_UPDATE_INTERVAL(this)
|
||||
LOG_SENSOR(" ", "Voltage", this->voltage_sensor_)
|
||||
LOG_SENSOR(" ", "Current", this->current_sensor_)
|
||||
LOG_SENSOR(" ", "Power", this->power_sensor_)
|
||||
}
|
||||
float HLW8012Component::get_setup_priority() const { return setup_priority::DATA; }
|
||||
void HLW8012Component::update() {
|
||||
// HLW8012 has 50% duty cycle
|
||||
float full_cycle_cf = this->cf_store_.get_pulse_width_s() * 2;
|
||||
float full_cycle_cf1 = this->cf1_store_.get_pulse_width_s() * 2;
|
||||
float cf_hz, cf1_hz;
|
||||
|
||||
if (full_cycle_cf == 0.0f)
|
||||
cf_hz = 0.0f;
|
||||
else
|
||||
cf_hz = 1.0f / full_cycle_cf;
|
||||
if (full_cycle_cf1 == 0.0f)
|
||||
cf1_hz = 0.0f;
|
||||
else
|
||||
cf1_hz = 1.0f / full_cycle_cf1;
|
||||
|
||||
if (this->nth_value_++ < 2) {
|
||||
return;
|
||||
}
|
||||
|
||||
const float v_ref_squared = HLW8012_REFERENCE_VOLTAGE * HLW8012_REFERENCE_VOLTAGE;
|
||||
const float power_multiplier_micros =
|
||||
64000000.0f * v_ref_squared * this->voltage_divider_ / this->current_resistor_ / 24.0f / HLW8012_CLOCK_FREQUENCY;
|
||||
float power = cf_hz * power_multiplier_micros / 1000000.0f;
|
||||
|
||||
if (this->change_mode_at_ != 0) {
|
||||
// Only read cf1 after one cycle. Apparently it's quite unstable after being changed.
|
||||
if (this->current_mode_) {
|
||||
const float current_multiplier_micros =
|
||||
512000000.0f * HLW8012_REFERENCE_VOLTAGE / this->current_resistor_ / 24.0f / HLW8012_CLOCK_FREQUENCY;
|
||||
float current = cf1_hz * current_multiplier_micros / 1000000.0f;
|
||||
ESP_LOGD(TAG, "Got power=%.1fW, current=%.1fA", power, current);
|
||||
if (this->current_sensor_ != nullptr) {
|
||||
this->current_sensor_->publish_state(current);
|
||||
}
|
||||
} else {
|
||||
const float voltage_multiplier_micros =
|
||||
256000000.0f * HLW8012_REFERENCE_VOLTAGE * this->voltage_divider_ / HLW8012_CLOCK_FREQUENCY;
|
||||
float voltage = cf1_hz * voltage_multiplier_micros / 1000000.0f;
|
||||
ESP_LOGD(TAG, "Got power=%.1fW, voltage=%.1fV", power, voltage);
|
||||
if (this->voltage_sensor_ != nullptr) {
|
||||
this->voltage_sensor_->publish_state(voltage);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (this->power_sensor_ != nullptr) {
|
||||
this->power_sensor_->publish_state(power);
|
||||
}
|
||||
|
||||
if (this->change_mode_at_++ == this->change_mode_every_) {
|
||||
this->current_mode_ = !this->current_mode_;
|
||||
ESP_LOGV(TAG, "Changing mode to %s mode", this->current_mode_ ? "CURRENT" : "VOLTAGE");
|
||||
this->change_mode_at_ = 0;
|
||||
this->sel_pin_->digital_write(this->current_mode_);
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace hlw8012
|
||||
} // namespace esphome
|
||||
@@ -0,0 +1,48 @@
|
||||
#pragma once
|
||||
|
||||
#include "esphome/core/component.h"
|
||||
#include "esphome/core/esphal.h"
|
||||
#include "esphome/components/sensor/sensor.h"
|
||||
#include "esphome/components/pulse_width/pulse_width.h"
|
||||
|
||||
namespace esphome {
|
||||
namespace hlw8012 {
|
||||
|
||||
class HLW8012Component : public PollingComponent {
|
||||
public:
|
||||
HLW8012Component(uint32_t update_interval) : PollingComponent(update_interval) {}
|
||||
|
||||
void setup() override;
|
||||
void dump_config() override;
|
||||
float get_setup_priority() const override;
|
||||
void update() override;
|
||||
|
||||
void set_change_mode_every(uint32_t change_mode_every) { change_mode_every_ = change_mode_every; }
|
||||
void set_current_resistor(float current_resistor) { current_resistor_ = current_resistor; }
|
||||
void set_voltage_divider(float voltage_divider) { voltage_divider_ = voltage_divider; }
|
||||
void set_sel_pin(GPIOPin *sel_pin) { sel_pin_ = sel_pin; }
|
||||
void set_cf_pin(GPIOPin *cf_pin) { cf_pin_ = cf_pin; }
|
||||
void set_cf1_pin(GPIOPin *cf1_pin) { cf1_pin_ = cf1_pin; }
|
||||
void set_voltage_sensor(sensor::Sensor *voltage_sensor) { voltage_sensor_ = voltage_sensor; }
|
||||
void set_current_sensor(sensor::Sensor *current_sensor) { current_sensor_ = current_sensor; }
|
||||
void set_power_sensor(sensor::Sensor *power_sensor) { power_sensor_ = power_sensor; }
|
||||
|
||||
protected:
|
||||
uint32_t nth_value_{0};
|
||||
bool current_mode_{false};
|
||||
uint32_t change_mode_at_{0};
|
||||
uint32_t change_mode_every_{8};
|
||||
float current_resistor_{0.001};
|
||||
float voltage_divider_{2351};
|
||||
GPIOPin *sel_pin_;
|
||||
GPIOPin *cf_pin_;
|
||||
pulse_width::PulseWidthSensorStore cf_store_;
|
||||
GPIOPin *cf1_pin_;
|
||||
pulse_width::PulseWidthSensorStore cf1_store_;
|
||||
sensor::Sensor *voltage_sensor_{nullptr};
|
||||
sensor::Sensor *current_sensor_{nullptr};
|
||||
sensor::Sensor *power_sensor_{nullptr};
|
||||
};
|
||||
|
||||
} // namespace hlw8012
|
||||
} // namespace esphome
|
||||
@@ -0,0 +1,57 @@
|
||||
import esphome.codegen as cg
|
||||
import esphome.config_validation as cv
|
||||
from esphome import pins
|
||||
from esphome.components import sensor
|
||||
from esphome.const import CONF_CHANGE_MODE_EVERY, CONF_CURRENT, \
|
||||
CONF_CURRENT_RESISTOR, CONF_ID, CONF_POWER, CONF_SEL_PIN, CONF_UPDATE_INTERVAL, \
|
||||
CONF_VOLTAGE, CONF_VOLTAGE_DIVIDER, ICON_FLASH, UNIT_VOLT, UNIT_AMPERE, UNIT_WATT
|
||||
|
||||
AUTO_LOAD = ['pulse_width']
|
||||
|
||||
hlw8012_ns = cg.esphome_ns.namespace('hlw8012')
|
||||
HLW8012Component = hlw8012_ns.class_('HLW8012Component', cg.PollingComponent)
|
||||
|
||||
CONF_CF1_PIN = 'cf1_pin'
|
||||
CONF_CF_PIN = 'cf_pin'
|
||||
CONFIG_SCHEMA = cv.Schema({
|
||||
cv.GenerateID(): cv.declare_variable_id(HLW8012Component),
|
||||
cv.Required(CONF_SEL_PIN): pins.gpio_output_pin_schema,
|
||||
cv.Required(CONF_CF_PIN): cv.All(pins.internal_gpio_input_pullup_pin_schema,
|
||||
pins.validate_has_interrupt),
|
||||
cv.Required(CONF_CF1_PIN): cv.All(pins.internal_gpio_input_pullup_pin_schema,
|
||||
pins.validate_has_interrupt),
|
||||
|
||||
cv.Optional(CONF_VOLTAGE): cv.nameable(sensor.sensor_schema(UNIT_VOLT, ICON_FLASH, 1)),
|
||||
cv.Optional(CONF_CURRENT): cv.nameable(sensor.sensor_schema(UNIT_AMPERE, ICON_FLASH, 2)),
|
||||
cv.Optional(CONF_POWER): cv.nameable(sensor.sensor_schema(UNIT_WATT, ICON_FLASH, 1)),
|
||||
|
||||
cv.Optional(CONF_CURRENT_RESISTOR, default=0.001): cv.resistance,
|
||||
cv.Optional(CONF_VOLTAGE_DIVIDER, default=2351): cv.positive_float,
|
||||
cv.Optional(CONF_CHANGE_MODE_EVERY, default=8): cv.All(cv.uint32_t, cv.Range(min=1)),
|
||||
cv.Optional(CONF_UPDATE_INTERVAL, default='60s'): cv.update_interval,
|
||||
}).extend(cv.COMPONENT_SCHEMA)
|
||||
|
||||
|
||||
def to_code(config):
|
||||
var = cg.new_Pvariable(config[CONF_ID], config[CONF_UPDATE_INTERVAL])
|
||||
yield cg.register_component(var, config)
|
||||
|
||||
sel = yield cg.gpio_pin_expression(config[CONF_SEL_PIN])
|
||||
cg.add(var.set_sel_pin(sel))
|
||||
cf = yield cg.gpio_pin_expression(config[CONF_CF_PIN])
|
||||
cg.add(var.set_cf_pin(cf))
|
||||
cf1 = yield cg.gpio_pin_expression(config[CONF_CF1_PIN])
|
||||
cg.add(var.set_cf1_pin(cf1))
|
||||
|
||||
if CONF_VOLTAGE in config:
|
||||
sens = yield sensor.new_sensor(config[CONF_VOLTAGE])
|
||||
cg.add(var.set_voltage_sensor(sens))
|
||||
if CONF_CURRENT in config:
|
||||
sens = yield sensor.new_sensor(config[CONF_CURRENT])
|
||||
cg.add(var.set_current_sensor(sens))
|
||||
if CONF_POWER in config:
|
||||
sens = yield sensor.new_sensor(config[CONF_POWER])
|
||||
cg.add(var.set_power_sensor(sens))
|
||||
cg.add(var.set_current_resistor(config[CONF_CURRENT_RESISTOR]))
|
||||
cg.add(var.set_voltage_divider(config[CONF_VOLTAGE_DIVIDER]))
|
||||
cg.add(var.set_change_mode_every(config[CONF_CHANGE_MODE_EVERY]))
|
||||
Reference in New Issue
Block a user