Refactor KNX DALI Gateway Configuration and Update Device Parameters
- Introduced configuration macros for OEM manufacturer ID, application number, and application version in knxprod.h. - Updated product identity definitions to use the new configuration macros. - Modified device type enumeration to include additional device types. - Adjusted color space enumeration values for consistency. - Defined generated group object layout constants for memory offsets and block sizes. - Enhanced knx_dali_gw.cpp to utilize the new configuration macros for manufacturer ID and program version. - Updated the device initialization logic to reflect the new hardware and program version structures. - Removed obsolete knx_dali_gw subproject and updated related submodules. Signed-off-by: Tony <tonylu@tony-cloud.com>
This commit is contained in:
@@ -663,6 +663,47 @@ config GATEWAY_KNX_SECURITY_PLAIN_NVS
|
||||
during bring-up, but production builds should replace it with encrypted
|
||||
NVS, flash encryption, and secure boot before exposing real keys.
|
||||
|
||||
config GATEWAY_KNX_OEM_MANUFACTURER_ID
|
||||
hex "KNX OEM manufacturer ID"
|
||||
depends on GATEWAY_KNX_BRIDGE_SUPPORTED
|
||||
range 0x0000 0xffff
|
||||
default 0x00A4
|
||||
help
|
||||
Manufacturer ID advertised by the ETS-programmable KNX-DALI gateway
|
||||
application. This value must match the manufacturer ID used by the
|
||||
Kaenx Creator generated KNX product database.
|
||||
|
||||
config GATEWAY_KNX_OEM_HARDWARE_ID
|
||||
hex "KNX OEM hardware ID"
|
||||
depends on GATEWAY_KNX_BRIDGE_SUPPORTED
|
||||
range 0x0000 0xffff
|
||||
default 0xA401
|
||||
help
|
||||
Hardware ID encoded into the OpenKNX Device Object hardware type as
|
||||
0000HHHHVV00. This must match the hardware identifier from the KNX
|
||||
product database, for example Hardware Id or SerialNumber 0xA401 in
|
||||
the generated Hardware.xml.
|
||||
|
||||
config GATEWAY_KNX_OEM_APPLICATION_NUMBER
|
||||
hex "KNX OEM application number"
|
||||
depends on GATEWAY_KNX_BRIDGE_SUPPORTED
|
||||
range 0x0000 0xffff
|
||||
default 0x0001
|
||||
help
|
||||
Application number advertised by the ETS-programmable KNX-DALI gateway
|
||||
application. Keep this in sync with MAIN_ApplicationNumber from the
|
||||
generated knxprod.h.
|
||||
|
||||
config GATEWAY_KNX_OEM_APPLICATION_VERSION
|
||||
hex "KNX OEM application version"
|
||||
depends on GATEWAY_KNX_BRIDGE_SUPPORTED
|
||||
range 0x00 0xff
|
||||
default 0x08
|
||||
help
|
||||
Application version advertised by the ETS-programmable KNX-DALI gateway
|
||||
application. Keep this in sync with MAIN_ApplicationVersion from the
|
||||
generated knxprod.h.
|
||||
|
||||
config GATEWAY_KNX_MAIN_GROUP
|
||||
int "KNX DALI main group"
|
||||
depends on GATEWAY_KNX_BRIDGE_SUPPORTED
|
||||
|
||||
@@ -676,6 +676,10 @@ CONFIG_GATEWAY_KNX_DATA_SECURE_SUPPORTED=y
|
||||
# CONFIG_GATEWAY_KNX_IP_SECURE_SUPPORTED is not set
|
||||
# CONFIG_GATEWAY_KNX_SECURITY_DEV_ENDPOINTS is not set
|
||||
CONFIG_GATEWAY_KNX_SECURITY_PLAIN_NVS=y
|
||||
CONFIG_GATEWAY_KNX_OEM_MANUFACTURER_ID=0x01e5
|
||||
CONFIG_GATEWAY_KNX_OEM_HARDWARE_ID=0xa401
|
||||
CONFIG_GATEWAY_KNX_OEM_APPLICATION_NUMBER=0x0001
|
||||
CONFIG_GATEWAY_KNX_OEM_APPLICATION_VERSION=0x08
|
||||
CONFIG_GATEWAY_KNX_MAIN_GROUP=0
|
||||
CONFIG_GATEWAY_KNX_TUNNEL_ENABLED=y
|
||||
CONFIG_GATEWAY_KNX_MULTICAST_ENABLED=y
|
||||
|
||||
@@ -622,11 +622,8 @@ CONFIG_GATEWAY_CHANNEL1_NATIVE_BAUDRATE=1200
|
||||
#
|
||||
CONFIG_GATEWAY_CACHE_SUPPORTED=y
|
||||
CONFIG_GATEWAY_CACHE_START_ENABLED=y
|
||||
CONFIG_GATEWAY_CACHE_RECONCILIATION_ENABLED=y
|
||||
# CONFIG_GATEWAY_CACHE_FULL_STATE_MIRROR is not set
|
||||
# CONFIG_GATEWAY_CACHE_RECONCILIATION_ENABLED is not set
|
||||
CONFIG_GATEWAY_CACHE_FLUSH_INTERVAL_MS=60000
|
||||
CONFIG_GATEWAY_CACHE_OUTSIDE_BUS_FIRST=y
|
||||
# CONFIG_GATEWAY_CACHE_LOCAL_GATEWAY_FIRST is not set
|
||||
# end of Gateway Cache
|
||||
|
||||
# CONFIG_GATEWAY_ENABLE_DALI_BUS is not set
|
||||
@@ -679,6 +676,9 @@ CONFIG_GATEWAY_KNX_DATA_SECURE_SUPPORTED=y
|
||||
# CONFIG_GATEWAY_KNX_IP_SECURE_SUPPORTED is not set
|
||||
# CONFIG_GATEWAY_KNX_SECURITY_DEV_ENDPOINTS is not set
|
||||
CONFIG_GATEWAY_KNX_SECURITY_PLAIN_NVS=y
|
||||
CONFIG_GATEWAY_KNX_OEM_MANUFACTURER_ID=0x00fa
|
||||
CONFIG_GATEWAY_KNX_OEM_APPLICATION_NUMBER=0xa401
|
||||
CONFIG_GATEWAY_KNX_OEM_APPLICATION_VERSION=0x08
|
||||
CONFIG_GATEWAY_KNX_MAIN_GROUP=0
|
||||
CONFIG_GATEWAY_KNX_TUNNEL_ENABLED=y
|
||||
CONFIG_GATEWAY_KNX_MULTICAST_ENABLED=y
|
||||
@@ -1133,8 +1133,8 @@ CONFIG_BT_CTRL_BLE_ADV=y
|
||||
# Common Options
|
||||
#
|
||||
CONFIG_BT_ALARM_MAX_NUM=50
|
||||
# CONFIG_BT_SMP_CRYPTO_STACK_TINYCRYPT is not set
|
||||
CONFIG_BT_SMP_CRYPTO_STACK_MBEDTLS=y
|
||||
CONFIG_BT_SMP_CRYPTO_STACK_TINYCRYPT=y
|
||||
# CONFIG_BT_SMP_CRYPTO_STACK_MBEDTLS is not set
|
||||
|
||||
#
|
||||
# BLE Log
|
||||
|
||||
Reference in New Issue
Block a user