Skip to content

Commit

Permalink
Update ZAP version and fix compilation issues
Browse files Browse the repository at this point in the history
  • Loading branch information
erwinpan1 committed Dec 5, 2023
1 parent 540b76e commit 68a3edb
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 14 deletions.
2 changes: 2 additions & 0 deletions examples/chef/common/stubs.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ EmberAfStatus emberAfExternalAttributeReadCallback(EndpointId endpoint, ClusterI
return chefConcentrationMeasurementReadCallback(endpoint, clusterId, attributeMetadata, buffer, maxReadLength);
#endif
default:
break;
}
return EMBER_ZCL_STATUS_SUCCESS;
}
Expand Down Expand Up @@ -102,6 +103,7 @@ EmberAfStatus emberAfExternalAttributeWriteCallback(EndpointId endpoint, Cluster
return chefConcentrationMeasurementWriteCallback(endpoint, clusterId, attributeMetadata, buffer);
#endif
default:
break;
}
return EMBER_ZCL_STATUS_SUCCESS;
}
Expand Down
34 changes: 21 additions & 13 deletions examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,8 @@ cluster TimeFormatLocalization = 44 {
}

attribute access(write: manage) HourFormatEnum hourFormat = 0;
air_quality_support_write_throught_rpc
attribute access(write: manage) optional CalendarTypeEnum activeCalendarType = 1;
readonly attribute optional CalendarTypeEnum supportedCalendarTypes[] = 2;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand Down Expand Up @@ -954,7 +955,15 @@ cluster AdministratorCommissioning = 60 {
octet_string<32> salt = 4;
}

request struct OpenBasicCommissioningWindowRequest {
int16u commissioningTimeout = 0;
}

/** This command is used by a current Administrator to instruct a Node to go into commissioning mode using enhanced commissioning method. */
timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
/** This command is used by a current Administrator to instruct a Node to go into commissioning mode using basic commissioning method, if the node supports it. */
timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
/** This command is used by a current Administrator to instruct a Node to revoke any active Open Commissioning Window or Open Basic Commissioning Window command. */
timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
}

Expand Down Expand Up @@ -2277,18 +2286,17 @@ endpoint 1 {
}

server cluster RadonConcentrationMeasurement {
callback attribute measuredValue default = 10;
callback attribute minMeasuredValue default = 5;
callback attribute maxMeasuredValue default = 100;
callback attribute peakMeasuredValue default = 36;
callback attribute peakMeasuredValueWindow default = 3600;
callback attribute averageMeasuredValue default = 20;
callback attribute averageMeasuredValueWindow default = 3600;
callback attribute uncertainty default = 0;
callback attribute measurementUnit default = 0;
callback attribute measurementMedium default = 0;
callback attribute levelValue default = 3;

callback attribute measuredValue;
callback attribute minMeasuredValue;
callback attribute maxMeasuredValue;
callback attribute peakMeasuredValue;
callback attribute peakMeasuredValueWindow;
callback attribute averageMeasuredValue;
callback attribute averageMeasuredValueWindow;
callback attribute uncertainty;
callback attribute measurementUnit;
callback attribute measurementMedium;
callback attribute levelValue;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute eventList;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6071,4 +6071,4 @@
"networkId": 0
}
]
}
}

0 comments on commit 68a3edb

Please sign in to comment.