sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-26 04:33:47 +00:00
Code Issues Releases Wiki Activity

Fix linting errors

Browse Source
This commit is contained in:
Stephen Tierney
2021-02-01 21:35:54 +11:00
committed by steve
parent 17d784bbc5
commit 7d13d6aa50
3 changed files with 89 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
esphome/components/ltr390/ltr390.cpp
View File

@@ -2,7 +2,6 @@
#include "esphome/core/log.h" #include "esphome/core/log.h"
#include <bitset> #include <bitset>
namespace esphome { namespace esphome {
namespace ltr390 { namespace ltr390 {
@@ -12,18 +11,18 @@ static const float gain_values_[5] = {1.0, 3.0, 6.0, 9.0, 18.0};
static const float resolution_values_[6] = {4.0, 2.0, 1.0, 0.5, 0.25, 0.125}; static const float resolution_values_[6] = {4.0, 2.0, 1.0, 0.5, 0.25, 0.125};
static const uint32_t mode_addresses_[2] = {0x0D, 0x10}; static const uint32_t mode_addresses_[2] = {0x0D, 0x10};
bool LTR390Component::enabled(void) { bool LTR390Component::enabled_(void) {
std::bitset<8> crtl_value(this->ctrl_reg_->get()); std::bitset<8> crtl_value(this->ctrl_reg_->get());
return (bool) crtl_value[LTR390_CTRL_EN]; return (bool) crtl_value[LTR390_CTRL_EN];
} }
void LTR390Component::enable(bool en) { void LTR390Component::enable_(bool en) {
std::bitset<8> crtl_value(this->ctrl_reg_->get()); std::bitset<8> crtl_value(this->ctrl_reg_->get());
crtl_value[LTR390_CTRL_EN] = en; crtl_value[LTR390_CTRL_EN] = en;
*this->ctrl_reg_ = crtl_value.to_ulong(); *this->ctrl_reg_ = crtl_value.to_ulong();
} }
bool LTR390Component::reset(void) { bool LTR390Component::reset_(void) {
std::bitset<8> crtl_value(this->ctrl_reg_->get()); std::bitset<8> crtl_value(this->ctrl_reg_->get());
crtl_value[LTR390_CTRL_RST] = 1; crtl_value[LTR390_CTRL_RST] = 1;
@@ -39,27 +38,27 @@ bool LTR390Component::reset(void) {
return true; return true;
} }
void LTR390Component::set_mode(ltr390_mode_t mode) { void LTR390Component::set_mode_(ltr390_mode_t mode) {
std::bitset<8> crtl_value(this->ctrl_reg_->get()); std::bitset<8> crtl_value(this->ctrl_reg_->get());
crtl_value[LTR390_CTRL_MODE] = mode; crtl_value[LTR390_CTRL_MODE] = mode;
*this->ctrl_reg_ = crtl_value.to_ulong(); *this->ctrl_reg_ = crtl_value.to_ulong();
} }
ltr390_mode_t LTR390Component::get_mode(void) { ltr390_mode_t LTR390Component::get_mode_(void) {
std::bitset<8> crtl_value(this->ctrl_reg_->get()); std::bitset<8> crtl_value(this->ctrl_reg_->get());
return (ltr390_mode_t)(int) crtl_value[LTR390_CTRL_MODE]; return (ltr390_mode_t)(int) crtl_value[LTR390_CTRL_MODE];
} }
void LTR390Component::set_gain(ltr390_gain_t gain) { void LTR390Component::set_gain_(ltr390_gain_t gain) {
*this->gain_reg_ = gain; *this->gain_reg_ = gain;
} }
ltr390_gain_t LTR390Component::get_gain(void) { ltr390_gain_t LTR390Component::get_gain_(void) {
std::bitset<8> gain_value(this->gain_reg_->get()); std::bitset<8> gain_value(this->gain_reg_->get());
return (ltr390_gain_t) gain_value.to_ulong(); return (ltr390_gain_t) gain_value.to_ulong();
} }
void LTR390Component::set_resolution(ltr390_resolution_t res) { void LTR390Component::set_resolution_(ltr390_resolution_t res) {
std::bitset<8> res_value(this->res_reg_->get()); std::bitset<8> res_value(this->res_reg_->get());
std::bitset<3> new_res_value(res); std::bitset<3> new_res_value(res);
@@ -71,7 +70,7 @@ void LTR390Component::set_resolution(ltr390_resolution_t res) {
*this->res_reg_ = res_value.to_ulong(); *this->res_reg_ = res_value.to_ulong();
} }
ltr390_resolution_t LTR390Component::get_resolution(void) { ltr390_resolution_t LTR390Component::get_resolution_(void) {
std::bitset<8> res_value(this->res_reg_->get()); std::bitset<8> res_value(this->res_reg_->get());
std::bitset<3> output_value (0); std::bitset<3> output_value (0);
@@ -82,7 +81,7 @@ ltr390_resolution_t LTR390Component::get_resolution(void) {
return (ltr390_resolution_t) output_value.to_ulong(); return (ltr390_resolution_t) output_value.to_ulong();
} }
bool LTR390Component::new_data_available(void) { bool LTR390Component::new_data_available_(void) {
std::bitset<8> status_value(this->status_reg_->get()); std::bitset<8> status_value(this->status_reg_->get());
return (bool) status_value[3]; return (bool) status_value[3];
} }
@@ -98,7 +97,7 @@ uint32_t little_endian_bytes_to_int(uint8_t *buffer, uint8_t num_bytes) {
return value; return value;
} }
uint32_t LTR390Component::read_sensor_data(ltr390_mode_t mode) { uint32_t LTR390Component::read_sensor_data_(ltr390_mode_t mode) {
const uint8_t num_bytes = 3; const uint8_t num_bytes = 3;
uint8_t buffer[num_bytes]; uint8_t buffer[num_bytes];
@@ -113,8 +112,6 @@ uint32_t LTR390Component::read_sensor_data(ltr390_mode_t mode) {
} }
void LTR390Component::setup() { void LTR390Component::setup() {
ESP_LOGCONFIG(TAG, "Setting up ltr390..."); ESP_LOGCONFIG(TAG, "Setting up ltr390...");
this->ctrl_reg_ = new i2c::I2CRegister(this, LTR390_MAIN_CTRL); this->ctrl_reg_ = new i2c::I2CRegister(this, LTR390_MAIN_CTRL);
@@ -152,14 +149,13 @@ void LTR390Component::setup() {
if (this->uvi_sensor_ != nullptr || this->uv_sensor_ != nullptr) { if (this->uvi_sensor_ != nullptr || this->uv_sensor_ != nullptr) {
this->mode_funcs_->push_back(std::make_tuple(LTR390_MODE_UVS, std::bind(&LTR390Component::read_uvs, this))); this->mode_funcs_->push_back(std::make_tuple(LTR390_MODE_UVS, std::bind(&LTR390Component::read_uvs, this)));
} }
} }
void LTR390Component::dump_config() { void LTR390Component::dump_config() {
LOG_I2C_DEVICE(this); LOG_I2C_DEVICE(this);
} }
void LTR390Component::read_als() { void LTR390Component::read_als_() {
uint32_t als = this->read_sensor_data(LTR390_MODE_ALS); uint32_t als = this->read_sensor_data(LTR390_MODE_ALS);
if (this->light_sensor_ != nullptr) { if (this->light_sensor_ != nullptr) {
@@ -170,10 +166,9 @@ void LTR390Component::read_als() {
if (this->als_sensor_ != nullptr) { if (this->als_sensor_ != nullptr) {
this->als_sensor_->publish_state(als); this->als_sensor_->publish_state(als);
} }
} }
void LTR390Component::read_uvs() { void LTR390Component::read_uvs_() {
uint32_t uv = this->read_sensor_data(LTR390_MODE_UVS); uint32_t uv = this->read_sensor_data(LTR390_MODE_UVS);
if (this->uvi_sensor_ != nullptr) { if (this->uvi_sensor_ != nullptr) {
@@ -185,8 +180,7 @@ void LTR390Component::read_uvs() {
} }
} }
void LTR390Component::read_mode_(int mode_index) {
void LTR390Component::read_mode(int mode_index) {
// Set mode // Set mode
this->set_mode(std::get<0>(this->mode_funcs_->at(mode_index))); this->set_mode(std::get<0>(this->mode_funcs_->at(mode_index)));
@@ -204,7 +198,6 @@ void LTR390Component::read_mode(int mode_index) {
this->reading = false; this->reading = false;
} }
}); });
} }
void LTR390Component::update() { void LTR390Component::update() {

56
esphome/components/ltr390/ltr390.h
View File

@@ -10,46 +10,46 @@
namespace esphome { namespace esphome {
namespace ltr390 { namespace ltr390 {
typedef enum { enum ltr390_ctrl_t {
LTR390_CTRL_EN = 1, LTR390_CTRL_EN = 1,
LTR390_CTRL_MODE = 3, LTR390_CTRL_MODE = 3,
LTR390_CTRL_RST = 4, LTR390_CTRL_RST = 4,
} ltr390_ctrl_t; };
// enums from https://github.com/adafruit/Adafruit_LTR390/ // enums from https://github.com/adafruit/Adafruit_LTR390/
#define LTR390_MAIN_CTRL 0x00 ///< Main control register static const uint8_t LTR390_MAIN_CTRL = 0x00;
#define LTR390_MEAS_RATE 0x04 ///< Resolution and data rate static const uint8_t LTR390_MEAS_RATE = 0x04;
#define LTR390_GAIN 0x05 ///< ALS and UVS gain range static const uint8_t LTR390_GAIN = 0x05;
#define LTR390_PART_ID 0x06 ///< Part id/revision register static const uint8_t LTR390_PART_ID = 0x06;
#define LTR390_MAIN_STATUS 0x07 ///< Main status register static const uint8_t LTR390_MAIN_STATUS = 0x07;
#define LTR390_SENSITIVITY 2300.0 #define LTR390_SENSITIVITY 2300.0
// Sensing modes // Sensing modes
typedef enum { enum ltr390_mode_t {
LTR390_MODE_ALS, LTR390_MODE_ALS,
LTR390_MODE_UVS, LTR390_MODE_UVS,
} ltr390_mode_t; };
// Sensor gain levels // Sensor gain levels
typedef enum { enum ltr390_gain_t {
LTR390_GAIN_1 = 0, LTR390_GAIN_1 = 0,
LTR390_GAIN_3, // Default LTR390_GAIN_3, // Default
LTR390_GAIN_6, LTR390_GAIN_6,
LTR390_GAIN_9, LTR390_GAIN_9,
LTR390_GAIN_18, LTR390_GAIN_18,
} ltr390_gain_t; };
// Sensor resolution // Sensor resolution
typedef enum { enum ltr390_resolution_t {
LTR390_RESOLUTION_20BIT, LTR390_RESOLUTION_20BIT,
LTR390_RESOLUTION_19BIT, LTR390_RESOLUTION_19BIT,
LTR390_RESOLUTION_18BIT, // Default LTR390_RESOLUTION_18BIT, // Default
LTR390_RESOLUTION_17BIT, LTR390_RESOLUTION_17BIT,
LTR390_RESOLUTION_16BIT, LTR390_RESOLUTION_16BIT,
LTR390_RESOLUTION_13BIT, LTR390_RESOLUTION_13BIT,
} ltr390_resolution_t; };
class LTR390Component : public PollingComponent, public i2c::I2CDevice { class LTR390Component : public PollingComponent, public i2c::I2CDevice {
public: public:
@@ -68,29 +68,29 @@ class LTR390Component : public PollingComponent, public i2c::I2CDevice {
void set_uv_sensor(sensor::Sensor *uv_sensor) { this->uv_sensor_ = uv_sensor; } void set_uv_sensor(sensor::Sensor *uv_sensor) { this->uv_sensor_ = uv_sensor; }
protected: protected:
bool enabled(); bool enabled_();
void enable(bool en); void enable_(bool en);
bool reset(void); bool reset_();
void set_mode(ltr390_mode_t mode); void set_mode_(ltr390_mode_t mode);
ltr390_mode_t get_mode(void); ltr390_mode_t get_mode_();
void set_gain(ltr390_gain_t gain); void set_gain_(ltr390_gain_t gain);
ltr390_gain_t get_gain(void); ltr390_gain_t get_gain_();
void set_resolution(ltr390_resolution_t res); void set_resolution_(ltr390_resolution_t res);
ltr390_resolution_t get_resolution(void); ltr390_resolution_t get_resolution_();
bool new_data_available(void); bool new_data_available_();
uint32_t read_sensor_data(ltr390_mode_t mode); uint32_t read_sensor_data_(ltr390_mode_t mode);
void read_als(void); void read_als_();
void read_uvs(void); void read_uvs_();
void read_mode(int mode_index); void read_mode_(int mode_index);
std::atomic<bool> reading; std::atomic<bool> reading_;
std::vector< std::tuple< ltr390_mode_t, std::function<void(void)> > > *mode_funcs_; std::vector< std::tuple< ltr390_mode_t, std::function<void(void)> > > *mode_funcs_;

3
esphome/components/ltr390/sensor.py
View File

@@ -1,7 +1,7 @@
import esphome.codegen as cg import esphome.codegen as cg
import esphome.config_validation as cv import esphome.config_validation as cv
from esphome.components import i2c, sensor from esphome.components import i2c, sensor
from esphome.const import CONF_ID, CONF_GAIN, CONF_RESOLUTION, UNIT_LUX, ICON_BRIGHTNESS_5 from esphome.const import CONF_ID, CONF_GAIN, CONF_LIGHT, CONF_RESOLUTION, UNIT_LUX, ICON_BRIGHTNESS_5
DEPENDENCIES = ['i2c'] DEPENDENCIES = ['i2c']
@@ -9,7 +9,6 @@ ltr390_ns = cg.esphome_ns.namespace('ltr390')
LTR390Component = ltr390_ns.class_('LTR390Component', cg.PollingComponent, i2c.I2CDevice) LTR390Component = ltr390_ns.class_('LTR390Component', cg.PollingComponent, i2c.I2CDevice)
CONF_LIGHT = 'light'
CONF_ALS = 'als' CONF_ALS = 'als'
CONF_UVI = 'uvi' CONF_UVI = 'uvi'
CONF_UV = 'uv' CONF_UV = 'uv'