Add support for Gridstream RF protocol from Landis & Gyr meters

merbanan · Dec 29, 2024 · 9b4fd4a · 9b4fd4a
1 parent dac21cf
commit 9b4fd4a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/conf/rtl_433.example.conf b/conf/rtl_433.example.conf
@@ -497,9 +497,9 @@ convert si
   protocol 268 # Bresser Thermo-/Hygro-Sensor Explore Scientific ST1005H
   protocol 269 # DeltaDore X3D devices
 # protocol 268 # Quinetic
-  protocol 270 # Landis & Gyr Gridstream Power Meters 9.6k
-  protocol 271 # Landis & Gyr Gridstream Power Meters 19.2k
-  protocol 272 # Landis & Gyr Gridstream Power Meters 38.4k
+  protocol 271 # Landis & Gyr Gridstream Power Meters 9.6k
+  protocol 272 # Landis & Gyr Gridstream Power Meters 19.2k
+  protocol 273 # Landis & Gyr Gridstream Power Meters 38.4k
 
 ## Flex devices (command line option "-X")
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -134,6 +134,7 @@ add_library(r_433 STATIC
     devices/generic_temperature_sensor.c
     devices/geo_minim.c
     devices/govee.c
+    devices/gridstream.c
     devices/gt_tmbbq05.c
     devices/gt_wt_02.c
     devices/gt_wt_03.c

diff --git a/src/devices/gridstream.c b/src/devices/gridstream.c
@@ -66,7 +66,7 @@ Subtype 0x55 with a data length of 0x23 can be used for this.
 Known CRC init values can be added to the code via PR when they have been identified.
 
 */
-static struct const crc_init known_crc_init[] = {
+static const struct crc_init known_crc_init[] = {
         {0xe623, "Kansas City, MO", "Evergy-Missouri West"},
         {0x5fd6, "Dallas, TX", "Oncor"},
         {0xD553, "Austin, TX", "Austin Energy"},
@@ -76,7 +76,10 @@ static struct const crc_init known_crc_init[] = {
         {0x2C22, "Santa Barbara, CA", "Southern California Edison"},
         {0x142A, "Washington", "Puget Sound Energy"},
         {0x47F7, "Pennsylvania", "PPL Electric"},
-        {0x22c6, "Long Island, NY", "PSEG Long Island"}};
+        {0x22c6, "Long Island, NY", "PSEG Long Island"},
+        {0x8819, "Alameda, CA", "Alameda Municipal Power"},
+        {0x4E2D, "Milwaukee, WI", "We Energies"},
+        {0x1D65, "Phoenix, AZ", "APS"}};
 
 static int gridstream_checksum(int fulllength, uint16_t length, uint8_t *bits, int adjust)
 {
@@ -131,7 +134,7 @@ static int gridstream_decode(r_device *decoder, bitbuffer_t *bitbuffer)
     char destaddress_str[9]     = "";
     int srcwanaddress           = 0;
     uint32_t uptime             = 0;
-    int clock;
+    int clock                   = 0;
     int subtype;
     unsigned offset;
     int protocol_version;