ESPHome DSMR component. Remove dependency on Arduino framework. Change the dependencies to the ones that don't require Arduino framework

Author: PolarGoose

.clang-tidy.hash

@@ -1 +1 @@
-3d46b63015d761c85ca9cb77ab79a389509e5776701fb22aed16e7b79d432c0c
+88a205b0fefeb3d1d1dc249944c3137ccc69c5b165d6a845468d9a3e18133ba3

esphome/components/dsmr/__init__.py

@@ -61,7 +61,6 @@ def _validate_key(value):
             ): cv.positive_time_period_milliseconds,
         }
     ).extend(uart.UART_DEVICE_SCHEMA),
-    cv.only_with_arduino,
 )
 
 
@@ -83,7 +82,7 @@ async def to_code(config):
     cg.add_build_flag("-DDSMR_WATER_MBUS_ID=" + str(config[CONF_WATER_MBUS_ID]))
 
     # DSMR Parser
-    cg.add_library("glmnet/Dsmr", "0.8")
+    cg.add_library("polargoose/arduino-dsmr-2", "7.0")
 
     # Crypto
-    cg.add_library("rweather/Crypto", "0.4.0")
+    cg.add_library("polargoose/Crypto-no-arduino", "0.4.0")

esphome/components/dsmr/dsmr.cpp

@@ -1,5 +1,3 @@
-#ifdef USE_ARDUINO
-
 #include "dsmr.h"
 #include "esphome/core/log.h"
 
@@ -257,9 +255,9 @@ bool Dsmr::parse_telegram() {
   ESP_LOGV(TAG, "Trying to parse telegram");
   this->stop_requesting_data_();
 
-  ::dsmr::ParseResult<void> res =
-      ::dsmr::P1Parser::parse(&data, this->telegram_, this->bytes_read_, false,
-                              this->crc_check_);  // Parse telegram according to data definition. Ignore unknown values.
+  const auto &res = arduino_dsmr_2::P1Parser::parse(
+      &data, this->telegram_, this->bytes_read_, false,
+      this->crc_check_);  // Parse telegram according to data definition. Ignore unknown values.
   if (res.err) {
     // Parsing error, show it
     auto err_str = res.fullError(this->telegram_, this->telegram_ + this->bytes_read_);
@@ -331,5 +329,3 @@ void Dsmr::set_decryption_key(const std::string &decryption_key) {
 
 }  // namespace dsmr
 }  // namespace esphome
-
-#endif  // USE_ARDUINO

esphome/components/dsmr/dsmr.h

@@ -1,24 +1,18 @@
 #pragma once
 
-#ifdef USE_ARDUINO
-
 #include "esphome/core/component.h"
 #include "esphome/components/sensor/sensor.h"
 #include "esphome/components/text_sensor/text_sensor.h"
 #include "esphome/components/uart/uart.h"
 #include "esphome/core/log.h"
-#include "esphome/core/defines.h"
-
-// don't include <dsmr.h> because it puts everything in global namespace
-#include <dsmr/parser.h>
-#include <dsmr/fields.h>
-
+#include <arduino-dsmr-2/fields.h>
+#include <arduino-dsmr-2/parser.h>
 #include <vector>
 
 namespace esphome {
 namespace dsmr {
 
-using namespace ::dsmr::fields;
+using namespace arduino_dsmr_2::fields;
 
 // DSMR_**_LIST generated by ESPHome and written in esphome/core/defines
 
@@ -44,8 +38,8 @@ using namespace ::dsmr::fields;
 #define DSMR_DATA_SENSOR(s) s
 #define DSMR_COMMA ,
 
-using MyData = ::dsmr::ParsedData<DSMR_TEXT_SENSOR_LIST(DSMR_DATA_SENSOR, DSMR_COMMA)
-                                      DSMR_BOTH DSMR_SENSOR_LIST(DSMR_DATA_SENSOR, DSMR_COMMA)>;
+using MyData = arduino_dsmr_2::ParsedData<DSMR_TEXT_SENSOR_LIST(DSMR_DATA_SENSOR, DSMR_COMMA)
+                                              DSMR_BOTH DSMR_SENSOR_LIST(DSMR_DATA_SENSOR, DSMR_COMMA)>;
 
 class Dsmr : public Component, public uart::UARTDevice {
  public:
@@ -142,5 +136,3 @@ class Dsmr : public Component, public uart::UARTDevice {
 };
 }  // namespace dsmr
 }  // namespace esphome
-
-#endif  // USE_ARDUINO

platformio.ini

@@ -33,13 +33,15 @@ build_flags =
 ; This are common settings for all environments.
 [common]
 lib_deps =
-    esphome/noise-c@0.1.10                  ; api
+    esphome/noise-c@0.1.10                 ; api
     improv/Improv@1.2.4                    ; improv_serial / esp32_improv
     bblanchon/ArduinoJson@7.4.2            ; json
     wjtje/qr-code-generator-library@1.7.0  ; qr_code
     functionpointer/arduino-MLX90393@1.0.2 ; mlx90393
     pavlodn/HaierProtocol@0.9.31           ; haier
     kikuchan98/pngle@1.1.0                 ; online_image
+    polargoose/arduino-dsmr-2@7.0.0        ; dsmr
+    polargoose/Crypto-no-arduino@0.4.0     ; dsmr
     https://github.com/esphome/TinyGPSPlus.git#v1.1.0     ; gps
     ; Using the repository directly, otherwise ESP-IDF can't use the library
     https://github.com/bitbank2/JPEGDEC.git#ca1e0f2    ; online_image
@@ -78,8 +80,6 @@ lib_deps =
     heman/AsyncMqttClient-esphome@1.0.0                   ; mqtt
     fastled/FastLED@3.9.16                                ; fastled_base
     freekode/TM1651@1.0.1                                 ; tm1651
-    glmnet/Dsmr@0.7                                       ; dsmr
-    rweather/Crypto@0.4.0                                 ; dsmr
     dudanov/MideaUART@1.1.9                               ; midea
     tonia/HeatpumpIR@1.0.37                               ; heatpumpir
 build_flags =
@@ -234,10 +234,12 @@ build_flags =
     -DUSE_ZEPHYR
     -DUSE_NRF52
 lib_deps =
-    bblanchon/ArduinoJson@7.4.2           ; json
+    bblanchon/ArduinoJson@7.4.2            ; json
     wjtje/qr-code-generator-library@1.7.0  ; qr_code
     pavlodn/HaierProtocol@0.9.31           ; haier
     functionpointer/arduino-MLX90393@1.0.2 ; mlx90393
+    polargoose/arduino-dsmr-2@7.0.0        ; dsmr
+    polargoose/Crypto-no-arduino@0.4.0     ; dsmr
     https://github.com/esphome/TinyGPSPlus.git#v1.1.0     ; gps
     https://github.com/Sensirion/arduino-gas-index-algorithm.git#3.2.1 ; Sensirion Gas Index Algorithm Arduino Library
     lvgl/lvgl@8.4.0                                       ; lvgl