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

Remove client-api.cpp and dependent clusters #19291

Merged
merged 6 commits into from
Jun 14, 2022
Merged

Remove client-api.cpp and dependent clusters #19291

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
309273c
Initial commit.
mrjerryjohns Jun 7, 2022
db42c5f
Merge branch 'master' into remove-ias
andy31415 Jun 14, 2022
da34608
Remove client-api.cpp from cmake files
andy31415 Jun 14, 2022
5bebc0c
Restyle
andy31415 Jun 14, 2022
cb793d6
Remove ias-zone client and server as the cluster is removed
andy31415 Jun 14, 2022
ca87edd
Add back client/server for IAS in case someone wants to resurect them…
andy31415 Jun 14, 2022
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
78 changes: 0 additions & 78 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
View file
Original file line number Diff line number Diff line change
@@ -1728,74 +1728,6 @@ server cluster Groups = 4 {
command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
}

server cluster IasZone = 1280 {
enum IasEnrollResponseCode : ENUM8 {
kSuccess = 0;
kNotSupported = 1;
kNoEnrollPermit = 2;
kTooManyZones = 3;
}

enum IasZoneType : ENUM16 {
kStandardCie = 0;
kMotionSensor = 13;
kContactSwitch = 21;
kFireSensor = 40;
kWaterSensor = 42;
kGasSensor = 43;
kPersonalEmergencyDevice = 44;
kVibrationMovementSensor = 45;
kRemoteControl = 271;
kKeyFob = 277;
kKeypad = 541;
kStandardWarningDevice = 549;
kGlassBreakSensor = 550;
kCarbonMonoxideSensor = 551;
kSecurityRepeater = 553;
kInvalidZoneType = 65535;
}

bitmap IasZoneStatus : BITMAP16 {
kAlarm1 = 0x1;
kAlarm2 = 0x2;
kTamper = 0x4;
kBattery = 0x8;
kSupervisionReports = 0x10;
kRestoreReports = 0x20;
kTrouble = 0x40;
kAc = 0x80;
kTest = 0x100;
kBatteryDefect = 0x200;
}

readonly attribute enum8 zoneState = 0;
readonly attribute enum16 zoneType = 1;
readonly attribute bitmap16 zoneStatus = 2;
attribute node_id iasCieAddress = 16;
readonly attribute int8u zoneId = 17;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

request struct ZoneEnrollResponseRequest {
IasEnrollResponseCode enrollResponseCode = 0;
INT8U zoneId = 1;
}

response struct ZoneStatusChangeNotification = 0 {
IasZoneStatus zoneStatus = 0;
BITMAP8 extendedStatus = 1;
INT8U zoneId = 2;
INT16U delay = 3;
}

response struct ZoneEnrollRequest = 1 {
IasZoneType zoneType = 0;
INT16U manufacturerCode = 1;
}

command ZoneEnrollResponse(ZoneEnrollResponseRequest): DefaultSuccess = 0;
}

server cluster Identify = 3 {
enum IdentifyEffectIdentifier : ENUM8 {
kBlink = 0;
@@ -4589,16 +4521,6 @@ endpoint 1 {
ram attribute clusterRevision default = 3;
}

server cluster IasZone {
ram attribute zoneState;
ram attribute zoneType;
ram attribute zoneStatus;
ram attribute iasCieAddress;
ram attribute zoneId default = 0xff;
ram attribute featureMap;
ram attribute clusterRevision default = 2;
}

server cluster WakeOnLan {
ram attribute MACAddress;
ram attribute featureMap;
2 changes: 0 additions & 2 deletions examples/all-clusters-app/esp32/main/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -78,7 +78,6 @@ set(SRC_DIRS_LIST
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/diagnostic-logs-server"
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/door-lock-server"
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/occupancy-sensor-server"
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/ias-zone-server"
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/ethernet-network-diagnostics-server"
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/localization-configuration-server"
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/time-format-localization-server"
@@ -88,7 +87,6 @@ set(SRC_DIRS_LIST
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/power-source-configuration-server"
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/power-source-server"
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/all-clusters-app/all-clusters-common/src"
#${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/ias-zone-client
)

if (CONFIG_ENABLE_PW_RPC)
1 change: 0 additions & 1 deletion examples/all-clusters-minimal-app/esp32/main/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -87,7 +87,6 @@ set(SRC_DIRS_LIST
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/power-source-configuration-server"
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/power-source-server"
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/all-clusters-app/all-clusters-common/src"
#${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/ias-zone-client
)

if (CONFIG_ENABLE_PW_RPC)
1 change: 0 additions & 1 deletion examples/common/pigweed/protos/attributes_service.proto
View file
Original file line number Diff line number Diff line change
@@ -155,7 +155,6 @@ enum ClusterType {
ZCL_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_ID = 0x0427;
ZCL_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_ID = 0x0428;
ZCL_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_ID = 0x0429;
ZCL_IAS_ZONE_CLUSTER_ID = 0x0500;
ZCL_IAS_ACE_CLUSTER_ID = 0x0501;
ZCL_IAS_WD_CLUSTER_ID = 0x0502;
ZCL_WAKE_ON_LAN_CLUSTER_ID = 0x0503;
1 change: 0 additions & 1 deletion examples/light-switch-app/telink/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -65,7 +65,6 @@ target_sources(app PRIVATE
${CHIP_ROOT}/src/app/util/attribute-storage.cpp
${CHIP_ROOT}/src/app/util/attribute-table.cpp
${CHIP_ROOT}/src/app/util/binding-table.cpp
${CHIP_ROOT}/src/app/util/client-api.cpp
${CHIP_ROOT}/src/app/util/ember-compatibility-functions.cpp
${CHIP_ROOT}/src/app/util/ember-print.cpp
${CHIP_ROOT}/src/app/util/error-mapping.cpp
1 change: 0 additions & 1 deletion examples/lighting-app/telink/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -65,7 +65,6 @@ target_sources(app PRIVATE
${CHIP_ROOT}/src/app/util/attribute-storage.cpp
${CHIP_ROOT}/src/app/util/attribute-table.cpp
${CHIP_ROOT}/src/app/util/binding-table.cpp
${CHIP_ROOT}/src/app/util/client-api.cpp
${CHIP_ROOT}/src/app/util/ember-compatibility-functions.cpp
${CHIP_ROOT}/src/app/util/ember-print.cpp
${CHIP_ROOT}/src/app/util/error-mapping.cpp
78 changes: 0 additions & 78 deletions examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
View file
Original file line number Diff line number Diff line change
@@ -777,74 +777,6 @@ server cluster Groups = 4 {
command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
}

server cluster IasZone = 1280 {
enum IasEnrollResponseCode : ENUM8 {
kSuccess = 0;
kNotSupported = 1;
kNoEnrollPermit = 2;
kTooManyZones = 3;
}

enum IasZoneType : ENUM16 {
kStandardCie = 0;
kMotionSensor = 13;
kContactSwitch = 21;
kFireSensor = 40;
kWaterSensor = 42;
kGasSensor = 43;
kPersonalEmergencyDevice = 44;
kVibrationMovementSensor = 45;
kRemoteControl = 271;
kKeyFob = 277;
kKeypad = 541;
kStandardWarningDevice = 549;
kGlassBreakSensor = 550;
kCarbonMonoxideSensor = 551;
kSecurityRepeater = 553;
kInvalidZoneType = 65535;
}

bitmap IasZoneStatus : BITMAP16 {
kAlarm1 = 0x1;
kAlarm2 = 0x2;
kTamper = 0x4;
kBattery = 0x8;
kSupervisionReports = 0x10;
kRestoreReports = 0x20;
kTrouble = 0x40;
kAc = 0x80;
kTest = 0x100;
kBatteryDefect = 0x200;
}

readonly attribute enum8 zoneState = 0;
readonly attribute enum16 zoneType = 1;
readonly attribute bitmap16 zoneStatus = 2;
attribute node_id iasCieAddress = 16;
readonly attribute int8u zoneId = 17;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

request struct ZoneEnrollResponseRequest {
IasEnrollResponseCode enrollResponseCode = 0;
INT8U zoneId = 1;
}

response struct ZoneStatusChangeNotification = 0 {
IasZoneStatus zoneStatus = 0;
BITMAP8 extendedStatus = 1;
INT8U zoneId = 2;
INT16U delay = 3;
}

response struct ZoneEnrollRequest = 1 {
IasZoneType zoneType = 0;
INT16U manufacturerCode = 1;
}

command ZoneEnrollResponse(ZoneEnrollResponseRequest): DefaultSuccess = 0;
}

server cluster Identify = 3 {
enum IdentifyEffectIdentifier : ENUM8 {
kBlink = 0;
@@ -2594,16 +2526,6 @@ endpoint 1 {
ram attribute clusterRevision default = 1;
}

server cluster IasZone {
ram attribute zoneState;
ram attribute zoneType;
ram attribute zoneStatus;
ram attribute iasCieAddress;
ram attribute zoneId default = 0xff;
ram attribute featureMap;
ram attribute clusterRevision default = 2;
}

server cluster WakeOnLan {
ram attribute MACAddress;
ram attribute featureMap;
1 change: 0 additions & 1 deletion src/app/chip_data_model.cmake
View file
Original file line number Diff line number Diff line change
@@ -82,7 +82,6 @@ function(chip_configure_data_model APP_TARGET)
${CHIP_APP_BASE_DIR}/util/attribute-storage.cpp
${CHIP_APP_BASE_DIR}/util/attribute-table.cpp
${CHIP_APP_BASE_DIR}/util/binding-table.cpp
${CHIP_APP_BASE_DIR}/util/client-api.cpp
${CHIP_APP_BASE_DIR}/util/DataModelHandler.cpp
${CHIP_APP_BASE_DIR}/util/ember-compatibility-functions.cpp
${CHIP_APP_BASE_DIR}/util/ember-print.cpp
4 changes: 0 additions & 4 deletions src/app/chip_data_model.gni
View file
Original file line number Diff line number Diff line change
@@ -71,9 +71,6 @@ template("chip_data_model") {
"${_app_root}/clusters/color-control-server/color-control-server.h",
"${_app_root}/clusters/door-lock-server/door-lock-server.h",
"${_app_root}/clusters/groups-server/groups-server.h",
"${_app_root}/clusters/ias-zone-client/ias-zone-client.h",
"${_app_root}/clusters/ias-zone-server/ias-zone-server-tokens.h",
"${_app_root}/clusters/ias-zone-server/ias-zone-server.h",
"${_app_root}/clusters/identify-server/identify-server.h",
"${_app_root}/clusters/level-control/level-control.h",
"${_app_root}/clusters/on-off-server/on-off-server.h",
@@ -87,7 +84,6 @@ template("chip_data_model") {
"${_app_root}/util/attribute-table.cpp",
"${_app_root}/util/binding-table.cpp",
"${_app_root}/util/binding-table.h",
"${_app_root}/util/client-api.cpp",
"${_app_root}/util/ember-compatibility-functions.cpp",
"${_app_root}/util/ember-print.cpp",
"${_app_root}/util/error-mapping.cpp",
12 changes: 0 additions & 12 deletions src/app/util/DataModelHandler.cpp
View file
Original file line number Diff line number Diff line change
@@ -29,10 +29,6 @@
#endif
#include <lib/support/logging/CHIPLogging.h>

#ifdef EMBER_AF_PLUGIN_IAS_ZONE_SERVER
void emberAfPluginIasZoneServerStackStatusCallback(EmberStatus status);
#endif

using namespace ::chip;

void InitDataModelHandler(chip::Messaging::ExchangeManager * exchangeManager)
@@ -41,13 +37,5 @@ void InitDataModelHandler(chip::Messaging::ExchangeManager * exchangeManager)
ChipLogProgress(Zcl, "Using ZAP configuration...");
emberAfEndpointConfigure();
emberAfInit(exchangeManager);

#if defined(EMBER_AF_PLUGIN_IAS_ZONE_SERVER)
EmberStatus status = EMBER_NETWORK_UP;
#endif

#ifdef EMBER_AF_PLUGIN_IAS_ZONE_SERVER
emberAfPluginIasZoneServerStackStatusCallback(status);
#endif
#endif
}
4 changes: 0 additions & 4 deletions src/app/util/af-event.cpp
View file
Original file line number Diff line number Diff line change
@@ -66,10 +66,6 @@ struct EmberEventData
// Globals

#ifdef EMBER_AF_GENERATED_EVENT_CODE
// Stubs for IAS Zone Client Cluster issue #2057
EmberEventControl emberAfPluginIasZoneClientStateMachineEventControl;
void emberAfPluginIasZoneClientStateMachineEventHandler(void){};

EMBER_AF_GENERATED_EVENT_CODE
#endif // EMBER_AF_GENERATED_EVENT_CODE

1 change: 0 additions & 1 deletion src/app/util/af.h
View file
Original file line number Diff line number Diff line change
@@ -68,7 +68,6 @@

#include <app/util/af-types.h>

#include <app/util/client-api.h>
#include <app/util/debug-printing.h>
#include <app/util/ember-print.h>

Loading