Merge branch 'arduino:main' into main

Author: BenjaminDannegard

.github/workflows/compile-examples.yml

@@ -76,6 +76,7 @@ jobs:
               - libraries/RTC/examples/RTC_NTPSync
               - libraries/RTC/examples/RTC_Alarm
               - libraries/SFU
+              - libraries/KVStore/examples/StartCounter
           - board:
               fqbn: "arduino-git:renesas:portenta_c33"
             additional-sketch-paths: |
@@ -91,6 +92,7 @@ jobs:
               - libraries/RTC/examples/RTC_NTPSync
               - libraries/RTC/examples/RTC_Alarm
               - libraries/SFU
+              - libraries/KVStore/examples/StartCounter
           - board:
               fqbn: "arduino:renesas_uno:unor4wifi"
             additional-sketch-paths: |

boards.txt

@@ -12,7 +12,7 @@ portenta_c33.build.fpu=-mfpu=fpv5-sp-d16
 portenta_c33.build.float-abi=-mfloat-abi=hard
 
 portenta_c33.build.board=PORTENTA_C33
-portenta_c33.build.defines=-DF_CPU=200000000 -DPROVIDE_FREERTOS_HOOK
+portenta_c33.build.defines=-DF_CPU=200000000
 portenta_c33.vid.0=0x2341
 portenta_c33.pid.0=0x0068
 portenta_c33.vid.1=0x2341

cores/arduino/analog.cpp

@@ -558,7 +558,10 @@ void analogReference(uint8_t mode) {
   R_ADC_Open(&adc1.ctrl, &adc1.cfg);
 }
 
+#if defined(AVCC_MEASURE_PIN)
 static float aref = 0;
+#endif
+
 float analogReference() {
     switch (adc.cfg_extend.adc_vref_control) {
       case ADC_VREF_CONTROL_1_5V_OUTPUT:
@@ -817,4 +820,4 @@ void analogWrite(pin_size_t pinNumber, int value)
 
 FspTimer* __get_timer_for_channel(int channel) {
   return  pwms.get_from_channel(channel)->get_timer();
-}
+}

cores/arduino/main.cpp

@@ -65,6 +65,7 @@ void unsecure_registers() {
 
 extern "C" void Stacktrace_Handler(void);
 extern "C" __attribute__((weak)) void start_freertos_on_header_inclusion() {}
+extern "C" __attribute__((weak)) void early_start_freertos_on_header_inclusion() {}
 
 void arduino_main(void)
 {
@@ -112,10 +113,9 @@ void arduino_main(void)
    Serial.begin(115200);
 #endif
    startAgt();
+   early_start_freertos_on_header_inclusion();
    setup();
-#ifdef PROVIDE_FREERTOS_HOOK
    start_freertos_on_header_inclusion();
-#endif
    while (1)
    {
       loop();

extras/uno-r4-wifi-usb-bridge

@@ -27,6 +27,27 @@ extern "C" {
 #include "lib/FreeRTOS-Kernel-v10.5.1/semphr.h"
 #include "lib/FreeRTOS-Kernel-v10.5.1/task.h"
 #include "lib/FreeRTOS-Kernel-v10.5.1/timers.h"
+#include <stdbool.h>
+
+
+// If you need to automatically start FREERTOS, declare either EARLY_AUTOSTART_FREERTOS or
+// AUTOSTART_FREERTOS in your library or sketch code (.ino or .cpp file)
+//
+// EARLY_AUTOSTART_FREERTOS -> if you need the scheduler to be already running in setup()
+// AUTOSTART_FREERTOS -> if you only declare the threads in setup() and use them in loop()
+
+void _start_freertos_on_header_inclusion_impl(bool early_start);
+void early_start_freertos_on_header_inclusion();
+void start_freertos_on_header_inclusion();
+#define EARLY_AUTOSTART_FREERTOS \
+    void early_start_freertos_on_header_inclusion() { \
+        _start_freertos_on_header_inclusion_impl(true); \
+    }
+#define AUTOSTART_FREERTOS \
+    void start_freertos_on_header_inclusion() { \
+        _start_freertos_on_header_inclusion_impl(false); \
+    }
+
 
 #ifdef __cplusplus
 }

libraries/Arduino_FreeRTOS/src/Arduino_FreeRTOS.h

@@ -32,6 +32,7 @@
 #include "FreeRTOSConfig.h"
 #include "../../lib/FreeRTOS-Kernel-v10.5.1/FreeRTOS.h"
 #include "../../lib/FreeRTOS-Kernel-v10.5.1/task.h"
+#include "portmacro.h"
 
 #if BSP_TZ_NONSECURE_BUILD
  #include "tz_context.h"
@@ -225,28 +226,34 @@ static void prvTaskExitError(void);
 
 #endif
 
-#ifdef PROVIDE_FREERTOS_HOOK
-void loop_thread_func(void* arg) {
+extern void setup(void);
+extern void loop(void);
+
+static void sketch_thread_func(void* arg) {
+    bool early_start = (bool)arg;
+    if (early_start) {
+        setup();
+    }
     while (1)
     {
         loop();
     }
 }
 
-static TaskHandle_t loop_task;
-void start_freertos_on_header_inclusion() {
-    xTaskCreate(
-      (TaskFunction_t)loop_thread_func,
-      "Loop Thread",
-      4096 / 4,   /* usStackDepth in words */
-      NULL,   /* pvParameters */
-      4,         /* uxPriority */
-      &loop_task /* pxCreatedTask */
-    );
-
-    vTaskStartScheduler();
+void _start_freertos_on_header_inclusion_impl(bool early_start) {
+    static TaskHandle_t sketch_task;
+    if (xTaskGetSchedulerState() != taskSCHEDULER_RUNNING) {
+        xTaskCreate(
+        (TaskFunction_t)sketch_thread_func,
+        "Sketch Thread",
+        4096 / 4,   /* usStackDepth in words */
+        (void*)early_start,   /* pvParameters */
+        4,         /* uxPriority */
+        &sketch_task /* pxCreatedTask */
+        );
+        vTaskStartScheduler();
+    }
 }
-#endif
 
 /* Arduino specific overrides */
 void delay(uint32_t ms) {

libraries/Arduino_FreeRTOS/src/portable/FSP/port.c

@@ -287,7 +287,7 @@ int QSPIFlashBlockDevice::write(const void *buffer, bd_addr_t add, bd_size_t _si
       R_QSPI_BankSet(&ctrl, bank);
       rv = R_QSPI_Write(&ctrl, (uint8_t *)(buffer), (uint8_t*)address, chunk);
       address += chunk;
-      buffer += chunk;
+      buffer = (uint8_t *)(buffer) + chunk;
 
       if(rv == FSP_SUCCESS) {
          rv = get_flash_status();
@@ -328,7 +328,7 @@ int QSPIFlashBlockDevice::erase(bd_addr_t add, bd_size_t _size) {
 
    uint32_t num_of_blocks = (_size / erase_block_size);
 
-   for(int i = 0; i < num_of_blocks && rv == FSP_SUCCESS; i++) {
+   for(uint32_t i = 0; i < num_of_blocks && rv == FSP_SUCCESS; i++) {
       /* set bank */
       uint32_t bank = add / READ_PAGE_SIZE;  
       uint32_t address = base_address + ((add + i * erase_block_size) % READ_PAGE_SIZE);  

libraries/BlockDevices/QSPIFlashBlockDevice.cpp

@@ -70,25 +70,27 @@
 
 class QSPIFlashBlockDevice : public BlockDevice {
 private:
-  bool opened;
-  
+
+  pin_t ck;
+  pin_t cs;
+  pin_t io0;
+  pin_t io1;
+  pin_t io2;
+  pin_t io3;
+
   bd_addr_t base_address;
   bd_size_t total_size;
   bd_size_t read_block_size;
   bd_size_t erase_block_size;
   bd_size_t write_block_size;
 
+  bool opened;
+
   bool is_address_correct(bd_addr_t add);
 
   qspi_instance_ctrl_t  ctrl;
   spi_flash_cfg_t       cfg;
   qspi_extended_cfg_t   ext_cfg;
-  pin_t ck;
-  pin_t cs;
-  pin_t io0;
-  pin_t io1;
-  pin_t io2;
-  pin_t io3;
 
   fsp_err_t get_flash_status();
 

libraries/BlockDevices/QSPIFlashBlockDevice.h

@@ -166,7 +166,6 @@ SDCardBlockDevice::~SDCardBlockDevice() {
 /*                               CALLBACK                                     */
 /* -------------------------------------------------------------------------- */
 void SDCardBlockDevice::SDCardBlockDeviceCbk(sdmmc_callback_args_t *arg) {
-   int open_status = -1;
    if(arg != nullptr) {
       sdmmc_event_t event = arg->event;
 
@@ -368,8 +367,9 @@ int SDCardBlockDevice::read(void *buffer, bd_addr_t add, bd_size_t _size) {
          uint32_t num_of_blocks = (_size / read_block_size);
          uint32_t start_add_of_block = (add / read_block_size);
          rv = FSP_SUCCESS;
-         for(int i = 0; i < num_of_blocks && rv == FSP_SUCCESS; i++) {
-            rv = R_SDHI_Read (&ctrl, (uint8_t *)(buffer + (i * read_block_size)), start_add_of_block + i, 1);
+         for(uint32_t i = 0; i < num_of_blocks && rv == FSP_SUCCESS; i++) {
+           uint8_t *buf = (uint8_t *)buffer;
+            rv = R_SDHI_Read (&ctrl, buf + (i * read_block_size), start_add_of_block + i, 1);
             if(rv == FSP_SUCCESS) {
                rv = wait_for_completition();
             }
@@ -404,8 +404,9 @@ int SDCardBlockDevice::write(const void *buffer, bd_addr_t add, bd_size_t _size)
          uint32_t num_of_blocks = (_size / write_block_size);
          uint32_t start_block_number = (add / write_block_size);
          rv = FSP_SUCCESS;
-         for(int i = 0; i < num_of_blocks && rv == FSP_SUCCESS; i++) {
-            rv = R_SDHI_Write (&ctrl, (uint8_t *)(buffer + (i * write_block_size)), start_block_number + i, 1);
+         for(uint32_t i = 0; i < num_of_blocks && rv == FSP_SUCCESS; i++) {
+            uint8_t *buf = (uint8_t *)buffer;
+            rv = R_SDHI_Write (&ctrl, buf + (i * write_block_size), start_block_number + i, 1);
             if(rv == FSP_SUCCESS) {
                rv = wait_for_completition();
             }
@@ -439,7 +440,7 @@ int SDCardBlockDevice::erase(bd_addr_t add, bd_size_t _size) {
          uint32_t num_of_blocks = (_size / erase_block_size);
          uint32_t start_block_number = (add / erase_block_size);
          rv = FSP_SUCCESS;
-         for(int i = 0; i < num_of_blocks && rv == FSP_SUCCESS; i++) {
+         for(uint32_t i = 0; i < num_of_blocks && rv == FSP_SUCCESS; i++) {
             rv = R_SDHI_Erase (&ctrl, start_block_number + i, 1);
             if(rv == FSP_SUCCESS) {
                rv = wait_for_completition();