Merge pull request #414 from facchinm/freertos_hook_move

Allow FreeRTOS hook for C33 only and improve its reliability
arduino · Dec 12, 2024 · 51b909d · 51b909d
2 parents 95113d2 + b83fd20
commit 51b909d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/boards.txt b/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
+portenta_c33.build.defines=-DF_CPU=200000000 -DPROVIDE_FREERTOS_HOOK
 portenta_c33.vid.0=0x2341
 portenta_c33.pid.0=0x0068
 portenta_c33.vid.1=0x2341

diff --git a/cores/arduino/main.cpp b/cores/arduino/main.cpp
@@ -112,8 +112,10 @@ void arduino_main(void)
    Serial.begin(115200);
 #endif
    startAgt();
-   start_freertos_on_header_inclusion();
    setup();
+#ifdef PROVIDE_FREERTOS_HOOK
+   start_freertos_on_header_inclusion();
+#endif
    while (1)
    {
       loop();

diff --git a/libraries/Arduino_FreeRTOS/src/portable/FSP/port.c b/libraries/Arduino_FreeRTOS/src/portable/FSP/port.c
@@ -225,8 +225,8 @@ static void prvTaskExitError(void);
 
 #endif
 
+#ifdef PROVIDE_FREERTOS_HOOK
 void loop_thread_func(void* arg) {
-    setup();
     while (1)
     {
         loop();
@@ -246,6 +246,7 @@ void start_freertos_on_header_inclusion() {
 
     vTaskStartScheduler();
 }
+#endif
 
 /* Arduino specific overrides */
 void delay(uint32_t ms) {