Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-11-30 10:44:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Conforming to CLANG 2

Browse source
This commit is contained in:
markodraca 2024-09-12 18:40:47 +02:00
parent 543a4ba7a4
commit 9b3fd47247
3 changed files with 9 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
esphome/components/mcp3204/mcp3204.cpp
View file

@ -20,15 +20,14 @@ void MCP3204::dump_config() {
} }
float MCP3204::read_data(uint8_t channel, bool differential) { float MCP3204::read_data(uint8_t channel, bool differential) {
uint8_t command, sgldiff; uint8_t command, sgldiff;
uint8_t b0, b1, b2; uint8_t b0, b1, b2;
sgldiff = differential ? 0 : 1; sgldiff = differential ? 0 : 1;
command = ((0x01 << 7) | // start bit command = ((0x01 << 7) | // start bit
(sgldiff << 6) | // single or differential (sgldiff << 6) | // single or differential
((channel & 0x07) << 3)); // channel number ((channel & 0x07) << 3)); // channel number
this->enable(); this->enable();
b0 = this->transfer_byte(command); b0 = this->transfer_byte(command);
@ -37,7 +36,7 @@ float MCP3204::read_data(uint8_t channel, bool differential) {
this->disable(); this->disable();
uint16_t digital_value = 0xFFF & ((b0 & 0x01) << 11 | (b1 & 0xFF) << 3 | (b2 & 0xE0) >> 5); uint16_t digital_value = 0xFFF & ((b0 & 0x01) << 11 | (b1 & 0xFF) << 3 | (b2 & 0xE0) >> 5);
return float(digital_value) / 4096.000 * this->reference_voltage_; // in V return float(digital_value) / 4096.000 * this->reference_voltage_; // in V
} }
} // namespace mcp3204 } // namespace mcp3204

11
esphome/components/mcp3204/mcp3204.h
View file

@ -8,17 +8,12 @@ namespace esphome {
namespace mcp3204 { namespace mcp3204 {
class MCP3204 : public Component, class MCP3204 : public Component,
public spi::SPIDevice<spi::BIT_ORDER_MSB_FIRST, public spi::SPIDevice<spi::BIT_ORDER_MSB_FIRST, spi::CLOCK_POLARITY_LOW, spi::CLOCK_PHASE_LEADING,
spi::CLOCK_POLARITY_LOW, spi::DATA_RATE_1MHZ> {
spi::CLOCK_PHASE_LEADING,
spi::DATA_RATE_1MHZ> {
public: public:
MCP3204() = default; MCP3204() = default;
void set_reference_voltage(float reference_voltage) void set_reference_voltage(float reference_voltage) { this->reference_voltage_ = reference_voltage; }
{
this->reference_voltage_ = reference_voltage;
}
void setup() override; void setup() override;
void dump_config() override; void dump_config() override;

10
esphome/components/mcp3204/sensor/mcp3204_sensor.cpp
View file

@ -17,14 +17,8 @@ void MCP3204Sensor::dump_config() {
ESP_LOGCONFIG(TAG, " DIFFERENTIAL MODE: %u", this->diffmode_); ESP_LOGCONFIG(TAG, " DIFFERENTIAL MODE: %u", this->diffmode_);
LOG_UPDATE_INTERVAL(this); LOG_UPDATE_INTERVAL(this);
} }
float MCP3204Sensor::sample() float MCP3204Sensor::sample() { return this->parent_->read_data(this->pin_, this->diffmode_); }
{ void MCP3204Sensor::update() { this->publish_state(this->sample()); }
return this->parent_->read_data(this->pin_, this->diffmode_);
}
void MCP3204Sensor::update()
{
this->publish_state(this->sample());
}
} // namespace mcp3204 } // namespace mcp3204
} // namespace esphome } // namespace esphome