Merge pull request arduino#68 from bcmi-labs/freertos-santiago

[Arduino FreeRTOS] Add support for Uno R4 WiFi and Minima

Former-commit-id: bda4a18

Author: facchinm

libraries/Arduino_FreeRTOS/examples/FreeRTOS-Blink/FreeRTOS-Blink.ino

@@ -19,8 +19,11 @@ void setup()
   Serial.begin(115200);
   while (!Serial) { }
 
+#if defined(ARDUINO_PORTENTA_H33)
+  /* Only the Portenta C33 has an RGB LED. */
   pinMode(LEDR, OUTPUT);
   digitalWrite(LEDR, LOW);
+#endif
 
   /* Init a task that calls 'loop'
    * since after the call to
@@ -69,7 +72,12 @@ void setup()
 
 void loop()
 {
+#if defined(ARDUINO_PORTENTA_H33)
+  /* Only the Portenta C33 has an RGB LED. */
   digitalWrite(LEDR, !digitalRead(LEDR));
+#else
+  Serial.println(millis());
+#endif
   vTaskDelay(configTICK_RATE_HZ/4);
 }
 

libraries/Arduino_FreeRTOS/library.properties

@@ -2,7 +2,7 @@ name=Arduino_FreeRTOS
 version=1.0.0
 author=Arduino
 maintainer=Arduino <[email protected]>
-sentence=This library provides FreeRTOS for the Portenta C33.
+sentence=This library provides FreeRTOS for the Portenta C33, Uno R4 Minima / WiFi.
 paragraph=
 category=Other
 url=

libraries/Arduino_FreeRTOS/src/Arduino_FreeRTOS.h

@@ -10,8 +10,8 @@
 
 #pragma once
 
-#ifndef ARDUINO_PORTENTA_H33
-# error "FreeRTOS is currently only supported for the Portenta C33."
+#if !defined(ARDUINO_PORTENTA_H33) && !defined(ARDUINO_SANTIAGO) && !defined(ARDUINO_SANTIAGO_COMPOSTA)
+# error "FreeRTOS is currently only supported for the Portenta C33, Arduino Uno R4 Minima and Arduino Uno R4 WiFi."
 #endif
 
 #ifdef __cplusplus

libraries/Arduino_FreeRTOS/src/FreeRTOSConfig.h

@@ -117,7 +117,13 @@ FSP_HEADER
 #define configSUPPORT_DYNAMIC_ALLOCATION (1)
 #endif
 #ifndef configTOTAL_HEAP_SIZE
-#define configTOTAL_HEAP_SIZE (0x8000)
+# if defined(ARDUINO_PORTENTA_H33)
+#   define configTOTAL_HEAP_SIZE (0x8000)
+# elif (defined(ARDUINO_SANTIAGO) || defined(ARDUINO_SANTIAGO_COMPOSTA))
+#   define configTOTAL_HEAP_SIZE (0x2000) /* R7FA4M1AB has 32 kByte RAM total, so we only allocate 8 kByte RAM for FreeRTOS heap. */
+# else
+#  error "Define the total allowed heap size dependent on your MCU's available RAM."
+# endif
 #endif
 #ifndef configAPPLICATION_ALLOCATED_HEAP
 #define configAPPLICATION_ALLOCATED_HEAP (4)

libraries/Arduino_FreeRTOS/src/lib/FreeRTOS-Kernel-v10.5.1/portable.h

@@ -50,7 +50,7 @@
  * included here.  In this case the path to the correct portmacro.h header file
  * must be set in the compiler's include path. */
 #ifndef portENTER_CRITICAL
-    #include "../../portable/GCC/RA6M5/portmacro.h"
+    #include "../../portable/FSP/portmacro.h"
 #endif
 
 #if portBYTE_ALIGNMENT == 32

libraries/Arduino_FreeRTOS/src/portable/GCC/RA6M5/port.c renamed to libraries/Arduino_FreeRTOS/src/portable/FSP/port.c

@@ -30,8 +30,8 @@
 /* Scheduler includes. */
 #include "bsp_api.h"
 #include "FreeRTOSConfig.h"
-#include "../../../lib/FreeRTOS-Kernel-v10.5.1/FreeRTOS.h"
-#include "../../../lib/FreeRTOS-Kernel-v10.5.1/task.h"
+#include "../../lib/FreeRTOS-Kernel-v10.5.1/FreeRTOS.h"
+#include "../../lib/FreeRTOS-Kernel-v10.5.1/task.h"
 
 #if BSP_TZ_NONSECURE_BUILD
  #include "tz_context.h"

libraries/Arduino_FreeRTOS/src/portable/GCC/RA6M5/portmacro.h renamed to libraries/Arduino_FreeRTOS/src/portable/FSP/portmacro.h

@@ -36,14 +36,14 @@ extern "C" {
  * is defined correctly and privileged functions are placed in correct sections. */
  #define MPU_WRAPPERS_INCLUDED_FROM_API_FILE
 
- #include "../../../lib/FreeRTOS-Kernel-v10.5.1/mpu_wrappers.h"
+ #include "../../lib/FreeRTOS-Kernel-v10.5.1/mpu_wrappers.h"
 
 /* MPU_WRAPPERS_INCLUDED_FROM_API_FILE is needed to be defined only for the
  * header files. */
  #undef MPU_WRAPPERS_INCLUDED_FROM_API_FILE
 
 /* Needed for definitions of pdFALSE and pdTRUE. */
- #include "../../../lib/FreeRTOS-Kernel-v10.5.1/projdefs.h"
+ #include "../../lib/FreeRTOS-Kernel-v10.5.1/projdefs.h"
 
 /*-----------------------------------------------------------
  * Port specific definitions.