Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-11-27 09:18:00 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Fix some more bugs

Browse source
This commit is contained in:
Jimmy Wennlund 2024-09-25 13:43:37 +02:00
parent 6c86132a53
commit b66729dac1
2 changed files with 35 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
esphome/components/bl0910/bl0910.cpp
View file

@ -10,6 +10,10 @@ namespace bl0910 {
static const char *const TAG = "bl0910"; static const char *const TAG = "bl0910";
constexpr int32_t encode_int24(uint8_t byte1, uint8_t byte2, uint8_t byte3) {
return ((static_cast<int8_t>(byte1) << 16) | (byte2 << 8) | (byte3));
}
static uint8_t checksum_calc(const uint8_t *data) { static uint8_t checksum_calc(const uint8_t *data) {
uint8_t checksum = 0; uint8_t checksum = 0;
for (int i = 0; i < 5; i++) { for (int i = 0; i < 5; i++) {
@ -55,15 +59,39 @@ int32_t BL0910::read_register_(uint8_t addr) {
return 0xFF000000; return 0xFF000000;
} }
return encode_int24(packet[2], packet[3], packet[4]);
}
uint32_t BL0910::read_uregister_(uint8_t addr) {
uint8_t packet[6] = {0};
packet[0] = BL0910_READ_COMMAND;
packet[1] = addr;
this->enable();
this->transfer_array(packet, sizeof(packet) / sizeof(packet[0]));
this->disable();
// These bytes are swapped out with SPI transfer_array to zeros
// But needs to be swapped back to verify checksum
packet[0] = BL0910_READ_COMMAND;
packet[1] = addr;
uint8_t checksum = checksum_calc(packet);
if (checksum != packet[5]) // checksum is byte 6
{
ESP_LOGE(TAG, "Checksum error calculated: %x != read: %x", checksum, packet[5]);
return 0xFF000000;
}
return encode_uint24(packet[2], packet[3], packet[4]); return encode_uint24(packet[2], packet[3], packet[4]);
} }
float BL0910::get_voltage_(uint8_t channel) { float BL0910::get_voltage_(uint8_t channel) {
return ((float) this->read_register_(BL0910_REG_RMS[channel])) / this->voltage_reference_[channel]; return ((float) this->read_uregister_(BL0910_REG_RMS[channel])) / this->voltage_reference_[channel];
} }
float BL0910::get_current_(uint8_t channel) { float BL0910::get_current_(uint8_t channel) {
return ((float) this->read_register_(BL0910_REG_RMS[channel])) / this->current_reference_[channel]; return ((float) this->read_uregister_(BL0910_REG_RMS[channel])) / this->current_reference_[channel];
} }
float BL0910::get_power_(uint8_t channel) { float BL0910::get_power_(uint8_t channel) {
@ -71,21 +99,21 @@ float BL0910::get_power_(uint8_t channel) {
} }
float BL0910::get_energy_(uint8_t channel) { float BL0910::get_energy_(uint8_t channel) {
return ((float) this->read_register_(BL0910_REG_CF_CNT[channel])) / this->energy_reference_[channel]; return ((float) this->read_uregister_(BL0910_REG_CF_CNT[channel])) / this->energy_reference_[channel];
} }
float BL0910::get_frequency_() { float BL0910::get_frequency_() {
const float freq = (float) this->read_register_(BL0910_REG_PERIOD); const float freq = (float) this->read_uregister_(BL0910_REG_PERIOD);
return 10000000.0 / freq; return 10000000.0 / freq;
} }
float BL0910::get_temperature_() { float BL0910::get_temperature_() {
const float temp = (float) this->read_register_(BL0910_REG_TPS1); const float temp = (float) this->read_uregister_(BL0910_REG_TPS1);
return (temp - 64.0) * 12.5 / 59.0 - 40.0; return (temp - 64.0) * 12.5 / 59.0 - 40.0;
} }
float BL0910::get_powerfactor_(uint8_t channel, float freq) { float BL0910::get_powerfactor_(uint8_t channel, float freq) {
const float angle = (float) this->read_register_(BL0910_REG_ANGLE[channel]); const float angle = (float) this->read_uregister_(BL0910_REG_ANGLE[channel]);
return (360.0f * angle * freq) / 500000.0f; return (360.0f * angle * freq) / 500000.0f;
} }

1
esphome/components/bl0910/bl0910.h
View file

@ -71,6 +71,7 @@ class BL0910 : public PollingComponent,
} }
void write_register_(uint8_t addr, uint8_t data_h, uint8_t data_m, uint8_t data_l); void write_register_(uint8_t addr, uint8_t data_h, uint8_t data_m, uint8_t data_l);
int32_t read_register_(uint8_t addr); int32_t read_register_(uint8_t addr);
uint32_t read_uregister_(uint8_t addr);
float get_voltage_(uint8_t channel); float get_voltage_(uint8_t channel);
float get_frequency_(); float get_frequency_();
float get_current_(uint8_t channel); float get_current_(uint8_t channel);