boneio 1.0.0.dev1__tar.gz → 1.0.0.dev2__tar.gz

{boneio-1.0.0.dev1/boneio.egg-info → boneio-1.0.0.dev2}/PKG-INFO

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

{boneio-1.0.0.dev1/boneio/boards/0.3_test → boneio-1.0.0.dev2/boneio/boards/0.4}/input.yaml

@@ -55,7 +55,6 @@ input_mapping:
     pin: P9_15
   in_25:
     pin: P9_14
-  ##
   in_26:
     pin: P9_13
   in_27:

boneio-1.0.0.dev2/boneio/boards/0.4/output_24_16.yaml

@@ -0,0 +1,103 @@
+mcp23017:
+  - id: mcp_left
+    address: 0x20
+  - id: mcp_right
+    address: 0x21
+
+output_mapping:
+  out_01:
+    kind: mcp
+    mcp_id: mcp_left
+    pin: 9
+  out_02:
+    kind: mcp
+    mcp_id: mcp_left
+    pin: 8
+  out_03:
+    kind: mcp
+    mcp_id: mcp_right
+    pin: 1
+  out_04:
+    kind: mcp
+    mcp_id: mcp_right
+    pin: 0
+  out_05:
+    kind: mcp
+    mcp_id: mcp_left
+    pin: 13
+  out_06:
+    kind: mcp
+    mcp_id: mcp_left
+    pin: 12
+  out_07:
+    kind: mcp
+    mcp_id: mcp_left
+    pin: 11
+  out_08:
+    kind: mcp
+    mcp_id: mcp_left
+    pin: 10
+  out_09:
+    kind: mcp
+    mcp_id: mcp_right
+    pin: 14
+  out_10:
+    kind: mcp
+    mcp_id: mcp_right
+    pin: 15
+  out_11:
+    kind: mcp
+    mcp_id: mcp_right
+    pin: 13
+  out_12:
+    kind: mcp
+    mcp_id: mcp_right
+    pin: 12
+  out_13:
+    kind: mcp
+    mcp_id: mcp_left
+    pin: 6
+  out_14:
+    kind: mcp
+    mcp_id: mcp_left
+    pin: 5
+  out_15:
+    kind: mcp
+    mcp_id: mcp_left
+    pin: 4
+  out_16:
+    kind: mcp
+    mcp_id: mcp_left
+    pin: 3
+  out_17:
+    kind: mcp
+    mcp_id: mcp_left
+    pin: 2
+  out_18:
+    kind: mcp
+    mcp_id: mcp_left
+    pin: 0
+  out_19:
+    kind: mcp
+    mcp_id: mcp_left
+    pin: 1
+  out_20:
+    kind: mcp
+    mcp_id: mcp_left
+    pin: 7
+  out_21:
+    kind: mcp
+    mcp_id: mcp_right
+    pin: 8
+  out_22:
+    kind: mcp
+    mcp_id: mcp_right
+    pin: 9
+  out_23:
+    kind: mcp
+    mcp_id: mcp_right
+    pin: 11
+  out_24:
+    kind: mcp
+    mcp_id: mcp_right
+    pin: 10

boneio-1.0.0.dev1/boneio/boards/0.7/output_24_16.yaml → boneio-1.0.0.dev2/boneio/boards/0.4/output_32_5.yaml

@@ -1,137 +1,139 @@
 mcp23017:
-  - id: mcp_right
-    address: 0x20
   - id: mcp_left
+    address: 0x20
+  - id: mcp_right
     address: 0x21
 
 output_mapping:
+  # mcp_left - upper left 8 relays
   out_01:
     kind: mcp
     mcp_id: mcp_left
-    pin: 7
+    pin: 0
   out_02:
     kind: mcp
     mcp_id: mcp_left
-    pin: 6
+    pin: 1
   out_03:
     kind: mcp
     mcp_id: mcp_left
-    pin: 5
+    pin: 2
   out_04:
     kind: mcp
     mcp_id: mcp_left
-    pin: 4
+    pin: 3
   out_05:
     kind: mcp
     mcp_id: mcp_left
-    pin: 3
+    pin: 4
   out_06:
     kind: mcp
     mcp_id: mcp_left
-    pin: 2
+    pin: 5
   out_07:
     kind: mcp
     mcp_id: mcp_left
-    pin: 1
+    pin: 6
   out_08:
     kind: mcp
     mcp_id: mcp_left
-    pin: 0
+    pin: 7
+  # mcp_right - upper right 8 relays
   out_09:
     kind: mcp
     mcp_id: mcp_right
-    pin: 7
+    pin: 0
   out_10:
     kind: mcp
     mcp_id: mcp_right
-    pin: 6
+    pin: 1
   out_11:
     kind: mcp
     mcp_id: mcp_right
-    pin: 5
+    pin: 2
   out_12:
     kind: mcp
     mcp_id: mcp_right
-    pin: 4
+    pin: 3
   out_13:
     kind: mcp
     mcp_id: mcp_right
-    pin: 3
+    pin: 4
   out_14:
     kind: mcp
     mcp_id: mcp_right
-    pin: 2
+    pin: 5
   out_15:
     kind: mcp
     mcp_id: mcp_right
-    pin: 1
+    pin: 6
   out_16:
     kind: mcp
     mcp_id: mcp_right
-    pin: 0
+    pin: 7
+  # mcp_left - lower left 8 relays
   out_17:
     kind: mcp
     mcp_id: mcp_left
-    pin: 8
+    pin: 15
   out_18:
     kind: mcp
     mcp_id: mcp_left
-    pin: 9
+    pin: 14
   out_19:
     kind: mcp
     mcp_id: mcp_left
-    pin: 10
+    pin: 13
   out_20:
     kind: mcp
     mcp_id: mcp_left
-    pin: 11
+    pin: 12
   out_21:
     kind: mcp
     mcp_id: mcp_left
-    pin: 12
+    pin: 11
   out_22:
     kind: mcp
     mcp_id: mcp_left
-    pin: 13
+    pin: 10
   out_23:
     kind: mcp
     mcp_id: mcp_left
-    pin: 14
+    pin: 9
   out_24:
     kind: mcp
     mcp_id: mcp_left
-    pin: 15
+    pin: 8
+  # mcp_right - lower right 8 relays
   out_25:
     kind: mcp
     mcp_id: mcp_right
-    pin: 8
+    pin: 15
   out_26:
     kind: mcp
     mcp_id: mcp_right
-    pin: 9
+    pin: 14
   out_27:
     kind: mcp
     mcp_id: mcp_right
-    pin: 10
+    pin: 13
   out_28:
     kind: mcp
     mcp_id: mcp_right
-    pin: 11
+    pin: 12
   out_29:
     kind: mcp
     mcp_id: mcp_right
-    pin: 12
+    pin: 11
   out_30:
     kind: mcp
     mcp_id: mcp_right
-    pin: 13
+    pin: 10
   out_31:
     kind: mcp
     mcp_id: mcp_right
-    pin: 14
+    pin: 9
   out_32:
     kind: mcp
     mcp_id: mcp_right
-    pin: 15
-
-
+    pin: 8

{boneio-1.0.0.dev1 → boneio-1.0.0.dev2}/boneio/core/config/config_helper.py

@@ -37,6 +37,7 @@ class ConfigHelper:
         ha_discovery_prefix: str = HOMEASSISTANT,
         network_info: dict = {},
         is_web_active: bool = False,
+        web_port: int = 8090,
         config_file_path: str | None = None,
     ):
         self._name = name
@@ -45,6 +46,7 @@ class ConfigHelper:
         self._ha_discovery = ha_discovery
         self._ha_discovery_prefix = ha_discovery_prefix
         self._device_type = device_type
+        self._web_port = web_port
         self._fetch_old_discovery = None
         self._autodiscovery_messages = {
             SWITCH: {},
@@ -107,6 +109,10 @@ class ConfigHelper:
     def is_web_active(self) -> bool:
         return self._is_web_active
 
+    @property
+    def web_port(self) -> int:
+        return self._web_port
+
     @property
     def topic_prefix(self) -> str:
         return self._topic_prefix

{boneio-1.0.0.dev1 → boneio-1.0.0.dev2}/boneio/core/config/yaml_util.py

@@ -228,7 +228,8 @@ def normalize_board_name(name: str) -> str:
     """Normalize board name to a standard format.
     
     Examples:
-        32x10a, 32x10A, 32 -> 32_10
+        32x10a, 32x10A, 32x10 -> 32_10
+        32x5a, 32x5A, 32x5 -> 32_5
         cover -> cover
         cover mix, cm -> cover_mix
         24x16A, 24x16, 24 -> 24_16
@@ -246,7 +247,11 @@ def normalize_board_name(name: str) -> str:
     if name == 'cover':
         return 'cover'
     
-    # Handle 32x10A variations
+    # Handle 32x5A variations (must check before 32x10 since both start with 32)
+    if name in ('32x5a', '32x5'):
+        return '32_5'
+    
+    # Handle 32x10A variations (default for 32 without suffix)
     if name.startswith('32'):
         return '32_10'
     

{boneio-1.0.0.dev1 → boneio-1.0.0.dev2}/boneio/example_config/24x16/adc.yaml

@@ -1,14 +1,14 @@
-- id: adc1
+- name: adc1
   pin: P9_33
-- id: adc2
+- name: adc2
   pin: P9_36
-- id: adc3
+- name: adc3
   pin: P9_35
-- id: adc4
+- name: adc4
   pin: P9_38
-- id: adc5
+- name: adc5
   pin: P9_37
-- id: adc6
+- name: adc6
   pin: P9_40
-- id: adc7
+- name: adc7
   pin: P9_39

{boneio-1.0.0.dev1 → boneio-1.0.0.dev2}/boneio/example_config/24x16/binary_sensor.yaml

@@ -3,13 +3,13 @@
 # PINs are shared between event.yaml and binary_sensor.yaml.
 # Don't duplicate PINs.
 
-- id: IN_48
+- name: IN_48
   boneio_input: IN_48
   actions:
     pressed:
       - action: output
         pin: OUT_01
-- id: IN_49
+- name: IN_49
   boneio_input: IN_49
   actions:
     pressed:

{boneio-1.0.0.dev1 → boneio-1.0.0.dev2}/boneio/example_config/24x16/event.yaml

@@ -4,7 +4,7 @@
 # Don't duplicate PINs.
 
 # IN_48 and IN_49 are enabled in binary_sensor.yaml by default.
-- id: IN_01
+- name: IN_01
   boneio_input: IN_01
   actions:
     single:
@@ -13,7 +13,7 @@
     double:
       - action: output
         pin: OUT_01
-- id: IN_02
+- name: IN_02
   boneio_input: IN_02
   actions:
     single:
@@ -22,7 +22,7 @@
     double:
       - action: output
         pin: OUT_01
-- id: IN_03
+- name: IN_03
   boneio_input: IN_03
   actions:
     single:
@@ -34,178 +34,178 @@
     long:
       - action: output
         pin: OUT_03
-- id: IN_04
+- name: IN_04
   boneio_input: IN_04
   actions:
     single:
       - action: output
         pin: OUT_04
-- id: IN_05
+- name: IN_05
   boneio_input: IN_05
   actions:
     single:
       - action: output
         pin: OUT_05
-- id: IN_06
+- name: IN_06
   boneio_input: IN_06
   actions:
     single:
       - action: output
         pin: OUT_06
-- id: IN_07
+- name: IN_07
   boneio_input: IN_07
   actions:
     single:
       - action: output
         pin: OUT_07
-- id: IN_08
+- name: IN_08
   boneio_input: IN_08
   actions:
     single:
       - action: output
         pin: OUT_08
-- id: IN_09
+- name: IN_09
   boneio_input: IN_09
   actions:
     single:
       - action: output
         pin: OUT_09
-- id: IN_10
+- name: IN_10
   boneio_input: IN_10
   actions:
     single:
       - action: output
         pin: OUT_10
-- id: IN_11
+- name: IN_11
   boneio_input: IN_11
   actions:
     single:
       - action: output
         pin: OUT_11
-- id: IN_12
+- name: IN_12
   boneio_input: IN_12
   actions:
     single:
       - action: output
         pin: OUT_12
-- id: IN_13
+- name: IN_13
   boneio_input: IN_13
   actions:
     single:
       - action: output
         pin: OUT_13
-- id: IN_14
+- name: IN_14
   boneio_input: IN_14
   actions:
     single:
       - action: output
         pin: OUT_14
 
-- id: IN_15
+- name: IN_15
   boneio_input: IN_15
   actions:
     single:
       - action: output
         pin: OUT_15
-- id: IN_16
+- name: IN_16
   boneio_input: IN_16
   actions:
     single:
       - action: output
         pin: OUT_16
-- id: IN_17
+- name: IN_17
   boneio_input: IN_17
   actions:
     single:
       - action: output
         pin: OUT_17
-- id: IN_18
+- name: IN_18
   boneio_input: IN_18
   actions:
     single:
       - action: output
         pin: OUT_18
-- id: IN_19
+- name: IN_19
   boneio_input: IN_19
   actions:
     single:
       - action: output
         pin: OUT_19
-- id: IN_20
+- name: IN_20
   boneio_input: IN_20
   actions:
     single:
       - action: output
         pin: OUT_20
-- id: IN_21
+- name: IN_21
   boneio_input: IN_21
   actions:
     single:
       - action: output
         pin: OUT_21
-- id: IN_22
+- name: IN_22
   boneio_input: IN_22
   actions:
     single:
       - action: output
         pin: OUT_22
-- id: IN_23
+- name: IN_23
   boneio_input: IN_23
   actions:
     single:
       - action: output
         pin: OUT_23
-- id: IN_24
+- name: IN_24
   boneio_input: IN_24
   actions:
     single:
       - action: output
         pin: OUT_24
-- id: IN_25
+- name: IN_25
   boneio_input: IN_25
-- id: IN_26
+- name: IN_26
   boneio_input: IN_26
-- id: IN_27
+- name: IN_27
   boneio_input: IN_27
-- id: IN_28
+- name: IN_28
   boneio_input: IN_28
-- id: IN_29
+- name: IN_29
   boneio_input: IN_29
-- id: IN_30
+- name: IN_30
   boneio_input: IN_30
-- id: IN_31
+- name: IN_31
   boneio_input: IN_31
-- id: IN_32
+- name: IN_32
   boneio_input: IN_32
-- id: IN_33
+- name: IN_33
   boneio_input: IN_33
-- id: IN_34
+- name: IN_34
   boneio_input: IN_34
-- id: IN_35
+- name: IN_35
   boneio_input: IN_35
-- id: IN_36
+- name: IN_36
   boneio_input: IN_36
-- id: IN_37
+- name: IN_37
   boneio_input: IN_37
-- id: IN_38
+- name: IN_38
   boneio_input: IN_38
-- id: IN_39
+- name: IN_39
   boneio_input: IN_39
-- id: IN_40
+- name: IN_40
   boneio_input: IN_40
-- id: IN_41
+- name: IN_41
   boneio_input: IN_41
-- id: IN_42
+- name: IN_42
   boneio_input: IN_42
-- id: IN_43
+- name: IN_43
   boneio_input: IN_43
-- id: IN_44
+- name: IN_44
   boneio_input: IN_44
-- id: IN_45
+- name: IN_45
   boneio_input: IN_45
-- id: IN_46
+- name: IN_46
   boneio_input: IN_46
-- id: IN_47
+- name: IN_47
   boneio_input: IN_47
 # - id: IN_48
 #   boneio_input: IN_48