From 0feaf9c062a0cfcb841374ef3d95c67f399d5bc4 Mon Sep 17 00:00:00 2001
From: Sandeep Mistry <sandeep.mistry@arm.com>
Date: Fri, 16 Sep 2022 10:53:33 -0400
Subject: [PATCH] Python: use MatterPostAttributeChangeCallback (instead of
 emberAfPostAttributeChangeCallback)

---
 examples/lighting-app/python/lighting.py         | 1 -
 src/controller/python/chip/server/ServerInit.cpp | 9 +++++----
 src/controller/python/chip/server/types.py       | 2 --
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/examples/lighting-app/python/lighting.py b/examples/lighting-app/python/lighting.py
index 50e4d71498ccbe..a10fbbddf14e35 100644
--- a/examples/lighting-app/python/lighting.py
+++ b/examples/lighting-app/python/lighting.py
@@ -177,7 +177,6 @@ def attributeChangeCallback(
     endpoint: int,
     clusterId: int,
     attributeId: int,
-    manufacturerCode: int,
     xx_type: int,
     size: int,
     value: bytes,
diff --git a/src/controller/python/chip/server/ServerInit.cpp b/src/controller/python/chip/server/ServerInit.cpp
index 0f9b785db0ce5c..ae97ab998bbbea 100644
--- a/src/controller/python/chip/server/ServerInit.cpp
+++ b/src/controller/python/chip/server/ServerInit.cpp
@@ -102,7 +102,7 @@ static bool EnsureWiFiIsStarted()
 #endif
 
 using PostAttributeChangeCallback = void (*)(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId,
-                                             uint16_t manufacturerCode, uint8_t type, uint16_t size, uint8_t * value);
+                                             uint8_t type, uint16_t size, uint8_t * value);
 
 class PythonServerDelegate // : public ServerDelegate
 {
@@ -197,14 +197,15 @@ void pychip_server_native_init()
 }
 }
 
-void emberAfPostAttributeChangeCallback(chip::EndpointId endpoint, chip::ClusterId clusterId, chip::AttributeId attributeId,
-                                        uint16_t manufacturerCode, uint8_t type, uint16_t size, uint8_t * value)
+void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size,
+                                       uint8_t * value)
 {
     // ChipLogProgress(NotSpecified, "emberAfPostAttributeChangeCallback()");
     if (gPythonServerDelegate.mPostAttributeChangeCallback != nullptr)
     {
         // ChipLogProgress(NotSpecified, "callback %p", gPythonServerDelegate.mPostAttributeChangeCallback);
-        gPythonServerDelegate.mPostAttributeChangeCallback(endpoint, clusterId, attributeId, manufacturerCode, type, size, value);
+        gPythonServerDelegate.mPostAttributeChangeCallback(attributePath.mEndpointId, attributePath.mClusterId,
+                                                           attributePath.mAttributeId, type, size, value);
     }
     else
     {
diff --git a/src/controller/python/chip/server/types.py b/src/controller/python/chip/server/types.py
index 9aaeb60e10c8ea..ec5c13d462ff7e 100644
--- a/src/controller/python/chip/server/types.py
+++ b/src/controller/python/chip/server/types.py
@@ -8,7 +8,5 @@
     c_uint16,
     c_uint8,
     c_uint16,
-    c_uint8,
-    c_uint16,
     c_char_p,
 )