preparation for esp_idf

lubeda · May 19, 2024 · 2e77138 · 2e77138
1 parent ad1109e
commit 2e77138
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/components/ehmtxv2/EHMTX.cpp b/components/ehmtxv2/EHMTX.cpp
@@ -706,7 +706,7 @@ namespace esphome
         }
       }
       this->display_gauge = true;
-      ESP_LOGD(TAG, "show_gauge 2 color %d", round(percent));
+      ESP_LOGD(TAG, "show_gauge 2 color %d", int(round(percent)));
     }
   }
 #else
@@ -720,7 +720,7 @@ namespace esphome
       this->display_gauge = true;
       this->gauge_value = (uint8_t)(100 - percent) * 7 / 100;
     }
-    ESP_LOGD(TAG, "show_gauge 2 color %d", round(percent));
+    ESP_LOGD(TAG, "show_gauge 2 color %d", int(round(percent)));
   }
 #endif
 

diff --git a/components/ehmtxv2/EHMTX.h b/components/ehmtxv2/EHMTX.h
@@ -4,9 +4,11 @@
 #define USE_Fireplugin
 #include "esphome/components/time/real_time_clock.h"
 
-#ifdef CONFIG_IDF_TARGET_ESP32S3
-#undef USE_Fireplugin
-#define F(x) (x)
+#if defined CONFIG_IDF_TARGET_ESP32S3 || defined CONFIG_IDF_TARGET_ESP32
+  #undef USE_Fireplugin
+  #ifndef F
+    #define F(x) (x)
+  #endif
 #endif
 
 const uint8_t MAXQUEUE = 24;