Mirrored_Repos/esphome-mitsubishiheatpump
1
0
Fork 0
mirror of https://github.com/geoffdavis/esphome-mitsubishiheatpump synced 2024-08-30 18:12:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Mark component as failed if serial conflict is detected

Browse Source
This commit is contained in:
Stewart Adam 2024-03-25 00:47:37 -07:00
parent 980271337a
commit eaba66fac4
No known key found for this signature in database
GPG Key ID: 99869D38798AF6A2
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
components/mitsubishi_heatpump/espmhp.cpp
View File

@ -42,15 +42,27 @@ MitsubishiHeatPump::MitsubishiHeatPump(
this->traits_.set_visual_temperature_step(ESPMHP_TEMPERATURE_STEP); this->traits_.set_visual_temperature_step(ESPMHP_TEMPERATURE_STEP);
} }
void MitsubishiHeatPump::check_logger_conflict_() { bool MitsubishiHeatPump::verify_serial() {
if (!this->get_hw_serial_()) {
ESP_LOGCONFIG(
TAG,
"No HardwareSerial was provided. "
"Software serial ports are unsupported by this component."
);
return false;
}
#ifdef USE_LOGGER #ifdef USE_LOGGER
if (this->get_hw_serial_() == logger::global_logger->get_hw_serial()) { if (this->get_hw_serial_() == logger::global_logger->get_hw_serial()) {
ESP_LOGW(TAG, " You're using the same serial port for logging" ESP_LOGW(TAG, " You're using the same serial port for logging"
" and the MitsubishiHeatPump component. Please disable" " and the MitsubishiHeatPump component. Please disable"
" logging over the serial port by setting" " logging over the serial port by setting"
" logger:baud_rate to 0."); " logger:baud_rate to 0.");
return false;
} }
#endif #endif
// unless something went wrong, assume we have a valid serial configuration
return true;
} }
void MitsubishiHeatPump::update() { void MitsubishiHeatPump::update() {
@ -414,18 +426,13 @@ void MitsubishiHeatPump::setup() {
// This will be called by App.setup() // This will be called by App.setup()
this->banner(); this->banner();
ESP_LOGCONFIG(TAG, "Setting up UART..."); ESP_LOGCONFIG(TAG, "Setting up UART...");
if (!this->get_hw_serial_()) {
ESP_LOGCONFIG( if (!this->verify_serial()) {
TAG,
"No HardwareSerial was provided. "
"Software serial ports are unsupported by this component."
);
this->mark_failed(); this->mark_failed();
return; return;
} }
this->check_logger_conflict_();
ESP_LOGCONFIG(TAG, "Intializing new HeatPump object."); ESP_LOGCONFIG(TAG, "Initializing new HeatPump object.");
this->hp = new HeatPump(); this->hp = new HeatPump();
this->current_temperature = NAN; this->current_temperature = NAN;
this->target_temperature = NAN; this->target_temperature = NAN;

4
components/mitsubishi_heatpump/espmhp.h
View File

@ -113,8 +113,8 @@ class MitsubishiHeatPump : public PollingComponent, public climate::Climate {
} }
//Print a warning message if we're using the sole hardware UART on an //Print a warning message if we're using the sole hardware UART on an
//ESP8266 or UART0 on ESP32 //ESP8266 or UART0 on ESP32, or if no serial was provided
void check_logger_conflict_(); bool verify_serial();
// various prefs to save mode-specific temperatures, akin to how the IR // various prefs to save mode-specific temperatures, akin to how the IR
// remote works. // remote works.