rtlamr-python 1.0.3__tar.gz → 1.0.4__tar.gz

{rtlamr_python-1.0.3/src/rtlamr_python.egg-info → rtlamr_python-1.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rtlamr-python
-Version: 1.0.3
+Version: 1.0.4
 Summary: Python implementation of RTLAMR-go — a multi-protocol ERT smart meter receiver
 Author-email: Ryan Bagwell <ryan@ryanbagwell.com>
 License-Expression: MIT
@@ -28,9 +28,7 @@ Requires-Dist: setuptools
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Provides-Extra: lib
-Requires-Dist: pyrtlsdrlib==0.0.5; extra == "lib"
-Provides-Extra: lib-alpine
-Requires-Dist: pyrtlsdrlib-alpine==0.0.5; extra == "lib-alpine"
+Requires-Dist: pyrtlsdrlib==0.0.6; extra == "lib"
 Dynamic: license-file
 
 # rtlamr-python

{rtlamr_python-1.0.3 → rtlamr_python-1.0.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rtlamr-python"
-version = "1.0.3"
+version = "1.0.4"
 description = "Python implementation of RTLAMR-go — a multi-protocol ERT smart meter receiver"
 readme = "README.md"
 license = "MIT"
@@ -38,10 +38,7 @@ dev = [
   "pytest",
 ]
 lib = [
-  "pyrtlsdrlib==0.0.5",
-]
-lib-alpine = [
-  "pyrtlsdrlib-alpine==0.0.5"
+  "pyrtlsdrlib==0.0.6",
 ]
 
 [project.urls]

{rtlamr_python-1.0.3 → rtlamr_python-1.0.4}/src/rtlamr_python/protocols/commodity.py

@@ -1,15 +1,26 @@
 """ERT type → commodity classification.
 
 Source: https://github.com/bemasher/rtlamr/blob/master/meters.csv
-Ambiguous types resolved by predominant field usage:
-  4  → electric (Itron AMI/C/R300 series; Sensus R-275 gas is the outlier)
-  12 → gas (Itron 100G series; Schlumberger CENTRON electric is the outlier)
+(verified against upstream 2026-09-26 — 67 rows, ERT types 0-13 only).
+
+Mostly the 4-bit classic ERT type field used by SCM/IDM/NetIDM. SCM+ carries
+an 8-bit EndpointType instead (see protocols/scmplus.py) that isn't in
+meters.csv at all — a value outside 0-15 isn't a gap in this table, it's a
+code meters.csv simply doesn't document for that wider space. 156 is one
+such code, added below without meters.csv backing (see comment on it).
+
+Two types are ambiguous across commodities in the source data; resolved by
+majority vote:
+  4  -> electric (18 rows: Itron AMI/C-series/R300 family; 1 outlier: Sensus
+        R-275, Gas)
+  12 -> gas (4 rows: Itron 100G family; 1 outlier: Schlumberger CENTRON OOK
+        RF, Electric)
 """
 from __future__ import annotations
 
 COMMODITY_ERT_TYPES: dict[str, list[int | str]] = {
     "electric": [4, 5, 7, 8],
-    "gas":      [0, 1, 2, 9, 12],
+    "gas":      [0, 1, 2, 9, 12, 156],
     "water":    [3, 11, 13, "r900"],
 }
 

{rtlamr_python-1.0.3 → rtlamr_python-1.0.4/src/rtlamr_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rtlamr-python
-Version: 1.0.3
+Version: 1.0.4
 Summary: Python implementation of RTLAMR-go — a multi-protocol ERT smart meter receiver
 Author-email: Ryan Bagwell <ryan@ryanbagwell.com>
 License-Expression: MIT
@@ -28,9 +28,7 @@ Requires-Dist: setuptools
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Provides-Extra: lib
-Requires-Dist: pyrtlsdrlib==0.0.5; extra == "lib"
-Provides-Extra: lib-alpine
-Requires-Dist: pyrtlsdrlib-alpine==0.0.5; extra == "lib-alpine"
+Requires-Dist: pyrtlsdrlib==0.0.6; extra == "lib"
 Dynamic: license-file
 
 # rtlamr-python

{rtlamr_python-1.0.3 → rtlamr_python-1.0.4}/src/rtlamr_python.egg-info/requires.txt

@@ -7,7 +7,4 @@ setuptools
 pytest
 
 [lib]
-pyrtlsdrlib==0.0.5
-
-[lib-alpine]
-pyrtlsdrlib-alpine==0.0.5
+pyrtlsdrlib==0.0.6