Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 0e22bb4

Browse filesBrowse files
SuGliderSuGlider
committed
feat(matter): moved all identify callback to endpoint.h
1 parent 1dff8bc commit 0e22bb4
Copy full SHA for 0e22bb4
Expand file treeCollapse file tree

15 files changed

+32
-187
lines changed

‎libraries/Matter/examples/MatterOnIdentify/MatterOnIdentify.ino

Copy file name to clipboardExpand all lines: libraries/Matter/examples/MatterOnIdentify/MatterOnIdentify.ino
+18-16Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@
3232
// Single On/Off Light Endpoint - at least one per node
3333
MatterOnOffLight OnOffLight;
3434

35+
// WiFi is manually set and started
36+
const char *ssid = "your-ssid"; // Change this to your WiFi SSID
37+
const char *password = "your-password"; // Change this to your WiFi password
38+
3539
// Light GPIO that can be controlled by Matter APP
3640
#ifdef LED_BUILTIN
3741
const uint8_t ledPin = LED_BUILTIN;
@@ -48,15 +52,23 @@ bool button_state = false; // false = released | true = pres
4852
const uint32_t decommissioningTimeout = 5000; // keep the button pressed for 5s, or longer, to decommission
4953

5054
// Matter Protocol Endpoint (On/OFF Light) Callback
51-
bool matterCB(bool state) {
55+
bool onOffLightCallback(bool state) {
5256
digitalWrite(ledPin, state ? HIGH : LOW);
5357
// This callback must return the success state to Matter core
5458
return true;
5559
}
5660

57-
// WiFi is manually set and started
58-
const char *ssid = "your-ssid"; // Change this to your WiFi SSID
59-
const char *password = "your-password"; // Change this to your WiFi password
61+
bool onIdentifyLightCallback(bool identifyIsActive, uint8_t counter) {
62+
log_i("Identify Cluster is %s, counter: %d", identifyIsActive ? "Active" : "Inactive", counter);
63+
if (identifyIsActive) {
64+
// Start Blinking the light
65+
OnOffLight.toggle();
66+
} else {
67+
// Stop Blinking and restore the light to the its last state
68+
OnOffLight.updateAccessory();
69+
}
70+
return true;
71+
}
6072

6173
void setup() {
6274
// Initialize the USER BUTTON (Boot button) that will be used to decommission the Matter Node
@@ -75,20 +87,10 @@ void setup() {
7587
OnOffLight.begin();
7688

7789
// On Identify Callback - Blink the LED
78-
OnOffLight.onIdentify([](bool identifyIsActive, uint8_t counter) {
79-
log_i("Identify Cluster is %s, counter: %d", identifyIsActive ? "Active" : "Inactive", counter);
80-
if (identifyIsActive) {
81-
// Start Blinking the light
82-
OnOffLight.toggle();
83-
} else {
84-
// Stop Blinking and restore the light to the its last state
85-
OnOffLight.updateAccessory();
86-
}
87-
return true;
88-
});
90+
OnOffLight.onIdentify(onIdentifyLightCallback);
8991

9092
// Associate a callback to the Matter Controller
91-
OnOffLight.onChange(matterCB);
93+
OnOffLight.onChange(onOffLightCallback);
9294

9395
// Matter beginning - Last step, after all EndPoints are initialized
9496
Matter.begin();

‎libraries/Matter/src/MatterEndPoint.h

Copy file name to clipboardExpand all lines: libraries/Matter/src/MatterEndPoint.h
+14-1Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,21 @@ class MatterEndPoint {
103103
virtual bool attributeChangeCB(uint16_t endpoint_id, uint32_t cluster_id, uint32_t attribute_id, esp_matter_attr_val_t *val) = 0;
104104

105105
// This callback is invoked when clients interact with the Identify Cluster of an specific endpoint.
106-
virtual bool endpointIdentifyCB(uint16_t endpoint_id, bool identifyIsEnabled, uint8_t identifyCounter) = 0;
106+
bool endpointIdentifyCB(uint16_t endpoint_id, bool identifyIsEnabled, uint8_t identifyCounter) {
107+
if (_onEndPointIdentifyCB) {
108+
return _onEndPointIdentifyCB(identifyIsEnabled, identifyCounter);
109+
}
110+
return true;
111+
}
112+
// User callaback for the Identify Cluster functionality
113+
using EndPointIdentifyCB = std::function<bool(bool, uint8_t)>;
114+
void onIdentify(EndPointIdentifyCB onEndPointIdentifyCB) {
115+
_onEndPointIdentifyCB = onEndPointIdentifyCB;
116+
}
117+
118+
107119
protected:
108120
uint16_t endpoint_id = 0;
121+
EndPointIdentifyCB _onEndPointIdentifyCB = NULL;
109122
};
110123
#endif /* CONFIG_ESP_MATTER_ENABLE_DATA_MODEL */

‎libraries/Matter/src/MatterEndpoints/MatterColorLight.h

Copy file name to clipboardExpand all lines: libraries/Matter/src/MatterEndpoints/MatterColorLight.h
-13Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -46,18 +46,6 @@ class MatterColorLight : public MatterEndPoint {
4646

4747
// this function is called by Matter internal event processor. It could be overwritten by the application, if necessary.
4848
bool attributeChangeCB(uint16_t endpoint_id, uint32_t cluster_id, uint32_t attribute_id, esp_matter_attr_val_t *val);
49-
// this function is invoked when clients interact with the Identify Cluster of an specific endpoint
50-
bool endpointIdentifyCB(uint16_t endpoint_id, bool identifyIsEnabled, uint8_t identifyCounter) {
51-
if (_onEndPointIdentifyCB) {
52-
return _onEndPointIdentifyCB(identifyIsEnabled, identifyCounter);
53-
}
54-
return true;
55-
}
56-
// User callaback for the Identify Cluster functionality
57-
using EndPointIdentifyCB = std::function<bool(bool, uint8_t)>;
58-
void onIdentify(EndPointIdentifyCB onEndPointIdentifyCB) {
59-
_onEndPointIdentifyCB = onEndPointIdentifyCB;
60-
}
6149

6250
// User Callback for whenever the Light On/Off state is changed by the Matter Controller
6351
using EndPointOnOffCB = std::function<bool(bool)>;
@@ -83,6 +71,5 @@ class MatterColorLight : public MatterEndPoint {
8371
EndPointOnOffCB _onChangeOnOffCB = NULL;
8472
EndPointRGBColorCB _onChangeColorCB = NULL;
8573
EndPointCB _onChangeCB = NULL;
86-
EndPointIdentifyCB _onEndPointIdentifyCB = NULL;
8774
};
8875
#endif /* CONFIG_ESP_MATTER_ENABLE_DATA_MODEL */

‎libraries/Matter/src/MatterEndpoints/MatterColorTemperatureLight.h

Copy file name to clipboardExpand all lines: libraries/Matter/src/MatterEndpoints/MatterColorTemperatureLight.h
-14Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,6 @@ class MatterColorTemperatureLight : public MatterEndPoint {
5151

5252
// this function is called by Matter internal event processor. It could be overwritten by the application, if necessary.
5353
bool attributeChangeCB(uint16_t endpoint_id, uint32_t cluster_id, uint32_t attribute_id, esp_matter_attr_val_t *val);
54-
// this function is invoked when clients interact with the Identify Cluster of an specific endpoint
55-
bool endpointIdentifyCB(uint16_t endpoint_id, bool identifyIsEnabled, uint8_t identifyCounter) {
56-
if (_onEndPointIdentifyCB) {
57-
return _onEndPointIdentifyCB(identifyIsEnabled, identifyCounter);
58-
}
59-
return true;
60-
}
61-
// User callaback for the Identify Cluster functionality
62-
using EndPointIdentifyCB = std::function<bool(bool, uint8_t)>;
63-
void onIdentify(EndPointIdentifyCB onEndPointIdentifyCB) {
64-
_onEndPointIdentifyCB = onEndPointIdentifyCB;
65-
}
6654

6755
// User Callback for whenever the Light On/Off state is changed by the Matter Controller
6856
using EndPointOnOffCB = std::function<bool(bool)>;
@@ -97,7 +85,5 @@ class MatterColorTemperatureLight : public MatterEndPoint {
9785
EndPointBrightnessCB _onChangeBrightnessCB = NULL;
9886
EndPointTemperatureCB _onChangeTemperatureCB = NULL;
9987
EndPointCB _onChangeCB = NULL;
100-
EndPointIdentifyCB _onEndPointIdentifyCB = NULL;
101-
10288
};
10389
#endif /* CONFIG_ESP_MATTER_ENABLE_DATA_MODEL */

‎libraries/Matter/src/MatterEndpoints/MatterContactSensor.h

Copy file name to clipboardExpand all lines: libraries/Matter/src/MatterEndpoints/MatterContactSensor.h
-13Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -46,22 +46,9 @@ class MatterContactSensor : public MatterEndPoint {
4646

4747
// this function is called by Matter internal event processor. It could be overwritten by the application, if necessary.
4848
bool attributeChangeCB(uint16_t endpoint_id, uint32_t cluster_id, uint32_t attribute_id, esp_matter_attr_val_t *val);
49-
// this function is invoked when clients interact with the Identify Cluster of an specific endpoint
50-
bool endpointIdentifyCB(uint16_t endpoint_id, bool identifyIsEnabled, uint8_t identifyCounter) {
51-
if (_onEndPointIdentifyCB) {
52-
return _onEndPointIdentifyCB(identifyIsEnabled, identifyCounter);
53-
}
54-
return true;
55-
}
56-
// User callaback for the Identify Cluster functionality
57-
using EndPointIdentifyCB = std::function<bool(bool, uint8_t)>;
58-
void onIdentify(EndPointIdentifyCB onEndPointIdentifyCB) {
59-
_onEndPointIdentifyCB = onEndPointIdentifyCB;
60-
}
6149

6250
protected:
6351
bool started = false;
6452
bool contactState = false;
65-
EndPointIdentifyCB _onEndPointIdentifyCB = NULL;
6653
};
6754
#endif /* CONFIG_ESP_MATTER_ENABLE_DATA_MODEL */

‎libraries/Matter/src/MatterEndpoints/MatterDimmableLight.h

Copy file name to clipboardExpand all lines: libraries/Matter/src/MatterEndpoints/MatterDimmableLight.h
-13Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -46,18 +46,6 @@ class MatterDimmableLight : public MatterEndPoint {
4646

4747
// this function is called by Matter internal event processor. It could be overwritten by the application, if necessary.
4848
bool attributeChangeCB(uint16_t endpoint_id, uint32_t cluster_id, uint32_t attribute_id, esp_matter_attr_val_t *val);
49-
// this function is invoked when clients interact with the Identify Cluster of an specific endpoint
50-
bool endpointIdentifyCB(uint16_t endpoint_id, bool identifyIsEnabled, uint8_t identifyCounter) {
51-
if (_onEndPointIdentifyCB) {
52-
return _onEndPointIdentifyCB(identifyIsEnabled, identifyCounter);
53-
}
54-
return true;
55-
}
56-
// User callaback for the Identify Cluster functionality
57-
using EndPointIdentifyCB = std::function<bool(bool, uint8_t)>;
58-
void onIdentify(EndPointIdentifyCB onEndPointIdentifyCB) {
59-
_onEndPointIdentifyCB = onEndPointIdentifyCB;
60-
}
6149

6250
// User Callback for whenever the Light On/Off state is changed by the Matter Controller
6351
using EndPointOnOffCB = std::function<bool(bool)>;
@@ -83,6 +71,5 @@ class MatterDimmableLight : public MatterEndPoint {
8371
EndPointOnOffCB _onChangeOnOffCB = NULL;
8472
EndPointBrightnessCB _onChangeBrightnessCB = NULL;
8573
EndPointCB _onChangeCB = NULL;
86-
EndPointIdentifyCB _onEndPointIdentifyCB = NULL;
8774
};
8875
#endif /* CONFIG_ESP_MATTER_ENABLE_DATA_MODEL */

‎libraries/Matter/src/MatterEndpoints/MatterEnhancedColorLight.h

Copy file name to clipboardExpand all lines: libraries/Matter/src/MatterEndpoints/MatterEnhancedColorLight.h
-13Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -56,18 +56,6 @@ class MatterEnhancedColorLight : public MatterEndPoint {
5656

5757
// this function is called by Matter internal event processor. It could be overwritten by the application, if necessary.
5858
bool attributeChangeCB(uint16_t endpoint_id, uint32_t cluster_id, uint32_t attribute_id, esp_matter_attr_val_t *val);
59-
// this function is invoked when clients interact with the Identify Cluster of an specific endpoint
60-
bool endpointIdentifyCB(uint16_t endpoint_id, bool identifyIsEnabled, uint8_t identifyCounter) {
61-
if (_onEndPointIdentifyCB) {
62-
return _onEndPointIdentifyCB(identifyIsEnabled, identifyCounter);
63-
}
64-
return true;
65-
}
66-
// User callaback for the Identify Cluster functionality
67-
using EndPointIdentifyCB = std::function<bool(bool, uint8_t)>;
68-
void onIdentify(EndPointIdentifyCB onEndPointIdentifyCB) {
69-
_onEndPointIdentifyCB = onEndPointIdentifyCB;
70-
}
7159

7260
// User Callback for whenever the Light On/Off state is changed by the Matter Controller
7361
using EndPointOnOffCB = std::function<bool(bool)>;
@@ -110,6 +98,5 @@ class MatterEnhancedColorLight : public MatterEndPoint {
11098
EndPointRGBColorCB _onChangeColorCB = NULL;
11199
EndPointTemperatureCB _onChangeTemperatureCB = NULL;
112100
EndPointCB _onChangeCB = NULL;
113-
EndPointIdentifyCB _onEndPointIdentifyCB = NULL;
114101
};
115102
#endif /* CONFIG_ESP_MATTER_ENABLE_DATA_MODEL */

‎libraries/Matter/src/MatterEndpoints/MatterFan.h

Copy file name to clipboardExpand all lines: libraries/Matter/src/MatterEndpoints/MatterFan.h
-13Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -105,18 +105,6 @@ class MatterFan : public MatterEndPoint {
105105

106106
// this function is called by Matter internal event processor. It could be overwritten by the application, if necessary.
107107
bool attributeChangeCB(uint16_t endpoint_id, uint32_t cluster_id, uint32_t attribute_id, esp_matter_attr_val_t *val);
108-
// this function is invoked when clients interact with the Identify Cluster of an specific endpoint
109-
bool endpointIdentifyCB(uint16_t endpoint_id, bool identifyIsEnabled, uint8_t identifyCounter) {
110-
if (_onEndPointIdentifyCB) {
111-
return _onEndPointIdentifyCB(identifyIsEnabled, identifyCounter);
112-
}
113-
return true;
114-
}
115-
// User callaback for the Identify Cluster functionality
116-
using EndPointIdentifyCB = std::function<bool(bool, uint8_t)>;
117-
void onIdentify(EndPointIdentifyCB onEndPointIdentifyCB) {
118-
_onEndPointIdentifyCB = onEndPointIdentifyCB;
119-
}
120108

121109
// User Callback for whenever the Fan Mode (state) is changed by the Matter Controller
122110
using EndPointModeCB = std::function<bool(FanMode_t)>;
@@ -145,7 +133,6 @@ class MatterFan : public MatterEndPoint {
145133
EndPointModeCB _onChangeModeCB = NULL;
146134
EndPointSpeedCB _onChangeSpeedCB = NULL;
147135
EndPointCB _onChangeCB = NULL;
148-
EndPointIdentifyCB _onEndPointIdentifyCB = NULL;
149136

150137
// bitmap for Fan Sequence Modes (OFF, LOW, MEDIUM, HIGH, AUTO)
151138
static const uint8_t fanSeqModeOff = 0x01;

‎libraries/Matter/src/MatterEndpoints/MatterGenericSwitch.h

Copy file name to clipboardExpand all lines: libraries/Matter/src/MatterEndpoints/MatterGenericSwitch.h
-13Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,21 +32,8 @@ class MatterGenericSwitch : public MatterEndPoint {
3232

3333
// this function is called by Matter internal event processor. It could be overwritten by the application, if necessary.
3434
bool attributeChangeCB(uint16_t endpoint_id, uint32_t cluster_id, uint32_t attribute_id, esp_matter_attr_val_t *val);
35-
// this function is invoked when clients interact with the Identify Cluster of an specific endpoint
36-
bool endpointIdentifyCB(uint16_t endpoint_id, bool identifyIsEnabled, uint8_t identifyCounter) {
37-
if (_onEndPointIdentifyCB) {
38-
return _onEndPointIdentifyCB(identifyIsEnabled, identifyCounter);
39-
}
40-
return true;
41-
}
42-
// User callaback for the Identify Cluster functionality
43-
using EndPointIdentifyCB = std::function<bool(bool, uint8_t)>;
44-
void onIdentify(EndPointIdentifyCB onEndPointIdentifyCB) {
45-
_onEndPointIdentifyCB = onEndPointIdentifyCB;
46-
}
4735

4836
protected:
4937
bool started = false;
50-
EndPointIdentifyCB _onEndPointIdentifyCB = NULL;
5138
};
5239
#endif /* CONFIG_ESP_MATTER_ENABLE_DATA_MODEL */

‎libraries/Matter/src/MatterEndpoints/MatterHumiditySensor.h

Copy file name to clipboardExpand all lines: libraries/Matter/src/MatterEndpoints/MatterHumiditySensor.h
-13Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -57,18 +57,6 @@ class MatterHumiditySensor : public MatterEndPoint {
5757

5858
// this function is called by Matter internal event processor. It could be overwritten by the application, if necessary.
5959
bool attributeChangeCB(uint16_t endpoint_id, uint32_t cluster_id, uint32_t attribute_id, esp_matter_attr_val_t *val);
60-
// this function is invoked when clients interact with the Identify Cluster of an specific endpoint
61-
bool endpointIdentifyCB(uint16_t endpoint_id, bool identifyIsEnabled, uint8_t identifyCounter) {
62-
if (_onEndPointIdentifyCB) {
63-
return _onEndPointIdentifyCB(identifyIsEnabled, identifyCounter);
64-
}
65-
return true;
66-
}
67-
// User callaback for the Identify Cluster functionality
68-
using EndPointIdentifyCB = std::function<bool(bool, uint8_t)>;
69-
void onIdentify(EndPointIdentifyCB onEndPointIdentifyCB) {
70-
_onEndPointIdentifyCB = onEndPointIdentifyCB;
71-
}
7260

7361
protected:
7462
bool started = false;
@@ -77,6 +65,5 @@ class MatterHumiditySensor : public MatterEndPoint {
7765
// internal function to set the raw humidity value (Matter Cluster)
7866
bool begin(uint16_t _rawHumidity);
7967
bool setRawHumidity(uint16_t _rawHumidity);
80-
EndPointIdentifyCB _onEndPointIdentifyCB = NULL;
8168
};
8269
#endif /* CONFIG_ESP_MATTER_ENABLE_DATA_MODEL */

‎libraries/Matter/src/MatterEndpoints/MatterOccupancySensor.h

Copy file name to clipboardExpand all lines: libraries/Matter/src/MatterEndpoints/MatterOccupancySensor.h
-13Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -57,18 +57,6 @@ class MatterOccupancySensor : public MatterEndPoint {
5757

5858
// this function is called by Matter internal event processor. It could be overwritten by the application, if necessary.
5959
bool attributeChangeCB(uint16_t endpoint_id, uint32_t cluster_id, uint32_t attribute_id, esp_matter_attr_val_t *val);
60-
// this function is invoked when clients interact with the Identify Cluster of an specific endpoint
61-
bool endpointIdentifyCB(uint16_t endpoint_id, bool identifyIsEnabled, uint8_t identifyCounter) {
62-
if (_onEndPointIdentifyCB) {
63-
return _onEndPointIdentifyCB(identifyIsEnabled, identifyCounter);
64-
}
65-
return true;
66-
}
67-
// User callaback for the Identify Cluster functionality
68-
using EndPointIdentifyCB = std::function<bool(bool, uint8_t)>;
69-
void onIdentify(EndPointIdentifyCB onEndPointIdentifyCB) {
70-
_onEndPointIdentifyCB = onEndPointIdentifyCB;
71-
}
7260

7361
protected:
7462
// bitmap for Occupancy Sensor Types
@@ -81,6 +69,5 @@ class MatterOccupancySensor : public MatterEndPoint {
8169

8270
bool started = false;
8371
bool occupancyState = false;
84-
EndPointIdentifyCB _onEndPointIdentifyCB = NULL;
8572
};
8673
#endif /* CONFIG_ESP_MATTER_ENABLE_DATA_MODEL */

‎libraries/Matter/src/MatterEndpoints/MatterOnOffLight.h

Copy file name to clipboardExpand all lines: libraries/Matter/src/MatterEndpoints/MatterOnOffLight.h
-13Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -39,18 +39,6 @@ class MatterOnOffLight : public MatterEndPoint {
3939

4040
// this function is called by Matter internal event processor. It could be overwritten by the application, if necessary.
4141
bool attributeChangeCB(uint16_t endpoint_id, uint32_t cluster_id, uint32_t attribute_id, esp_matter_attr_val_t *val);
42-
// this function is invoked when clients interact with the Identify Cluster of an specific endpoint
43-
bool endpointIdentifyCB(uint16_t endpoint_id, bool identifyIsEnabled, uint8_t identifyCounter) {
44-
if (_onEndPointIdentifyCB) {
45-
return _onEndPointIdentifyCB(identifyIsEnabled, identifyCounter);
46-
}
47-
return true;
48-
}
49-
// User callaback for the Identify Cluster functionality
50-
using EndPointIdentifyCB = std::function<bool(bool, uint8_t)>;
51-
void onIdentify(EndPointIdentifyCB onEndPointIdentifyCB) {
52-
_onEndPointIdentifyCB = onEndPointIdentifyCB;
53-
}
5442

5543
// User Callback for whenever the Light state is changed by the Matter Controller
5644
using EndPointCB = std::function<bool(bool)>;
@@ -66,6 +54,5 @@ class MatterOnOffLight : public MatterEndPoint {
6654
bool onOffState = false; // default initial state is off, but it can be changed by begin(bool)
6755
EndPointCB _onChangeCB = NULL;
6856
EndPointCB _onChangeOnOffCB = NULL;
69-
EndPointIdentifyCB _onEndPointIdentifyCB = NULL;
7057
};
7158
#endif /* CONFIG_ESP_MATTER_ENABLE_DATA_MODEL */

‎libraries/Matter/src/MatterEndpoints/MatterOnOffPlugin.h

Copy file name to clipboardExpand all lines: libraries/Matter/src/MatterEndpoints/MatterOnOffPlugin.h
-13Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -39,18 +39,6 @@ class MatterOnOffPlugin : public MatterEndPoint {
3939

4040
// this function is called by Matter internal event processor. It could be overwritten by the application, if necessary.
4141
bool attributeChangeCB(uint16_t endpoint_id, uint32_t cluster_id, uint32_t attribute_id, esp_matter_attr_val_t *val);
42-
// this function is invoked when clients interact with the Identify Cluster of an specific endpoint
43-
bool endpointIdentifyCB(uint16_t endpoint_id, bool identifyIsEnabled, uint8_t identifyCounter) {
44-
if (_onEndPointIdentifyCB) {
45-
return _onEndPointIdentifyCB(identifyIsEnabled, identifyCounter);
46-
}
47-
return true;
48-
}
49-
// User callaback for the Identify Cluster functionality
50-
using EndPointIdentifyCB = std::function<bool(bool, uint8_t)>;
51-
void onIdentify(EndPointIdentifyCB onEndPointIdentifyCB) {
52-
_onEndPointIdentifyCB = onEndPointIdentifyCB;
53-
}
5442

5543
// User Callback for whenever the Plugin state is changed by the Matter Controller
5644
using EndPointCB = std::function<bool(bool)>;
@@ -66,6 +54,5 @@ class MatterOnOffPlugin : public MatterEndPoint {
6654
bool onOffState = false; // default initial state is off, but it can be changed by begin(bool)
6755
EndPointCB _onChangeCB = NULL;
6856
EndPointCB _onChangeOnOffCB = NULL;
69-
EndPointIdentifyCB _onEndPointIdentifyCB = NULL;
7057
};
7158
#endif /* CONFIG_ESP_MATTER_ENABLE_DATA_MODEL */

‎libraries/Matter/src/MatterEndpoints/MatterPressureSensor.h

Copy file name to clipboardExpand all lines: libraries/Matter/src/MatterEndpoints/MatterPressureSensor.h
-13Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -50,24 +50,11 @@ class MatterPressureSensor : public MatterEndPoint {
5050

5151
// this function is called by Matter internal event processor. It could be overwritten by the application, if necessary.
5252
bool attributeChangeCB(uint16_t endpoint_id, uint32_t cluster_id, uint32_t attribute_id, esp_matter_attr_val_t *val);
53-
// this function is invoked when clients interact with the Identify Cluster of an specific endpoint
54-
bool endpointIdentifyCB(uint16_t endpoint_id, bool identifyIsEnabled, uint8_t identifyCounter) {
55-
if (_onEndPointIdentifyCB) {
56-
return _onEndPointIdentifyCB(identifyIsEnabled, identifyCounter);
57-
}
58-
return true;
59-
}
60-
// User callaback for the Identify Cluster functionality
61-
using EndPointIdentifyCB = std::function<bool(bool, uint8_t)>;
62-
void onIdentify(EndPointIdentifyCB onEndPointIdentifyCB) {
63-
_onEndPointIdentifyCB = onEndPointIdentifyCB;
64-
}
6553

6654
protected:
6755
bool started = false;
6856
// implementation keeps pressure in hPa
6957
int16_t rawPressure = 0;
70-
EndPointIdentifyCB _onEndPointIdentifyCB = NULL;
7158
// internal function to set the raw pressure value (Matter Cluster)
7259
bool setRawPressure(int16_t _rawPressure);
7360
bool begin(int16_t _rawPressure);

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.