Merge branch 'arduino:main' into main

isidromv · web-flow · commit 6bc894ca485c · 2024-05-21T11:06:25.000+02:00
diff --git a/.github/workflows/compile-examples.yml b/.github/workflows/compile-examples.yml
@@ -87,11 +87,13 @@ jobs:
           - board:
               fqbn: "arduino:renesas_uno:unor4wifi"
             additional-sketch-paths: |
+              - libraries/Arduino_LED_Matrix
               - libraries/WiFiS3
               - libraries/OTAUpdate
           - board:
               fqbn: "arduino-git:renesas:unor4wifi"
             additional-sketch-paths: |
+              - libraries/Arduino_LED_Matrix
               - libraries/WiFiS3
               - libraries/OTAUpdate
               - libraries/OPAMP
@@ -157,6 +159,7 @@ jobs:
             - name: ArduinoDMX
             - name: ArduinoRS485
             - name: ArduinoIoTCloud
+            - name: ArduinoGraphics
           platforms: |
             # Use Board Manager to install the latest release of Arduino Renesas Boards to get the toolchain
             - name: "arduino:renesas_uno"
diff --git a/cores/arduino/IRQManager.cpp b/cores/arduino/IRQManager.cpp
@@ -38,6 +38,28 @@ IRQManager& IRQManager::getInstance() {
     return instance;
 }
 
+bool IRQManager::addGenericInterrupt(GenericIrqCfg_t &cfg, Irq_f fnc /*= nullptr*/){
+    /* getting the address of the current location of the irq vector table */
+    volatile uint32_t *irq_ptr = (volatile uint32_t *)SCB->VTOR;
+    /* set the displacement to the "programmable" part of the table */
+    irq_ptr += FIXED_IRQ_NUM;
+    bool rv = false;
+    
+    if((cfg.irq == FSP_INVALID_VECTOR) && (last_interrupt_index < PROG_IRQ_NUM)) {
+    	if(fnc != nullptr){
+    		R_ICU->IELSR[last_interrupt_index] = cfg.event;
+    		*(irq_ptr + last_interrupt_index) = (uint32_t)fnc;
+    		R_BSP_IrqDisable((IRQn_Type)last_interrupt_index);
+    		R_BSP_IrqStatusClear((IRQn_Type)last_interrupt_index);
+    		NVIC_SetPriority((IRQn_Type)last_interrupt_index, cfg.ipl);
+    		R_BSP_IrqEnable ((IRQn_Type)last_interrupt_index);
+    		cfg.irq = (IRQn_Type)last_interrupt_index;
+    		last_interrupt_index++;
+    		rv = true;
+    	}
+    }
+	return rv;
+}
 
 bool IRQManager::addADCScanEnd(ADC_Container *adc, Irq_f fnc /*= nullptr*/) {
     /* getting the address of the current location of the irq vector table */
diff --git a/cores/arduino/IRQManager.h b/cores/arduino/IRQManager.h
@@ -125,6 +125,11 @@ typedef struct timer {
     agt_extended_cfg_t *agt_ext_cfg;
 } TimerIrqCfg_t;
 
+typedef struct genericIrq {
+	IRQn_Type irq;
+	uint8_t ipl;
+	elc_event_t event;
+} GenericIrqCfg_t;
 
 
 #ifdef __cplusplus
@@ -199,7 +204,8 @@ class IRQManager {
        it returns true if the interrupt is correctly added */
     bool addDMA(dmac_extended_cfg_t &cfg, Irq_f fnc = nullptr);
 #endif
-
+    
+    bool addGenericInterrupt(GenericIrqCfg_t &cfg, Irq_f fnc = nullptr);
     bool addTimerOverflow(TimerIrqCfg_t &cfg, Irq_f fnc = nullptr);
     bool addTimerUnderflow(TimerIrqCfg_t &cfg, Irq_f fnc = nullptr);
     bool addTimerCompareCaptureA(TimerIrqCfg_t &cfg, Irq_f fnc = nullptr);
diff --git a/libraries/Arduino_CAN/src/CanUtil.cpp b/libraries/Arduino_CAN/src/CanUtil.cpp
@@ -28,7 +28,7 @@ namespace util
  **************************************************************************************/
 
 std::tuple<bool, uint32_t, uint32_t, uint32_t>
-  calc_can_bit_timing(CanBitRate const can_bitrate,
+  calc_can_bit_timing(uint32_t const can_bitrate,
                       uint32_t const can_clock_Hz,
                       uint32_t const tq_min,
                       uint32_t const tq_max,
diff --git a/libraries/Arduino_CAN/src/CanUtil.h b/libraries/Arduino_CAN/src/CanUtil.h
@@ -36,7 +36,7 @@ std::tuple<bool,     /* valid result found */
            uint32_t, /* baud_rate_prescaler */
            uint32_t, /* time_segment_1 */
            uint32_t> /* time_segment_2 */
-calc_can_bit_timing(CanBitRate const can_bitrate, uint32_t const can_clock_Hz, uint32_t const tq_min, uint32_t const tq_max,
+calc_can_bit_timing(uint32_t const can_bitrate, uint32_t const can_clock_Hz, uint32_t const tq_min, uint32_t const tq_max,
                     uint32_t const tseg1_min, uint32_t const tseg1_max, uint32_t const tseg2_min, uint32_t const tseg2_max);
 
 /**************************************************************************************
diff --git a/libraries/Arduino_CAN/src/R7FA4M1_CAN.cpp b/libraries/Arduino_CAN/src/R7FA4M1_CAN.cpp
@@ -137,6 +137,11 @@ R7FA4M1_CAN::R7FA4M1_CAN(int const can_tx_pin, int const can_rx_pin)
  **************************************************************************************/
 
 bool R7FA4M1_CAN::begin(CanBitRate const can_bitrate)
+{
+  return begin(static_cast<uint32_t>(can_bitrate)); 
+}
+
+bool R7FA4M1_CAN::begin(uint32_t const can_bitrate)
 {
   bool init_ok = true;
 
diff --git a/libraries/Arduino_CAN/src/R7FA4M1_CAN.h b/libraries/Arduino_CAN/src/R7FA4M1_CAN.h
@@ -52,6 +52,7 @@ class R7FA4M1_CAN final : public HardwareCAN
 
 
   bool begin(CanBitRate const can_bitrate) override;
+  bool begin(uint32_t const can_bitrate);
   void end() override;
 
   void setFilterMask_Standard(uint32_t const mask);
diff --git a/libraries/Arduino_CAN/src/R7FA6M5_CAN.cpp b/libraries/Arduino_CAN/src/R7FA6M5_CAN.cpp
@@ -100,6 +100,11 @@ R7FA6M5_CAN::R7FA6M5_CAN(int const can_tx_pin, int const can_rx_pin)
  **************************************************************************************/
 
 bool R7FA6M5_CAN::begin(CanBitRate const can_bitrate)
+{
+  return begin(static_cast<uint32_t>(can_bitrate));
+}
+
+bool R7FA6M5_CAN::begin(uint32_t const can_bitrate)
 {
   bool init_ok = true;
 
diff --git a/libraries/Arduino_CAN/src/R7FA6M5_CAN.h b/libraries/Arduino_CAN/src/R7FA6M5_CAN.h
@@ -54,6 +54,7 @@ class R7FA6M5_CAN final : public HardwareCAN
 
 
   bool begin(CanBitRate const can_bitrate) override;
+  bool begin(uint32_t const can_bitrate);
   void end() override;
 
 
diff --git a/libraries/Arduino_FreeRTOS/src/Arduino_FreeRTOS.h b/libraries/Arduino_FreeRTOS/src/Arduino_FreeRTOS.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2022 by Alexander Entinger <a.entinger@arduino.cc>
- * CAN library for Arduino.
+ * FreeRTOS library for Arduino.
  *
  * This file is free software; you can redistribute it and/or modify
  * it under the terms of either the GNU General Public License version 2
diff --git a/libraries/Arduino_LED_Matrix/examples/DisplaySingleFrame/DisplaySingleFrame.ino b/libraries/Arduino_LED_Matrix/examples/DisplaySingleFrame/DisplaySingleFrame.ino
@@ -34,6 +34,10 @@ void loop() {
   matrix.loadFrame(LEDMATRIX_HEART_BIG);
   delay(500);
 
+  // Turn off the display
+  matrix.clear();
+  delay(1000);
+
   // Print the current value of millis() to the serial monitor
   Serial.println(millis());
 }
diff --git a/libraries/Arduino_LED_Matrix/src/Arduino_LED_Matrix.h b/libraries/Arduino_LED_Matrix/src/Arduino_LED_Matrix.h
@@ -169,10 +169,10 @@ class ArduinoLEDMatrix
     void off(size_t pin) {
         turnLed(pin, false);
     }
-    bool begin() {
+    int begin() {
         bool rv = true;
         uint8_t type;
-        uint8_t ch = FspTimer::get_available_timer(type);
+        int8_t ch = FspTimer::get_available_timer(type);
         if(ch == -1) {
             return false;
         }
@@ -253,6 +253,16 @@ class ArduinoLEDMatrix
         _callBack = callBack;
     }
 
+    void clear() {
+        const uint32_t fullOff[] = {
+        	0x00000000,
+        	0x00000000,
+        	0x00000000
+        };
+        loadFrame(fullOff);
+    }
+
+
 #ifdef MATRIX_WITH_ARDUINOGRAPHICS
     virtual void set(int x, int y, uint8_t r, uint8_t g, uint8_t b) {
       if (y >= canvasHeight || x >= canvasWidth || y < 0 || x < 0) {
diff --git a/libraries/SE05X/src/lib/platform/arduino/sm_port.cpp b/libraries/SE05X/src/lib/platform/arduino/sm_port.cpp
@@ -23,7 +23,7 @@ void smlog_print(const char *format, ...) {
     char debug_buf[1024];   
     va_list argptr;
     va_start(argptr, format);
-    vsprintf(debug_buf, format, argptr);
+    vsnprintf(debug_buf, sizeof(debug_buf), format, argptr);
     va_end(argptr);
     Serial.print(debug_buf);
 }
diff --git a/libraries/SSLClient/src/ssl_debug.cpp b/libraries/SSLClient/src/ssl_debug.cpp
@@ -23,7 +23,7 @@ void ssl_debug_print(const char *format, ...) {
     char debug_buf[1024];   
     va_list argptr;
     va_start(argptr, format);
-    vsprintf(debug_buf, format, argptr);
+    vsnprintf(debug_buf, sizeof(debug_buf), format, argptr);
     va_end(argptr);
     Serial.print(debug_buf);
 }
@@ -32,7 +32,7 @@ void ssl_debug_println(const char *format, ...) {
     char debug_buf[1024];   
     va_list argptr;
     va_start(argptr, format);
-    vsprintf(debug_buf, format, argptr);
+    vsnprintf(debug_buf, sizeof(debug_buf), format, argptr);
     va_end(argptr);
     Serial.println(debug_buf);
 }
diff --git a/libraries/SoftwareSerial/src/SoftwareSerial.h b/libraries/SoftwareSerial/src/SoftwareSerial.h
@@ -57,7 +57,7 @@ template <size_t N> struct ss_descr_t {
     fsp_dma_t dma;
     fsp_pin_t pin;
     int irq_chan;
-    ::RingBuffer<char> ringbuf;
+    ::RingBuffer<uint8_t> ringbuf;
     uint32_t dmabuf[N][SS_MAX_FRAME_SIZE] __attribute__((aligned(4)));
     ss_descr_t(size_t bufsize): irq_chan(-1), ringbuf(bufsize) {
     }
diff --git a/libraries/WiFiS3/src/Modem.cpp b/libraries/WiFiS3/src/Modem.cpp
@@ -88,10 +88,9 @@ bool ModemClass::passthrough(const uint8_t *data, size_t size) {
 /* -------------------------------------------------------------------------- */
 void ModemClass::write_nowait(const string &cmd, string &str, char * fmt, ...) {
 /* -------------------------------------------------------------------------- */   
-   memset(tx_buff,0x00,MAX_BUFF_SIZE);
    va_list va;
    va_start (va, fmt);
-   vsprintf ((char *)tx_buff, fmt, va);
+   vsnprintf((char *)tx_buff, MAX_BUFF_SIZE, fmt, va);
    va_end (va);
    
    if(_serial_debug && _debug_level >= 2) { 
@@ -109,10 +108,9 @@ void ModemClass::write_nowait(const string &cmd, string &str, char * fmt, ...) {
 bool ModemClass::write(const string &prompt, string &data_res, char * fmt, ...){
 /* -------------------------------------------------------------------------- */  
    data_res.clear();
-   memset(tx_buff,0x00,MAX_BUFF_SIZE);
    va_list va;
    va_start (va, fmt);
-   vsprintf ((char *)tx_buff, fmt, va);
+   vsnprintf((char *)tx_buff, MAX_BUFF_SIZE, fmt, va);
    va_end (va);
   
    if(_serial_debug) {
diff --git a/libraries/Wire/Wire.cpp b/libraries/Wire/Wire.cpp
@@ -30,8 +30,8 @@ extern "C" {
 
 #include "Wire.h"
 
-TwoWire *TwoWire::g_SCIWires[TWOWIRE_MAX_I2C_CHANNELS] = {nullptr};
-TwoWire *TwoWire::g_I2CWires[TWOWIRE_MAX_SCI_CHANNELS] = {nullptr};
+TwoWire *TwoWire::g_SCIWires[TWOWIRE_MAX_SCI_CHANNELS] = {nullptr};
+TwoWire *TwoWire::g_I2CWires[TWOWIRE_MAX_I2C_CHANNELS] = {nullptr};
 
 /* -------------------------------------------------------------------------- */
 void TwoWire::setBusStatus(WireStatus_t ws) {
@@ -437,25 +437,28 @@ void TwoWire::end(void) {
   if(init_ok) {
     if(is_master) {
       if(m_close != nullptr) {
-        m_close(&m_i2c_ctrl);
         R_BSP_IrqDisable (m_i2c_cfg.txi_irq);
         R_BSP_IrqDisable (m_i2c_cfg.rxi_irq);
         R_BSP_IrqDisable (m_i2c_cfg.tei_irq);
         R_BSP_IrqDisable (m_i2c_cfg.eri_irq);
-          
+        m_close(&m_i2c_ctrl);  
       }
     }
     else {
       if(s_close != nullptr) {
-        s_close(&s_i2c_ctrl);
         R_BSP_IrqDisable (s_i2c_cfg.txi_irq);
         R_BSP_IrqDisable (s_i2c_cfg.rxi_irq);
         R_BSP_IrqDisable (s_i2c_cfg.tei_irq);
         R_BSP_IrqDisable (s_i2c_cfg.eri_irq);
+        s_close(&s_i2c_ctrl);
         
       }
     }
   }
+  /* fix for slave that create a sort of lock on the I2C bus when end is called and the master
+     is not more able to get the I2C buse working */
+  R_IOPORT_PinCfg(NULL, g_pin_cfg[sda_pin].pin, IOPORT_CFG_PORT_DIRECTION_INPUT | IOPORT_CFG_PULLUP_ENABLE);
+  R_IOPORT_PinCfg(NULL, g_pin_cfg[scl_pin].pin, IOPORT_CFG_PORT_DIRECTION_INPUT | IOPORT_CFG_PULLUP_ENABLE);
   init_ok = false;
 }
 
diff --git a/libraries/Wire/Wire.h b/libraries/Wire/Wire.h
@@ -152,8 +152,8 @@ class TwoWire : public arduino::HardwareI2C {
 
   private:
     
-    static TwoWire *g_SCIWires[TWOWIRE_MAX_I2C_CHANNELS];
-    static TwoWire *g_I2CWires[TWOWIRE_MAX_SCI_CHANNELS];
+    static TwoWire *g_SCIWires[TWOWIRE_MAX_SCI_CHANNELS];
+    static TwoWire *g_I2CWires[TWOWIRE_MAX_I2C_CHANNELS];
     
     static void WireSCIMasterCallback(i2c_master_callback_args_t *);
     static void WireMasterCallback(i2c_master_callback_args_t *);
diff --git a/libraries/lwIpWrapper/src/CNetIf.cpp b/libraries/lwIpWrapper/src/CNetIf.cpp
@@ -1567,10 +1567,9 @@ char b_dbg[512];
 extern "C" void printDbg(const char* fmt, ...)
 {
 
-    memset(b_dbg, 0x00, 256);
     va_list va;
     va_start(va, fmt);
-    vsprintf(b_dbg, fmt, va);
+    vsnprintf(b_dbg, sizeof(b_dbg), fmt, va);
     va_end(va);
 
     Serial.println(b_dbg);
diff --git a/svd/R7FA4M1AB.svd b/svd/R7FA4M1AB.svd

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ class R7FA6M5_CAN final : public HardwareCAN`
`54`	`54`
`55`	`55`
`56`	`56`	`bool begin(CanBitRate const can_bitrate) override;`
	`57`	`+ bool begin(uint32_t const can_bitrate);`
`57`	`58`	`void end() override;`
`58`	`59`
`59`	`60`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`/*`
`2`	`2`	`* Copyright (c) 2022 by Alexander Entinger <[email protected]>`
`3`		`- * CAN library for Arduino.`
	`3`	`+ * FreeRTOS library for Arduino.`
`4`	`4`	`*`
`5`	`5`	`* This file is free software; you can redistribute it and/or modify`
`6`	`6`	`* it under the terms of either the GNU General Public License version 2`