1
0
mirror of https://github.com/esphome/esphome.git synced 2025-09-29 00:22:21 +01: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
2019-04-17 12:06:00 +02:00
committed by GitHub
parent 049807e3ab
commit 6682c43dfa
817 changed files with 54156 additions and 10830 deletions

View File

View File

@@ -0,0 +1,81 @@
# coding=utf-8
import esphome.codegen as cg
import esphome.config_validation as cv
from esphome.components import i2c, sensor
from esphome.const import CONF_COLOR_TEMPERATURE, CONF_GAIN, CONF_ID, \
CONF_ILLUMINANCE, CONF_INTEGRATION_TIME, CONF_UPDATE_INTERVAL, ICON_LIGHTBULB, \
UNIT_PERCENT, ICON_THERMOMETER, UNIT_KELVIN, ICON_BRIGHTNESS_5, UNIT_LUX
DEPENDENCIES = ['i2c']
CONF_RED_CHANNEL = 'red_channel'
CONF_GREEN_CHANNEL = 'green_channel'
CONF_BLUE_CHANNEL = 'blue_channel'
CONF_CLEAR_CHANNEL = 'clear_channel'
tcs34725_ns = cg.esphome_ns.namespace('tcs34725')
TCS34725Component = tcs34725_ns.class_('TCS34725Component', cg.PollingComponent, i2c.I2CDevice)
TCS34725IntegrationTime = tcs34725_ns.enum('TCS34725IntegrationTime')
TCS34725_INTEGRATION_TIMES = {
'2.4ms': TCS34725IntegrationTime.TCS34725_INTEGRATION_TIME_2_4MS,
'24ms': TCS34725IntegrationTime.TCS34725_INTEGRATION_TIME_24MS,
'50ms': TCS34725IntegrationTime.TCS34725_INTEGRATION_TIME_50MS,
'101ms': TCS34725IntegrationTime.TCS34725_INTEGRATION_TIME_101MS,
'154ms': TCS34725IntegrationTime.TCS34725_INTEGRATION_TIME_154MS,
'700ms': TCS34725IntegrationTime.TCS34725_INTEGRATION_TIME_700MS,
}
TCS34725Gain = tcs34725_ns.enum('TCS34725Gain')
TCS34725_GAINS = {
'1X': TCS34725Gain.TCS34725_GAIN_1X,
'4X': TCS34725Gain.TCS34725_GAIN_4X,
'16X': TCS34725Gain.TCS34725_GAIN_16X,
'60X': TCS34725Gain.TCS34725_GAIN_60X,
}
color_channel_schema = sensor.sensor_schema(UNIT_PERCENT, ICON_LIGHTBULB, 1)
color_temperature_schema = sensor.sensor_schema(UNIT_KELVIN, ICON_THERMOMETER, 1)
illuminance_schema = sensor.sensor_schema(UNIT_LUX, ICON_BRIGHTNESS_5, 1)
CONFIG_SCHEMA = cv.Schema({
cv.GenerateID(): cv.declare_variable_id(TCS34725Component),
cv.Optional(CONF_RED_CHANNEL): cv.nameable(color_channel_schema),
cv.Optional(CONF_GREEN_CHANNEL): cv.nameable(color_channel_schema),
cv.Optional(CONF_BLUE_CHANNEL): cv.nameable(color_channel_schema),
cv.Optional(CONF_CLEAR_CHANNEL): cv.nameable(color_channel_schema),
cv.Optional(CONF_ILLUMINANCE): cv.nameable(illuminance_schema),
cv.Optional(CONF_COLOR_TEMPERATURE): cv.nameable(color_temperature_schema),
cv.Optional(CONF_INTEGRATION_TIME, default='2.4ms'):
cv.one_of(*TCS34725_INTEGRATION_TIMES, lower=True),
cv.Optional(CONF_GAIN, default='1X'): cv.All(cv.Upper, cv.one_of(*TCS34725_GAINS), upper=True),
cv.Optional(CONF_UPDATE_INTERVAL, default='60s'): cv.update_interval,
}).extend(cv.COMPONENT_SCHEMA).extend(i2c.i2c_device_schema(0x29))
def to_code(config):
var = cg.new_Pvariable(config[CONF_ID], config[CONF_UPDATE_INTERVAL])
yield cg.register_component(var, config)
yield i2c.register_i2c_device(var, config)
cg.add(var.set_integration_time(TCS34725_INTEGRATION_TIMES[config[CONF_INTEGRATION_TIME]]))
cg.add(var.set_gain(TCS34725_GAINS[config[CONF_GAIN]]))
if CONF_RED_CHANNEL in config:
sens = yield sensor.new_sensor(config[CONF_RED_CHANNEL])
cg.add(var.set_red_sensor(sens))
if CONF_GREEN_CHANNEL in config:
sens = yield sensor.new_sensor(config[CONF_GREEN_CHANNEL])
cg.add(var.set_green_sensor(sens))
if CONF_BLUE_CHANNEL in config:
sens = yield sensor.new_sensor(config[CONF_BLUE_CHANNEL])
cg.add(var.set_blue_sensor(sens))
if CONF_CLEAR_CHANNEL in config:
sens = yield sensor.new_sensor(config[CONF_CLEAR_CHANNEL])
cg.add(var.set_clear_sensor(sens))
if CONF_ILLUMINANCE in config:
sens = yield sensor.new_sensor(config[CONF_ILLUMINANCE])
cg.add(var.set_illuminance_sensor(sens))
if CONF_COLOR_TEMPERATURE in config:
sens = yield sensor.new_sensor(config[CONF_COLOR_TEMPERATURE])
cg.add(var.set_color_temperature_sensor(sens))

View File

@@ -0,0 +1,123 @@
#include "tcs34725.h"
#include "esphome/core/log.h"
namespace esphome {
namespace tcs34725 {
static const char *TAG = "tcs34725";
static const uint8_t TCS34725_ADDRESS = 0x29;
static const uint8_t TCS34725_COMMAND_BIT = 0x80;
static const uint8_t TCS34725_REGISTER_ID = TCS34725_COMMAND_BIT | 0x12;
static const uint8_t TCS34725_REGISTER_ATIME = TCS34725_COMMAND_BIT | 0x01;
static const uint8_t TCS34725_REGISTER_CONTROL = TCS34725_COMMAND_BIT | 0x0F;
static const uint8_t TCS34725_REGISTER_ENABLE = TCS34725_COMMAND_BIT | 0x00;
static const uint8_t TCS34725_REGISTER_CDATAL = TCS34725_COMMAND_BIT | 0x14;
static const uint8_t TCS34725_REGISTER_RDATAL = TCS34725_COMMAND_BIT | 0x16;
static const uint8_t TCS34725_REGISTER_GDATAL = TCS34725_COMMAND_BIT | 0x18;
static const uint8_t TCS34725_REGISTER_BDATAL = TCS34725_COMMAND_BIT | 0x1A;
void TCS34725Component::setup() {
ESP_LOGCONFIG(TAG, "Setting up TCS34725...");
uint8_t id;
if (!this->read_byte(TCS34725_REGISTER_ID, &id)) {
this->mark_failed();
return;
}
uint8_t integration_reg = this->integration_time_;
uint8_t gain_reg = this->gain_;
if (!this->write_byte(TCS34725_REGISTER_ATIME, integration_reg) ||
!this->write_byte(TCS34725_REGISTER_CONTROL, gain_reg)) {
this->mark_failed();
return;
}
if (!this->write_byte(TCS34725_REGISTER_ENABLE, 0x01)) { // Power on (internal oscillator on)
this->mark_failed();
return;
}
delay(3);
if (!this->write_byte(TCS34725_REGISTER_ENABLE, 0x03)) { // Power on (internal oscillator on) + RGBC ADC Enable
this->mark_failed();
return;
}
}
void TCS34725Component::dump_config() {
ESP_LOGCONFIG(TAG, "TCS34725:");
LOG_I2C_DEVICE(this);
if (this->is_failed()) {
ESP_LOGE(TAG, "Communication with TCS34725 failed!");
}
LOG_UPDATE_INTERVAL(this);
LOG_SENSOR(" ", "Clear Channel", this->clear_sensor_);
LOG_SENSOR(" ", "Red Channel", this->red_sensor_);
LOG_SENSOR(" ", "Green Channel", this->green_sensor_);
LOG_SENSOR(" ", "Blue Channel", this->blue_sensor_);
LOG_SENSOR(" ", "Illuminance", this->illuminance_sensor_);
LOG_SENSOR(" ", "Color Temperature", this->color_temperature_sensor_);
}
float TCS34725Component::get_setup_priority() const { return setup_priority::DATA; }
void TCS34725Component::update() {
uint16_t raw_c;
uint16_t raw_r;
uint16_t raw_g;
uint16_t raw_b;
if (!this->read_byte_16(TCS34725_REGISTER_CDATAL, &raw_c) || !this->read_byte_16(TCS34725_REGISTER_RDATAL, &raw_r) ||
!this->read_byte_16(TCS34725_REGISTER_GDATAL, &raw_g) || !this->read_byte_16(TCS34725_REGISTER_BDATAL, &raw_b)) {
ESP_LOGW(TAG, "Reading data from TCS34725 failed!");
this->status_set_warning();
return;
}
const float channel_c = raw_c / 655.35f;
const float channel_r = raw_r / 655.35f;
const float channel_g = raw_g / 655.35f;
const float channel_b = raw_b / 655.35f;
if (this->clear_sensor_ != nullptr)
this->clear_sensor_->publish_state(channel_c);
if (this->red_sensor_ != nullptr)
this->red_sensor_->publish_state(channel_r);
if (this->green_sensor_ != nullptr)
this->green_sensor_->publish_state(channel_g);
if (this->blue_sensor_ != nullptr)
this->blue_sensor_->publish_state(channel_b);
// Formulae taken from Adafruit TCS35725 library
float illuminance = (-0.32466f * channel_r) + (1.57837f * channel_g) + (-0.73191f * channel_b);
if (this->illuminance_sensor_ != nullptr)
this->illuminance_sensor_->publish_state(illuminance);
// Color temperature
// 1. Convert RGB to XYZ color space
const float x = (-0.14282f * raw_r) + (1.54924f * raw_g) + (-0.95641f * raw_b);
const float y = (-0.32466f * raw_r) + (1.57837f * raw_g) + (-0.73191f * raw_b);
const float z = (-0.68202f * raw_r) + (0.77073f * raw_g) + (0.56332f * raw_b);
// 2. Calculate chromacity coordinates
const float xc = (x) / (x + y + z);
const float yc = (y) / (x + y + z);
// 3. Use McCamy's formula to determine the color temperature
const float n = (xc - 0.3320f) / (0.1858f - yc);
// 4. final color temperature in Kelvin.
const float color_temperature = (449.0f * powf(n, 3.0f)) + (3525.0f * powf(n, 2.0f)) + (6823.3f * n) + 5520.33f;
if (this->color_temperature_sensor_ != nullptr)
this->color_temperature_sensor_->publish_state(color_temperature);
ESP_LOGD(TAG, "Got R=%.1f%%,G=%.1f%%,B=%.1f%%,C=%.1f%% Illuminance=%.1flx Color Temperature=%.1fK", channel_r,
channel_g, channel_b, channel_c, illuminance, color_temperature);
this->status_clear_warning();
}
void TCS34725Component::set_integration_time(TCS34725IntegrationTime integration_time) {
this->integration_time_ = integration_time;
}
void TCS34725Component::set_gain(TCS34725Gain gain) { this->gain_ = gain; }
} // namespace tcs34725
} // namespace esphome

View File

@@ -0,0 +1,59 @@
#pragma once
#include "esphome/core/component.h"
#include "esphome/components/sensor/sensor.h"
#include "esphome/components/i2c/i2c.h"
namespace esphome {
namespace tcs34725 {
enum TCS34725IntegrationTime {
TCS34725_INTEGRATION_TIME_2_4MS = 0xFF,
TCS34725_INTEGRATION_TIME_24MS = 0xF6,
TCS34725_INTEGRATION_TIME_50MS = 0xEB,
TCS34725_INTEGRATION_TIME_101MS = 0xD5,
TCS34725_INTEGRATION_TIME_154MS = 0xC0,
TCS34725_INTEGRATION_TIME_700MS = 0x00,
};
enum TCS34725Gain {
TCS34725_GAIN_1X = 0x00,
TCS34725_GAIN_4X = 0x01,
TCS34725_GAIN_16X = 0x02,
TCS34725_GAIN_60X = 0x03,
};
class TCS34725Component : public PollingComponent, public i2c::I2CDevice {
public:
TCS34725Component(uint32_t update_interval) : PollingComponent(update_interval) {}
void set_integration_time(TCS34725IntegrationTime integration_time);
void set_gain(TCS34725Gain gain);
void set_clear_sensor(sensor::Sensor *clear_sensor) { clear_sensor_ = clear_sensor; }
void set_red_sensor(sensor::Sensor *red_sensor) { red_sensor_ = red_sensor; }
void set_green_sensor(sensor::Sensor *green_sensor) { green_sensor_ = green_sensor; }
void set_blue_sensor(sensor::Sensor *blue_sensor) { blue_sensor_ = blue_sensor; }
void set_illuminance_sensor(sensor::Sensor *illuminance_sensor) { illuminance_sensor_ = illuminance_sensor; }
void set_color_temperature_sensor(sensor::Sensor *color_temperature_sensor) {
color_temperature_sensor_ = color_temperature_sensor;
}
void setup() override;
float get_setup_priority() const override;
void update() override;
void dump_config() override;
protected:
sensor::Sensor *clear_sensor_{nullptr};
sensor::Sensor *red_sensor_{nullptr};
sensor::Sensor *green_sensor_{nullptr};
sensor::Sensor *blue_sensor_{nullptr};
sensor::Sensor *illuminance_sensor_{nullptr};
sensor::Sensor *color_temperature_sensor_{nullptr};
TCS34725IntegrationTime integration_time_{TCS34725_INTEGRATION_TIME_2_4MS};
TCS34725Gain gain_{TCS34725_GAIN_1X};
};
} // namespace tcs34725
} // namespace esphome