Skip to content

Commit

Permalink
Add concentrator support.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Nerivec
Nerivec committed Nov 7, 2024
1 parent 34ec45e commit a696d6c
Show file tree
Hide file tree
Showing 12 changed files with 117 additions and 6 deletions.
12 changes: 11 additions & 1 deletion manifests/aeotec/aeotec_zga008_zigbee_router.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ slcp_defines:
SL_ZIGBEE_ADDRESS_TABLE_SIZE: 32
SL_ZIGBEE_MULTICAST_TABLE_SIZE: 26
SL_ZIGBEE_ROUTE_TABLE_SIZE: 16
SL_ZIGBEE_DISCOVERY_TABLE_SIZE: 8
SL_ZIGBEE_DISCOVERY_TABLE_SIZE: 16

c_defines:
SL_IOSTREAM_USART_VCOM_BAUDRATE: 115200
Expand Down Expand Up @@ -55,6 +55,16 @@ c_defines:
SL_ZIGBEE_AF_PLUGIN_NETWORK_STEERING_CHANNEL_MASK: 0x07fff800
SL_ZIGBEE_AF_PLUGIN_NETWORK_STEERING_RADIO_TX_POWER: 20

SL_ZIGBEE_AF_PLUGIN_CONCENTRATOR_CONCENTRATOR_TYPE: HIGH_RAM_CONCENTRATOR
# <1-60>
SL_ZIGBEE_AF_PLUGIN_CONCENTRATOR_MIN_TIME_BETWEEN_BROADCASTS_SECONDS: 10
# <30-300>
SL_ZIGBEE_AF_PLUGIN_CONCENTRATOR_MAX_TIME_BETWEEN_BROADCASTS_SECONDS: 60
# <1-100>
SL_ZIGBEE_AF_PLUGIN_CONCENTRATOR_ROUTE_ERROR_THRESHOLD: 3
# <1-100>
SL_ZIGBEE_AF_PLUGIN_CONCENTRATOR_DELIVERY_FAILURE_THRESHOLD: 1

zap_config:
endpoint_types:
- name: "Centralized"
Expand Down
12 changes: 11 additions & 1 deletion manifests/easyiot/easyiot_zb-gw04-1v1_zigbee_router.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ slcp_defines:
SL_ZIGBEE_ADDRESS_TABLE_SIZE: 32
SL_ZIGBEE_MULTICAST_TABLE_SIZE: 26
SL_ZIGBEE_ROUTE_TABLE_SIZE: 16
SL_ZIGBEE_DISCOVERY_TABLE_SIZE: 8
SL_ZIGBEE_DISCOVERY_TABLE_SIZE: 16

c_defines:
SL_IOSTREAM_USART_VCOM_BAUDRATE: 115200
Expand Down Expand Up @@ -55,6 +55,16 @@ c_defines:
SL_ZIGBEE_AF_PLUGIN_NETWORK_STEERING_CHANNEL_MASK: 0x07fff800
SL_ZIGBEE_AF_PLUGIN_NETWORK_STEERING_RADIO_TX_POWER: 20

SL_ZIGBEE_AF_PLUGIN_CONCENTRATOR_CONCENTRATOR_TYPE: HIGH_RAM_CONCENTRATOR
# <1-60>
SL_ZIGBEE_AF_PLUGIN_CONCENTRATOR_MIN_TIME_BETWEEN_BROADCASTS_SECONDS: 10
# <30-300>
SL_ZIGBEE_AF_PLUGIN_CONCENTRATOR_MAX_TIME_BETWEEN_BROADCASTS_SECONDS: 60
# <1-100>
SL_ZIGBEE_AF_PLUGIN_CONCENTRATOR_ROUTE_ERROR_THRESHOLD: 3
# <1-100>
SL_ZIGBEE_AF_PLUGIN_CONCENTRATOR_DELIVERY_FAILURE_THRESHOLD: 1

zap_config:
endpoint_types:
- name: "Centralized"
Expand Down
12 changes: 11 additions & 1 deletion manifests/easyiot/easyiot_zb-gw04-1v2_zigbee_router.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ slcp_defines:
SL_ZIGBEE_ADDRESS_TABLE_SIZE: 32
SL_ZIGBEE_MULTICAST_TABLE_SIZE: 26
SL_ZIGBEE_ROUTE_TABLE_SIZE: 16
SL_ZIGBEE_DISCOVERY_TABLE_SIZE: 8
SL_ZIGBEE_DISCOVERY_TABLE_SIZE: 16

c_defines:
SL_IOSTREAM_USART_VCOM_BAUDRATE: 115200
Expand Down Expand Up @@ -55,6 +55,16 @@ c_defines:
SL_ZIGBEE_AF_PLUGIN_NETWORK_STEERING_CHANNEL_MASK: 0x07fff800
SL_ZIGBEE_AF_PLUGIN_NETWORK_STEERING_RADIO_TX_POWER: 20

SL_ZIGBEE_AF_PLUGIN_CONCENTRATOR_CONCENTRATOR_TYPE: HIGH_RAM_CONCENTRATOR
# <1-60>
SL_ZIGBEE_AF_PLUGIN_CONCENTRATOR_MIN_TIME_BETWEEN_BROADCASTS_SECONDS: 10
# <30-300>
SL_ZIGBEE_AF_PLUGIN_CONCENTRATOR_MAX_TIME_BETWEEN_BROADCASTS_SECONDS: 60
# <1-100>
SL_ZIGBEE_AF_PLUGIN_CONCENTRATOR_ROUTE_ERROR_THRESHOLD: 3
# <1-100>
SL_ZIGBEE_AF_PLUGIN_CONCENTRATOR_DELIVERY_FAILURE_THRESHOLD: 1

zap_config:
endpoint_types:
- name: "Centralized"
Expand Down
12 changes: 11 additions & 1 deletion manifests/nabucasa/nabucasa_skyconnect_zigbee_router.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ slcp_defines:
SL_ZIGBEE_ADDRESS_TABLE_SIZE: 32
SL_ZIGBEE_MULTICAST_TABLE_SIZE: 26
SL_ZIGBEE_ROUTE_TABLE_SIZE: 16
SL_ZIGBEE_DISCOVERY_TABLE_SIZE: 8
SL_ZIGBEE_DISCOVERY_TABLE_SIZE: 16

c_defines:
SL_IOSTREAM_USART_VCOM_BAUDRATE: 115200
Expand Down Expand Up @@ -57,6 +57,16 @@ c_defines:
SL_ZIGBEE_AF_PLUGIN_NETWORK_STEERING_CHANNEL_MASK: 0x07fff800
SL_ZIGBEE_AF_PLUGIN_NETWORK_STEERING_RADIO_TX_POWER: 20

SL_ZIGBEE_AF_PLUGIN_CONCENTRATOR_CONCENTRATOR_TYPE: HIGH_RAM_CONCENTRATOR
# <1-60>
SL_ZIGBEE_AF_PLUGIN_CONCENTRATOR_MIN_TIME_BETWEEN_BROADCASTS_SECONDS: 10
# <30-300>
SL_ZIGBEE_AF_PLUGIN_CONCENTRATOR_MAX_TIME_BETWEEN_BROADCASTS_SECONDS: 60
# <1-100>
SL_ZIGBEE_AF_PLUGIN_CONCENTRATOR_ROUTE_ERROR_THRESHOLD: 3
# <1-100>
SL_ZIGBEE_AF_PLUGIN_CONCENTRATOR_DELIVERY_FAILURE_THRESHOLD: 1

zap_config:
endpoint_types:
- name: "Centralized"
Expand Down
12 changes: 11 additions & 1 deletion manifests/smlight/smlight_slzb06m_zigbee_router.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ slcp_defines:
SL_ZIGBEE_ADDRESS_TABLE_SIZE: 32
SL_ZIGBEE_MULTICAST_TABLE_SIZE: 26
SL_ZIGBEE_ROUTE_TABLE_SIZE: 16
SL_ZIGBEE_DISCOVERY_TABLE_SIZE: 8
SL_ZIGBEE_DISCOVERY_TABLE_SIZE: 16

c_defines:
SL_IOSTREAM_USART_VCOM_BAUDRATE: 115200
Expand Down Expand Up @@ -55,6 +55,16 @@ c_defines:
SL_ZIGBEE_AF_PLUGIN_NETWORK_STEERING_CHANNEL_MASK: 0x07fff800
SL_ZIGBEE_AF_PLUGIN_NETWORK_STEERING_RADIO_TX_POWER: 20

SL_ZIGBEE_AF_PLUGIN_CONCENTRATOR_CONCENTRATOR_TYPE: HIGH_RAM_CONCENTRATOR
# <1-60>
SL_ZIGBEE_AF_PLUGIN_CONCENTRATOR_MIN_TIME_BETWEEN_BROADCASTS_SECONDS: 10
# <30-300>
SL_ZIGBEE_AF_PLUGIN_CONCENTRATOR_MAX_TIME_BETWEEN_BROADCASTS_SECONDS: 60
# <1-100>
SL_ZIGBEE_AF_PLUGIN_CONCENTRATOR_ROUTE_ERROR_THRESHOLD: 3
# <1-100>
SL_ZIGBEE_AF_PLUGIN_CONCENTRATOR_DELIVERY_FAILURE_THRESHOLD: 1

zap_config:
endpoint_types:
- name: "Centralized"
Expand Down
10 changes: 10 additions & 0 deletions manifests/smlight/smlight_slzb07Mg24_zigbee_router.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,16 @@ c_defines:
SL_ZIGBEE_AF_PLUGIN_NETWORK_STEERING_CHANNEL_MASK: 0x07fff800
SL_ZIGBEE_AF_PLUGIN_NETWORK_STEERING_RADIO_TX_POWER: 19

SL_ZIGBEE_AF_PLUGIN_CONCENTRATOR_CONCENTRATOR_TYPE: HIGH_RAM_CONCENTRATOR
# <1-60>
SL_ZIGBEE_AF_PLUGIN_CONCENTRATOR_MIN_TIME_BETWEEN_BROADCASTS_SECONDS: 10
# <30-300>
SL_ZIGBEE_AF_PLUGIN_CONCENTRATOR_MAX_TIME_BETWEEN_BROADCASTS_SECONDS: 60
# <1-100>
SL_ZIGBEE_AF_PLUGIN_CONCENTRATOR_ROUTE_ERROR_THRESHOLD: 3
# <1-100>
SL_ZIGBEE_AF_PLUGIN_CONCENTRATOR_DELIVERY_FAILURE_THRESHOLD: 1

zap_config:
endpoint_types:
- name: "Centralized"
Expand Down
12 changes: 11 additions & 1 deletion manifests/smlight/smlight_slzb07_zigbee_router.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ slcp_defines:
SL_ZIGBEE_ADDRESS_TABLE_SIZE: 32
SL_ZIGBEE_MULTICAST_TABLE_SIZE: 26
SL_ZIGBEE_ROUTE_TABLE_SIZE: 16
SL_ZIGBEE_DISCOVERY_TABLE_SIZE: 8
SL_ZIGBEE_DISCOVERY_TABLE_SIZE: 16

c_defines:
SL_IOSTREAM_USART_VCOM_BAUDRATE: 115200
Expand Down Expand Up @@ -55,6 +55,16 @@ c_defines:
SL_ZIGBEE_AF_PLUGIN_NETWORK_STEERING_CHANNEL_MASK: 0x07fff800
SL_ZIGBEE_AF_PLUGIN_NETWORK_STEERING_RADIO_TX_POWER: 20

SL_ZIGBEE_AF_PLUGIN_CONCENTRATOR_CONCENTRATOR_TYPE: HIGH_RAM_CONCENTRATOR
# <1-60>
SL_ZIGBEE_AF_PLUGIN_CONCENTRATOR_MIN_TIME_BETWEEN_BROADCASTS_SECONDS: 10
# <30-300>
SL_ZIGBEE_AF_PLUGIN_CONCENTRATOR_MAX_TIME_BETWEEN_BROADCASTS_SECONDS: 60
# <1-100>
SL_ZIGBEE_AF_PLUGIN_CONCENTRATOR_ROUTE_ERROR_THRESHOLD: 3
# <1-100>
SL_ZIGBEE_AF_PLUGIN_CONCENTRATOR_DELIVERY_FAILURE_THRESHOLD: 1

zap_config:
endpoint_types:
- name: "Centralized"
Expand Down
10 changes: 10 additions & 0 deletions manifests/sonoff/sonoff_zbdonglee_zigbee_router.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,16 @@ c_defines:
# a >5sec press will factory reset the adapter
SL_ZIGBEE_AF_PLUGIN_BUTTON_JOINING_PERMIT_JOIN_TIMEOUT: 60

SL_ZIGBEE_AF_PLUGIN_CONCENTRATOR_CONCENTRATOR_TYPE: HIGH_RAM_CONCENTRATOR
# <1-60>
SL_ZIGBEE_AF_PLUGIN_CONCENTRATOR_MIN_TIME_BETWEEN_BROADCASTS_SECONDS: 10
# <30-300>
SL_ZIGBEE_AF_PLUGIN_CONCENTRATOR_MAX_TIME_BETWEEN_BROADCASTS_SECONDS: 60
# <1-100>
SL_ZIGBEE_AF_PLUGIN_CONCENTRATOR_ROUTE_ERROR_THRESHOLD: 3
# <1-100>
SL_ZIGBEE_AF_PLUGIN_CONCENTRATOR_DELIVERY_FAILURE_THRESHOLD: 1

zap_config:
endpoint_types:
- name: "Centralized"
Expand Down
10 changes: 10 additions & 0 deletions manifests/sparkfun/sparkfun_mgm240p_zigbee_router.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,16 @@ c_defines:
SL_ZIGBEE_AF_PLUGIN_NETWORK_STEERING_CHANNEL_MASK: 0x07fff800
SL_ZIGBEE_AF_PLUGIN_NETWORK_STEERING_RADIO_TX_POWER: 19

SL_ZIGBEE_AF_PLUGIN_CONCENTRATOR_CONCENTRATOR_TYPE: HIGH_RAM_CONCENTRATOR
# <1-60>
SL_ZIGBEE_AF_PLUGIN_CONCENTRATOR_MIN_TIME_BETWEEN_BROADCASTS_SECONDS: 10
# <30-300>
SL_ZIGBEE_AF_PLUGIN_CONCENTRATOR_MAX_TIME_BETWEEN_BROADCASTS_SECONDS: 60
# <1-100>
SL_ZIGBEE_AF_PLUGIN_CONCENTRATOR_ROUTE_ERROR_THRESHOLD: 3
# <1-100>
SL_ZIGBEE_AF_PLUGIN_CONCENTRATOR_DELIVERY_FAILURE_THRESHOLD: 1

zap_config:
endpoint_types:
- name: "Centralized"
Expand Down
10 changes: 10 additions & 0 deletions manifests/tubeszb/tubeszb-mgm24-zigbee_router.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,16 @@ c_defines:
SL_ZIGBEE_AF_PLUGIN_NETWORK_STEERING_CHANNEL_MASK: 0x07fff800
SL_ZIGBEE_AF_PLUGIN_NETWORK_STEERING_RADIO_TX_POWER: 19

SL_ZIGBEE_AF_PLUGIN_CONCENTRATOR_CONCENTRATOR_TYPE: HIGH_RAM_CONCENTRATOR
# <1-60>
SL_ZIGBEE_AF_PLUGIN_CONCENTRATOR_MIN_TIME_BETWEEN_BROADCASTS_SECONDS: 10
# <30-300>
SL_ZIGBEE_AF_PLUGIN_CONCENTRATOR_MAX_TIME_BETWEEN_BROADCASTS_SECONDS: 60
# <1-100>
SL_ZIGBEE_AF_PLUGIN_CONCENTRATOR_ROUTE_ERROR_THRESHOLD: 3
# <1-100>
SL_ZIGBEE_AF_PLUGIN_CONCENTRATOR_DELIVERY_FAILURE_THRESHOLD: 1

zap_config:
endpoint_types:
- name: "Centralized"
Expand Down
10 changes: 10 additions & 0 deletions manifests/tubeszb/tubeszb-mgm24PB-zigbee_router.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,16 @@ c_defines:
SL_ZIGBEE_AF_PLUGIN_NETWORK_STEERING_CHANNEL_MASK: 0x07fff800
SL_ZIGBEE_AF_PLUGIN_NETWORK_STEERING_RADIO_TX_POWER: 19

SL_ZIGBEE_AF_PLUGIN_CONCENTRATOR_CONCENTRATOR_TYPE: HIGH_RAM_CONCENTRATOR
# <1-60>
SL_ZIGBEE_AF_PLUGIN_CONCENTRATOR_MIN_TIME_BETWEEN_BROADCASTS_SECONDS: 10
# <30-300>
SL_ZIGBEE_AF_PLUGIN_CONCENTRATOR_MAX_TIME_BETWEEN_BROADCASTS_SECONDS: 60
# <1-100>
SL_ZIGBEE_AF_PLUGIN_CONCENTRATOR_ROUTE_ERROR_THRESHOLD: 3
# <1-100>
SL_ZIGBEE_AF_PLUGIN_CONCENTRATOR_DELIVERY_FAILURE_THRESHOLD: 1

zap_config:
endpoint_types:
- name: "Centralized"
Expand Down
1 change: 1 addition & 0 deletions src/zigbee_router/zigbee_router.slcp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ component:
- id: zigbee_application_bootloader
- id: zigbee_button_joining
- id: rail_util_rssi
- id: zigbee_concentrator

define:
- name: EMBER_CUSTOM_MAC_FILTER_TABLE_SIZE
Expand Down

0 comments on commit a696d6c

Please sign in to comment.