Merge branch 'pr-42'

Author: Hovhannes Tumanyan

esphome/components/navien/navien.cpp

@@ -209,6 +209,7 @@ void NavienBase::send_scheduled_recirculation_off_cmd() {
   }
 
   void Navien::on_error(){
+    ESP_LOGW(TAG, "Communications interrupted, resetting states!");
     this->target_temp_sensor->publish_state(0);
     this->outlet_temp_sensor->publish_state(0);
     this->inlet_temp_sensor->publish_state(0);
@@ -343,13 +344,14 @@ void NavienBase::send_scheduled_recirculation_off_cmd() {
       this->panel_version_sensor->publish_state(this->state.panel_version);
   }
 
-  void Navien::update() {
-    ESP_LOGV(TAG, "Conn Status: received: %d, updated: %d", this->received_cnt, this->updated_cnt);
-
-    // Call receive on navien_link_ to process UART data
-    if (navien_link_) {
+  void Navien::loop() {
+    if (navien_link_ && src_ == 0) {
       navien_link_->receive();
     }
+  }
+
+  void Navien::update() {
+    ESP_LOGV(TAG, "Conn Status: received: %d, updated: %d", this->received_cnt, this->updated_cnt);
 
     // here we track how many packets were received
     // since the last update

esphome/components/navien/navien.h

@@ -273,6 +273,7 @@ namespace navien {
 
     virtual float get_setup_priority() const { return setup_priority::HARDWARE; }
     virtual void setup() override;
+    void loop() override;
     void update() override;
     void dump_config() override;
 

esphome/components/navien/navien_link.cpp

@@ -118,6 +118,7 @@ void NavienLink::parse_packet(){
     crc_c = NavienLink::checksum(this->recv_buffer.raw_data, HDR_SIZE + this->recv_buffer.hdr.len, CHECKSUM_SEED_62);
     if (crc_c != crc_r){
       ESP_LOGE(TAG, "SRC:0x%02X Control Packet checksum error: 0x%02X (calc) != 0x%02X (recv), seed=0x%02X", this->recv_buffer.hdr.src, crc_c, crc_r, CHECKSUM_SEED_62);
+      this->on_error();
       NavienLink::print_buffer(this->recv_buffer.raw_data, HDR_SIZE + this->recv_buffer.hdr.len + 1);
       break;
     }
@@ -169,7 +170,8 @@ void NavienLink::receive() {
           return;
         }
         if (!uart->read_array(this->recv_buffer.raw_data, HDR_SIZE)) {
-          ESP_LOGV(TAG, "Failed to read header");
+          ESP_LOGW(TAG, "Failed to read header");
+          this->on_error();
           break;
         }
         this->recv_state = HEADER_PARSED;
@@ -185,7 +187,8 @@ void NavienLink::receive() {
           return;
         }
         if (!uart->read_array(this->recv_buffer.raw_data + HDR_SIZE, len)) {
-          ESP_LOGV(TAG, "Failed to read %d bytes", len);
+          ESP_LOGW(TAG, "Failed to read %d bytes", len);
+          this->on_error();
           break;
         }
         ESP_LOGV(TAG, "Got Packet => %d bytes", len + HDR_SIZE);
@@ -208,7 +211,6 @@ void NavienLink::receive() {
             uart->write_array(NAVILINK_PRESENT, sizeof(NAVILINK_PRESENT));
             // NavienLink::print_buffer(NAVILINK_PRESENT, sizeof(NAVILINK_PRESENT));
           }
-          this->on_error();
         }
 
         // Navien::print_buffer(this->recv_buffer.raw_data, len + HDR_SIZE);