Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Restyle Part 3: feature/air pressure measurement cluster #7031

Closed
wants to merge 9 commits into from
Closed

Restyle Part 3: feature/air pressure measurement cluster #7031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1aa419a
format endpointClusterWithInit for easier pull requests
May 20, 2021
a673075
add air pressure measurement clsuter definition to zap tool
May 19, 2021
fd234a1
add support for emberAfAirPressureMeasurementClusterServerInitCallback
May 20, 2021
e42f3dd
add air pressure measurement cluster to controller-clusters.zap
May 20, 2021
23afbd8
add impl. for air pressure measurement cluster on the server side
May 19, 2021
99492f2
Add new clusters to zap_cluster_list.py
vivien-apple May 20, 2021
99cff8c
Merge branch 'master' into feature/air-pressure-measurement-cluster
May 20, 2021
d78e12c
regenearte code related to controller-clusters.zap
May 20, 2021
68dec82
Restyled by clang-format
restyled-commits May 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions examples/all-clusters-app/all-clusters-common/gen/attribute-id.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -935,6 +935,14 @@
#define ZCL_PHYSICAL_CONTACT_UNOCCUPIED_TO_OCCUPIED_DELAY_ATTRIBUTE_ID (0x0031)
#define ZCL_PHYSICAL_CONTACT_UNOCCUPIED_TO_OCCUPIED_THRESHOLD_ATTRIBUTE_ID (0x0032)

// Attribute ids for cluster: Air Pressure Measurement

// Client attributes

// Server attributes
#define ZCL_AIR_PRESSURE_MEASUREMENT_MEASURED_VALUE_ATTRIBUTE_ID (0x0000)
#define ZCL_AIR_PRESSURE_MEASUREMENT_ALTITUDE_ATTRIBUTE_ID (0x0001)

// Attribute ids for cluster: Carbon Monoxide Concentration Measurement

// Client attributes
Expand Down
10 changes: 10 additions & 0 deletions examples/all-clusters-app/all-clusters-common/gen/client-command-macro.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3190,6 +3190,16 @@
ZCL_STEP_COLOR_TEMPERATURE_COMMAND_ID, "uuuuuuu", stepMode, stepSize, transitionTime, \
colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride);

/** @brief Command description for altitude
*
* Command: altitude
* @param altitude INT16S
*/
#define emberAfFillCommandAir \
Pressure MeasurementClusteraltitude(altitude) emberAfFillExternalBuffer(mask, \
\
ZCL_ALTITUDE_COMMAND_ID, "u", altitude);

/** @brief Command description for ZoneEnrollResponse
*
* Command: ZoneEnrollResponse
Expand Down
3 changes: 3 additions & 0 deletions examples/all-clusters-app/all-clusters-common/gen/cluster-id.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,9 @@
// Definitions for cluster: Occupancy Sensing
#define ZCL_OCCUPANCY_SENSING_CLUSTER_ID (0x0406)

// Definitions for cluster: Air Pressure Measurement
#define ZCL_AIR_PRESSURE_MEASUREMENT_CLUSTER_ID (0x0407)

// Definitions for cluster: Carbon Monoxide Concentration Measurement
#define ZCL_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x040C)

Expand Down
3 changes: 3 additions & 0 deletions examples/all-clusters-app/all-clusters-common/gen/command-id.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,9 @@
#define ZCL_MOVE_COLOR_TEMPERATURE_COMMAND_ID (0x4B)
#define ZCL_STEP_COLOR_TEMPERATURE_COMMAND_ID (0x4C)

// Commands for cluster: Air Pressure Measurement
#define ZCL_ALTITUDE_COMMAND_ID (0x00)

// Commands for cluster: IAS Zone
#define ZCL_ZONE_ENROLL_RESPONSE_COMMAND_ID (0x00)
#define ZCL_ZONE_STATUS_CHANGE_NOTIFICATION_COMMAND_ID (0x00)
Expand Down
8 changes: 8 additions & 0 deletions examples/all-clusters-app/all-clusters-common/gen/print-cluster.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,13 @@
#define CHIP_PRINTCLUSTER_OCCUPANCY_SENSING_CLUSTER
#endif

#if defined(ZCL_USING_AIR_PRESSURE_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_AIR_PRESSURE_MEASUREMENT_CLUSTER_CLIENT)
#define CHIP_PRINTCLUSTER_AIR_PRESSURE_MEASUREMENT_CLUSTER \
{ ZCL_AIR_PRESSURE_MEASUREMENT_CLUSTER_ID, 1031, "Air Pressure Measurement" },
#else
#define CHIP_PRINTCLUSTER_AIR_PRESSURE_MEASUREMENT_CLUSTER
#endif

#if defined(ZCL_USING_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || \
defined(ZCL_USING_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
#define CHIP_PRINTCLUSTER_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
Expand Down Expand Up @@ -965,6 +972,7 @@
CHIP_PRINTCLUSTER_FLOW_MEASUREMENT_CLUSTER \
CHIP_PRINTCLUSTER_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER \
CHIP_PRINTCLUSTER_OCCUPANCY_SENSING_CLUSTER \
CHIP_PRINTCLUSTER_AIR_PRESSURE_MEASUREMENT_CLUSTER \
CHIP_PRINTCLUSTER_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
CHIP_PRINTCLUSTER_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
CHIP_PRINTCLUSTER_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER \
Expand Down
8 changes: 8 additions & 0 deletions examples/bridge-app/bridge-common/gen/attribute-id.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -935,6 +935,14 @@
#define ZCL_PHYSICAL_CONTACT_UNOCCUPIED_TO_OCCUPIED_DELAY_ATTRIBUTE_ID (0x0031)
#define ZCL_PHYSICAL_CONTACT_UNOCCUPIED_TO_OCCUPIED_THRESHOLD_ATTRIBUTE_ID (0x0032)

// Attribute ids for cluster: Air Pressure Measurement

// Client attributes

// Server attributes
#define ZCL_AIR_PRESSURE_MEASUREMENT_MEASURED_VALUE_ATTRIBUTE_ID (0x0000)
#define ZCL_AIR_PRESSURE_MEASUREMENT_ALTITUDE_ATTRIBUTE_ID (0x0001)

// Attribute ids for cluster: Carbon Monoxide Concentration Measurement

// Client attributes
Expand Down
10 changes: 10 additions & 0 deletions examples/bridge-app/bridge-common/gen/client-command-macro.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3190,6 +3190,16 @@
ZCL_STEP_COLOR_TEMPERATURE_COMMAND_ID, "uuuuuuu", stepMode, stepSize, transitionTime, \
colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride);

/** @brief Command description for altitude
*
* Command: altitude
* @param altitude INT16S
*/
#define emberAfFillCommandAir \
Pressure MeasurementClusteraltitude(altitude) emberAfFillExternalBuffer(mask, \
\
ZCL_ALTITUDE_COMMAND_ID, "u", altitude);

/** @brief Command description for ZoneEnrollResponse
*
* Command: ZoneEnrollResponse
Expand Down
3 changes: 3 additions & 0 deletions examples/bridge-app/bridge-common/gen/cluster-id.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,9 @@
// Definitions for cluster: Occupancy Sensing
#define ZCL_OCCUPANCY_SENSING_CLUSTER_ID (0x0406)

// Definitions for cluster: Air Pressure Measurement
#define ZCL_AIR_PRESSURE_MEASUREMENT_CLUSTER_ID (0x0407)

// Definitions for cluster: Carbon Monoxide Concentration Measurement
#define ZCL_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x040C)

Expand Down
3 changes: 3 additions & 0 deletions examples/bridge-app/bridge-common/gen/command-id.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,9 @@
#define ZCL_MOVE_COLOR_TEMPERATURE_COMMAND_ID (0x4B)
#define ZCL_STEP_COLOR_TEMPERATURE_COMMAND_ID (0x4C)

// Commands for cluster: Air Pressure Measurement
#define ZCL_ALTITUDE_COMMAND_ID (0x00)

// Commands for cluster: IAS Zone
#define ZCL_ZONE_ENROLL_RESPONSE_COMMAND_ID (0x00)
#define ZCL_ZONE_STATUS_CHANGE_NOTIFICATION_COMMAND_ID (0x00)
Expand Down
8 changes: 8 additions & 0 deletions examples/bridge-app/bridge-common/gen/print-cluster.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,13 @@
#define CHIP_PRINTCLUSTER_OCCUPANCY_SENSING_CLUSTER
#endif

#if defined(ZCL_USING_AIR_PRESSURE_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_AIR_PRESSURE_MEASUREMENT_CLUSTER_CLIENT)
#define CHIP_PRINTCLUSTER_AIR_PRESSURE_MEASUREMENT_CLUSTER \
{ ZCL_AIR_PRESSURE_MEASUREMENT_CLUSTER_ID, 1031, "Air Pressure Measurement" },
#else
#define CHIP_PRINTCLUSTER_AIR_PRESSURE_MEASUREMENT_CLUSTER
#endif

#if defined(ZCL_USING_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || \
defined(ZCL_USING_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
#define CHIP_PRINTCLUSTER_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
Expand Down Expand Up @@ -965,6 +972,7 @@
CHIP_PRINTCLUSTER_FLOW_MEASUREMENT_CLUSTER \
CHIP_PRINTCLUSTER_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER \
CHIP_PRINTCLUSTER_OCCUPANCY_SENSING_CLUSTER \
CHIP_PRINTCLUSTER_AIR_PRESSURE_MEASUREMENT_CLUSTER \
CHIP_PRINTCLUSTER_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
CHIP_PRINTCLUSTER_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
CHIP_PRINTCLUSTER_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER \
Expand Down
Loading