Remove unused code and fix error when disable RPC

Author: erwinpan1

examples/chef/common/chef-binding-handler.cpp

@@ -327,59 +327,12 @@ void ChefBindingHandler::SwitchWorkerHandler(intptr_t context)
     BindingManager::GetInstance().NotifyBoundClusterChanged(data->EndpointId, data->ClusterId, static_cast<void *>(data));
 }
 
-/*
-static void ChefBoundDeviceChangedHandler(const EmberBindingTableEntry & binding, chip::OperationalDeviceProxy * peer_device,
-                                      void * context)
-{
-    using namespace chip;
-    using namespace chip::app;
-
-    if (binding.type == EMBER_MULTICAST_BINDING)
-    {
-        ChipLogError(NotSpecified, "Group binding is not supported now");
-        return;
-    }
-
-printf("\033[41m %s, %d \033[0m  \n", __func__, __LINE__);
-
-    if (binding.type == EMBER_UNICAST_BINDING && binding.local == 1 &&
-        (!binding.clusterId.HasValue() || binding.clusterId.Value() == Clusters::OnOff::Id))
-    {
-        auto onSuccess = [](const ConcreteCommandPath & commandPath, const StatusIB & status, const auto & dataResponse) {
-            ChipLogProgress(NotSpecified, "OnOff command succeeds");
-        };
-        auto onFailure = [](CHIP_ERROR ret) {
-            ChipLogError(NotSpecified, "OnOff command failed: %" CHIP_ERROR_FORMAT, ret.Format());
-        };
-
-        VerifyOrDie(peer_device != nullptr && peer_device->ConnectionReady());
-        if (sSwitchOnOffState)
-        {
-            Clusters::OnOff::Commands::On::Type onCommand;
-            Controller::InvokeCommandRequest(peer_device->GetExchangeManager(), peer_device->GetSecureSession().Value(),
-                                             binding.remote, onCommand, onSuccess, onFailure);
-        }
-        else
-        {
-            Clusters::OnOff::Commands::Off::Type offCommand;
-            Controller::InvokeCommandRequest(peer_device->GetExchangeManager(), peer_device->GetSecureSession().Value(),
-                                             binding.remote, offCommand, onSuccess, onFailure);
-        }
-    }
-}
-*/
-
-/*
-static void ChefBoundDeviceContextReleaseHandler(void * context)
-{
-    (void) context;
-}
-*/
 void ChefBindingHandler::Init(chip::EndpointId endpoint)
 {
     DeviceLayer::PlatformMgr().ScheduleWork(InitInternal, endpoint);
 }
 
+#if CONFIG_ENABLE_PW_RPC == 1
 #include "Rpc.h"
 
 void ChefBindingCommandHandler(intptr_t ctx, chip::rpc::BindingCommandRequest * command)
@@ -395,26 +348,19 @@ printf("\033[41 %s, %d, endpoint=%d, clusterId=%d, commandId=%d \033[0m \n", __f
         data->IsGroup = ChefBindingHandler::GetInstance().IsGroupBound();
 
 	ChefBindingHandler::SwitchWorkerHandler(reinterpret_cast<intptr_t>(data));
-        // DeviceLayer::PlatformMgr().ScheduleWork(ChefBindingHandler::SwitchWorkerHandler, reinterpret_cast<intptr_t>(data));
         // TODO: Platform::Delete(data);
     }
 }
-
-#include "Rpc.h"
+#endif // CONFIG_ENABLE_PW_RPC
 
 void emberAfBindingClusterInitCallback(EndpointId endpoint)
 {
-    intptr_t ctx = 1;
 printf("\033[41m %s, %d \033[0m  \n", __func__, __LINE__);
 
     ChefBindingHandler::GetInstance().Init(endpoint);
+#if CONFIG_ENABLE_PW_RPC == 1
+    intptr_t ctx = 1;
     chip::rpc::RpcRegisterAppBindingCommandHander(ChefBindingCommandHandler, ctx);
-/*
-    auto & server = chip::Server::GetInstance();
-    chip::BindingManager::GetInstance().Init(
-        { &server.GetFabricTable(), server.GetCASESessionManager(), &server.GetPersistentStorage() });
-    chip::BindingManager::GetInstance().RegisterBoundDeviceChangedHandler(ChefBoundDeviceChangedHandler);
-    chip::BindingManager::GetInstance().RegisterBoundDeviceContextReleaseHandler(ChefBoundDeviceContextReleaseHandler);
-*/
+#endif // CONFIG_ENABLE_PW_RPC
 }
 

examples/chef/common/stubs.cpp

@@ -61,16 +61,6 @@ EmberAfStatus emberAfExternalAttributeReadCallback(EndpointId endpoint, ClusterI
     return EMBER_ZCL_STATUS_SUCCESS;
 }
 
-/*
- *
-Thread 3 "rootnode_airqua" hit Breakpoint 1, emberAfExternalAttributeWriteCallback (endpoint=1, clusterId=91,
-    attributeMetadata=0x555555791f30 <(anonymous namespace)::generatedAttributes+1904>, buffer=0x7ffff68464ac "\001")
-    at /home/erwinpan/matter/erwinpan1/master_1124_airqualitysensor/examples/chef/common/stubs.cpp:22
-(gdb) p *attributeMetadata
-$1 = {defaultValue = {ptrToDefaultValue = 0x0, defaultValue = 0, ptrToMinMaxValue = 0x0}, attributeId = 0, size = 1, attributeType =
-48 '0', mask = 16 '\020'} (gdb)
-*/
-
 EmberAfStatus emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId,
                                                     const EmberAfAttributeMetadata * attributeMetadata, uint8_t * buffer)
 {

examples/common/pigweed/rpc_services/Device.h

@@ -480,7 +480,7 @@ class Device : public pw_rpc::nanopb::Device::Service<Device>
         return pw::OkStatus();
     }
 
-    using BindingCommandHandler = void (*)(uint32_t endpoint, uint32_t clusterId, uint32_t commandId, uint32_t value); 
+    using BindingCommandHandler = void (*)(uint16_t endpoint, uint32_t clusterId, uint32_t commandId, uint32_t value); 
 
     void RegisterBindingCommandHandler(BindingCommandHandler handler) { mBindingCommandHandler = handler; }
 

examples/platform/linux/Rpc.cpp

@@ -87,7 +87,7 @@ printf("\033[41m %s , %d, endpoint=%d, clusterId=%d, commandId=%d \033[0m \n", _
     delete data;
 }
 
-void RpcBindingCommandHandler(uint32_t endpoint, uint32_t clusterId, uint32_t commandId, uint32_t value) 
+void RpcBindingCommandHandler(uint16_t endpoint, uint32_t clusterId, uint32_t commandId, uint32_t value) 
 {
     struct BindingCommandRequest * data = new BindingCommandRequest{endpoint, clusterId, commandId};
 printf("\033[41m %s , %d \033[0m \n", __func__, __LINE__);

examples/platform/linux/Rpc.h

@@ -22,7 +22,7 @@ namespace chip {
 namespace rpc {
 
 struct BindingCommandRequest {
-    uint32_t endpoint;
+    uint16_t endpoint;
     uint32_t clusterId;
     uint32_t commandId;
     uint32_t value;