[opentherm] Rename OpenthermData accessors that collide with vendor SDK type macros (#17611)

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
This commit is contained in:
Jonathan Swoboda
2026-07-16 15:25:45 -04:00
committed by GitHub
co-authored by Copilot Autofix powered by AI
parent 5b37049dff
commit 72bd45538e
3 changed files with 21 additions and 21 deletions
+6 -6
View File
@@ -27,11 +27,11 @@ uint8_t parse_u8_lb(OpenthermData &data) { return data.valueLB; }
uint8_t parse_u8_hb(OpenthermData &data) { return data.valueHB; }
int8_t parse_s8_lb(OpenthermData &data) { return (int8_t) data.valueLB; }
int8_t parse_s8_hb(OpenthermData &data) { return (int8_t) data.valueHB; }
uint16_t parse_u16(OpenthermData &data) { return data.u16(); }
uint16_t parse_u16(OpenthermData &data) { return data.get_u16(); }
uint16_t parse_u8_lb_60(OpenthermData &data) { return data.valueLB * 60; }
uint16_t parse_u8_hb_60(OpenthermData &data) { return data.valueHB * 60; }
int16_t parse_s16(OpenthermData &data) { return data.s16(); }
float parse_f88(OpenthermData &data) { return data.f88(); }
int16_t parse_s16(OpenthermData &data) { return data.get_s16(); }
float parse_f88(OpenthermData &data) { return data.get_f88(); }
void write_flag8_lb_0(const bool value, OpenthermData &data) { data.valueLB = write_bit(data.valueLB, 0, value); }
void write_flag8_lb_1(const bool value, OpenthermData &data) { data.valueLB = write_bit(data.valueLB, 1, value); }
@@ -53,9 +53,9 @@ void write_u8_lb(const uint8_t value, OpenthermData &data) { data.valueLB = valu
void write_u8_hb(const uint8_t value, OpenthermData &data) { data.valueHB = value; }
void write_s8_lb(const int8_t value, OpenthermData &data) { data.valueLB = (uint8_t) value; }
void write_s8_hb(const int8_t value, OpenthermData &data) { data.valueHB = (uint8_t) value; }
void write_u16(const uint16_t value, OpenthermData &data) { data.u16(value); }
void write_s16(const int16_t value, OpenthermData &data) { data.s16(value); }
void write_f88(const float value, OpenthermData &data) { data.f88(value); }
void write_u16(const uint16_t value, OpenthermData &data) { data.set_u16(value); }
void write_s16(const int16_t value, OpenthermData &data) { data.set_s16(value); }
void write_f88(const float value, OpenthermData &data) { data.set_f88(value); }
} // namespace message_data
+8 -8
View File
@@ -533,34 +533,34 @@ void OpenTherm::debug_data(OpenthermData &data) {
ESP_LOGD(TAG, "%s %s %s %s", format_bin_to(type_buf, data.type), format_bin_to(id_buf, data.id),
format_bin_to(hb_buf, data.valueHB), format_bin_to(lb_buf, data.valueLB));
ESP_LOGD(TAG, "type: %s; id: %u; HB: %u; LB: %u; uint_16: %u; float: %f",
this->message_type_to_str((MessageType) data.type), data.id, data.valueHB, data.valueLB, data.u16(),
data.f88());
this->message_type_to_str((MessageType) data.type), data.id, data.valueHB, data.valueLB, data.get_u16(),
data.get_f88());
}
void OpenTherm::debug_error(OpenThermError &error) const {
ESP_LOGD(TAG, "data: 0x%08" PRIx32 "; clock: %u; capture: 0x%08" PRIx32 "; bit_pos: %u", error.data, this->clock_,
error.capture, error.bit_pos);
}
float OpenthermData::f88() { return ((float) this->s16()) / 256.0f; }
float OpenthermData::get_f88() { return ((float) this->get_s16()) / 256.0f; }
void OpenthermData::f88(float value) { this->s16((int16_t) (value * 256)); }
void OpenthermData::set_f88(float value) { this->set_s16((int16_t) (value * 256)); }
uint16_t OpenthermData::u16() {
uint16_t OpenthermData::get_u16() {
uint16_t const value = this->valueHB;
return (value << 8) | this->valueLB;
}
void OpenthermData::u16(uint16_t value) {
void OpenthermData::set_u16(uint16_t value) {
this->valueLB = value & 0xFF;
this->valueHB = (value >> 8) & 0xFF;
}
int16_t OpenthermData::s16() {
int16_t OpenthermData::get_s16() {
int16_t const value = this->valueHB;
return (value << 8) | this->valueLB;
}
void OpenthermData::s16(int16_t value) {
void OpenthermData::set_s16(int16_t value) {
this->valueLB = value & 0xFF;
this->valueHB = (value >> 8) & 0xFF;
}
+7 -7
View File
@@ -178,7 +178,7 @@ enum BitPositions { STOP_BIT = 33 };
/**
* Structure to hold Opentherm data packet content.
* Use f88(), u16() or s16() functions to get appropriate value of data packet accoridng to id of message.
* Use get_f88(), get_u16() or get_s16() functions to get appropriate value of data packet according to id of message.
*/
struct OpenthermData {
uint8_t type;
@@ -191,32 +191,32 @@ struct OpenthermData {
/**
* @return float representation of data packet value
*/
float f88();
float get_f88();
/**
* @param float number to set as value of this data packet
*/
void f88(float value);
void set_f88(float value);
/**
* @return unsigned 16b integer representation of data packet value
*/
uint16_t u16();
uint16_t get_u16();
/**
* @param unsigned 16b integer number to set as value of this data packet
*/
void u16(uint16_t value);
void set_u16(uint16_t value);
/**
* @return signed 16b integer representation of data packet value
*/
int16_t s16();
int16_t get_s16();
/**
* @param signed 16b integer number to set as value of this data packet
*/
void s16(int16_t value);
void set_s16(int16_t value);
};
struct OpenThermError {