rename sensors

Author: avaldebe

.vscode/settings.json

@@ -47,6 +47,7 @@
         "mqttpassword",
         "mqttuser",
         "pmsa",
+        "pmsx",
         "pwsh",
         "senserion"
     ],

src/pms/sensor/aq/__init__.py

@@ -0,0 +1 @@
+from . import mcu680

src/pms/sensor/bosch_sensortec/__init__.py

@@ -20,7 +20,7 @@
 
 
 class Message(base.Message):
-    """Messages from MCU680 modules with a BME680 sensor"""
+    """Messages from mcu680 modules with a BME680 sensor"""
 
     data_records = slice(7)
 

src/pms/sensor/aq/MCU680.py renamed to src/pms/sensor/bosch_sensortec/mcu680.py

@@ -0,0 +1 @@
+from . import hpma115s0, hpma115c0

src/pms/sensor/honeywell/__init__.py

@@ -7,16 +7,16 @@
 from dataclasses import dataclass, field
 
 from pms.sensor import base
-from . import HPMA115S0
+from . import hpma115s0
 
-commands = HPMA115S0.commands._replace(
+commands = hpma115s0.commands._replace(
     passive_read=base.Cmd(  # Read Particle Measuring Results
         b"\x68\x01\x04\x93", b"\x40\x05\x04", 16
     )
 )
 
 
-class Message(HPMA115S0.Message):
+class Message(hpma115s0.Message):
     """Messages from Honeywell HPMA115C0 sensors"""
 
     data_records = slice(4)

src/pms/sensor/pm/HPMA115C0.py renamed to src/pms/sensor/honeywell/hpma115c0.py

@@ -0,0 +1 @@
+from . import sds01x, sds198

src/pms/sensor/pm/HPMA115S0.py renamed to src/pms/sensor/honeywell/hpma115s0.py

@@ -7,9 +7,9 @@
 from dataclasses import dataclass, field
 
 from pms.sensor import base
-from . import SDS01x
+from . import sds01x
 
-commands = SDS01x.commands._replace(
+commands = sds01x.commands._replace(
     passive_read=base.Cmd(
         b"\xAA\xB4\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xFF\xFF\x02\xAB",
         b"\xAA\xCF",
@@ -18,7 +18,7 @@
 )
 
 
-class Message(SDS01x.Message):
+class Message(sds01x.Message):
     """Messages from NovaFitness SDS011, SDS018 and SDS021 sensors"""
 
     data_records = slice(1, 2)

src/pms/sensor/novafitness/__init__.py

@@ -0,0 +1 @@
+from . import pmsx003, pms3003, pms5003s, pms5003st, pms5003t

src/pms/sensor/pm/extra_commands.py renamed to src/pms/sensor/novafitness/extra_commands.py

@@ -7,20 +7,20 @@
 from dataclasses import dataclass, field
 
 from pms.sensor import base
-from . import PMS3003, PMSx003
+from . import pms3003, pmsx003
 
 
-commands = PMSx003.commands
+commands = pmsx003.commands
 
 
-class Message(PMS3003.Message):
+class Message(pms3003.Message):
     """Messages from Plantower PMS5003S sensors"""
 
     data_records = slice(13)
 
 
 @dataclass(frozen=False)
-class ObsData(PMSx003.ObsData):
+class ObsData(pmsx003.ObsData):
     """Observations from Plantower PMS5003S sensors
 
     time                                    measurement time [seconds since epoch]

src/pms/sensor/pm/SDS01x.py renamed to src/pms/sensor/novafitness/sds01x.py

@@ -9,19 +9,19 @@
 import struct
 
 from pms.sensor import base
-from . import PMS3003, PMSx003, PMS5003S
+from . import pms3003, pmsx003, pms5003s
 
 
 commands = base.Commands(
-    passive_read=base.Cmd(PMSx003.commands.passive_read.command, b"\x42\x4D\x00\x24", 40),
-    passive_mode=PMSx003.commands.passive_mode,
-    active_mode=base.Cmd(PMSx003.commands.active_mode.command, b"\x42\x4D\x00\x24", 40),
-    sleep=PMSx003.commands.sleep,
-    wake=base.Cmd(PMSx003.commands.wake.command, b"\x42\x4D\x00\x24", 40),
+    passive_read=base.Cmd(pmsx003.commands.passive_read.command, b"\x42\x4D\x00\x24", 40),
+    passive_mode=pmsx003.commands.passive_mode,
+    active_mode=base.Cmd(pmsx003.commands.active_mode.command, b"\x42\x4D\x00\x24", 40),
+    sleep=pmsx003.commands.sleep,
+    wake=base.Cmd(pmsx003.commands.wake.command, b"\x42\x4D\x00\x24", 40),
 )
 
 
-class Message(PMS3003.Message):
+class Message(pms3003.Message):
     """Messages from Plantower PMS5003ST sensors"""
 
     data_records = slice(15)
@@ -32,11 +32,11 @@ def _unpack(message: bytes) -> Tuple[int, ...]:
             # 14th record is signed (temp)
             return struct.unpack(f">13Hh3H", message)
         else:
-            return PMS3003.Message._unpack(message)
+            return pms3003.Message._unpack(message)
 
 
 @dataclass(frozen=False)
-class ObsData(PMS5003S.ObsData):
+class ObsData(pms5003s.ObsData):
     """Observations from Plantower PMS5003ST sensors
 
     time                                    measurement time [seconds since epoch]

src/pms/sensor/pm/SDS198.py renamed to src/pms/sensor/novafitness/sds198.py

@@ -10,13 +10,13 @@
 
 from pms import InconsistentObservation
 from pms.sensor import base
-from . import PMS3003, PMSx003
+from . import pms3003, pmsx003
 
 
-commands = PMSx003.commands
+commands = pmsx003.commands
 
 
-class Message(PMS3003.Message):
+class Message(pms3003.Message):
     """Messages from Plantower PMS5003T sensors"""
 
     data_records = slice(12)
@@ -27,11 +27,11 @@ def _unpack(message: bytes) -> Tuple[int, ...]:
             # 11th record is signed (temp)
             return struct.unpack(">10Hh2H", message)
         else:
-            return PMS3003.Message._unpack(message)
+            return pms3003.Message._unpack(message)
 
 
 @dataclass(frozen=False)
-class ObsData(PMS3003.ObsData):
+class ObsData(pms3003.ObsData):
     """Observations from Plantower PMS5003T sensors
 
     time                                    measurement time [seconds since epoch]

src/pms/sensor/plantower/__init__.py

@@ -7,7 +7,7 @@
 
 from pms import InconsistentObservation
 from pms.sensor import base
-from . import PMS3003
+from . import pms3003
 
 
 commands = base.Commands(
@@ -19,14 +19,14 @@
 )
 
 
-class Message(PMS3003.Message):
+class Message(pms3003.Message):
     """Messages from Plantower PMS1003, PMS5003, PMS7003 and PMSA003 sensors"""
 
     data_records = slice(12)
 
 
 @dataclass(frozen=False)
-class ObsData(PMS3003.ObsData):
+class ObsData(pms3003.ObsData):
     """Observations from Plantower PMS1003, PMS5003, PMS7003 and PMSA003 sensors
 
     time                                    measurement time [seconds since epoch]

src/pms/sensor/pm/PMS3003.py renamed to src/pms/sensor/plantower/pms3003.py

@@ -0,0 +1 @@
+from . import sps30

src/pms/sensor/pm/PMS5003S.py renamed to src/pms/sensor/plantower/pms5003s.py

@@ -6,23 +6,23 @@
 from enum import Enum
 
 from pms import WrongMessageFormat
-from pms.sensor import base, pm, aq
+from pms.sensor import base, plantower, novafitness, honeywell, senserion, bosch_sensortec
 
 
 class Sensor(Enum):
     """Supported PM sensors"""
 
-    PMSx003 = pm.PMSx003
-    PMS3003 = pm.PMS3003
-    PMS5003S = pm.PMS5003S
-    PMS5003ST = pm.PMS5003ST
-    PMS5003T = pm.PMS5003T
-    SDS01x = pm.SDS01x
-    SDS198 = pm.SDS198
-    HPMA115S0 = pm.HPMA115S0
-    HPMA115C0 = pm.HPMA115C0
-    SPS30 = pm.SPS30
-    MCU680 = aq.MCU680
+    PMSx003 = plantower.pmsx003
+    PMS3003 = plantower.pms3003
+    PMS5003S = plantower.pms5003s
+    PMS5003ST = plantower.pms5003st
+    PMS5003T = plantower.pms5003t
+    SDS01x = novafitness.sds01x
+    SDS198 = novafitness.sds198
+    HPMA115S0 = honeywell.hpma115s0
+    HPMA115C0 = honeywell.hpma115c0
+    SPS30 = senserion.sps30
+    MCU680 = bosch_sensortec.mcu680
 
     PMS1003 = PMS5003 = PMS7003 = PMSA003 = PMSx003
     G1, G3, G5, G7, G10 = PMS1003, PMS3003, PMS5003, PMS7003, PMSA003

src/pms/sensor/pm/PMS5003ST.py renamed to src/pms/sensor/plantower/pms5003st.py

@@ -2,7 +2,7 @@
 import pytest
 
 os.environ["LEVEL"] = "DEBUG"
-from pms.sensor.pm.extra_commands import SDS, HPMA
+from pms.sensor.novafitness.extra_commands import SDS, HPMA
 
 
 @pytest.mark.parametrize(