Merge pull request #164 from elad-bar/sensor-pages-printed-per-consum…

…able Add sensor of total printed pages per consumable (toner only)
elad-bar · Jun 20, 2024 · 6f5f810 · 6f5f810
2 parents e9ba3bb + b2949bf
commit 6f5f810
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## 2.0.3
 
 - Add support for `inktank` cartridge type
+- Add sensor of total printed pages per consumable, available for toner only
 
 ## 2.0.2
 

diff --git a/custom_components/hpprinter/managers/ha_config_manager.py b/custom_components/hpprinter/managers/ha_config_manager.py
@@ -374,9 +374,15 @@ def _is_valid_entity(
             for exclude_key in exclude:
                 exclude_value = exclude[exclude_key]
 
-                if data.get(exclude_key) == exclude_value:
-                    is_valid = False
-                    break
+                if isinstance(exclude_value, list):
+                    if data.get(exclude_key) in exclude_value:
+                        is_valid = False
+                        break
+
+                else:
+                    if data.get(exclude_key) == exclude_value:
+                        is_valid = False
+                        break
 
         return is_valid
 

diff --git a/custom_components/hpprinter/parameters/data_points.json b/custom_components/hpprinter/parameters/data_points.json
@@ -173,6 +173,22 @@
         "unit_of_measurement": "refills",
         "state_class": "total_increasing",
         "icon": "mdi:format-color-fill"
+      },
+      "total_impression": {
+        "path": "TotalImpressions",
+        "platform": "sensor",
+        "unit_of_measurement": "pages",
+        "state_class": "total_increasing",
+        "icon": "mdi:file-document-check",
+        "exclude": {
+          "consumable_type_enum": [
+            "ink",
+            "inkcartridge",
+            "printhead",
+            "tonercartridge",
+            "inktank"
+          ]
+        }
       }
     }
   },