Fix sensor filter compatibility (#25)

* Fix sensor filter compatibility
TillFleisch · Aug 13, 2024 · 3a84fd1 · 3a84fd1
1 parent 6a95645
commit 3a84fd1
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/components/LD2450/LD2450.cpp b/components/LD2450/LD2450.cpp
@@ -238,6 +238,15 @@ namespace esphome::ld2450
 
             ESP_LOGE(TAG, "LD2450-Sensor stopped sending updates!");
 
+#ifdef USE_BINARY_SENSOR
+            if (occupancy_binary_sensor_ != nullptr)
+                occupancy_binary_sensor_->publish_state(false);
+#endif
+#ifdef USE_SENSOR
+            if (target_count_sensor_ != nullptr)
+                target_count_sensor_->publish_state(NAN);
+#endif
+
             // Update zones and related components (unavailable)
             for (Zone *zone : zones_)
             {
@@ -329,11 +338,11 @@ namespace esphome::ld2450
         is_occupied_ = target_count > 0;
 
 #ifdef USE_BINARY_SENSOR
-        if (occupancy_binary_sensor_ != nullptr && occupancy_binary_sensor_->state != is_occupied_)
+        if (occupancy_binary_sensor_ != nullptr)
             occupancy_binary_sensor_->publish_state(is_occupied_);
 #endif
 #ifdef USE_SENSOR
-        if (target_count_sensor_ != nullptr && target_count_sensor_->state != target_count)
+        if (target_count_sensor_ != nullptr && target_count_sensor_->raw_state != target_count)
             target_count_sensor_->publish_state(target_count);
 #endif
 

diff --git a/components/LD2450/LD2450.h b/components/LD2450/LD2450.h
@@ -11,7 +11,7 @@
 #ifdef USE_BINARY_SENSOR
 #include "esphome/components/binary_sensor/binary_sensor.h"
 #endif
-#ifdef USE_BINARY_SENSOR
+#ifdef USE_SENSOR
 #include "esphome/components/sensor/sensor.h"
 #endif
 #ifdef USE_NUMBER

diff --git a/components/LD2450/zone.cpp b/components/LD2450/zone.cpp
@@ -81,11 +81,11 @@ namespace esphome::ld2450
         }
 
 #ifdef USE_BINARY_SENSOR
-        if (occupancy_binary_sensor_ != nullptr && (occupancy_binary_sensor_->state != (target_count > 0) || !occupancy_binary_sensor_->has_state()))
+        if (occupancy_binary_sensor_ != nullptr)
             occupancy_binary_sensor_->publish_state(target_count > 0);
 #endif
 #ifdef USE_SENSOR
-        if (target_count_sensor_ != nullptr && (target_count_sensor_->state != target_count || !target_count_sensor_->has_state()))
+        if (target_count_sensor_ != nullptr && (target_count_sensor_->raw_state != target_count))
             target_count_sensor_->publish_state(target_count);
 #endif
     }