boneIO 0.1.0.dev23__tar.gz → 0.1.0.dev25__tar.gz

{boneio-0.1.0.dev23 → boneio-0.1.0.dev25}/MANIFEST.in

@@ -2,5 +2,4 @@ include README.md
 include requirements.txt
 include LICENSE
 recursive-include boneio *.yaml
-recursive-include example_config *.yaml
 recursive-include boneio *.ttf

{boneio-0.1.0.dev23/boneio.egg-info → boneio-0.1.0.dev25}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.1
 Name: boneio
-Version: 0.1.0.dev23
+Version: 0.1.0.dev25
 Summary: Python Helper for BoneIO
 Home-page: https://github.com/maciejk1984/boneIO
 License: GNU General Public License v3.0
-Download-URL: https://github.com/maciejk1984/boneIO/archive/0.1.0.dev23.zip
+Download-URL: https://github.com/maciejk1984/boneIO/archive/0.1.0.dev25.zip
 Platform: UNKNOWN
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.7

{boneio-0.1.0.dev23 → boneio-0.1.0.dev25}/boneio/bonecli.py

@@ -12,6 +12,7 @@ from boneio.const import (
     HA_DISCOVERY,
     HOST,
     MCP23017,
+    MCP_TEMP_9808,
     MQTT,
     OLED,
     OUTPUT,
@@ -121,8 +122,6 @@ async def run(ctx, debug: int, config: str, mqttpassword: str = ""):
     schema = load_yaml_file(os.path.join(MAINPATH, "schema.yaml"))
     v = CustomValidator(schema, purge_unknown=True)
     config_yaml = load_yaml_file(config)
-    print("aaa", schema)
-    print("bbb", config_yaml)
     if not config_yaml:
         _LOGGER.info("Missing file.")
         return
@@ -143,6 +142,7 @@ async def run(ctx, debug: int, config: str, mqttpassword: str = ""):
         ha_discovery_prefix=_config[MQTT][HA_DISCOVERY][TOPIC_PREFIX],
         mcp23017=_config.get(MCP23017, []),
         lm75=_config.get(LM75),
+        mcp9808=_config.get(MCP_TEMP_9808),
         oled=_config.get(OLED),
         adc_list=_config.get(ADC, []),
     )

{boneio-0.1.0.dev23 → boneio-0.1.0.dev25}/boneio/const.py

@@ -84,6 +84,7 @@ TEMPERATURE = "temperature"
 SENSOR = "sensor"
 BINARY_SENSOR = "binary_sensor"
 LM75 = "lm75"
+MCP_TEMP_9808 = "mcp9808"
 INPUT_SENSOR = "inputsensor"
 
 # TYPING

{boneio-0.1.0.dev23 → boneio-0.1.0.dev25}/boneio/helper/stats.py

@@ -22,7 +22,8 @@ from boneio.const import (
     MAC,
     NONE,
 )
-from boneio.sensor import LM75Sensor
+from boneio.sensor import LM75Sensor, MCP9808Sensor
+
 
 intervals = (("d", 86400), ("h", 3600), ("m", 60))
 
@@ -144,11 +145,11 @@ class HostData:
 
     data = {UPTIME: {}, NETWORK: {}, CPU: {}, DISK: {}, MEMORY: {}, SWAP: {}}
 
-    def __init__(self, output: dict, callback: Callable, lm75: LM75Sensor) -> None:
+    def __init__(self, output: dict, callback: Callable, temp_sensor: Callable[[LM75Sensor, MCP9808Sensor], None]) -> None:
         """Initialize HostData."""
         self._hostname = socket.gethostname()
         self.data[UPTIME] = {HOST: self._hostname, UPTIME: 0}
-        self._lm75 = lm75
+        self._temp_sensor = temp_sensor
         self._output = output
         self._callback = callback
         self._loop = asyncio.get_running_loop()
@@ -161,8 +162,8 @@ class HostData:
     def write_uptime(self, uptime: str) -> None:
         """Write uptime."""
         self.data[UPTIME][UPTIME] = uptime
-        if self._lm75:
-            self.data[UPTIME][self._lm75.name] = self._lm75.state
+        if self._temp_sensor:
+            self.data[UPTIME][self._temp_sensor.name] = self._temp_sensor.state
         self._loop.call_soon_threadsafe(partial(self._callback, UPTIME))
 
     def get(self, type: str) -> dict:

{boneio-0.1.0.dev23 → boneio-0.1.0.dev25}/boneio/manager.py

@@ -18,8 +18,10 @@ from boneio.const import (
     INIT_SLEEP,
     INPUT,
     KIND,
+    LM75,
     MCP,
     MCP_ID,
+    MCP_TEMP_9808,
     OFF,
     ON,
     ONLINE,
@@ -64,6 +66,7 @@ class Manager:
         relay_pins: List,
         input_pins: List,
         lm75: dict = None,
+        mcp9808: dict = None,
         ha_discovery: bool = True,
         ha_discovery_prefix: str = HOMEASSISTANT,
         mcp23017: Optional[List] = None,
@@ -84,20 +87,24 @@ class Manager:
         self._grouped_outputs = {}
         self._oled = None
         self._tasks: List[asyncio.Task] = []
-        self._lm75 = None
+        self._temp_sensors = []
 
-        def create_lm75_sensor():
+        def create_temp_sensor(sensor_type: str, temp_def: dict = {}):
             """Create LM sensor in manager."""
-            from .sensor.lm75 import LM75Sensor
-
-            name = lm75.get(ID)
+            if sensor_type == LM75:
+                from .sensor import LM75Sensor as TempSensor
+            elif sensor_type == MCP_TEMP_9808:
+                from .sensor import MCP9808Sensor as TempSensor
+            else:
+                return
+            name = temp_def.get(ID)
             id = name.replace(" ", "")
             try:
-                self._lm75 = LM75Sensor(
+                temp_sensor = TempSensor(
                     id=id,
                     name=name,
                     i2c=self._i2cbusio,
-                    address=lm75[ADDRESS],
+                    address=temp_def[ADDRESS],
                     send_message=self.send_message,
                     topic_prefix=topic_prefix,
                 )
@@ -108,9 +115,10 @@ class Manager:
                     prefix=ha_discovery_prefix,
                     availibilty_msg_func=ha_sensor_temp_availibilty_message,
                 )
-                self._tasks.append(asyncio.create_task(self._lm75.send_state()))
+                self._tasks.append(asyncio.create_task(temp_sensor.send_state()))
+                self._temp_sensors.append(temp_sensor)
             except I2CError as err:
-                _LOGGER.error("Can't configure LM75 sensor. %s", err)
+                _LOGGER.error("Can't configure Temp sensor. %s", err)
                 pass
 
         def create_mcp23017():
@@ -163,7 +171,10 @@ class Manager:
             return True
 
         if lm75:
-            create_lm75_sensor()
+            create_temp_sensor(sensor_type=LM75, temp_def=lm75)
+
+        if mcp9808:
+            create_temp_sensor(sensor_type=MCP_TEMP_9808, temp_def=mcp9808)
 
         if mcp23017:
             create_mcp23017()
@@ -274,7 +285,7 @@ class Manager:
 
             self._host_data = HostData(
                 output=self._grouped_outputs,
-                lm75=self._lm75,
+                temp_sensor=self._temp_sensors[0] if self._temp_sensors else None,
                 callback=self._host_data_callback,
             )
             for f in host_stats.values():

{boneio-0.1.0.dev23 → boneio-0.1.0.dev25}/boneio/schema.yaml

@@ -68,6 +68,23 @@ lm75:
       meta:
         label: GPIO of I2C SDA
 
+
+mcp9808:
+  type: dict
+  required: False
+  schema:
+    id:
+      type: string
+      required: False
+      meta:
+        label: Id of I2C to use in pin config
+    address:
+      type: string
+      required: True
+      default: 0x18
+      meta:
+        label: GPIO of I2C SDA
+
 mcp23017:
   type: list
   required: False

boneio-0.1.0.dev25/boneio/sensor/__init__.py

@@ -0,0 +1,6 @@
+"""Sensor module."""
+from boneio.sensor.temp import LM75Sensor, MCP9808Sensor
+from boneio.sensor.gpio import GpioInputSensor
+from boneio.sensor.adc import initialize_adc, GpioADCSensor
+
+__all__ = ["LM75Sensor", "MCP9808Sensor", "GpioInputSensor", "initialize_adc", "GpioADCSensor"]

boneio-0.1.0.dev23/boneio/sensor/lm75.py → boneio-0.1.0.dev25/boneio/sensor/temp/__init__.py

@@ -1,21 +1,30 @@
-"""Manage LM75 sensor."""
+"""Manage BoneIO onboard temp sensors."""
 
 import asyncio
 from adafruit_pct2075 import PCT2075
+from adafruit_mcp9808 import MCP9808
+from boneio.const import STATE, SENSOR, LM75, MCP_TEMP_9808, TEMPERATURE
+
+from boneio.helper.exceptions import I2CError
+from boneio.helper import BasicMqtt
+
+
 from boneio.const import STATE, SENSOR, LM75
 
 from boneio.helper.exceptions import I2CError
 from boneio.helper import BasicMqtt
 
 
-class LM75Sensor(BasicMqtt):
-    """Represent LM75 sensor in BoneIO."""
+class TempSensor(BasicMqtt):
+    """Represent Temp sensor in BoneIO."""
+    SensorClass = None
+    DefaultName = TEMPERATURE
 
-    def __init__(self, i2c, address, id: str = LM75, **kwargs):
-        """Initialize LM75 class."""
+    def __init__(self, i2c, address, id: str = DefaultName, **kwargs):
+        """Initialize Temp class."""
         super().__init__(id=id, topic_type=SENSOR, **kwargs)
         try:
-            self._pct = PCT2075(i2c_bus=i2c, address=address)
+            self._pct = self.SensorClass(i2c_bus=i2c, address=address)
         except ValueError as err:
             raise I2CError(err)
 
@@ -32,3 +41,14 @@ class LM75Sensor(BasicMqtt):
                 payload={STATE: self.state},
             )
             await asyncio.sleep(60)
+
+
+class LM75Sensor(TempSensor):
+    """Represent LM75 sensor in BoneIO."""
+    SensorClass = PCT2075
+    DefaultName = LM75
+
+class MCP9808Sensor(TempSensor):
+    """Represent MCP9808 sensor in BoneIO."""
+    SensorClass = MCP9808
+    DefaultName = MCP_TEMP_9808

boneio-0.1.0.dev25/boneio/version.py

@@ -0,0 +1,2 @@
+# flake8: noqa
+__version__ = "0.1.0.dev25"

{boneio-0.1.0.dev23 → boneio-0.1.0.dev25/boneio.egg-info}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.1
 Name: boneio
-Version: 0.1.0.dev23
+Version: 0.1.0.dev25
 Summary: Python Helper for BoneIO
 Home-page: https://github.com/maciejk1984/boneIO
 License: GNU General Public License v3.0
-Download-URL: https://github.com/maciejk1984/boneIO/archive/0.1.0.dev23.zip
+Download-URL: https://github.com/maciejk1984/boneIO/archive/0.1.0.dev25.zip
 Platform: UNKNOWN
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.7

{boneio-0.1.0.dev23 → boneio-0.1.0.dev25}/boneio.egg-info/SOURCES.txt

@@ -17,6 +17,12 @@ boneio.egg-info/dependency_links.txt
 boneio.egg-info/entry_points.txt
 boneio.egg-info/requires.txt
 boneio.egg-info/top_level.txt
+boneio/example_config/__init__.py
+boneio/example_config/adc.yaml
+boneio/example_config/config.yaml
+boneio/example_config/input.yaml
+boneio/example_config/output24x16A.yaml
+boneio/example_config/output32x5A.yaml
 boneio/fonts/danube__.ttf
 boneio/helper/__init__.py
 boneio/helper/exceptions.py
@@ -36,10 +42,4 @@ boneio/relay/mcp.py
 boneio/sensor/__init__.py
 boneio/sensor/adc.py
 boneio/sensor/gpio.py
-boneio/sensor/lm75.py
-example_config/__init__.py
-example_config/adc.yaml
-example_config/config.yaml
-example_config/input.yaml
-example_config/output24x16A.yaml
-example_config/output32x5A.yaml
+boneio/sensor/temp/__init__.py

{boneio-0.1.0.dev23 → boneio-0.1.0.dev25}/boneio.egg-info/requires.txt

@@ -2,6 +2,7 @@ Adafruit-BBIO==1.2.0
 Adafruit-Blinka==6.15.0
 adafruit-circuitpython-mcp230xx==2.5.1
 adafruit-circuitpython-pct2075==1.1.11
+adafruit-circuitpython-mcp9808==3.3.9
 Adafruit-PlatformDetect==3.17.2
 Adafruit-PureIO==1.1.9
 asyncio-mqtt==0.10.0

boneio-0.1.0.dev25/boneio.egg-info/top_level.txt

@@ -0,0 +1 @@
+boneio

{boneio-0.1.0.dev23 → boneio-0.1.0.dev25}/requirements.txt

@@ -4,6 +4,7 @@ adafruit-circuitpython-busdevice==5.1.1
 adafruit-circuitpython-framebuf==1.4.8
 adafruit-circuitpython-mcp230xx==2.5.1
 adafruit-circuitpython-pct2075==1.1.11
+adafruit-circuitpython-mcp9808==3.3.9
 Adafruit-PlatformDetect==3.17.2
 Adafruit-PureIO==1.1.9
 asyncio-mqtt==0.10.0

{boneio-0.1.0.dev23 → boneio-0.1.0.dev25}/setup.py

@@ -33,6 +33,7 @@ setup(
         "Adafruit-Blinka==6.15.0",
         "adafruit-circuitpython-mcp230xx==2.5.1",
         "adafruit-circuitpython-pct2075==1.1.11",
+        "adafruit-circuitpython-mcp9808==3.3.9",
         "Adafruit-PlatformDetect==3.17.2",
         "Adafruit-PureIO==1.1.9",
         "asyncio-mqtt==0.10.0",

boneio-0.1.0.dev23/boneio/sensor/__init__.py

@@ -1,6 +0,0 @@
-"""Sensor module."""
-from boneio.sensor.lm75 import LM75Sensor
-from boneio.sensor.gpio import GpioInputSensor
-from boneio.sensor.adc import initialize_adc, GpioADCSensor
-
-__all__ = ["LM75Sensor", "GpioInputSensor", "initialize_adc", "GpioADCSensor"]

boneio-0.1.0.dev23/boneio/version.py

@@ -1,2 +0,0 @@
-# flake8: noqa
-__version__ = "0.1.0.dev23"

boneio-0.1.0.dev23/boneio.egg-info/top_level.txt

@@ -1,2 +0,0 @@
-boneio
-example_config