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

[bytebuffer] Use existing bit_cast operations. (#7374)

Browse source
This commit is contained in:
Clyde Stubbs 2024-08-30 06:16:16 +10:00 committed by GitHub
parent f28418d0b4
commit c09df3c05d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
esphome/core/bytebuffer.cpp
View file

@ -1,6 +1,9 @@
#include "bytebuffer.h" #include "bytebuffer.h"
#include <cassert> #include <cassert>
#include <cstring> #include "esphome/core/helpers.h"
#include <list>
#include <vector>
namespace esphome { namespace esphome {
@ -110,18 +113,13 @@ uint32_t ByteBuffer::get_int24() {
} }
float ByteBuffer::get_float() { float ByteBuffer::get_float() {
assert(this->get_remaining() >= sizeof(float)); assert(this->get_remaining() >= sizeof(float));
auto ui_value = this->get_uint32(); return bit_cast<float>(this->get_uint32());
float value;
memcpy(&value, &ui_value, sizeof(float));
return value;
} }
double ByteBuffer::get_double() { double ByteBuffer::get_double() {
assert(this->get_remaining() >= sizeof(double)); assert(this->get_remaining() >= sizeof(double));
auto ui_value = this->get_uint64(); return bit_cast<double>(this->get_uint64());
double value;
memcpy(&value, &ui_value, sizeof(double));
return value;
} }
std::vector<uint8_t> ByteBuffer::get_vector(size_t length) { std::vector<uint8_t> ByteBuffer::get_vector(size_t length) {
assert(this->get_remaining() >= length); assert(this->get_remaining() >= length);
auto start = this->data_.begin() + this->position_; auto start = this->data_.begin() + this->position_;
@ -154,16 +152,12 @@ void ByteBuffer::put_uint(uint64_t value, size_t length) {
void ByteBuffer::put_float(float value) { void ByteBuffer::put_float(float value) {
static_assert(sizeof(float) == sizeof(uint32_t), "Float sizes other than 32 bit not supported"); static_assert(sizeof(float) == sizeof(uint32_t), "Float sizes other than 32 bit not supported");
assert(this->get_remaining() >= sizeof(float)); assert(this->get_remaining() >= sizeof(float));
uint32_t ui_value; this->put_uint32(bit_cast<uint32_t>(value));
memcpy(&ui_value, &value, sizeof(float)); // this work-around required to silence compiler warnings
this->put_uint32(ui_value);
} }
void ByteBuffer::put_double(double value) { void ByteBuffer::put_double(double value) {
static_assert(sizeof(double) == sizeof(uint64_t), "Double sizes other than 64 bit not supported"); static_assert(sizeof(double) == sizeof(uint64_t), "Double sizes other than 64 bit not supported");
assert(this->get_remaining() >= sizeof(double)); assert(this->get_remaining() >= sizeof(double));
uint64_t ui_value; this->put_uint64(bit_cast<uint64_t>(value));
memcpy(&ui_value, &value, sizeof(double));
this->put_uint64(ui_value);
} }
void ByteBuffer::put_vector(const std::vector<uint8_t> &value) { void ByteBuffer::put_vector(const std::vector<uint8_t> &value) {
assert(this->get_remaining() >= value.size()); assert(this->get_remaining() >= value.size());