cores/psoc6: Fix some cppcheck errors.

ramya-subramanyam · ramya-subramanyam · commit fe239fccd692 · 2025-05-07T11:34:34.000+05:30
Signed-off-by: Ramya Subramanyam &lt;ramya.subramanyam@infineon.com&gt;
diff --git a/cores/psoc6/Uart.cpp b/cores/psoc6/Uart.cpp
@@ -120,10 +120,10 @@ int Uart::read(void) {
 }
 
 size_t Uart::write(uint8_t c) {
-    return write((const uint8_t *)&c, 1);
+    return write((const uint8_t*)&c, 1);
 }
 
-size_t Uart::write(const uint8_t *buffer, size_t size) {
+size_t Uart::write(const uint8_t* buffer, size_t size) {
     size_t left_to_write = size;
     unsigned long time_start_ms = millis();
     uint32_t constexpr timeout_ms = 500;
@@ -138,7 +138,7 @@ size_t Uart::write(const uint8_t *buffer, size_t size) {
             left_to_write > num_bytes_writable ? num_bytes_writable : left_to_write;
         /* Trying to write 0 size will throw an exception. */
         if (bytes_to_write > 0) {
-            cy_rslt_t result = cyhal_uart_write(&uart_obj, (void *)buffer, &bytes_to_write);
+            cy_rslt_t result = cyhal_uart_write(&uart_obj, (void*)buffer, &bytes_to_write);
             if (result != CY_RSLT_SUCCESS) {
                 break;
             }
@@ -158,8 +158,8 @@ uart_error_t Uart::getLastError() {
     return last_error;
 }
 
-void Uart::uart_event_handler(void *handler_arg, cyhal_uart_event_t event) {
-    Uart *uart = static_cast<Uart *>(handler_arg);
+void Uart::uart_event_handler(void* handler_arg, cyhal_uart_event_t event) {
+    Uart* uart = static_cast<Uart*>(handler_arg);
     uart->IrqHandler();
 }
 
diff --git a/cores/psoc6/Uart.h b/cores/psoc6/Uart.h
@@ -23,14 +23,14 @@ class Uart : public arduino::HardwareSerial {
     int read(void);
     void flush(void);
     virtual size_t write(uint8_t c);
-    virtual size_t write(const uint8_t *buffer, size_t size);
+    virtual size_t write(const uint8_t* buffer, size_t size);
 
     using Print::write;
     operator bool();
 
     uart_error_t getLastError();
 
-    static void uart_event_handler(void *handler_arg, cyhal_uart_event_t event);
+    static void uart_event_handler(void* handler_arg, cyhal_uart_event_t event);
 
 private:
     pin_size_t tx_pin;
diff --git a/cores/psoc6/analog_io.c b/cores/psoc6/analog_io.c
@@ -123,6 +123,7 @@ void analogWriteResolution(int res) {
 
 void analogWrite(pin_size_t pinNumber, int value) {
     uint8_t pwm_index = 0;
+    uint8_t pwm_value = value;
     cy_rslt_t result = CY_RSLT_TYPE_ERROR;
 
     if (pinNumber > GPIO_PIN_COUNT) {
@@ -146,19 +147,21 @@ void analogWrite(pin_size_t pinNumber, int value) {
         }
     }
 
-    if (value < 0) {
-        value = 0;
-    }
-    if (value > desiredWriteResolution) {
-        value = desiredWriteResolution;
-    }
+    if (pwm_index < PWM_HOWMANY) {
+        if (value < 0) {
+            pwm_value = 0;
+        }
+        if (value > desiredWriteResolution) {
+            pwm_value = desiredWriteResolution;
+        }
 
-    float duty_cycle_pertentage = (value / desiredWriteResolution) * 100.0f;
+        float duty_cycle_pertentage = (pwm_value / desiredWriteResolution) * 100.0f;
 
-    result =
-        cyhal_pwm_set_duty_cycle(&pwm[pwm_index].pwm_obj, duty_cycle_pertentage, PWM_FREQUENCY_HZ);
-    pwm_assert(result);
+        result = cyhal_pwm_set_duty_cycle(&pwm[pwm_index].pwm_obj, duty_cycle_pertentage,
+                                          PWM_FREQUENCY_HZ);
+        pwm_assert(result);
 
-    result = cyhal_pwm_start(&pwm[pwm_index].pwm_obj);
-    pwm_assert(result);
+        result = cyhal_pwm_start(&pwm[pwm_index].pwm_obj);
+        pwm_assert(result);
+    }
 }
diff --git a/cores/psoc6/interrupts.c b/cores/psoc6/interrupts.c
@@ -53,7 +53,7 @@ void attachInterrupt(pin_size_t interruptNumber, voidFuncPtr callback, PinStatus
             break;
     }
 
-    gpio_callback_data.callback = (void (*)(void *, cyhal_gpio_event_t))callback;
+    gpio_callback_data.callback = (void (*)(void*, cyhal_gpio_event_t))callback;
     cyhal_gpio_register_callback(pin, &gpio_callback_data);
     cyhal_gpio_enable_event(pin, event, GPIO_INTERRUPT_PRIORITY, true);
 }
diff --git a/cores/psoc6/main.cpp b/cores/psoc6/main.cpp
@@ -33,7 +33,7 @@
 
 TaskHandle_t arduino_main_task_handle;
 
-void arduino_main_task(void *arg);
+void arduino_main_task(void* arg);
 
 // Weak empty variant initialization function.
 // May be redefined by variant files.
@@ -64,7 +64,7 @@ int main(void) {
     return 0;
 }
 
-void arduino_main_task(void *arg) {
+void arduino_main_task(void* arg) {
 
     /* Enable global interrupts */
     interrupts();
@@ -74,8 +74,5 @@ void arduino_main_task(void *arg) {
 
     for (;;) {
         loop();
-        if (arduino::serialEventRun) {
-            arduino::serialEventRun();
-        }
     }
 }
diff --git a/libraries/WiFi/src/SecSocket.h b/libraries/WiFi/src/SecSocket.h
@@ -1,6 +1,7 @@
 #ifndef CY_SECURE_SOCKET_H
 #define CY_SECURE_SOCKET_H
 
+#include "Arduino.h"
 #include "api/IPAddress.h"
 #include "api/RingBuffer.h"
 #include "cy_secure_sockets.h"
diff --git a/variants/CY8CKIT-062S2-AI/pins_arduino.h b/variants/CY8CKIT-062S2-AI/pins_arduino.h
@@ -30,102 +30,107 @@
 
 /****** UART CORE DEFINES ******/
 
-#define SERIAL_HOWMANY		2
-#define UART1_TX_PIN      32  // UART_TX P5_1
-#define UART1_RX_PIN      31  // UART_RX P5_0
-#define UART1_CTS_PIN     NC  // NOT CONNECTED
-#define UART1_RTS_PIN     NC  // NOT CONNECTED
-#define UART2_TX_PIN      10  // UART_TX P10_1
-#define UART2_RX_PIN      11  // UART_RX P10_0
-#define UART2_CTS_PIN     NC  // NOT CONNECTED
-#define UART2_RTS_PIN     NC  // NOT CONNECTED
-
-#define I2C_HOWMANY    2
-#define I2C1_SDA_PIN    CYBSP_I2C_SDA
-#define I2C1_SCL_PIN    CYBSP_I2C_SCL
-#define I2C2_SDA_PIN    P9_1
-#define I2C2_SCL_PIN    P9_0
-
-#define SPI_HOWMANY             1
-#define PIN_SPI_MOSI            0 // SPI-MOSI P9_0
-#define PIN_SPI_MISO            1 // SPI-MISO P9_1
-#define PIN_SPI_SCK             2 // SPI-SCLK P9_2
-#define PIN_SPI_SS              3 // IO_0     P9_3
-
+#define SERIAL_HOWMANY 2
+#define UART1_TX_PIN 32  // UART_TX P5_1
+#define UART1_RX_PIN 31  // UART_RX P5_0
+#define UART1_CTS_PIN NC // NOT CONNECTED
+#define UART1_RTS_PIN NC // NOT CONNECTED
+#define UART2_TX_PIN 10  // UART_TX P10_1
+#define UART2_RX_PIN 11  // UART_RX P10_0
+#define UART2_CTS_PIN NC // NOT CONNECTED
+#define UART2_RTS_PIN NC // NOT CONNECTED
+
+#define I2C_HOWMANY 2
+#define I2C1_SDA_PIN CYBSP_I2C_SDA
+#define I2C1_SCL_PIN CYBSP_I2C_SCL
+#define I2C2_SDA_PIN P9_1
+#define I2C2_SCL_PIN P9_0
+
+#define SPI_HOWMANY 1
+#define PIN_SPI_MOSI 0 // SPI-MOSI P9_0
+#define PIN_SPI_MISO 1 // SPI-MISO P9_1
+#define PIN_SPI_SCK 2  // SPI-SCLK P9_2
+#define PIN_SPI_SS 3   // IO_0     P9_3
 static const uint8_t SS = PIN_SPI_SS;
-static const uint8_t MOSI = PIN_SPI_MOSI; 
-static const uint8_t MISO = PIN_SPI_MISO; 
+static const uint8_t MOSI = PIN_SPI_MOSI;
+static const uint8_t MISO = PIN_SPI_MISO;
 static const uint8_t SCK = PIN_SPI_SCK;
 
-#define A0                      0 // ADC P10.1
-#define A1                      1 // ADC P10.0
+#define ADC_HOWMANY 2
+#define ADC_RESOLUTION 12 // ADC resolution in bits, but the observed range is from 0-2^11.
+#define PIN_A0 11         // ADC P10.0
+#define PIN_A1 10         // ADC P10.1
+static const uint8_t A0 = PIN_A0;
+static const uint8_t A1 = PIN_A1;
+
+#define PWM_HOWMANY 14 // Number of output pins that can be PWM channels
 
-#define LED1                    12 // Additional LED1
-#define LED_BUILTIN             LED1 // Standard Arduino LED: Uses LED1
-#define LED2                    13 // Additional LED2
-#define BUTTON1                 14 // Additional BUTTON1
-#define USER_BUTTON             BUTTON1 // Standard Arduino USER_BUTTON: Uses BUTTON1
+#define LED1 12             // Additional LED1
+#define LED_BUILTIN LED1    // Standard Arduino LED: Uses LED1
+#define LED2 13             // Additional LED2
+#define BUTTON1 14          // Additional BUTTON1
+#define USER_BUTTON BUTTON1 // Standard Arduino USER_BUTTON: Uses BUTTON1
 
 //****************************************************************************
 
 #ifdef ARDUINO_GPIO
 
-#ifdef __cplusplus
+    #ifdef __cplusplus
 extern "C" {
-#endif
+    #endif
 
 // Mapping of digital pins and comments
 const cyhal_gpio_t mapping_gpio_pin[] = {
-    /* 0   */ P9_0, // SPI-MOSI         
-    /* 1   */ P9_1, // SPI-MISO        
-    /* 2   */ P9_2, // SPI-SCLK        
-    /* 3   */ P9_3, // IO_0            
-    /* 4   */ P9_4, // IO_1            
-    /* 5   */ P9_5, // IO_2 / PWM1     
-    /* 6   */ P9_6, // IO_3 / PWM2     
-    /* 7   */ P9_7, // IO_4            
-		   
-    /* 8   */ P0_2, // I2C-SCL         
-    /* 9   */ P0_3, // I2C-SDA         
-    /* 10  */ P10_1,// A1 / UART_TX    
-    /* 11  */ P10_0,// A0 / UART_RX    
+    /* 0   */ P9_0, // SPI-MOSI / PWM
+    /* 1   */ P9_1, // SPI-MISO / PWM
+    /* 2   */ P9_2, // SPI-SCLK / PWM
+    /* 3   */ P9_3, // IO_0 / PWM
+    /* 4   */ P9_4, // IO_1 / PWM
+    /* 5   */ P9_5, // IO_2 / PWM
+    /* 6   */ P9_6, // IO_3 / PWM
+    /* 7   */ P9_7, // IO_4 / PWM
+
+    /* 8   */ P0_2,  // I2C-SCL / PWM
+    /* 9   */ P0_3,  // I2C-SDA / PWM
+    /* 10  */ P10_1, // A1 / UART_TX / PWM
+    /* 11  */ P10_0, // A0 / UART_RX / PWM
 
     // on board LEDs and USER BUTTON
 
-    /* 12  */ P5_3, // LED1            
-    /* 13  */ P5_4, // LED2            
-    /* 14  */ P5_2, // USER BUTTON     
+    /* 12  */ P5_3, // LED1
+    /* 13  */ P5_4, // LED2
+    /* 14  */ P5_2, // USER BUTTON
 
     // Additional pins for expansion IO connector - J15 starting here
 
-    /* 15  */ P13_0,// SDHC_DATA00 / SPI-MOSI / UART_RX / I2C-SCL     
-    /* 16  */ P13_1,// SDHC_DATA01 / SPI-MISO / UART_TX / I2C-SDA     
-    /* 17  */ P13_2,// SDHC_DATA02 / SPI-SCLK / IO / PWM             
-    /* 18  */ P13_3,// SDHC_DATA03 / IO / PWM                         
-    /* 19  */ P13_4,// SDHC_DATA10 / UART_RX / I2C-SCL                
-    /* 20  */ P13_5,// SDHC_DATA11 / UART_TX / I2C-SDA                
-    /* 21  */ P13_6,// SDHC_DATA12 / IO / PWM                         
-    /* 22  */ P13_7,// SDHC_DATA13 / IO / PWM                         
-    /* 23  */ P8_2,// SPI-SCLK / IO /PWM                              
-    /* 24  */ P8_1,// SPI-MISO / UART_TX / I2C-SDA / IO / PWM         
-    /* 25  */ P8_0,// SPI-MOSI / UART_RX / I2C-SCL / IO / PWM         
-    /* 26  */ P8_3,// IO / PWM                                        
-    /* 27  */ P8_4,// UART_RX / I2C-SCL / IO /PWM                     
-    /* 28  */ P8_5,// UART_TX / I2C-SDA / IO /PWM                     
-    /* 29  */ P12_4,// SDHC_CMD / IO /PWM                             
-    /* 30  */ P12_5,// SDHC_CLK / IO /PWM
-
-    // Debugger Serial UART pins (not available on connector) 
-    
-    /* 31  */ P5_0, // DEBUG_UART_RX 
-    /* 32  */ P5_1, // DEBUG_UART_TX 
+    /* 15  */ P13_0, // SDHC_DATA00 / SPI-MOSI / UART_RX / I2C-SCL / PWM
+    /* 16  */ P13_1, // SDHC_DATA01 / SPI-MISO / UART_TX / I2C-SDA / PWM
+    /* 17  */ P13_2, // SDHC_DATA02 / SPI-SCLK / IO / PWM
+    /* 18  */ P13_3, // SDHC_DATA03 / IO / PWM
+    /* 19  */ P13_4, // SDHC_DATA10 / UART_RX / I2C-SCL / PWM
+    /* 20  */ P13_5, // SDHC_DATA11 / UART_TX / I2C-SDA / PWM
+    /* 21  */ P13_6, // SDHC_DATA12 / IO / PWM
+    /* 22  */ P13_7, // SDHC_DATA13 / IO / PWM
+    /* 23  */ P8_2,  // SPI-SCLK / IO / PWM
+    /* 24  */ P8_1,  // SPI-MISO / UART_TX / I2C-SDA / IO / PWM
+    /* 25  */ P8_0,  // SPI-MOSI / UART_RX / I2C-SCL / IO / PWM
+    /* 26  */ P8_3,  // IO / PWM
+    /* 27  */ P8_4,  // UART_RX / I2C-SCL / IO / PWM
+    /* 28  */ P8_5,  // UART_TX / I2C-SDA / IO / PWM
+    /* 29  */ P12_4, // SDHC_CMD / IO / PWM
+    /* 30  */ P12_5, // SDHC_CLK / IO / PWM
+
+    // Debugger Serial UART pins (not available on connector)
+
+    /* 31  */ P5_0, // DEBUG_UART_RX
+    /* 32  */ P5_1, // DEBUG_UART_TX
 };
 
 const uint8_t GPIO_PIN_COUNT = (sizeof(mapping_gpio_pin) / sizeof(mapping_gpio_pin[0])) - 1;
 
-#ifdef __cplusplus
+    #ifdef __cplusplus
 }
-#endif /* __cplusplus */
+    #endif /* __cplusplus */
 
 #endif /* ARDUINO_GPIO*/
 

Original file line number	Diff line number	Diff line change
`@@ -120,10 +120,10 @@ int Uart::read(void) {`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`size_t Uart::write(uint8_t c) {`
`123`		`- return write((const uint8_t *)&c, 1);`
	`123`	`+ return write((const uint8_t*)&c, 1);`
`124`	`124`	`}`
`125`	`125`
`126`		`-size_t Uart::write(const uint8_t *buffer, size_t size) {`
	`126`	`+size_t Uart::write(const uint8_t* buffer, size_t size) {`
`127`	`127`	`size_t left_to_write = size;`
`128`	`128`	`unsigned long time_start_ms = millis();`
`129`	`129`	`uint32_t constexpr timeout_ms = 500;`
`@@ -138,7 +138,7 @@ size_t Uart::write(const uint8_t *buffer, size_t size) {`
`138`	`138`	`left_to_write > num_bytes_writable ? num_bytes_writable : left_to_write;`
`139`	`139`	`/* Trying to write 0 size will throw an exception. */`
`140`	`140`	`if (bytes_to_write > 0) {`
`141`		`- cy_rslt_t result = cyhal_uart_write(&uart_obj, (void *)buffer, &bytes_to_write);`
	`141`	`+ cy_rslt_t result = cyhal_uart_write(&uart_obj, (void*)buffer, &bytes_to_write);`
`142`	`142`	`if (result != CY_RSLT_SUCCESS) {`
`143`	`143`	`break;`
`144`	`144`	`}`
`@@ -158,8 +158,8 @@ uart_error_t Uart::getLastError() {`
`158`	`158`	`return last_error;`
`159`	`159`	`}`
`160`	`160`
`161`		`-void Uart::uart_event_handler(void *handler_arg, cyhal_uart_event_t event) {`
`162`		`- Uart uart = static_cast<Uart >(handler_arg);`
	`161`	`+void Uart::uart_event_handler(void* handler_arg, cyhal_uart_event_t event) {`
	`162`	`+ Uart* uart = static_cast<Uart*>(handler_arg);`
`163`	`163`	`uart->IrqHandler();`
`164`	`164`	`}`
`165`	`165`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ void attachInterrupt(pin_size_t interruptNumber, voidFuncPtr callback, PinStatus`
`53`	`53`	`break;`
`54`	`54`	`}`
`55`	`55`
`56`		`- gpio_callback_data.callback = (void ()(void , cyhal_gpio_event_t))callback;`
	`56`	`+ gpio_callback_data.callback = (void ()(void, cyhal_gpio_event_t))callback;`
`57`	`57`	`cyhal_gpio_register_callback(pin, &gpio_callback_data);`
`58`	`58`	`cyhal_gpio_enable_event(pin, event, GPIO_INTERRUPT_PRIORITY, true);`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@`
`33`	`33`
`34`	`34`	`TaskHandle_t arduino_main_task_handle;`
`35`	`35`
`36`		`-void arduino_main_task(void *arg);`
	`36`	`+void arduino_main_task(void* arg);`
`37`	`37`
`38`	`38`	`// Weak empty variant initialization function.`
`39`	`39`	`// May be redefined by variant files.`
`@@ -64,7 +64,7 @@ int main(void) {`
`64`	`64`	`return 0;`
`65`	`65`	`}`
`66`	`66`
`67`		`-void arduino_main_task(void *arg) {`
	`67`	`+void arduino_main_task(void* arg) {`
`68`	`68`
`69`	`69`	`/* Enable global interrupts */`
`70`	`70`	`interrupts();`
`@@ -74,8 +74,5 @@ void arduino_main_task(void *arg) {`
`74`	`74`
`75`	`75`	`for (;;) {`
`76`	`76`	`loop();`
`77`		`- if (arduino::serialEventRun) {`
`78`		`- arduino::serialEventRun();`
`79`		`- }`
`80`	`77`	`}`
`81`	`78`	`}`