sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-03-14 14:48:18 +00:00
Code Issues Releases Wiki Activity

Update lint

Browse Source
This commit is contained in:
Jesse Hills 2019-05-27 08:02:41 +12:00
parent fffa342048
commit 0f1106e959
No known key found for this signature in database
GPG Key ID: F7ECB64F6269DC28
2 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
esphome/components/ct_clamp/ct_clamp_sensor.cpp
View File

@ -10,7 +10,7 @@ void CTClampSensor::setup() {
ESP_LOGCONFIG(TAG, "Setting up CT Clamp '%s'...", this->get_name().c_str());
GPIOPin(this->pin_, INPUT).setup();
offsetI = ADC_COUNTS>>1;
offsetI = ADC_COUNTS >> 1;
}
@ -27,33 +27,31 @@ float CTClampSensor::get_setup_priority() const { return setup_priority::DATA; }
void CTClampSensor::update() {
for (unsigned int n = 0; n < this->sample_size_; n++)
{
sampleI = analogRead(this->pin_);
for (unsigned int n = 0; n < this->sample_size_; n++) {
sample_i_ = analogRead(this->pin_);
// Digital low pass filter extracts the 1.65 V dc offset,
// then subtract this - signal is now centered on 0 counts.
offsetI = (offsetI + (sampleI-offsetI)/(ADC_COUNTS));
filteredI = sampleI - offsetI;
offset_i_ = (offset_i_ + (sample_i_ - offset_i_) / (ADC_COUNTS));
filtered_i_ = sample_i_ - offset_i_;
// Root-mean-square method current
// 1) square current values
sqI = filteredI * filteredI;
sq_i_ = filtered_i_ * filtered_i_;
// 2) sum
sumI += sqI;
sum_i_ += sq_i_;
}
double I_RATIO = this->calibration_ * ((supply_voltage_) / (ADC_COUNTS));
Irms = I_RATIO * sqrt(sumI / this->sample_size_);
double i_ratio = this->calibration_ * ((supply_voltage_) / (ADC_COUNTS));
irms_ = i_ratio * sqrt(sum_i_ / this->sample_size_);
//Reset accumulators
sumI = 0;
sum_i_ = 0;
ESP_LOGD(TAG, "'%s'", this->get_name().c_str(), Irms);
ESP_LOGD(TAG, " Amps=%.2fA", Irms);
ESP_LOGD(TAG, " Watts=%.0fW", Irms * 230.0);
ESP_LOGD(TAG, "'%s'", this->get_name().c_str(), irms_);
ESP_LOGD(TAG, " Amps=%.2fA", irms_);
this->publish_state(Irms);
this->publish_state(irms_);
}
#ifdef ARDUINO_ARCH_ESP8266

14
esphome/components/ct_clamp/ct_clamp_sensor.h
View File

@ -32,17 +32,17 @@ class CTClampSensor : public sensor::Sensor, public PollingComponent {
uint32_t sample_size_;
double supply_voltage_;
int sampleI;
double Irms,filteredI,offsetI,sumI,sqI;
int sample_i_;
double irms_,filtered_i_,offset_i_,sum_i_,sq_i_;
#ifdef ARDUINO_ARCH_ESP32
#define ADC_BITS 12
#define ADC_BITS 12
#endif
#ifdef ARDUINO_ARCH_ESP8266
#define ADC_BITS 10
#define ADC_BITS 10
#endif
#define ADC_COUNTS (1<<ADC_BITS)
#define ADC_COUNTS (1 << ADC_BITS)
};
} // namespace ct_clamp
} // namespace esphome
} // namespace ct_clamp
} // namespace esphome