Upstream/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-11-28 12:46:22 +01:00
Code Issues Projects Releases Wiki Activity

Fix clang formatting and methods

Browse Source
This commit is contained in:
thetestspecimen 2024-10-08 00:10:25 +03:00
parent 648bf3580c
commit 8b05c8b172
No known key found for this signature in database
GPG Key ID: C88001C355A25170
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
esphome/components/sen0501/sen0501.cpp
View File

@ -1,7 +1,6 @@
#include "sen0501.h" #include "sen0501.h"
#include "esphome/core/log.h" #include "esphome/core/log.h"
#include "esphome/core/hal.h" #include "esphome/core/hal.h"
#include "esphome/core/helpers.h"
namespace esphome { namespace esphome {
namespace sen0501 { namespace sen0501 {
@ -40,14 +39,14 @@ void Sen0501Component::setup() {
} else { } else {
uint8_t buf[2]; uint8_t buf[2];
this->read_bytes(REG_PID, buf, 2); this->read_bytes(REG_PID, buf, 2);
uint16_t product_id = this->encode_uint16(buf[0], buf[1]); uint16_t product_id = encode_uint16(buf[0], buf[1]);
if ((product_id != DEVICE_PID_GRAVITY) && (product_id != DEVICE_PID_BREAKOUT)) { if ((product_id != DEVICE_PID_GRAVITY) && (product_id != DEVICE_PID_BREAKOUT)) {
this->error_code_ = WRONG_DEVICE_ID; this->error_code_ = WRONG_DEVICE_ID;
this->mark_failed(); this->mark_failed();
return; return;
} }
this->read_bytes(REG_VID, buf, 2); this->read_bytes(REG_VID, buf, 2);
uint16_t vendor_id = this->encode_uint16(buf[0], buf[1]); uint16_t vendor_id = encode_uint16(buf[0], buf[1]);
if (vendor_id != DEVICE_VID) { if (vendor_id != DEVICE_VID) {
this->error_code_ = WRONG_VENDOR_ID; this->error_code_ = WRONG_VENDOR_ID;
this->mark_failed(); this->mark_failed();
@ -100,7 +99,7 @@ void Sen0501Component::read_temperature_() {
uint8_t buffer[2]; uint8_t buffer[2];
float temp; float temp;
this->read_bytes(REG_TEMP, buffer, 2); this->read_bytes(REG_TEMP, buffer, 2);
uint16_t data = this->encode_uint16(buffer[0], buffer[1]); uint16_t data = encode_uint16(buffer[0], buffer[1]);
temp = 175.0f * float(data) / 65536.0f - 45.0f; temp = 175.0f * float(data) / 65536.0f - 45.0f;
this->temperature_->publish_state(temp); this->temperature_->publish_state(temp);
} }
@ -111,7 +110,7 @@ void Sen0501Component::read_humidity_() {
uint8_t buffer[2]; uint8_t buffer[2];
float humidity; float humidity;
this->read_bytes(REG_HUMIDITY, buffer, 2); this->read_bytes(REG_HUMIDITY, buffer, 2);
uint16_t data = this->encode_uint16(buffer[0], buffer[1]); uint16_t data = encode_uint16(buffer[0], buffer[1]);
humidity = (float) data * 100 / 65536; humidity = (float) data * 100 / 65536;
this->humidity_->publish_state(humidity); this->humidity_->publish_state(humidity);
} }
@ -123,21 +122,21 @@ void Sen0501Component::read_uv_intensity_() {
uint16_t version = 0; uint16_t version = 0;
float ultra_violet; float ultra_violet;
this->read_bytes(REG_VERSION, buffer, 2); this->read_bytes(REG_VERSION, buffer, 2);
version = this->encode_uint16(buffer[0], buffer[1]); version = encode_uint16(buffer[0], buffer[1]);
if (version == 0x1001) { if (version == 0x1001) {
this->read_bytes(REG_ULTRAVIOLET_INTENSITY, buffer, 2); this->read_bytes(REG_ULTRAVIOLET_INTENSITY, buffer, 2);
uint16_t uv_level = this->encode_uint16(buffer[0], buffer[1]); uint16_t uv_level = encode_uint16(buffer[0], buffer[1]);
ultra_violet = (float) uv_level / 1800.0; ultra_violet = (float) uv_level / 1800.0;
} else { } else {
this->read_bytes(REG_ULTRAVIOLET_INTENSITY, buffer, 2); this->read_bytes(REG_ULTRAVIOLET_INTENSITY, buffer, 2);
uint16_t uv_level = this->encode_uint16(buffer[0], buffer[1]); uint16_t uv_level = encode_uint16(buffer[0], buffer[1]);
float output_voltage = 3.0 * uv_level / 1024; float output_voltage = 3.0 * uv_level / 1024;
if (output_voltage <= 0.99) { if (output_voltage <= 0.99) {
output_voltage = 0.99; output_voltage = 0.99;
} else if (output_voltage >= 2.99) { } else if (output_voltage >= 2.99) {
output_voltage = 2.99; output_voltage = 2.99;
} }
ultra_violet = this->remap(output_voltage, 0.99f, 2.9f, 0.0f, 15.0f); ultra_violet = remap(output_voltage, 0.99f, 2.9f, 0.0f, 15.0f);
} }
this->uv_intensity_->publish_state(ultra_violet); this->uv_intensity_->publish_state(ultra_violet);
} }
@ -147,7 +146,7 @@ void Sen0501Component::read_luminous_intensity_() {
return; return;
uint8_t buffer[2]; uint8_t buffer[2];
this->read_bytes(REG_LUMINOUS_INTENSITY, buffer, 2); this->read_bytes(REG_LUMINOUS_INTENSITY, buffer, 2);
uint16_t data = this->encode_uint16(buffer[0], buffer[1]); uint16_t data = encode_uint16(buffer[0], buffer[1]);
float luminous = data; float luminous = data;
luminous = luminous * (1.0023f + luminous * (8.1488e-5f + luminous * (-9.3924e-9f + luminous * 6.0135e-13f))); luminous = luminous * (1.0023f + luminous * (8.1488e-5f + luminous * (-9.3924e-9f + luminous * 6.0135e-13f)));
this->luminous_intensity_->publish_state(luminous); this->luminous_intensity_->publish_state(luminous);
@ -158,7 +157,7 @@ void Sen0501Component::read_atmospheric_pressure_() {
return; return;
uint8_t buffer[2]; uint8_t buffer[2];
this->read_bytes(REG_ATMOSPHERIC_PRESSURE, buffer, 2); this->read_bytes(REG_ATMOSPHERIC_PRESSURE, buffer, 2);
uint16_t atmosphere = this->encode_uint16(buffer[0], buffer[1]); uint16_t atmosphere = encode_uint16(buffer[0], buffer[1]);
this->atmospheric_pressure_->publish_state(atmosphere); this->atmospheric_pressure_->publish_state(atmosphere);
if (this->elevation_ == nullptr) if (this->elevation_ == nullptr)
return; return;

1
esphome/components/sen0501/sen0501.h
View File

@ -27,7 +27,6 @@ class Sen0501Component : public PollingComponent, public i2c::I2CDevice {
void update() override; void update() override;
protected: protected:
void read_temperature_(); void read_temperature_();
void read_humidity_(); void read_humidity_();
void read_uv_intensity_(); void read_uv_intensity_();