Hendrik/esphome-truma_inetbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix idf compiler errors & warnings

Browse Source
This commit is contained in:
Your Name 2023-03-23 12:32:50 +01:00
parent 54e289a860
commit 3d64c93809
8 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/truma_inetbox/TrumaStausFrameResponseStorage.h
View File

@ -21,7 +21,7 @@ class TrumaStausFrameResponseStorage : public TrumaStausFrameStorage<T>, public
virtual bool can_update() { return this->data_valid_; } virtual bool can_update() { return this->data_valid_; }
virtual TResponse *update_prepare() = 0; virtual TResponse *update_prepare() = 0;
void update_submit() { this->update_status_unsubmitted_ = true; } void update_submit() { this->update_status_unsubmitted_ = true; }
const bool has_update() const { return this->update_status_unsubmitted_; } bool has_update() const { return this->update_status_unsubmitted_; }
void set_status(T val) override { void set_status(T val) override {
TrumaStausFrameStorage<T>::set_status(val); TrumaStausFrameStorage<T>::set_status(val);
this->update_status_stale_ = false; this->update_status_stale_ = false;

4
components/truma_inetbox/TrumaiNetBoxApp.h
View File

@ -27,8 +27,8 @@ class TrumaiNetBoxApp : public LinBusProtocol {
void lin_heartbeat() override; void lin_heartbeat() override;
void lin_reset_device() override; void lin_reset_device() override;
const TRUMA_DEVICE get_heater_device() const { return this->heater_device_; } TRUMA_DEVICE get_heater_device() const { return this->heater_device_; }
const TRUMA_DEVICE get_aircon_device() const { return this->aircon_device_; } TRUMA_DEVICE get_aircon_device() const { return this->aircon_device_; }
TrumaiNetBoxAppAirconAuto *get_aircon_auto() { return &this->airconAuto_; } TrumaiNetBoxAppAirconAuto *get_aircon_auto() { return &this->airconAuto_; }
TrumaiNetBoxAppAirconManual *get_aircon_manual() { return &this->airconManual_; } TrumaiNetBoxAppAirconManual *get_aircon_manual() { return &this->airconManual_; }

2
components/truma_inetbox/TrumaiNetBoxAppClock.h
View File

@ -14,7 +14,7 @@ class TrumaiNetBoxAppClock : public TrumaStausFrameStorage<StatusFrameClock>, pu
#ifdef USE_TIME #ifdef USE_TIME
bool can_update() { return this->data_valid_; } bool can_update() { return this->data_valid_; }
void update_submit() { this->update_status_unsubmitted_ = true; } void update_submit() { this->update_status_unsubmitted_ = true; }
const bool has_update() const { return this->update_status_unsubmitted_; } bool has_update() const { return this->update_status_unsubmitted_; }
bool action_write_time(); bool action_write_time();
void create_update_data(StatusFrame *response, u_int8_t *response_len, u_int8_t command_counter); void create_update_data(StatusFrame *response, u_int8_t *response_len, u_int8_t command_counter);

2
components/truma_inetbox/TrumaiNetBoxAppConfig.cpp
View File

@ -8,7 +8,7 @@ namespace truma_inetbox {
static const char *const TAG = "truma_inetbox.TrumaiNetBoxAppConfig"; static const char *const TAG = "truma_inetbox.TrumaiNetBoxAppConfig";
void TrumaiNetBoxAppConfig::dump_data() const { void TrumaiNetBoxAppConfig::dump_data() const {
ESP_LOGD(TAG, "StatusFrameConfig Offset: %.1f", temp_code_to_decimal(this->config_.data_.temp_offset)); ESP_LOGD(TAG, "StatusFrameConfig Offset: %.1f", temp_code_to_decimal(this->data_.temp_offset));
} }
} // namespace truma_inetbox } // namespace truma_inetbox

2
components/truma_inetbox/binary_sensor/enum.h
View File

@ -20,6 +20,7 @@ enum class TRUMA_BINARY_SENSOR_TYPE {
TIMER_WATER, TIMER_WATER,
}; };
#ifdef ESPHOME_LOG_HAS_CONFIG
static const char *enum_to_c_str(const TRUMA_BINARY_SENSOR_TYPE val) { static const char *enum_to_c_str(const TRUMA_BINARY_SENSOR_TYPE val) {
switch (val) { switch (val) {
case TRUMA_BINARY_SENSOR_TYPE::HEATER_ROOM: case TRUMA_BINARY_SENSOR_TYPE::HEATER_ROOM:
@ -61,6 +62,7 @@ static const char *enum_to_c_str(const TRUMA_BINARY_SENSOR_TYPE val) {
break; break;
} }
} }
#endif // ESPHOME_LOG_HAS_CONFIG
} // namespace truma_inetbox } // namespace truma_inetbox
} // namespace esphome } // namespace esphome

2
components/truma_inetbox/number/enum.h
View File

@ -13,6 +13,7 @@ enum class TRUMA_NUMBER_TYPE {
AIRCON_MANUAL_TEMPERATURE, AIRCON_MANUAL_TEMPERATURE,
}; };
#ifdef ESPHOME_LOG_HAS_CONFIG
static const char *enum_to_c_str(const TRUMA_NUMBER_TYPE val) { static const char *enum_to_c_str(const TRUMA_NUMBER_TYPE val) {
switch (val) { switch (val) {
case TRUMA_NUMBER_TYPE::TARGET_ROOM_TEMPERATURE: case TRUMA_NUMBER_TYPE::TARGET_ROOM_TEMPERATURE:
@ -34,6 +35,7 @@ static const char *enum_to_c_str(const TRUMA_NUMBER_TYPE val) {
break; break;
} }
} }
#endif // ESPHOME_LOG_HAS_CONFIG
} // namespace truma_inetbox } // namespace truma_inetbox
} // namespace esphome } // namespace esphome

5
components/truma_inetbox/sensor/TrumaSensor.cpp
View File

@ -34,11 +34,14 @@ void TrumaSensor::setup() {
case TRUMA_SENSOR_TYPE::OPERATING_STATUS: case TRUMA_SENSOR_TYPE::OPERATING_STATUS:
this->publish_state(static_cast<float>(status_heater->operating_status)); this->publish_state(static_cast<float>(status_heater->operating_status));
break; break;
case TRUMA_SENSOR_TYPE::HEATER_ERROR_CODE: case TRUMA_SENSOR_TYPE::HEATER_ERROR_CODE: {
float errorcode = status_heater->error_code_high * 100.0f + status_heater->error_code_low; float errorcode = status_heater->error_code_high * 100.0f + status_heater->error_code_low;
this->publish_state(errorcode); this->publish_state(errorcode);
break; break;
} }
default:
break;
}
}); });
} }

2
components/truma_inetbox/sensor/TrumaSensor.h
View File

@ -18,6 +18,7 @@ enum class TRUMA_SENSOR_TYPE {
HEATER_ERROR_CODE, HEATER_ERROR_CODE,
}; };
#ifdef ESPHOME_LOG_HAS_CONFIG
static const char *enum_to_c_str(const TRUMA_SENSOR_TYPE val) { static const char *enum_to_c_str(const TRUMA_SENSOR_TYPE val) {
switch (val) { switch (val) {
case TRUMA_SENSOR_TYPE::CURRENT_ROOM_TEMPERATURE: case TRUMA_SENSOR_TYPE::CURRENT_ROOM_TEMPERATURE:
@ -52,6 +53,7 @@ static const char *enum_to_c_str(const TRUMA_SENSOR_TYPE val) {
break; break;
} }
} }
#endif // ESPHOME_LOG_HAS_CONFIG
class TrumaSensor : public Component, public sensor::Sensor, public Parented<TrumaiNetBoxApp> { class TrumaSensor : public Component, public sensor::Sensor, public Parented<TrumaiNetBoxApp> {
public: public: