Skip to content

Commit

Permalink
Merge branch 'master' into energy-management-app
Browse files Browse the repository at this point in the history
  • Loading branch information
@lboue
lboue authored Jun 24, 2024
2 parents 1f21a87 + 50971be commit 7763bf8
Show file tree
Hide file tree
Showing 495 changed files with 8,870 additions and 6,071 deletions.
4 changes: 2 additions & 2 deletions config/nxp/chip-module/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ if (CONFIG_CHIP_OTA_REQUESTOR)
COMMAND
cp ${PROJECT_BINARY_DIR}/../modules/connectedhomeip/build_mcuboot/zephyr/zephyr.bin ${PROJECT_BINARY_DIR}/zephyr.mcuboot.bin
)

add_dependencies(build_mcuboot ${ZEPHYR_FINAL_EXECUTABLE})
set(BLOCK_SIZE "1024")
dt_nodelabel(dts_partition_path NODELABEL "boot_partition")
dt_reg_size(mcuboot_size PATH ${dts_partition_path})
Expand All @@ -249,7 +249,7 @@ if (CONFIG_CHIP_OTA_REQUESTOR)
COMMAND
dd if=${PROJECT_BINARY_DIR}/${ZEPHYR_OUTPUT_NAME}.bin of=${PROJECT_BINARY_DIR}/zephyr_full.bin bs=${BLOCK_SIZE} seek=${boot_blocks}
)
add_dependencies(merge_mcuboot ${ZEPHYR_FINAL_EXECUTABLE})
add_dependencies(merge_mcuboot build_mcuboot)

if (CONFIG_CHIP_OTA_IMAGE_BUILD)
chip_ota_image(chip-ota-image
Expand Down
7 changes: 5 additions & 2 deletions config/nxp/chip-module/Kconfig.defaults
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ config BT_BUF_ACL_TX_SIZE

config BT_RX_STACK_SIZE
default 2048 if NO_OPTIMIZATIONS && DEBUG
default 1536
default 1600

config BT_DEVICE_NAME_GATT_WRITABLE
bool
Expand All @@ -217,6 +217,9 @@ config HCI_NXP_ENABLE_AUTO_SLEEP
config CHIP_OTA_REQUESTOR
default n

config CHIP_DEVICE_SOFTWARE_VERSION
default 1

# Enable extended discovery
config CHIP_EXTENDED_DISCOVERY
default y
Expand All @@ -225,7 +228,7 @@ config NVS_LOOKUP_CACHE
default y

config NVS_LOOKUP_CACHE_SIZE
default 512
default 1024

if CHIP_WIFI

Expand Down
4 changes: 2 additions & 2 deletions docs/guides/nxp/nxp_zephyr_ota_software_update.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,9 @@ The same procedure can be followed from the
sub-section, replacing `CONFIG_CHIP_DEVICE_SOFTWARE_VERSION` with a number
greater than the initial one used on the active application (Candidate
application version number should be greater than the one used on the active
application). By default the value is set to 0, try resetting this option to 1
application). By default the value is set to 1, try resetting this option to 2
to generate the OTA update Image. You can do this by adding
`-DCONFIG_CHIP_DEVICE_SOFTWARE_VERSION=1` to the west build command.
`-DCONFIG_CHIP_DEVICE_SOFTWARE_VERSION=2` to the west build command.

The current implementation automates the following procedures:

Expand Down
145 changes: 136 additions & 9 deletions examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1573,6 +1573,38 @@ cluster ThermostatUserInterfaceConfiguration = 516 {
readonly attribute int16u clusterRevision = 65533;
}

/** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
cluster TemperatureMeasurement = 1026 {
revision 1; // NOTE: Default/not specifically set

readonly attribute nullable temperature measuredValue = 0;
readonly attribute nullable temperature minMeasuredValue = 1;
readonly attribute nullable temperature maxMeasuredValue = 2;
readonly attribute optional int16u tolerance = 3;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
readonly attribute attrib_id attributeList[] = 65531;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
}

/** Attributes and commands for configuring the measurement of relative humidity, and reporting relative humidity measurements. */
cluster RelativeHumidityMeasurement = 1029 {
revision 3;

readonly attribute nullable int16u measuredValue = 0;
readonly attribute nullable int16u minMeasuredValue = 1;
readonly attribute nullable int16u maxMeasuredValue = 2;
readonly attribute optional int16u tolerance = 3;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
readonly attribute attrib_id attributeList[] = 65531;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
}

endpoint 0 {
device type ma_rootdevice = 22, version 1;

Expand Down Expand Up @@ -1812,20 +1844,26 @@ endpoint 1 {
}

server cluster Thermostat {
ram attribute localTemperature;
ram attribute localTemperature default = 2800;
ram attribute absMinHeatSetpointLimit default = 700;
ram attribute absMaxHeatSetpointLimit default = 3000;
ram attribute absMinCoolSetpointLimit default = 1600;
ram attribute absMaxCoolSetpointLimit default = 3000;
ram attribute absMaxCoolSetpointLimit default = 3200;
ram attribute occupiedCoolingSetpoint default = 2600;
ram attribute occupiedHeatingSetpoint default = 2000;
ram attribute minHeatSetpointLimit default = 700;
ram attribute maxHeatSetpointLimit default = 3000;
ram attribute minCoolSetpointLimit default = 1600;
ram attribute maxCoolSetpointLimit default = 3000;
ram attribute controlSequenceOfOperation default = 0x00;
ram attribute systemMode default = 0x03;
ram attribute maxCoolSetpointLimit default = 3200;
ram attribute controlSequenceOfOperation default = 0x04;
ram attribute systemMode default = 0x01;
ram attribute ACLouverPosition default = 0;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute eventList;
callback attribute attributeList;
ram attribute featureMap default = 2;
ram attribute clusterRevision default = 6;
ram attribute featureMap default = 3;
ram attribute clusterRevision default = 7;

handle command SetpointRaiseLower;
}
Expand All @@ -1835,16 +1873,19 @@ endpoint 1 {
ram attribute fanModeSequence default = 2;
ram attribute percentSetting default = 0;
ram attribute percentCurrent default = 0;
ram attribute airflowDirection default = 0;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute eventList;
callback attribute attributeList;
ram attribute featureMap default = 0;
ram attribute featureMap default = 33;
ram attribute clusterRevision default = 1;

handle command Step;
}

server cluster ThermostatUserInterfaceConfiguration {
ram attribute temperatureDisplayMode default = 0x01;
ram attribute temperatureDisplayMode default = 0x00;
ram attribute keypadLockout default = 0x00;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
Expand All @@ -1854,5 +1895,91 @@ endpoint 1 {
ram attribute clusterRevision default = 2;
}
}
endpoint 2 {
device type ma_tempsensor = 770, version 1;


server cluster Identify {
ram attribute identifyTime default = 0x0;
ram attribute identifyType default = 0x00;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute eventList;
callback attribute attributeList;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 4;

handle command Identify;
handle command TriggerEffect;
}

server cluster Descriptor {
callback attribute deviceTypeList;
callback attribute serverList;
callback attribute clientList;
callback attribute partsList;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute eventList;
callback attribute attributeList;
callback attribute featureMap;
callback attribute clusterRevision;
}

server cluster TemperatureMeasurement {
ram attribute measuredValue default = 2800;
ram attribute minMeasuredValue default = 1500;
ram attribute maxMeasuredValue default = 4500;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute eventList;
callback attribute attributeList;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 3;
}
}
endpoint 3 {
device type ma_humiditysensor = 775, version 1;


server cluster Identify {
ram attribute identifyTime default = 0x0;
ram attribute identifyType default = 0x00;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute eventList;
callback attribute attributeList;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 4;

handle command Identify;
handle command TriggerEffect;
}

server cluster Descriptor {
callback attribute deviceTypeList;
callback attribute serverList;
callback attribute clientList;
callback attribute partsList;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute eventList;
callback attribute attributeList;
callback attribute featureMap;
callback attribute clusterRevision;
}

server cluster RelativeHumidityMeasurement {
ram attribute measuredValue default = 6500;
ram attribute minMeasuredValue default = 3000;
ram attribute maxMeasuredValue default = 10000;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute eventList;
callback attribute attributeList;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 3;
}
}


Loading

0 comments on commit 7763bf8

Please sign in to comment.