From fcf2669ddf92b6de09e67e1f25cf877d63865d1e Mon Sep 17 00:00:00 2001
From: DigiH <github@digih.net>
Date: Fri, 5 Apr 2024 17:09:51 +0200
Subject: [PATCH] [DISC] Additional RF discovery keys and device classes

---
 main/config_RF.h            | 20 ++++++++++++++------
 main/config_mqttDiscovery.h |  2 ++
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/main/config_RF.h b/main/config_RF.h
index 9aa34fd38c..df7a10e03d 100644
--- a/main/config_RF.h
+++ b/main/config_RF.h
@@ -80,7 +80,7 @@ struct RTL_433device {
   bool isDisc;
 };
 
-const char parameters[40][4][24] = {
+const char parameters[50][4][24] = {
     // RTL_433 key, name, unit, device_class
     {"temperature_C", "temperature", "°C", "temperature"},
     {"temperature_1_C", "temperature", "°C", "temperature"},
@@ -88,6 +88,7 @@ const char parameters[40][4][24] = {
     {"temperature_F", "temperature", "°F", "temperature"},
     {"time", "timestamp", "", "timestamp"},
     {"battery_ok", "battery", "%", "battery"},
+    {"battery_mV", "battery", "mV", "voltage"},
     {"humidity", "humidity", "%", "humidity"},
     {"moisture", "moisture", "%", "humidity"},
     {"pressure_hPa", "pressure", "hPa", "pressure"},
@@ -108,19 +109,26 @@ const char parameters[40][4][24] = {
     {"rain_rate_in_h", "rain", "in/h", "precipitation_intensity"},
     {"rssi", "rssi", "dB", "signal_strength"},
     {"snr", "snr", "dB", ""},
-    {"noise", "noise", "dB", ""},
-    {"depth_cm", "depth", "cm", ""},
+    {"noise", "noise", "dB", "sound_pressure"},
+    {"depth_cm", "depth", "cm", "distance"},
     {"power_W", "power", "W", "power"},
     {"light_lux", "light", "lx", "illuminance"},
     {"lux", "lux", "lx", "illuminance"},
     {"uvi", "UVI", "UV index", ""},
     {"uv", "UV", "UV level", ""},
-    {"storm_dist", "storm distance", "mi", ""},
-    {"strike_distance", "strike distance", "mi", ""},
+    {"storm_dist", "storm distance", "mi", "distance"},
+    {"storm_dist_km", "storm distance", "km", "distance"},
+    {"strike_count", "strike count", "", ""}, // from rtl_433_mqtt_hass.py
+    {"strike_distance", "strike distance", "mi", "distance"},
+    {"strike_distance_km", "strike distance", "km", "distance"},
+    {"co2_ppm", "Carbon Dioxide", "ppm", "carbon_dioxide"},
+    {"pm2_5_ug_m3", "PM2.5", "μg/m³", "pm25"},
+    {"pm10_ug_m3", "PM10", "μg/m³", "pm10"},
+    {"estimated_pm10_0_ug_m3", "estimated PM10", "μg/m³", "pm10"},
+    {"pm1_ug_m3", "PM1", "μg/m³", "pm1"},
     {"tamper", "tamper", "", ""},
     {"alarm", "alarm", "", ""},
     {"motion", "motion", "", "motion"},
-    {"strike_count", "strike count", "", ""}, // from rtl_433_mqtt_hass.py
     {"event", "Status", "", "moisture"}};
 #  endif
 #  ifdef RTL_433_DISCOVERY_LOGGING
diff --git a/main/config_mqttDiscovery.h b/main/config_mqttDiscovery.h
index 3825c0a113..b38ec3a789 100644
--- a/main/config_mqttDiscovery.h
+++ b/main/config_mqttDiscovery.h
@@ -198,6 +198,7 @@ const char* availableHASSClasses[] = {"battery",
                                       "lock",
                                       "motion",
                                       "moving",
+                                      "pm1",
                                       "pm10",
                                       "pm25",
                                       "power",
@@ -208,6 +209,7 @@ const char* availableHASSClasses[] = {"battery",
                                       "problem",
                                       "restart",
                                       "signal_strength",
+                                      "sound_pressure",
                                       "temperature",
                                       "timestamp",
                                       "voltage",