cores/psoc6: ./libraries: Format source code using clang.

Signed-off-by: Ramya Subramanyam <[email protected]>

Author: ramya-subramanyam

cores/psoc6/main.cpp

@@ -27,8 +27,8 @@
 
 #include "time.h"
 
-#define ARDUINO_MAIN_TASK_STACK_SIZE    (4096u)
-#define ARDUINO_MAIN_TASK_PRIORITY      (2u)
+#define ARDUINO_MAIN_TASK_STACK_SIZE (4096u)
+#define ARDUINO_MAIN_TASK_PRIORITY (2u)
 
 TaskHandle_t arduino_main_task_handle;
 
@@ -54,7 +54,8 @@ int main() {
 
     time_init();
 
-    xTaskCreate(arduino_main_task, "arduino-main-task", ARDUINO_MAIN_TASK_STACK_SIZE, NULL, ARDUINO_MAIN_TASK_PRIORITY, &arduino_main_task_handle);
+    xTaskCreate(arduino_main_task, "arduino-main-task", ARDUINO_MAIN_TASK_STACK_SIZE, NULL,
+                ARDUINO_MAIN_TASK_PRIORITY, &arduino_main_task_handle);
     vTaskStartScheduler();
 
     /* Should never get here */

libraries/WiFi/src/SecSocket.cpp

@@ -16,6 +16,12 @@ Socket::Socket():
     remote_ip(0, 0, 0, 0),
     _port(0) {
 
+Socket::Socket()
+    : socket(nullptr),
+      _status(SOCKET_STATUS_UNINITED),
+      _last_error(CY_RSLT_SUCCESS),
+      remote_ip(0, 0, 0, 0),
+      _port(0) {
 }
 
 void Socket::begin() {
@@ -113,7 +119,7 @@ void Socket::listen(int max_connections) {
     _status = SOCKET_STATUS_LISTENING;
 }
 
-bool Socket::accept(Socket & client_socket) {
+bool Socket::accept(Socket &client_socket) {
     cy_socket_sockaddr_t peer_addr;
     uint32_t peer_addr_len;
 

libraries/WiFi/src/SecSocket.h

@@ -1,9 +1,9 @@
 #ifndef CY_SECURE_SOCKET_H
 #define CY_SECURE_SOCKET_H
 
-#include "cy_secure_sockets.h"
 #include "IPAddress.h"
 #include "RingBuffer.h"
+#include "cy_secure_sockets.h"
 
 typedef enum {
     SOCKET_STATUS_UNINITED = 0,
@@ -19,7 +19,6 @@ typedef enum {
 class Socket {
 
 public:
-
     Socket();
 
     void begin();
@@ -35,7 +34,7 @@ class Socket {
     bool connect(const char *host, uint16_t port);
 
     void listen(int max_connections);
-    bool accept(Socket & client_socket);
+    bool accept(Socket &client_socket);
     uint32_t send(const void *data, uint32_t len);
     uint32_t available();
     int peek();
@@ -51,7 +50,6 @@ class Socket {
     cy_rslt_t getLastError();
 
 private:
-
     cy_socket_t socket;
     socket_status_t _status;
     cy_rslt_t _last_error;
@@ -62,7 +60,7 @@ class Socket {
     void setOptCallback(int optname, cy_socket_callback_t cback, void *arg);
 
     static const uint16_t RX_BUFFER_SIZE = 256;
-    arduino::RingBufferN < RX_BUFFER_SIZE > rx_buf;
+    arduino::RingBufferN<RX_BUFFER_SIZE> rx_buf;
 
     bool connect(cy_socket_sockaddr_t *addr);
     void receiveCallback();

libraries/WiFi/src/WiFi.cpp

@@ -157,11 +157,9 @@ wifi_error_t WiFiClass::getLastError() {
 
 
 WiFiClass::WiFiClass() {
-
 }
 
 WiFiClass::~WiFiClass() {
-
 }
 
 wifi_error_t WiFiClass::wcm_init(cy_wcm_interface_t mode) {

libraries/WiFi/src/WiFi.h

@@ -8,12 +8,13 @@
 #include "WiFiServer.h"
 
 #include "cy_wcm.h"
+#include <stdint.h>
 
 /**
  * TODO:
  *  - Adapt the enum list conveniently. Do we need to keep all?
  *  - Move it to some header file?
-*/
+ */
 typedef enum {
     WL_NO_SHIELD = 255,
     WL_NO_MODULE = 255,
@@ -53,23 +54,22 @@ typedef enum {
 class WiFiClass {
 
 public:
-
     /* Return the WiFi class singleton */
-    static WiFiClass & get_instance();
+    static WiFiClass &get_instance();
 
     /* Start Wifi connection for OPEN networks
-    *
-    * param ssid: Pointer to the SSID string.
-    */
+     *
+     * param ssid: Pointer to the SSID string.
+     */
     int begin(const char *ssid);
 
     /* Start WiFi connection with passphrase
-    * the most secure supported mode will be automatically selected
-    *
-    * param ssid: Pointer to the SSID string.
-    * param passphrase: Passphrase. Valid characters in a passphrase
-    *        must be between ASCII 32-126 (decimal).
-    */
+     * the most secure supported mode will be automatically selected
+     *
+     * param ssid: Pointer to the SSID string.
+     * param passphrase: Passphrase. Valid characters in a passphrase
+     *        must be between ASCII 32-126 (decimal).
+     */
     int begin(const char *ssid, const char *passphrase);
 
     /* WEP is not supported by WCM class as considered an insecure encryption. */
@@ -101,11 +101,11 @@ class WiFiClass {
     uint8_t beginAP(const char *ssid, const char *passphrase, uint8_t channel);
 
     /*
-    * Get the interface IP address.
-    * Currently only IPv4 is supported.
-    *
-    * return: IP address value. Returns 0.0.0.0 in case of error.
-    */
+     * Get the interface IP address.
+     * Currently only IPv4 is supported.
+     *
+     * return: IP address value. Returns 0.0.0.0 in case of error.
+     */
     IPAddress localIP();
 
     /*
@@ -124,9 +124,10 @@ class WiFiClass {
      *  WL_AP_LISTENING : assigned when the listening for connections in Access Point mode;
      *  WL_NO_SHIELD: assigned when no WiFi shield is present;
      *  WL_NO_MODULE: assigned when the communication with an integrated WiFi module fails;
-     *  WL_IDLE_STATUS: it is a temporary status assigned when WiFi.begin() is called and remains active until the number of attempts expires (resulting in WL_CONNECT_FAILED) or a connection is established (resulting in WL_CONNECTED);
-     *  WL_NO_SSID_AVAIL: assigned when no SSID are available;
-     *  WL_SCAN_COMPLETED: assigned when the scan networks is completed;
+     *  WL_IDLE_STATUS: it is a temporary status assigned when WiFi.begin() is called and remains
+     * active until the number of attempts expires (resulting in WL_CONNECT_FAILED) or a connection
+     * is established (resulting in WL_CONNECTED); WL_NO_SSID_AVAIL: assigned when no SSID are
+     * available; WL_SCAN_COMPLETED: assigned when the scan networks is completed;
      *  WL_CONNECT_FAILED: assigned when the connection fails for all the attempts;
      *  WL_CONNECTION_LOST: assigned when the connection is lost;
      *  WL_DISCONNECTED: assigned when disconnected from a network;
@@ -138,23 +139,21 @@ class WiFiClass {
     wifi_error_t getLastError();
 
 private:
-
     /* Extension of cy_wcm_interface_t enums. */
     #define CY_WCM_INTERFACE_TYPE_UNKNOWN   (cy_wcm_interface_t)0xFF
 
     cy_wcm_interface_t _mode = CY_WCM_INTERFACE_TYPE_UNKNOWN;
     volatile wifi_status_t _status = WIFI_STATUS_UNINITED;
     wifi_error_t _last_error = WIFI_ERROR_NONE;
 
-
     /* The WiFi class is implemented as singleton.
     The constructor and destructor are private. */
     WiFiClass();
     ~WiFiClass();
 
     /* Delete copy constructor and assignment operator  */
-    WiFiClass(const WiFiClass&) = delete;
-    WiFiClass& operator = (const WiFiClass&) = delete;
+    WiFiClass(const WiFiClass &) = delete;
+    WiFiClass &operator=(const WiFiClass &) = delete;
 
     /**
     * Initialize the WiFi connection manager.

libraries/WiFi/src/WiFiClient.cpp

@@ -97,11 +97,13 @@ WiFiClient::operator bool() {
 IPAddress WiFiClient::remoteIP() {
     return socket->remoteIP();
 }
+
 uint16_t WiFiClient::remotePort() {
     return socket->port();
 };
 
-WiFiClient::WiFiClient(const WiFiClient& other) : socket(other.socket) {
+WiFiClient::WiFiClient(const WiFiClient &other)
+    : socket(other.socket) {
 }
 
 WiFiClient& WiFiClient::operator = (const WiFiClient& other) {

libraries/WiFi/src/WiFiClient.h

@@ -6,11 +6,12 @@
 #include <SecSocket.h>
 #include "Client.h"
 #include "Print.h"
+#include <Socket.h>
+#include <memory>
 
 class WiFiClient: public arduino::Client {
 
 public:
-
     WiFiClient();
 
     int connect(IPAddress ip, uint16_t port);
@@ -33,20 +34,18 @@ class WiFiClient: public arduino::Client {
     using Print::print;
     using Print::println;
 
-    WiFiClient(const WiFiClient& other);
-    WiFiClient& operator = (const WiFiClient& other);
-
+    WiFiClient(const WiFiClient &other);
+    WiFiClient &operator=(const WiFiClient &other);
 
 private:
-
     /**
      * Implemented as shared ptr as this class is used
      * in the WiFiServer to keep the WiFiClient objects
      * as a list of connected clients.
      * Keeping objects will lead to copies which won´t
      * update the socket rx_buffer upon interrupts.
-    */
-    std::shared_ptr < Socket > socket;
+     */
+    std::shared_ptr<Socket> socket;
 
     static cy_rslt_t receiveCallback(cy_socket_t socket_handle, void *arg);
     static cy_rslt_t disconnectionCallback(cy_socket_t socket_handle, void *arg);

libraries/WiFi/src/WiFiServer.cpp

@@ -58,7 +58,7 @@ size_t WiFiServer::write(uint8_t data) {
 size_t WiFiServer::write(const uint8_t *buf, size_t size) {
     size_t written_bytes = 4294967295; /* Maximum value of uint32_t */
 
-    for (WiFiClient & client: connected_clients) {
+    for (WiFiClient &client : connected_clients) {
         uint16_t written_bytes_i = client.write(buf, size);
         /**
          * Keep as written_bytes the smallest value of written bytes to any clients.
@@ -114,7 +114,7 @@ cy_rslt_t WiFiServer::connectionCallback(cy_socket_t socket_handle, void *arg) {
      * and use the reference to accept the connection.
      */
     server->connected_clients.emplace_back();
-    WiFiClient & new_client = server->connected_clients.back();
+    WiFiClient &new_client = server->connected_clients.back();
 
     if (!server->socket.accept(*(new_client.socket))) {
         server->connected_clients.pop_back();

libraries/WiFi/src/WiFiServer.h

@@ -1,22 +1,24 @@
 #ifndef WIFI_SERVER_H
 #define WIFI_SERVER_H
 
+#include "Server.h"
+#include <Socket.h>
+#include <WiFiClient.h>
 #include <stdint.h>
 #include <vector>
 #include <WiFiClient.h>
 #include <SecSocket.h>
 #include "Server.h"
 
-class WiFiServer: public arduino::Server {
+class WiFiServer : public arduino::Server {
 
 public:
-
     WiFiServer();
 
     void begin(uint16_t port);
     void begin();
 
-    WiFiClient & available();
+    WiFiClient &available();
     size_t write(uint8_t) override;
     size_t write(const uint8_t *buf, size_t size) override;
 
@@ -31,12 +33,11 @@ class WiFiServer: public arduino::Server {
     uint8_t connectedSize();
 
 private:
-
     Socket socket;
 
     static const uint16_t SERVER_RECV_TIMEOUT_MS = 500;
     static const uint32_t SERVER_MAX_CLIENTS = 32;
-    std::vector < WiFiClient > connected_clients;
+    std::vector<WiFiClient> connected_clients;
 
     static cy_rslt_t connectionCallback(cy_socket_t socket_handle, void *arg);
     static cy_rslt_t receiveCallback(cy_socket_t socket_handle, void *arg);

libraries/Wire/Wire.h

@@ -1,12 +1,11 @@
 #ifndef WIRE_H
 #define WIRE_H
 
-#include <Arduino.h>
 #include "cyhal_i2c.h"
+#include <Arduino.h>
 
 class TwoWire {
 public:
-
     static const size_t BUFFER_LENGTH = 32;
     static const uint32_t I2C_DEFAULT_FREQ = 100000;
 
@@ -38,7 +37,7 @@ class TwoWire {
     void onRequest(void (*function)(void));
 
 private:
-    static TwoWire * instances[I2C_HOWMANY];
+    static TwoWire *instances[I2C_HOWMANY];
     void _begin();
     cyhal_gpio_t sda_pin;
     cyhal_gpio_t scl_pin;
@@ -63,7 +62,6 @@ class TwoWire {
     void onReceiveService(int);
     static void i2c_event_handler(void *callback_arg, cyhal_i2c_event_t event);
     void i2c_event_handler_member(cyhal_i2c_event_t event);
-
 };
 
 #if (I2C_HOWMANY > 0)