project-chip · rwalker-apple · Oct 12, 2020 · Oct 1, 2020 · Oct 12, 2020 · Oct 12, 2020
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Connected Home over IP {#mainpage}
+# Connected Home over IP
 
 ![Main](https://github.com/project-chip/connectedhomeip/workflows/Builds/badge.svg)
 ![Examples](https://github.com/project-chip/connectedhomeip/workflows/Examples/badge.svg)

diff --git a/examples/chip-tool/commands/clusters/BarrierControl/Commands.h b/examples/chip-tool/commands/clusters/BarrierControl/Commands.h
@@ -16,8 +16,7 @@
  *
  */
 
-#ifndef __CHIPTOOL_BARRIERCONTROL_COMMANDS_H__
-#define __CHIPTOOL_BARRIERCONTROL_COMMANDS_H__
+#pragma once
 
 #include "../../common/ModelCommand.h"
 
@@ -61,5 +60,3 @@ void registerClusterBarrierControl(Commands & commands)
 
     commands.Register(clusterName, clusterCommands);
 }
-
-#endif // __CHIPTOOL_BARRIERCONTROL_COMMANDS_H__
diff --git a/examples/chip-tool/commands/clusters/Commands.h b/examples/chip-tool/commands/clusters/Commands.h
@@ -18,8 +18,7 @@
 //
 //
 
-#ifndef __CHIPTOOL_CLUSTERS_COMMANDS_H__
-#define __CHIPTOOL_CLUSTERS_COMMANDS_H__
+#pragma once
 
 #include "../common/ModelCommand.h"
 
@@ -3677,5 +3676,3 @@ void registerClusters(Commands & commands)
     registerClusterScenes(commands);
     registerClusterTemperatureMeasurement(commands);
 }
-
-#endif // __CHIPTOOL_CLUSTERS_COMMANDS_H__
diff --git a/examples/chip-tool/commands/clusters/DoorLock/Commands.h b/examples/chip-tool/commands/clusters/DoorLock/Commands.h
@@ -16,8 +16,7 @@
  *
  */
 
-#ifndef __CHIPTOOL_DOORLOCK_COMMANDS_H__
-#define __CHIPTOOL_DOORLOCK_COMMANDS_H__
+#pragma once
 
 #include "../../common/ModelCommand.h"
 
@@ -61,5 +60,3 @@ void registerClusterDoorLock(Commands & commands)
 
     commands.Register(clusterName, clusterCommands);
 }
-
-#endif // __CHIPTOOL_DOORLOCK_COMMANDS_H__
diff --git a/examples/chip-tool/commands/common/Command.h b/examples/chip-tool/commands/common/Command.h
@@ -16,8 +16,7 @@
  *
  */
 
-#ifndef __CHIPTOOL_COMMAND_H__
-#define __CHIPTOOL_COMMAND_H__
+#pragma once
 
 #include <controller/CHIPDeviceController.h>
 #include <inet/InetInterface.h>
@@ -110,5 +109,3 @@ class Command
     const char * mName = nullptr;
     std::vector<Argument> mArgs;
 };
-
-#endif // __CHIPTOOL_COMMAND_H__
diff --git a/examples/chip-tool/commands/common/Commands.h b/examples/chip-tool/commands/common/Commands.h
@@ -16,8 +16,7 @@
  *
  */
 
-#ifndef __CHIPTOOL_COMMANDS_H__
-#define __CHIPTOOL_COMMANDS_H__
+#pragma once
 
 #include "Command.h"
 #include <map>
@@ -43,5 +42,3 @@ class Commands
 
     std::map<const char *, std::vector<std::unique_ptr<Command>>> clusters;
 };
-
-#endif // __CHIPTOOL_COMMANDS_H__
diff --git a/examples/chip-tool/commands/common/EchoCommand.cpp b/examples/chip-tool/commands/common/EchoCommand.cpp
@@ -43,11 +43,11 @@ void EchoCommand::SendEcho() const
     CHIP_ERROR err = mController->SendMessage(NULL, buffer);
     if (err == CHIP_NO_ERROR)
     {
-        ChipLogProgress(chipTool, "Echo (%s): Message sent to server", GetName());
+        ChipLogProgress(chipTool, "Echo (%s): Message sent to server", GetNetworkName());
     }
     else
     {
-        ChipLogError(chipTool, "Echo (%s): %s", GetName(), ErrorStr(err));
+        ChipLogError(chipTool, "Echo (%s): %s", GetNetworkName(), ErrorStr(err));
     }
 }
 
@@ -62,11 +62,11 @@ void EchoCommand::ReceiveEcho(PacketBuffer * buffer) const
     bool isEchoIdenticalToMessage = strncmp(msg_buffer, PAYLOAD, data_len) == 0;
     if (isEchoIdenticalToMessage)
     {
-        ChipLogProgress(chipTool, "Echo (%s): Received expected message !", GetName());
+        ChipLogProgress(chipTool, "Echo (%s): Received expected message !", GetNetworkName());
     }
     else
     {
-        ChipLogProgress(chipTool, "Echo: (%s): Error \nSend: %s \nRecv: %s", GetName(), PAYLOAD, msg_buffer);
+        ChipLogProgress(chipTool, "Echo: (%s): Error \nSend: %s \nRecv: %s", GetNetworkName(), PAYLOAD, msg_buffer);
     }
 }
 

diff --git a/examples/chip-tool/commands/common/EchoCommand.h b/examples/chip-tool/commands/common/EchoCommand.h
@@ -16,8 +16,7 @@
  *
  */
 
-#ifndef __CHIPTOOL_COMMAND_ECHO_H__
-#define __CHIPTOOL_COMMAND_ECHO_H__
+#pragma once
 
 #include "NetworkCommand.h"
 
@@ -40,5 +39,3 @@ class EchoCommand : public NetworkCommand
 
     ChipDeviceController * mController = nullptr;
 };
-
-#endif // __CHIPTOOL_COMMAND_ECHO_H__
diff --git a/examples/chip-tool/commands/common/ModelCommand.cpp b/examples/chip-tool/commands/common/ModelCommand.cpp
@@ -50,9 +50,11 @@ bool isValidFrame(uint8_t frameControl)
 
 void ModelCommand::OnConnect(ChipDeviceController * dc)
 {
-    SendCommand(dc);
-    UpdateWaitForResponse(true);
-    WaitForResponse();
+    if (SendCommand(dc))
+    {
+        UpdateWaitForResponse(true);
+        WaitForResponse();
+    }
 }
 
 void ModelCommand::OnError(ChipDeviceController * dc, CHIP_ERROR err)
@@ -80,7 +82,7 @@ CHIP_ERROR ModelCommand::Run(ChipDeviceController * dc, NodeId remoteId)
     return err;
 }
 
-void ModelCommand::SendCommand(ChipDeviceController * dc)
+bool ModelCommand::SendCommand(ChipDeviceController * dc)
 {
     // Make sure our buffer is big enough, but this will need a better setup!
     static const size_t bufferSize = 1024;
@@ -89,10 +91,17 @@ void ModelCommand::SendCommand(ChipDeviceController * dc)
     if (buffer == nullptr)
     {
         ChipLogError(chipTool, "Failed to allocate memory for packet data.");
-        return;
+        return false;
     }
 
     uint16_t dataLength = EncodeCommand(buffer, bufferSize, mEndPointId);
+    if (dataLength == 0)
+    {
+        PacketBuffer::Free(buffer);
+        ChipLogError(chipTool, "Error while encoding data for command: %s", GetName());
+        return false;
+    }
+
     buffer->SetDataLength(dataLength);
     ChipLogProgress(chipTool, "Encoded data of length %d", dataLength);
 
@@ -101,6 +110,7 @@ void ModelCommand::SendCommand(ChipDeviceController * dc)
 #endif
 
     dc->SendMessage(NULL, buffer);
+    return true;
 }
 
 void ModelCommand::ReceiveCommandResponse(ChipDeviceController * dc, PacketBuffer * buffer) const

diff --git a/examples/chip-tool/commands/common/ModelCommand.h b/examples/chip-tool/commands/common/ModelCommand.h
@@ -16,8 +16,7 @@
  *
  */
 
-#ifndef __CHIPTOOL_MODELCOMMAND_H__
-#define __CHIPTOOL_MODELCOMMAND_H__
+#pragma once
 
 #include "NetworkCommand.h"
 
@@ -56,7 +55,7 @@ class ModelCommand : public NetworkCommand
     virtual bool HandleClusterResponse(uint8_t * message, uint16_t messageLen) const { return false; }
 
 private:
-    void SendCommand(ChipDeviceController * dc);
+    bool SendCommand(ChipDeviceController * dc);
     void ReceiveCommandResponse(ChipDeviceController * dc, chip::System::PacketBuffer * buffer) const;
 
     void ParseGlobalResponseCommand(uint8_t commandId, uint8_t * message, uint16_t messageLen) const;
@@ -76,5 +75,3 @@ class ModelCommand : public NetworkCommand
     uint32_t mEndPointId;
     uint16_t mClusterId;
 };
-
-#endif // __CHIPTOOL_MODELCOMMAND_H__
diff --git a/examples/chip-tool/commands/common/NetworkCommand.h b/examples/chip-tool/commands/common/NetworkCommand.h
@@ -16,8 +16,7 @@
  *
  */
 
-#ifndef __CHIPTOOL_IPCOMMAND_H__
-#define __CHIPTOOL_IPCOMMAND_H__
+#pragma once
 
 #include "Command.h"
 
@@ -46,7 +45,7 @@ class NetworkCommand : public Command
         }
     }
 
-    const char * GetName(void) const { return mName; }
+    const char * GetNetworkName(void) const { return mName; }
 
     virtual void OnConnect(ChipDeviceController * dc)                                      = 0;
     virtual void OnError(ChipDeviceController * dc, CHIP_ERROR err)                        = 0;
@@ -65,5 +64,3 @@ class NetworkCommand : public Command
     uint32_t mDiscriminator;
     uint32_t mSetupPINCode;
 };
-
-#endif //__CHIPTOOL_IPCOMMAND_H__
diff --git a/examples/chip-tool/commands/echo/Commands.h b/examples/chip-tool/commands/echo/Commands.h
@@ -16,8 +16,7 @@
  *
  */
 
-#ifndef __CHIPTOOL_ECHO_COMMANDS_H__
-#define __CHIPTOOL_ECHO_COMMANDS_H__
+#pragma once
 
 #include "../common/EchoCommand.h"
 
@@ -44,5 +43,3 @@ void registerCommandsEcho(Commands & commands)
 
     commands.Register(clusterName, clusterCommands);
 }
-
-#endif // __CHIPTOOL_ECHO_COMMANDS_H__
diff --git a/examples/common/chip-app-server/include/DataModelHandler.h b/examples/common/chip-app-server/include/DataModelHandler.h
@@ -20,8 +20,7 @@
  *   This file defines the API for the handler for data model messages.
  */
 
-#ifndef DATA_MODEL_HANDLER_H
-#define DATA_MODEL_HANDLER_H
+#pragma once
 
 #include <system/SystemPacketBuffer.h>
 #include <transport/SecureSessionMgr.h>
@@ -39,5 +38,3 @@ void HandleDataModelMessage(const chip::PacketHeader & header, chip::System::Pac
                             chip::SecureSessionMgrBase * mgr);
 void InitDataModelHandler();
 }
-
-#endif // DATA_MODEL_HANDLER_H
diff --git a/examples/common/chip-app-server/include/QRCodeUtil.h b/examples/common/chip-app-server/include/QRCodeUtil.h
@@ -15,11 +15,8 @@
  *    limitations under the License.
  */
 
-#ifndef QR_CODE_UTIL_H
-#define QR_CODE_UTIL_H
+#pragma once
 
 #include <setup_payload/SetupPayload.h>
 
 void PrintQRCode(chip::RendezvousInformationFlags rendezvousFlags);
-
-#endif // QR_CODE_UTIL_H
diff --git a/examples/common/chip-app-server/include/RendezvousServer.h b/examples/common/chip-app-server/include/RendezvousServer.h
@@ -15,8 +15,7 @@
  *    limitations under the License.
  */
 
-#ifndef CHIP_APP_SERVER_RENDEZVOUS_DELEGATE_H_
-#define CHIP_APP_SERVER_RENDEZVOUS_DELEGATE_H_
+#pragma once
 
 #include <platform/CHIPDeviceLayer.h>
 #include <transport/RendezvousSession.h>
@@ -40,5 +39,3 @@ class RendezvousServer : public RendezvousSessionDelegate
 };
 
 } // namespace chip
-
-#endif // CHIP_APP_SERVER_RENDEZVOUS_DELEGATE_H_
diff --git a/examples/common/chip-app-server/include/Server.h b/examples/common/chip-app-server/include/Server.h
@@ -15,8 +15,7 @@
  *    limitations under the License.
  */
 
-#ifndef CHIP_APP_SERVER_SERVER_H
-#define CHIP_APP_SERVER_SERVER_H
+#pragma once
 
 #include <inet/IPAddress.h>
 #include <inet/InetLayer.h>
@@ -33,5 +32,3 @@ using DemoSessionManager = chip::SecureSessionMgr<chip::Transport::UDP>;
  * @param [in] sessions The demo's session manager.
  */
 void InitServer();
-
-#endif // CHIP_APP_SERVER_SERVER_H
diff --git a/examples/common/screen-framework/include/Display.h b/examples/common/screen-framework/include/Display.h
@@ -24,8 +24,7 @@
  *
  */
 
-#ifndef DISPLAY_H
-#define DISPLAY_H
+#pragma once
 
 #include "esp_system.h"
 
@@ -98,5 +97,3 @@ extern void DisplayStatusMessage(char * msg, uint16_t vpos);
 extern bool WakeDisplay();
 
 #endif // #if CONFIG_HAVE_DISPLAY
-
-#endif // DISPLAY_H
diff --git a/examples/common/screen-framework/include/ListScreen.h b/examples/common/screen-framework/include/ListScreen.h
@@ -23,8 +23,7 @@
  *
  */
 
-#ifndef LIST_SCREEN_H
-#define LIST_SCREEN_H
+#pragma once
 
 #include "Screen.h"
 #include "ScreenManager.h"
@@ -124,5 +123,3 @@ class SimpleListModel : public ListScreen::Model
 };
 
 #endif // CONFIG_HAVE_DISPLAY
-
-#endif // LIST_SCREEN_H
diff --git a/examples/common/screen-framework/include/Screen.h b/examples/common/screen-framework/include/Screen.h
@@ -23,8 +23,7 @@
  *
  */
 
-#ifndef SCREEN_H
-#define SCREEN_H
+#pragma once
 
 #include "Display.h"
 
@@ -66,5 +65,3 @@ class Screen
 };
 
 #endif // CONFIG_HAVE_DISPLAY
-
-#endif // SCREEN_H
diff --git a/examples/common/screen-framework/include/ScreenManager.h b/examples/common/screen-framework/include/ScreenManager.h
@@ -23,8 +23,7 @@
  *
  */
 
-#ifndef SCREEN_MANAGER_H
-#define SCREEN_MANAGER_H
+#pragma once
 
 #include "Display.h"
 #include "Screen.h"
@@ -63,5 +62,3 @@ class ScreenManager
 };
 
 #endif // CONFIG_HAVE_DISPLAY
-
-#endif // SCREEN_MANAGER_H
diff --git a/examples/lighting-app/efr32/include/AppConfig.h b/examples/lighting-app/efr32/include/AppConfig.h
@@ -17,8 +17,7 @@
  *    limitations under the License.
  */
 
-#ifndef APP_CONFIG_H
-#define APP_CONFIG_H
+#pragma once
 
 // ---- Lighting Example App Config ----
 
@@ -67,4 +66,3 @@ void appError(int err);
 #ifdef __cplusplus
 }
 #endif
-#endif // APP_CONFIG_H