Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-12-22 21:44:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix malloc with std::vector

Browse source
This commit is contained in:
Silvio 2021-08-15 00:19:50 +02:00
parent 559d242003
commit 7f6e7ea16b
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
esphome/components/daly_bms/daly_bms.cpp
View file

@ -1,5 +1,6 @@
#include "daly_bms.h" #include "daly_bms.h"
#include "esphome/core/log.h" #include "esphome/core/log.h"
#include <vector>
namespace esphome { namespace esphome {
namespace daly_bms { namespace daly_bms {
@ -30,12 +31,12 @@ void DalyBmsComponent::update() {
this->request_data(DALY_REQUEST_STATUS); this->request_data(DALY_REQUEST_STATUS);
this->request_data(DALY_REQUEST_TEMPERATURE); this->request_data(DALY_REQUEST_TEMPERATURE);
unsigned char *get_battery_level_data; std::vector<unsigned char> get_battery_level_data;
int available_data = this->available(); int available_data = this->available();
if (available_data >= 13) { if (available_data >= 13) {
get_battery_level_data = (unsigned char *) malloc(available_data); get_battery_level_data.resize(available_data);
this->read_array(get_battery_level_data, available_data); this->read_array(&get_battery_level_data[0], available_data);
this->decode_data(get_battery_level_data, available_data); this->decode_data(&get_battery_level_data[0], available_data);
} }
} }
@ -85,13 +86,13 @@ void DalyBmsComponent::decode_data(unsigned char *data, int length) {
switch (data[2]) { switch (data[2]) {
case DALY_REQUEST_BATTERY_LEVEL: case DALY_REQUEST_BATTERY_LEVEL:
if (this->voltage_sensor_) { if (this->voltage_sensor_) {
this->voltage_sensor_->publish_state((float) (((data[4] << 8) | data[5]) / 10)); this->voltage_sensor_->publish_state(((float) ((data[4] << 8) | data[5]) / 10));
} }
if (this->current_sensor_) { if (this->current_sensor_) {
this->current_sensor_->publish_state((float) ((((data[8] << 8) | data[9]) - 30000) / 10)); this->current_sensor_->publish_state(((float) (((data[8] << 8) | data[9]) - 30000) / 10));
} }
if (this->battery_level_sensor_) { if (this->battery_level_sensor_) {
this->battery_level_sensor_->publish_state((float) (((data[10] << 8) | data[11]) / 10)); this->battery_level_sensor_->publish_state(((float) ((data[10] << 8) | data[11]) / 10));
} }
break; break;
@ -179,8 +180,6 @@ void DalyBmsComponent::decode_data(unsigned char *data, int length) {
data = nullptr; data = nullptr;
} }
} }
free(data);
} }
} // namespace daly_bms } // namespace daly_bms