From a687b083aed516cbfe93ed25dc51a31837f95fb0 Mon Sep 17 00:00:00 2001
From: 0hax <43876620+0hax@users.noreply.github.com>
Date: Sat, 23 Oct 2021 19:01:23 +0200
Subject: [PATCH] Teleinfo ptec (#2599)

* teleinfo: handle historical mode correctly.

In historical mode, tags like PTEC leads to an issue where we detect a
timestamp wheras this is not possible in historical mode.

PTEC teleinfo tag looks like:
    PTEC HP..
Instead of the usual format
    IINST1 001 I

This make our data parsing fails.

While at here, make sure we continue parsing other tags even if parsing
one of the tag fails.

Signed-off-by: 0hax <0hax@protonmail.com>

* teleinfo: fix compilation with loglevel set to debug.

Signed-off-by: 0hax <0hax@protonmail.com>
---
 .../teleinfo/sensor/teleinfo_sensor.cpp         |  2 +-
 esphome/components/teleinfo/teleinfo.cpp        | 17 +++++++++--------
 .../text_sensor/teleinfo_text_sensor.cpp        |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/esphome/components/teleinfo/sensor/teleinfo_sensor.cpp b/esphome/components/teleinfo/sensor/teleinfo_sensor.cpp
index 661c149c09..4e4cd9f9e6 100644
--- a/esphome/components/teleinfo/sensor/teleinfo_sensor.cpp
+++ b/esphome/components/teleinfo/sensor/teleinfo_sensor.cpp
@@ -9,6 +9,6 @@ void TeleInfoSensor::publish_val(const std::string &val) {
   auto newval = parse_float(val);
   publish_state(*newval);
 }
-void TeleInfoSensor::dump_config() { LOG_SENSOR("  ", tag.c_str(), this); }
+void TeleInfoSensor::dump_config() { LOG_SENSOR("  ", "Teleinfo Sensor", this); }
 }  // namespace teleinfo
 }  // namespace esphome
diff --git a/esphome/components/teleinfo/teleinfo.cpp b/esphome/components/teleinfo/teleinfo.cpp
index badd66ae83..5a1e44ac8b 100644
--- a/esphome/components/teleinfo/teleinfo.cpp
+++ b/esphome/components/teleinfo/teleinfo.cpp
@@ -141,21 +141,22 @@ void TeleInfo::loop() {
         field_len = get_field(tag_, buf_finger, grp_end, separator_, MAX_TAG_SIZE);
         if (!field_len || field_len >= MAX_TAG_SIZE) {
           ESP_LOGE(TAG, "Invalid tag.");
-          break;
+          continue;
         }
 
         /* Advance buf_finger to after the tag and the separator. */
         buf_finger += field_len + 1;
 
         /*
-         * If there is two separators and the tag is not equal to "DATE",
-         * it means there is a timestamp to read first.
+         * If there is two separators and the tag is not equal to "DATE" or
+         * historical mode is not in use (separator_ != 0x20), it means there is a
+         * timestamp to read first.
          */
-        if (std::count(buf_finger, grp_end, separator_) == 2 && strcmp(tag_, "DATE") != 0) {
+        if (std::count(buf_finger, grp_end, separator_) == 2 && strcmp(tag_, "DATE") != 0 && separator_ != 0x20) {
           field_len = get_field(timestamp_, buf_finger, grp_end, separator_, MAX_TIMESTAMP_SIZE);
           if (!field_len || field_len >= MAX_TIMESTAMP_SIZE) {
-            ESP_LOGE(TAG, "Invalid Timestamp");
-            break;
+            ESP_LOGE(TAG, "Invalid timestamp for tag %s", timestamp_);
+            continue;
           }
 
           /* Advance buf_finger to after the first data and the separator. */
@@ -164,8 +165,8 @@ void TeleInfo::loop() {
 
         field_len = get_field(val_, buf_finger, grp_end, separator_, MAX_VAL_SIZE);
         if (!field_len || field_len >= MAX_VAL_SIZE) {
-          ESP_LOGE(TAG, "Invalid Value");
-          break;
+          ESP_LOGE(TAG, "Invalid value for tag %s", tag_);
+          continue;
         }
 
         /* Advance buf_finger to end of group */
diff --git a/esphome/components/teleinfo/text_sensor/teleinfo_text_sensor.cpp b/esphome/components/teleinfo/text_sensor/teleinfo_text_sensor.cpp
index 1adbd9ce13..87cf0dea17 100644
--- a/esphome/components/teleinfo/text_sensor/teleinfo_text_sensor.cpp
+++ b/esphome/components/teleinfo/text_sensor/teleinfo_text_sensor.cpp
@@ -6,6 +6,6 @@ namespace teleinfo {
 static const char *const TAG = "teleinfo_text_sensor";
 TeleInfoTextSensor::TeleInfoTextSensor(const char *tag) { this->tag = std::string(tag); }
 void TeleInfoTextSensor::publish_val(const std::string &val) { publish_state(val); }
-void TeleInfoTextSensor::dump_config() { LOG_TEXT_SENSOR("  ", tag.c_str(), this); }
+void TeleInfoTextSensor::dump_config() { LOG_TEXT_SENSOR("  ", "Teleinfo Text Sensor", this); }
 }  // namespace teleinfo
 }  // namespace esphome