From 1f8a1f0046b67b3067096a24f5d1935816dc1b8a Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 20 Jan 2022 15:21:44 +1300
Subject: [PATCH] Bump improv library version (#3072)

---
 esphome/components/esp32_improv/__init__.py   |  2 +-
 esphome/components/improv_serial/__init__.py  |  2 +-
 .../improv_serial/improv_serial_component.cpp | 57 +++----------------
 platformio.ini                                |  2 +-
 4 files changed, 10 insertions(+), 53 deletions(-)

diff --git a/esphome/components/esp32_improv/__init__.py b/esphome/components/esp32_improv/__init__.py
index 80c53f7c2a..26e586e4ff 100644
--- a/esphome/components/esp32_improv/__init__.py
+++ b/esphome/components/esp32_improv/__init__.py
@@ -56,7 +56,7 @@ async def to_code(config):
     cg.add(ble_server.register_service_component(var))
 
     cg.add_define("USE_IMPROV")
-    cg.add_library("esphome/Improv", "1.0.0")
+    cg.add_library("esphome/Improv", "1.1.0")
 
     cg.add(var.set_identify_duration(config[CONF_IDENTIFY_DURATION]))
     cg.add(var.set_authorized_duration(config[CONF_AUTHORIZED_DURATION]))
diff --git a/esphome/components/improv_serial/__init__.py b/esphome/components/improv_serial/__init__.py
index ed7c382a2f..4499bef1fd 100644
--- a/esphome/components/improv_serial/__init__.py
+++ b/esphome/components/improv_serial/__init__.py
@@ -30,4 +30,4 @@ FINAL_VALIDATE_SCHEMA = validate_logger_baud_rate
 async def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
-    cg.add_library("esphome/Improv", "1.0.0")
+    cg.add_library("esphome/Improv", "1.1.0")
diff --git a/esphome/components/improv_serial/improv_serial_component.cpp b/esphome/components/improv_serial/improv_serial_component.cpp
index b4d1d88370..9f86c06e6f 100644
--- a/esphome/components/improv_serial/improv_serial_component.cpp
+++ b/esphome/components/improv_serial/improv_serial_component.cpp
@@ -111,58 +111,15 @@ std::vector<uint8_t> ImprovSerialComponent::build_version_info_() {
 bool ImprovSerialComponent::parse_improv_serial_byte_(uint8_t byte) {
   size_t at = this->rx_buffer_.size();
   this->rx_buffer_.push_back(byte);
-  ESP_LOGD(TAG, "Improv Serial byte: 0x%02X", byte);
+  ESP_LOGV(TAG, "Improv Serial byte: 0x%02X", byte);
   const uint8_t *raw = &this->rx_buffer_[0];
-  if (at == 0)
-    return byte == 'I';
-  if (at == 1)
-    return byte == 'M';
-  if (at == 2)
-    return byte == 'P';
-  if (at == 3)
-    return byte == 'R';
-  if (at == 4)
-    return byte == 'O';
-  if (at == 5)
-    return byte == 'V';
 
-  if (at == 6)
-    return byte == IMPROV_SERIAL_VERSION;
-
-  if (at == 7)
-    return true;
-  uint8_t type = raw[7];
-
-  if (at == 8)
-    return true;
-  uint8_t data_len = raw[8];
-
-  if (at < 8 + data_len)
-    return true;
-
-  if (at == 8 + data_len)
-    return true;
-
-  if (at == 8 + data_len + 1) {
-    uint8_t checksum = 0x00;
-    for (size_t i = 0; i < at; i++)
-      checksum += raw[i];
-
-    if (checksum != byte) {
-      ESP_LOGW(TAG, "Error decoding Improv payload");
-      this->set_error_(improv::ERROR_INVALID_RPC);
-      return false;
-    }
-
-    if (type == TYPE_RPC) {
-      this->set_error_(improv::ERROR_NONE);
-      auto command = improv::parse_improv_data(&raw[9], data_len, false);
-      return this->parse_improv_payload_(command);
-    }
-  }
-
-  // If we got here then the command coming is is improv, but not an RPC command
-  return false;
+  return improv::parse_improv_serial_byte(
+      at, byte, raw, [this](improv::ImprovCommand command) -> bool { return this->parse_improv_payload_(command); },
+      [this](improv::Error error) -> void {
+        ESP_LOGW(TAG, "Error decoding Improv payload");
+        this->set_error_(error);
+      });
 }
 
 bool ImprovSerialComponent::parse_improv_payload_(improv::ImprovCommand &command) {
diff --git a/platformio.ini b/platformio.ini
index 589624a71d..d45e58953b 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -35,7 +35,7 @@ build_flags =
 lib_deps =
     esphome/noise-c@0.1.4         ; api
     makuna/NeoPixelBus@2.6.9      ; neopixelbus
-    esphome/Improv@1.0.0          ; improv_serial / esp32_improv
+    esphome/Improv@1.1.0          ; improv_serial / esp32_improv
     bblanchon/ArduinoJson@6.18.5  ; json
 build_flags =
     -DESPHOME_LOG_LEVEL=ESPHOME_LOG_LEVEL_VERY_VERBOSE