boneIO 0.9.0.dev14__tar.gz → 0.9.1__tar.gz

{boneio-0.9.0.dev14 → boneio-0.9.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: boneio
-Version: 0.9.0.dev14
+Version: 0.9.1
 Summary: Python App for BoneIO
 License: GNU General Public License v3.0
 Author-email: Paweł Szafer <pszafer@gmail.com>

boneio-0.9.1/boneio/boards/0.8/cover.yaml

@@ -0,0 +1,137 @@
+mcp23017:
+  - id: mcp1
+    address: 0x23
+  - id: mcp2
+    address: 0x24
+
+output_mapping:
+  cover_01_up:
+    kind: mcp
+    mcp_id: mcp2
+    pin: 7
+  cover_01_down:
+    kind: mcp
+    mcp_id: mcp2
+    pin: 6
+  cover_02_up:
+    kind: mcp
+    mcp_id: mcp2
+    pin: 5
+  cover_02_down:
+    kind: mcp
+    mcp_id: mcp2
+    pin: 4
+  cover_03_up:
+    kind: mcp
+    mcp_id: mcp2
+    pin: 3
+  cover_03_down:
+    kind: mcp
+    mcp_id: mcp2
+    pin: 2
+  cover_04_up:
+    kind: mcp
+    mcp_id: mcp2
+    pin: 1
+  cover_04_down:
+    kind: mcp
+    mcp_id: mcp2
+    pin: 0
+  cover_05_up:
+    kind: mcp
+    mcp_id: mcp1
+    pin: 7
+  cover_05_down:
+    kind: mcp
+    mcp_id: mcp1
+    pin: 6
+  cover_06_up:
+    kind: mcp
+    mcp_id: mcp1
+    pin: 5
+  cover_06_down:
+    kind: mcp
+    mcp_id: mcp1
+    pin: 4
+  cover_07_up:
+    kind: mcp
+    mcp_id: mcp1
+    pin: 3
+  cover_07_down:
+    kind: mcp
+    mcp_id: mcp1
+    pin: 2
+  cover_08_up:
+    kind: mcp
+    mcp_id: mcp1
+    pin: 1
+  cover_08_down:
+    kind: mcp
+    mcp_id: mcp1
+    pin: 0
+  cover_09_up:
+    kind: mcp
+    mcp_id: mcp2
+    pin: 8
+  cover_09_down:
+    kind: mcp
+    mcp_id: mcp2
+    pin: 9
+  cover_10_up:
+    kind: mcp
+    mcp_id: mcp2
+    pin: 10
+  cover_10_down:
+    kind: mcp
+    mcp_id: mcp2
+    pin: 11
+  cover_11_up:
+    kind: mcp
+    mcp_id: mcp2
+    pin: 12
+  cover_11_down:
+    kind: mcp
+    mcp_id: mcp2
+    pin: 13
+  cover_12_up:
+    kind: mcp
+    mcp_id: mcp2
+    pin: 14
+  cover_12_down:
+    kind: mcp
+    mcp_id: mcp2
+    pin: 15
+  cover_13_up:
+    kind: mcp
+    mcp_id: mcp1
+    pin: 8
+  cover_13_down:
+    kind: mcp
+    mcp_id: mcp1
+    pin: 9
+  cover_14_up:
+    kind: mcp
+    mcp_id: mcp1
+    pin: 10
+  cover_14_down:
+    kind: mcp
+    mcp_id: mcp1
+    pin: 11
+  cover_15_up:
+    kind: mcp
+    mcp_id: mcp1
+    pin: 12
+  cover_15_down:
+    kind: mcp
+    mcp_id: mcp1
+    pin: 13
+  cover_16_up:
+    kind: mcp
+    mcp_id: mcp1
+    pin: 14
+  cover_16_down:
+    kind: mcp
+    mcp_id: mcp1
+    pin: 15
+
+

boneio-0.9.1/boneio/boards/0.8/cover_mix.yaml

@@ -0,0 +1,137 @@
+mcp23017:
+  - id: mcp1
+    address: 0x23
+  - id: mcp2
+    address: 0x24
+
+output_mapping:
+  cover_01_up:
+    kind: mcp
+    mcp_id: mcp2
+    pin: 7
+  cover_01_down:
+    kind: mcp
+    mcp_id: mcp2
+    pin: 6
+  cover_02_up:
+    kind: mcp
+    mcp_id: mcp2
+    pin: 5
+  cover_02_down:
+    kind: mcp
+    mcp_id: mcp2
+    pin: 4
+  cover_03_up:
+    kind: mcp
+    mcp_id: mcp2
+    pin: 3
+  cover_03_down:
+    kind: mcp
+    mcp_id: mcp2
+    pin: 2
+  cover_04_up:
+    kind: mcp
+    mcp_id: mcp2
+    pin: 1
+  cover_04_down:
+    kind: mcp
+    mcp_id: mcp2
+    pin: 0
+  cover_05_up:
+    kind: mcp
+    mcp_id: mcp1
+    pin: 7
+  cover_05_down:
+    kind: mcp
+    mcp_id: mcp1
+    pin: 6
+  cover_06_up:
+    kind: mcp
+    mcp_id: mcp1
+    pin: 5
+  cover_06_down:
+    kind: mcp
+    mcp_id: mcp1
+    pin: 4
+  cover_07_up:
+    kind: mcp
+    mcp_id: mcp1
+    pin: 3
+  cover_07_down:
+    kind: mcp
+    mcp_id: mcp1
+    pin: 2
+  cover_08_up:
+    kind: mcp
+    mcp_id: mcp1
+    pin: 1
+  cover_08_down:
+    kind: mcp
+    mcp_id: mcp1
+    pin: 0
+  out_17:
+    kind: mcp
+    mcp_id: mcp2
+    pin: 8
+  out_18:
+    kind: mcp
+    mcp_id: mcp2
+    pin: 9
+  out_19:
+    kind: mcp
+    mcp_id: mcp2
+    pin: 10
+  out_20:
+    kind: mcp
+    mcp_id: mcp2
+    pin: 11
+  out_21:
+    kind: mcp
+    mcp_id: mcp2
+    pin: 12
+  out_22:
+    kind: mcp
+    mcp_id: mcp2
+    pin: 13
+  out_23:
+    kind: mcp
+    mcp_id: mcp2
+    pin: 14
+  out_24:
+    kind: mcp
+    mcp_id: mcp2
+    pin: 15
+  out_25:
+    kind: mcp
+    mcp_id: mcp1
+    pin: 8
+  out_26:
+    kind: mcp
+    mcp_id: mcp1
+    pin: 9
+  out_27:
+    kind: mcp
+    mcp_id: mcp1
+    pin: 10
+  out_28:
+    kind: mcp
+    mcp_id: mcp1
+    pin: 11
+  out_29:
+    kind: mcp
+    mcp_id: mcp1
+    pin: 12
+  out_30:
+    kind: mcp
+    mcp_id: mcp1
+    pin: 13
+  out_31:
+    kind: mcp
+    mcp_id: mcp1
+    pin: 14
+  out_32:
+    kind: mcp
+    mcp_id: mcp1
+    pin: 15
+
+

{boneio-0.9.0.dev14 → boneio-0.9.1}/boneio/example_config/config.yaml

@@ -12,15 +12,15 @@ lm75:
   - id: temp
     address: 0x48
 
-mcp23017:
-  - id: mcp1
-    address: 0x20
-  - id: mcp2
-    address: 0x21
-
 event: !include event.yaml
 binary_sensor: !include binary_sensor.yaml
 
 output: !include output32x5A.yaml
 
+boneio:
+  name: "boneIO Black 32x10A"
+  version: 0.8
+  device_type: "32x10A"
+  
+
 # adc: !include adc.yaml Uncomment only if needed.

{boneio-0.9.0.dev14 → boneio-0.9.1}/boneio/helper/yaml_util.py

@@ -262,7 +262,7 @@ def merge_board_config(config: dict) -> dict:
                         f"Input mapping '{input['boneio_input']}' not found in board configuration"
                     )
                 # Merge mapped output with user config, preserving user-specified values
-                input.update({k: v for k, v in mapped_input.items() if k not in input})
+                input.update({k: v for k, v in mapped_input.items()})
 
         for input in config.get("binary_sensor", []):
             if "boneio_input" in input:
@@ -273,7 +273,7 @@ def merge_board_config(config: dict) -> dict:
                         f"Input mapping '{input['boneio_input']}' not found in board configuration"
                     )
                 # Merge mapped output with user config, preserving user-specified values
-                input.update({k: v for k, v in mapped_input.items() if k not in input})
+                input.update({k: v for k, v in mapped_input.items()})
 
 
     return config
@@ -492,7 +492,13 @@ def load_config_from_string(config_str: str) -> dict:
     schema = load_yaml_file(schema_file)
     v = CustomValidator(schema, purge_unknown=True)
 
-    if not v.validate(config_str):
+    # First normalize the document
+    doc = v.normalized(config_str, always_return_document=True)
+    # Then merge board config
+    merged_doc = merge_board_config(doc)
+    
+    # Finally validate
+    if not v.validate(merged_doc):
         error_msg = "Configuration validation failed:\n"
         for field, errors in v.errors.items():
             error_lines = []
@@ -503,8 +509,8 @@ def load_config_from_string(config_str: str) -> dict:
                 ]
             error_msg += f"\n- {field}: {errors}\n{', '.join(error_lines)}"
         raise ConfigurationException(error_msg)
-    doc = v.normalized(v.document, always_return_document=True)
-    return merge_board_config(doc)
+    
+    return merged_doc
 
 
 def load_config_from_file(config_file: str):

{boneio-0.9.0.dev14 → boneio-0.9.1}/boneio/manager.py

@@ -187,7 +187,7 @@ class Manager:
             _name = _config.pop(ID)
             restore_state = _config.pop(RESTORE_STATE, False)
             _id = strip_accents(_name)
-            out = configure_relay(
+            out = configure_relay( #grouped_output updated here.
                 manager=self,
                 state_manager=self._state_manager,
                 topic_prefix=self._config_helper.topic_prefix,

{boneio-0.9.0.dev14 → boneio-0.9.1}/boneio/modbus/sdm120.json

@@ -4,6 +4,7 @@
         {
             "base": 0,
             "length": 34,
+            "register_type": "input",
             "registers": [
                 {
                     "name": "Voltage",
@@ -11,7 +12,7 @@
                     "unit_of_measurement": "V",
                     "state_class": "measurement",
                     "device_class": "voltage",
-                    "return_type": "float32"
+                    "return_type": "FP32"
                 },
                 {
                     "name": "Current",
@@ -19,7 +20,7 @@
                     "unit_of_measurement": "A",
                     "state_class": "measurement",
                     "device_class": "current",
-                    "return_type": "float32"
+                    "return_type": "FP32"
                 },
                 {
                     "name": "Power",
@@ -27,28 +28,28 @@
                     "unit_of_measurement": "W",
                     "state_class": "measurement",
                     "device_class": "power",
-                    "return_type": "float32"
+                    "return_type": "FP32"
                 },
                 {
                     "name": "Power_VA",
                     "address": 18,
                     "unit_of_measurement": "VA",
                     "state_class": "measurement",
-                    "return_type": "float32"
+                    "return_type": "FP32"
                 },
                 {
                     "name": "Power_VAr",
                     "address": 24,
                     "unit_of_measurement": "var",
                     "state_class": "measurement",
-                    "return_type": "float32"
+                    "return_type": "FP32"
                 },
                 {
                     "name": "Power_Factor",
                     "address": 30,
                     "unit_of_measurement": "%",
                     "state_class": "measurement",
-                    "return_type": "float32"
+                    "return_type": "FP32"
                 }
             ]
 
@@ -56,13 +57,14 @@
         {
             "base": 70,
             "length": 12,
+            "register_type": "input",
             "registers":[
                 {
                     "name": "Frequency",
                     "address": 70,
                     "unit_of_measurement": "Hz",
                     "state_class": "measurement",
-                    "return_type": "float32"
+                    "return_type": "FP32"
                 },
                 {
                     "name": "Import_Energy_kWh_Total",
@@ -70,7 +72,7 @@
                     "unit_of_measurement": "kWh",
                     "state_class": "total_increasing",
                     "device_class": "energy",
-                    "return_type": "float32"
+                    "return_type": "FP32"
                 },
                 {
                     "name": "Export_Energy_kWh_Total",
@@ -78,27 +80,28 @@
                     "unit_of_measurement": "kWh",
                     "state_class": "total_increasing",
                     "device_class": "energy",
-                    "return_type": "float32"
+                    "return_type": "FP32"
                 },
                 {
                     "name": "Import_Energy_kVArh_Total",
                     "address": 76,
                     "unit_of_measurement": "kvArh",
                     "state_class": "total_increasing",
-                    "return_type": "float32"
+                    "return_type": "FP32"
                 },
                 {
                     "name": "Export_Energy_kVArh_Total",
                     "address": 78,
                     "unit_of_measurement": "kvArh",
                     "state_class": "total_increasing",
-                    "return_type": "float32"
+                    "return_type": "FP32"
                 }
             ]
         },
         {
             "base": 342,
             "length": 4,
+            "register_type": "input",
             "registers": [
                 {
                     "name": "kWh_Total",
@@ -106,7 +109,7 @@
                     "unit_of_measurement": "kWh",
                     "state_class": "total_increasing",
                     "device_class": "energy",
-                    "return_type": "float32"
+                    "return_type": "FP32"
                 },
                 {
                     "name": "kvarh_Total",
@@ -114,7 +117,7 @@
                     "unit_of_measurement": "kWh",
                     "state_class": "total_increasing",
                     "device_class": "energy",
-                    "return_type": "float32"
+                    "return_type": "FP32"
                 }
             ]
         }