Skip to content

Commit 7763bf8

Browse files
lbouelboue
authored
Merge branch 'master' into energy-management-app
2 parents 1f21a87 + 50971be commit 7763bf8

File tree

495 files changed

+8870
-6071
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

495 files changed

+8870
-6071
lines changed

‎config/nxp/chip-module/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ if (CONFIG_CHIP_OTA_REQUESTOR)
237237
COMMAND
238238
cp ${PROJECT_BINARY_DIR}/../modules/connectedhomeip/build_mcuboot/zephyr/zephyr.bin ${PROJECT_BINARY_DIR}/zephyr.mcuboot.bin
239239
)
240-
240+
add_dependencies(build_mcuboot ${ZEPHYR_FINAL_EXECUTABLE})
241241
set(BLOCK_SIZE "1024")
242242
dt_nodelabel(dts_partition_path NODELABEL "boot_partition")
243243
dt_reg_size(mcuboot_size PATH ${dts_partition_path})
@@ -249,7 +249,7 @@ if (CONFIG_CHIP_OTA_REQUESTOR)
249249
COMMAND
250250
dd if=${PROJECT_BINARY_DIR}/${ZEPHYR_OUTPUT_NAME}.bin of=${PROJECT_BINARY_DIR}/zephyr_full.bin bs=${BLOCK_SIZE} seek=${boot_blocks}
251251
)
252-
add_dependencies(merge_mcuboot ${ZEPHYR_FINAL_EXECUTABLE})
252+
add_dependencies(merge_mcuboot build_mcuboot)
253253

254254
if (CONFIG_CHIP_OTA_IMAGE_BUILD)
255255
chip_ota_image(chip-ota-image

‎config/nxp/chip-module/Kconfig.defaults

+5-2
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ config BT_BUF_ACL_TX_SIZE
205205

206206
config BT_RX_STACK_SIZE
207207
default 2048 if NO_OPTIMIZATIONS && DEBUG
208-
default 1536
208+
default 1600
209209

210210
config BT_DEVICE_NAME_GATT_WRITABLE
211211
bool
@@ -217,6 +217,9 @@ config HCI_NXP_ENABLE_AUTO_SLEEP
217217
config CHIP_OTA_REQUESTOR
218218
default n
219219

220+
config CHIP_DEVICE_SOFTWARE_VERSION
221+
default 1
222+
220223
# Enable extended discovery
221224
config CHIP_EXTENDED_DISCOVERY
222225
default y
@@ -225,7 +228,7 @@ config NVS_LOOKUP_CACHE
225228
default y
226229

227230
config NVS_LOOKUP_CACHE_SIZE
228-
default 512
231+
default 1024
229232

230233
if CHIP_WIFI
231234

‎docs/guides/nxp/nxp_zephyr_ota_software_update.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,9 @@ The same procedure can be followed from the
157157
sub-section, replacing `CONFIG_CHIP_DEVICE_SOFTWARE_VERSION` with a number
158158
greater than the initial one used on the active application (Candidate
159159
application version number should be greater than the one used on the active
160-
application). By default the value is set to 0, try resetting this option to 1
160+
application). By default the value is set to 1, try resetting this option to 2
161161
to generate the OTA update Image. You can do this by adding
162-
`-DCONFIG_CHIP_DEVICE_SOFTWARE_VERSION=1` to the west build command.
162+
`-DCONFIG_CHIP_DEVICE_SOFTWARE_VERSION=2` to the west build command.
163163

164164
The current implementation automates the following procedures:
165165

‎examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter

+136-9
Original file line numberDiff line numberDiff line change
@@ -1573,6 +1573,38 @@ cluster ThermostatUserInterfaceConfiguration = 516 {
15731573
readonly attribute int16u clusterRevision = 65533;
15741574
}
15751575

1576+
/** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
1577+
cluster TemperatureMeasurement = 1026 {
1578+
revision 1; // NOTE: Default/not specifically set
1579+
1580+
readonly attribute nullable temperature measuredValue = 0;
1581+
readonly attribute nullable temperature minMeasuredValue = 1;
1582+
readonly attribute nullable temperature maxMeasuredValue = 2;
1583+
readonly attribute optional int16u tolerance = 3;
1584+
readonly attribute command_id generatedCommandList[] = 65528;
1585+
readonly attribute command_id acceptedCommandList[] = 65529;
1586+
readonly attribute event_id eventList[] = 65530;
1587+
readonly attribute attrib_id attributeList[] = 65531;
1588+
readonly attribute bitmap32 featureMap = 65532;
1589+
readonly attribute int16u clusterRevision = 65533;
1590+
}
1591+
1592+
/** Attributes and commands for configuring the measurement of relative humidity, and reporting relative humidity measurements. */
1593+
cluster RelativeHumidityMeasurement = 1029 {
1594+
revision 3;
1595+
1596+
readonly attribute nullable int16u measuredValue = 0;
1597+
readonly attribute nullable int16u minMeasuredValue = 1;
1598+
readonly attribute nullable int16u maxMeasuredValue = 2;
1599+
readonly attribute optional int16u tolerance = 3;
1600+
readonly attribute command_id generatedCommandList[] = 65528;
1601+
readonly attribute command_id acceptedCommandList[] = 65529;
1602+
readonly attribute event_id eventList[] = 65530;
1603+
readonly attribute attrib_id attributeList[] = 65531;
1604+
readonly attribute bitmap32 featureMap = 65532;
1605+
readonly attribute int16u clusterRevision = 65533;
1606+
}
1607+
15761608
endpoint 0 {
15771609
device type ma_rootdevice = 22, version 1;
15781610

@@ -1812,20 +1844,26 @@ endpoint 1 {
18121844
}
18131845

18141846
server cluster Thermostat {
1815-
ram attribute localTemperature;
1847+
ram attribute localTemperature default = 2800;
1848+
ram attribute absMinHeatSetpointLimit default = 700;
1849+
ram attribute absMaxHeatSetpointLimit default = 3000;
18161850
ram attribute absMinCoolSetpointLimit default = 1600;
1817-
ram attribute absMaxCoolSetpointLimit default = 3000;
1851+
ram attribute absMaxCoolSetpointLimit default = 3200;
18181852
ram attribute occupiedCoolingSetpoint default = 2600;
1853+
ram attribute occupiedHeatingSetpoint default = 2000;
1854+
ram attribute minHeatSetpointLimit default = 700;
1855+
ram attribute maxHeatSetpointLimit default = 3000;
18191856
ram attribute minCoolSetpointLimit default = 1600;
1820-
ram attribute maxCoolSetpointLimit default = 3000;
1821-
ram attribute controlSequenceOfOperation default = 0x00;
1822-
ram attribute systemMode default = 0x03;
1857+
ram attribute maxCoolSetpointLimit default = 3200;
1858+
ram attribute controlSequenceOfOperation default = 0x04;
1859+
ram attribute systemMode default = 0x01;
1860+
ram attribute ACLouverPosition default = 0;
18231861
callback attribute generatedCommandList;
18241862
callback attribute acceptedCommandList;
18251863
callback attribute eventList;
18261864
callback attribute attributeList;
1827-
ram attribute featureMap default = 2;
1828-
ram attribute clusterRevision default = 6;
1865+
ram attribute featureMap default = 3;
1866+
ram attribute clusterRevision default = 7;
18291867

18301868
handle command SetpointRaiseLower;
18311869
}
@@ -1835,16 +1873,19 @@ endpoint 1 {
18351873
ram attribute fanModeSequence default = 2;
18361874
ram attribute percentSetting default = 0;
18371875
ram attribute percentCurrent default = 0;
1876+
ram attribute airflowDirection default = 0;
18381877
callback attribute generatedCommandList;
18391878
callback attribute acceptedCommandList;
18401879
callback attribute eventList;
18411880
callback attribute attributeList;
1842-
ram attribute featureMap default = 0;
1881+
ram attribute featureMap default = 33;
18431882
ram attribute clusterRevision default = 1;
1883+
1884+
handle command Step;
18441885
}
18451886

18461887
server cluster ThermostatUserInterfaceConfiguration {
1847-
ram attribute temperatureDisplayMode default = 0x01;
1888+
ram attribute temperatureDisplayMode default = 0x00;
18481889
ram attribute keypadLockout default = 0x00;
18491890
callback attribute generatedCommandList;
18501891
callback attribute acceptedCommandList;
@@ -1854,5 +1895,91 @@ endpoint 1 {
18541895
ram attribute clusterRevision default = 2;
18551896
}
18561897
}
1898+
endpoint 2 {
1899+
device type ma_tempsensor = 770, version 1;
1900+
1901+
1902+
server cluster Identify {
1903+
ram attribute identifyTime default = 0x0;
1904+
ram attribute identifyType default = 0x00;
1905+
callback attribute generatedCommandList;
1906+
callback attribute acceptedCommandList;
1907+
callback attribute eventList;
1908+
callback attribute attributeList;
1909+
ram attribute featureMap default = 0;
1910+
ram attribute clusterRevision default = 4;
1911+
1912+
handle command Identify;
1913+
handle command TriggerEffect;
1914+
}
1915+
1916+
server cluster Descriptor {
1917+
callback attribute deviceTypeList;
1918+
callback attribute serverList;
1919+
callback attribute clientList;
1920+
callback attribute partsList;
1921+
callback attribute generatedCommandList;
1922+
callback attribute acceptedCommandList;
1923+
callback attribute eventList;
1924+
callback attribute attributeList;
1925+
callback attribute featureMap;
1926+
callback attribute clusterRevision;
1927+
}
1928+
1929+
server cluster TemperatureMeasurement {
1930+
ram attribute measuredValue default = 2800;
1931+
ram attribute minMeasuredValue default = 1500;
1932+
ram attribute maxMeasuredValue default = 4500;
1933+
callback attribute generatedCommandList;
1934+
callback attribute acceptedCommandList;
1935+
callback attribute eventList;
1936+
callback attribute attributeList;
1937+
ram attribute featureMap default = 0;
1938+
ram attribute clusterRevision default = 3;
1939+
}
1940+
}
1941+
endpoint 3 {
1942+
device type ma_humiditysensor = 775, version 1;
1943+
1944+
1945+
server cluster Identify {
1946+
ram attribute identifyTime default = 0x0;
1947+
ram attribute identifyType default = 0x00;
1948+
callback attribute generatedCommandList;
1949+
callback attribute acceptedCommandList;
1950+
callback attribute eventList;
1951+
callback attribute attributeList;
1952+
ram attribute featureMap default = 0;
1953+
ram attribute clusterRevision default = 4;
1954+
1955+
handle command Identify;
1956+
handle command TriggerEffect;
1957+
}
1958+
1959+
server cluster Descriptor {
1960+
callback attribute deviceTypeList;
1961+
callback attribute serverList;
1962+
callback attribute clientList;
1963+
callback attribute partsList;
1964+
callback attribute generatedCommandList;
1965+
callback attribute acceptedCommandList;
1966+
callback attribute eventList;
1967+
callback attribute attributeList;
1968+
callback attribute featureMap;
1969+
callback attribute clusterRevision;
1970+
}
1971+
1972+
server cluster RelativeHumidityMeasurement {
1973+
ram attribute measuredValue default = 6500;
1974+
ram attribute minMeasuredValue default = 3000;
1975+
ram attribute maxMeasuredValue default = 10000;
1976+
callback attribute generatedCommandList;
1977+
callback attribute acceptedCommandList;
1978+
callback attribute eventList;
1979+
callback attribute attributeList;
1980+
ram attribute featureMap default = 0;
1981+
ram attribute clusterRevision default = 3;
1982+
}
1983+
}
18571984

18581985

0 commit comments

Comments
 (0)