mirror of
https://github.com/esphome/esphome.git
synced 2024-12-01 03:04:12 +01:00
Fix clang-tidy
This commit is contained in:
parent
97396a2b13
commit
d7ea8d6dac
2 changed files with 21 additions and 21 deletions
|
@ -174,34 +174,34 @@ uint64_t ByteBuffer::get_uint64() {
|
||||||
}
|
}
|
||||||
float ByteBuffer::get_float() {
|
float ByteBuffer::get_float() {
|
||||||
assert(this->get_remaining() >= sizeof(float));
|
assert(this->get_remaining() >= sizeof(float));
|
||||||
uint8_t byteArray[sizeof(float)];
|
uint8_t byte_array[sizeof(float)];
|
||||||
if (this->endianness_ == LITTLE) {
|
if (this->endianness_ == LITTLE) {
|
||||||
for (uint8_t &bytePart : byteArray) {
|
for (uint8_t &byte_part : byte_array) {
|
||||||
bytePart = this->data_[this->position_++];
|
byte_part = this->data_[this->position_++];
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
for (size_t i = sizeof(float); i > 0; i--) {
|
for (size_t i = sizeof(float); i > 0; i--) {
|
||||||
byteArray[i - 1] = this->data_[this->position_++];
|
byte_array[i - 1] = this->data_[this->position_++];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
float value;
|
float value;
|
||||||
std::memcpy(&value, byteArray, sizeof(float));
|
std::memcpy(&value, byte_array, sizeof(float));
|
||||||
return value;
|
return value;
|
||||||
}
|
}
|
||||||
double ByteBuffer::get_double() {
|
double ByteBuffer::get_double() {
|
||||||
assert(this->get_remaining() >= sizeof(double));
|
assert(this->get_remaining() >= sizeof(double));
|
||||||
uint8_t byteArray[sizeof(double)];
|
uint8_t byte_array[sizeof(double)];
|
||||||
if (this->endianness_ == LITTLE) {
|
if (this->endianness_ == LITTLE) {
|
||||||
for (uint8_t &bytePart : byteArray) {
|
for (uint8_t &byte_part : byte_array) {
|
||||||
bytePart = this->data_[this->position_++];
|
byte_part = this->data_[this->position_++];
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
for (size_t i = sizeof(double); i > 0; i--) {
|
for (size_t i = sizeof(double); i > 0; i--) {
|
||||||
byteArray[i - 1] = this->data_[this->position_++];
|
byte_array[i - 1] = this->data_[this->position_++];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
double value;
|
double value;
|
||||||
std::memcpy(&value, byteArray, sizeof(double));
|
std::memcpy(&value, byte_array, sizeof(double));
|
||||||
return value;
|
return value;
|
||||||
}
|
}
|
||||||
std::string ByteBuffer::get_string(size_t length) {
|
std::string ByteBuffer::get_string(size_t length) {
|
||||||
|
@ -280,29 +280,29 @@ void ByteBuffer::put_uint64(uint64_t value) {
|
||||||
}
|
}
|
||||||
void ByteBuffer::put_float(float value) {
|
void ByteBuffer::put_float(float value) {
|
||||||
assert(this->get_remaining() >= sizeof(float));
|
assert(this->get_remaining() >= sizeof(float));
|
||||||
uint8_t byteArray[sizeof(float)];
|
uint8_t byte_array[sizeof(float)];
|
||||||
std::memcpy(byteArray, &value, sizeof(float));
|
std::memcpy(byte_array, &value, sizeof(float));
|
||||||
if (this->endianness_ == LITTLE) {
|
if (this->endianness_ == LITTLE) {
|
||||||
for (uint8_t bytePart : byteArray) {
|
for (uint8_t byte_part : byte_array) {
|
||||||
this->data_[this->position_++] = bytePart;
|
this->data_[this->position_++] = byte_part;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
for (size_t i = sizeof(float); i > 0; i--) {
|
for (size_t i = sizeof(float); i > 0; i--) {
|
||||||
this->data_[this->position_++] = byteArray[i - 1];
|
this->data_[this->position_++] = byte_array[i - 1];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
void ByteBuffer::put_double(double value) {
|
void ByteBuffer::put_double(double value) {
|
||||||
assert(this->get_remaining() >= sizeof(double));
|
assert(this->get_remaining() >= sizeof(double));
|
||||||
uint8_t byteArray[sizeof(double)];
|
uint8_t byte_array[sizeof(double)];
|
||||||
std::memcpy(byteArray, &value, sizeof(double));
|
std::memcpy(byte_array, &value, sizeof(double));
|
||||||
if (this->endianness_ == LITTLE) {
|
if (this->endianness_ == LITTLE) {
|
||||||
for (uint8_t bytePart : byteArray) {
|
for (uint8_t byte_part : byte_array) {
|
||||||
this->data_[this->position_++] = bytePart;
|
this->data_[this->position_++] = byte_part;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
for (size_t i = sizeof(double); i > 0; i--) {
|
for (size_t i = sizeof(double); i > 0; i--) {
|
||||||
this->data_[this->position_++] = byteArray[i - 1];
|
this->data_[this->position_++] = byte_array[i - 1];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -56,7 +56,7 @@ class ByteBuffer {
|
||||||
static ByteBuffer wrap(float value, Endian endianness = LITTLE);
|
static ByteBuffer wrap(float value, Endian endianness = LITTLE);
|
||||||
static ByteBuffer wrap(double value, Endian endianness = LITTLE);
|
static ByteBuffer wrap(double value, Endian endianness = LITTLE);
|
||||||
static ByteBuffer wrap(bool value) { return wrap(value ? (uint8_t) 1 : (uint8_t) 0); }
|
static ByteBuffer wrap(bool value) { return wrap(value ? (uint8_t) 1 : (uint8_t) 0); }
|
||||||
static ByteBuffer wrap(const std::string &value);
|
static ByteBuffer wrap(const std::string &data);
|
||||||
static ByteBuffer wrap(std::initializer_list<uint8_t> values);
|
static ByteBuffer wrap(std::initializer_list<uint8_t> values);
|
||||||
|
|
||||||
// Get one byte from the buffer, increment position by 1
|
// Get one byte from the buffer, increment position by 1
|
||||||
|
|
Loading…
Reference in a new issue