mirror of https://github.com/esphome/esphome.git
Merge branch 'dev' into ws18x0
This commit is contained in:
commit
fa412c0827
|
@ -60,6 +60,8 @@ void DisplayMenuComponent::left() {
|
|||
if (this->editing_) {
|
||||
this->finish_editing_();
|
||||
changed = true;
|
||||
} else {
|
||||
changed = this->leave_menu_();
|
||||
}
|
||||
break;
|
||||
case MENU_MODE_JOYSTICK:
|
||||
|
|
|
@ -1,16 +1,17 @@
|
|||
#pragma once
|
||||
|
||||
#include "esphome/core/component.h"
|
||||
#include "esphome/components/sensor/sensor.h"
|
||||
#include "esphome/components/uart/uart.h"
|
||||
#include "esphome/core/component.h"
|
||||
|
||||
namespace esphome {
|
||||
namespace pmsx003 {
|
||||
|
||||
// known command bytes
|
||||
#define PMS_CMD_AUTO_MANUAL 0xE1 // data=0: perform measurement manually, data=1: perform measurement automatically
|
||||
#define PMS_CMD_TRIG_MANUAL 0xE2 // trigger a manual measurement
|
||||
#define PMS_CMD_ON_STANDBY 0xE4 // data=0: go to standby mode, data=1: go to normal mode
|
||||
static const uint8_t PMS_CMD_AUTO_MANUAL =
|
||||
0xE1; // data=0: perform measurement manually, data=1: perform measurement automatically
|
||||
static const uint8_t PMS_CMD_TRIG_MANUAL = 0xE2; // trigger a manual measurement
|
||||
static const uint8_t PMS_CMD_ON_STANDBY = 0xE4; // data=0: go to standby mode, data=1: go to normal mode
|
||||
|
||||
static const uint16_t PMS_STABILISING_MS = 30000; // time taken for the sensor to become stable after power on
|
||||
|
||||
|
|
|
@ -72,6 +72,7 @@ void QMC5883LComponent::dump_config() {
|
|||
LOG_SENSOR(" ", "Y Axis", this->y_sensor_);
|
||||
LOG_SENSOR(" ", "Z Axis", this->z_sensor_);
|
||||
LOG_SENSOR(" ", "Heading", this->heading_sensor_);
|
||||
LOG_SENSOR(" ", "Temperature", this->temperature_sensor_);
|
||||
}
|
||||
float QMC5883LComponent::get_setup_priority() const { return setup_priority::DATA; }
|
||||
void QMC5883LComponent::update() {
|
||||
|
@ -123,7 +124,18 @@ void QMC5883LComponent::update() {
|
|||
heading = atan2f(0.0f - x, y) * 180.0f / M_PI;
|
||||
}
|
||||
|
||||
ESP_LOGD(TAG, "Got x=%0.02fµT y=%0.02fµT z=%0.02fµT heading=%0.01f° status=%u", x, y, z, heading, status);
|
||||
float temp = NAN;
|
||||
if (this->temperature_sensor_ != nullptr) {
|
||||
uint16_t raw_temp;
|
||||
if (!this->read_byte_16_(QMC5883L_REGISTER_TEMPERATURE_LSB, &raw_temp)) {
|
||||
this->status_set_warning();
|
||||
return;
|
||||
}
|
||||
temp = int16_t(raw_temp) * 0.01f;
|
||||
}
|
||||
|
||||
ESP_LOGD(TAG, "Got x=%0.02fµT y=%0.02fµT z=%0.02fµT heading=%0.01f° temperature=%0.01f°C status=%u", x, y, z, heading,
|
||||
temp, status);
|
||||
|
||||
if (this->x_sensor_ != nullptr)
|
||||
this->x_sensor_->publish_state(x);
|
||||
|
@ -133,6 +145,8 @@ void QMC5883LComponent::update() {
|
|||
this->z_sensor_->publish_state(z);
|
||||
if (this->heading_sensor_ != nullptr)
|
||||
this->heading_sensor_->publish_state(heading);
|
||||
if (this->temperature_sensor_ != nullptr)
|
||||
this->temperature_sensor_->publish_state(temp);
|
||||
}
|
||||
|
||||
bool QMC5883LComponent::read_byte_16_(uint8_t a_register, uint16_t *data) {
|
||||
|
|
|
@ -40,6 +40,7 @@ class QMC5883LComponent : public PollingComponent, public i2c::I2CDevice {
|
|||
void set_y_sensor(sensor::Sensor *y_sensor) { y_sensor_ = y_sensor; }
|
||||
void set_z_sensor(sensor::Sensor *z_sensor) { z_sensor_ = z_sensor; }
|
||||
void set_heading_sensor(sensor::Sensor *heading_sensor) { heading_sensor_ = heading_sensor; }
|
||||
void set_temperature_sensor(sensor::Sensor *temperature_sensor) { temperature_sensor_ = temperature_sensor; }
|
||||
|
||||
protected:
|
||||
QMC5883LDatarate datarate_{QMC5883L_DATARATE_10_HZ};
|
||||
|
@ -49,6 +50,7 @@ class QMC5883LComponent : public PollingComponent, public i2c::I2CDevice {
|
|||
sensor::Sensor *y_sensor_{nullptr};
|
||||
sensor::Sensor *z_sensor_{nullptr};
|
||||
sensor::Sensor *heading_sensor_{nullptr};
|
||||
sensor::Sensor *temperature_sensor_{nullptr};
|
||||
enum ErrorCode {
|
||||
NONE = 0,
|
||||
COMMUNICATION_FAILED,
|
||||
|
|
|
@ -6,12 +6,15 @@ from esphome.const import (
|
|||
CONF_FIELD_STRENGTH_X,
|
||||
CONF_FIELD_STRENGTH_Y,
|
||||
CONF_FIELD_STRENGTH_Z,
|
||||
CONF_TEMPERATURE,
|
||||
CONF_ID,
|
||||
CONF_OVERSAMPLING,
|
||||
CONF_RANGE,
|
||||
DEVICE_CLASS_TEMPERATURE,
|
||||
ICON_MAGNET,
|
||||
STATE_CLASS_MEASUREMENT,
|
||||
UNIT_MICROTESLA,
|
||||
UNIT_CELSIUS,
|
||||
UNIT_DEGREES,
|
||||
ICON_SCREEN_ROTATION,
|
||||
CONF_UPDATE_INTERVAL,
|
||||
|
@ -79,6 +82,12 @@ heading_schema = sensor.sensor_schema(
|
|||
icon=ICON_SCREEN_ROTATION,
|
||||
accuracy_decimals=1,
|
||||
)
|
||||
temperature_schema = sensor.sensor_schema(
|
||||
unit_of_measurement=UNIT_CELSIUS,
|
||||
accuracy_decimals=1,
|
||||
device_class=DEVICE_CLASS_TEMPERATURE,
|
||||
state_class=STATE_CLASS_MEASUREMENT,
|
||||
)
|
||||
|
||||
CONFIG_SCHEMA = (
|
||||
cv.Schema(
|
||||
|
@ -95,6 +104,7 @@ CONFIG_SCHEMA = (
|
|||
cv.Optional(CONF_FIELD_STRENGTH_Y): field_strength_schema,
|
||||
cv.Optional(CONF_FIELD_STRENGTH_Z): field_strength_schema,
|
||||
cv.Optional(CONF_HEADING): heading_schema,
|
||||
cv.Optional(CONF_TEMPERATURE): temperature_schema,
|
||||
}
|
||||
)
|
||||
.extend(cv.polling_component_schema("60s"))
|
||||
|
@ -131,3 +141,6 @@ async def to_code(config):
|
|||
if CONF_HEADING in config:
|
||||
sens = await sensor.new_sensor(config[CONF_HEADING])
|
||||
cg.add(var.set_heading_sensor(sens))
|
||||
if CONF_TEMPERATURE in config:
|
||||
sens = await sensor.new_sensor(config[CONF_TEMPERATURE])
|
||||
cg.add(var.set_temperature_sensor(sens))
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
# Useful stuff when working in a development environment
|
||||
clang-format==13.0.1
|
||||
clang-tidy==14.0.6
|
||||
yamllint==1.35.1
|
||||
|
|
|
@ -57,6 +57,7 @@ file_types = (
|
|||
"",
|
||||
)
|
||||
cpp_include = ("*.h", "*.c", "*.cpp", "*.tcc")
|
||||
py_include = ("*.py",)
|
||||
ignore_types = (".ico", ".png", ".woff", ".woff2", "")
|
||||
|
||||
LINT_FILE_CHECKS = []
|
||||
|
@ -265,7 +266,8 @@ def lint_end_newline(fname, content):
|
|||
return None
|
||||
|
||||
|
||||
CPP_RE_EOL = r"\s*?(?://.*?)?$"
|
||||
CPP_RE_EOL = r".*?(?://.*?)?$"
|
||||
PY_RE_EOL = r".*?(?:#.*?)?$"
|
||||
|
||||
|
||||
def highlight(s):
|
||||
|
@ -273,7 +275,7 @@ def highlight(s):
|
|||
|
||||
|
||||
@lint_re_check(
|
||||
r"^#define\s+([a-zA-Z0-9_]+)\s+([0-9bx]+)" + CPP_RE_EOL,
|
||||
r"^#define\s+([a-zA-Z0-9_]+)\s+(0b[10]+|0x[0-9a-fA-F]+|\d+)\s*?(?:\/\/.*?)?$",
|
||||
include=cpp_include,
|
||||
exclude=[
|
||||
"esphome/core/log.h",
|
||||
|
@ -574,11 +576,6 @@ def lint_pragma_once(fname, content):
|
|||
return None
|
||||
|
||||
|
||||
@lint_re_check(
|
||||
r"(whitelist|blacklist|slave)",
|
||||
exclude=["script/ci-custom.py"],
|
||||
flags=re.IGNORECASE | re.MULTILINE,
|
||||
)
|
||||
def lint_inclusive_language(fname, match):
|
||||
# From https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=49decddd39e5f6132ccd7d9fdc3d7c470b0061bb
|
||||
return (
|
||||
|
@ -596,6 +593,21 @@ def lint_inclusive_language(fname, match):
|
|||
)
|
||||
|
||||
|
||||
lint_re_check(
|
||||
r"(whitelist|blacklist|slave)" + PY_RE_EOL,
|
||||
include=py_include,
|
||||
exclude=["script/ci-custom.py"],
|
||||
flags=re.IGNORECASE | re.MULTILINE,
|
||||
)(lint_inclusive_language)
|
||||
|
||||
|
||||
lint_re_check(
|
||||
r"(whitelist|blacklist|slave)" + CPP_RE_EOL,
|
||||
include=cpp_include,
|
||||
flags=re.IGNORECASE | re.MULTILINE,
|
||||
)(lint_inclusive_language)
|
||||
|
||||
|
||||
@lint_re_check(r"[\t\r\f\v ]+$")
|
||||
def lint_trailing_whitespace(fname, match):
|
||||
return "Trailing whitespace detected"
|
||||
|
|
|
@ -14,6 +14,8 @@ sensor:
|
|||
name: QMC5883L Field Strength Z
|
||||
heading:
|
||||
name: QMC5883L Heading
|
||||
temperature:
|
||||
name: QMC5883L Temperature
|
||||
range: 800uT
|
||||
oversampling: 256x
|
||||
update_interval: 15s
|
||||
|
|
|
@ -14,6 +14,8 @@ sensor:
|
|||
name: QMC5883L Field Strength Z
|
||||
heading:
|
||||
name: QMC5883L Heading
|
||||
temperature:
|
||||
name: QMC5883L Temperature
|
||||
range: 800uT
|
||||
oversampling: 256x
|
||||
update_interval: 15s
|
||||
|
|
|
@ -14,6 +14,8 @@ sensor:
|
|||
name: QMC5883L Field Strength Z
|
||||
heading:
|
||||
name: QMC5883L Heading
|
||||
temperature:
|
||||
name: QMC5883L Temperature
|
||||
range: 800uT
|
||||
oversampling: 256x
|
||||
update_interval: 15s
|
||||
|
|
|
@ -14,6 +14,8 @@ sensor:
|
|||
name: QMC5883L Field Strength Z
|
||||
heading:
|
||||
name: QMC5883L Heading
|
||||
temperature:
|
||||
name: QMC5883L Temperature
|
||||
range: 800uT
|
||||
oversampling: 256x
|
||||
update_interval: 15s
|
||||
|
|
|
@ -14,6 +14,8 @@ sensor:
|
|||
name: QMC5883L Field Strength Z
|
||||
heading:
|
||||
name: QMC5883L Heading
|
||||
temperature:
|
||||
name: QMC5883L Temperature
|
||||
range: 800uT
|
||||
oversampling: 256x
|
||||
update_interval: 15s
|
||||
|
|
|
@ -14,6 +14,8 @@ sensor:
|
|||
name: QMC5883L Field Strength Z
|
||||
heading:
|
||||
name: QMC5883L Heading
|
||||
temperature:
|
||||
name: QMC5883L Temperature
|
||||
range: 800uT
|
||||
oversampling: 256x
|
||||
update_interval: 15s
|
||||
|
|
Loading…
Reference in New Issue