pico multicore fix

rtlopez · rtlopez · Jan 24, 2025 · Aug 8, 2024 · Aug 8, 2024 · Aug 8, 2024
commit c487cc4cc2aec6820f5f76b8ae13c55d915ad987
diff --git a/lib/Espfc/src/Target/TargetESP32.h b/lib/Espfc/src/Target/TargetESP32.h
@@ -90,4 +90,4 @@
 
 #define ESPFC_DSP
 
-#include "Target/TargetEsp32Common.h"
+#include "./TargetEsp32Common.h"
diff --git a/lib/Espfc/src/Target/TargetESP32c3.h b/lib/Espfc/src/Target/TargetESP32c3.h
@@ -72,8 +72,6 @@
 
 #define ESPFC_FEATURE_MASK (FEATURE_RX_SERIAL | FEATURE_DYNAMIC_FILTER)
 
-#define ESPFC_GUARD 0
-
 #define ESPFC_GYRO_I2C_RATE_MAX 1000
 #define ESPFC_GYRO_SPI_RATE_MAX 2000
 

diff --git a/lib/Espfc/src/Target/TargetESP32s2.h b/lib/Espfc/src/Target/TargetESP32s2.h
@@ -69,8 +69,6 @@
 
 #define ESPFC_FEATURE_MASK (FEATURE_RX_SERIAL | FEATURE_DYNAMIC_FILTER)
 
-#define ESPFC_GUARD 0
-
 #define ESPFC_GYRO_I2C_RATE_MAX 2000
 #define ESPFC_GYRO_SPI_RATE_MAX 2000
 

diff --git a/lib/Espfc/src/Target/TargetESP32s3.h b/lib/Espfc/src/Target/TargetESP32s3.h
@@ -84,8 +84,6 @@
 
 #define ESPFC_FEATURE_MASK (FEATURE_RX_SERIAL | FEATURE_DYNAMIC_FILTER)
 
-#define ESPFC_GUARD 0
-
 #define ESPFC_GYRO_I2C_RATE_MAX 2000
 #define ESPFC_GYRO_SPI_RATE_MAX 4000
 

diff --git a/lib/Espfc/src/Target/TargetESP8266.h b/lib/Espfc/src/Target/TargetESP8266.h
@@ -51,8 +51,6 @@
 
 #define ESPFC_FEATURE_MASK (FEATURE_RX_PPM | FEATURE_DYNAMIC_FILTER)
 
-#define ESPFC_GUARD 1
-
 #define ESPFC_GYRO_I2C_RATE_MAX 1000
 #define ESPFC_GYRO_SPI_RATE_MAX 1000
 

diff --git a/lib/Espfc/src/Target/TargetRP2040.h b/lib/Espfc/src/Target/TargetRP2040.h
@@ -67,17 +67,14 @@
 
 #define ESPFC_FEATURE_MASK (FEATURE_RX_SERIAL | FEATURE_DYNAMIC_FILTER)
 
-#define ESPFC_GUARD 0
-
 #if defined(ARCH_RP2350)
-#define ESPFC_GYRO_I2C_RATE_MAX 1000
 #define ESPFC_GYRO_SPI_RATE_MAX 4000
 #else
-#define ESPFC_GYRO_I2C_RATE_MAX 1000
 #define ESPFC_GYRO_SPI_RATE_MAX 1000
+#endif
+#define ESPFC_GYRO_I2C_RATE_MAX 1000
 #define ESPFC_MULTI_CORE
 #define ESPFC_MULTI_CORE_RP2040
-#endif
 
 #include "Device/SerialDevice.h"
 #include "Debug_Espfc.h"

diff --git a/lib/Espfc/src/Target/TargetUnitTest.h b/lib/Espfc/src/Target/TargetUnitTest.h
@@ -14,8 +14,6 @@
 #define ESPFC_OUTPUT_PROTOCOL ESC_PROTOCOL_DISABLED
 #define ESPFC_FEATURE_MASK (0)
 
-#define ESPFC_GUARD 1
-
 #define ESPFC_GYRO_I2C_RATE_MAX 2000
 #define ESPFC_GYRO_SPI_RATE_MAX 8000
 

diff --git a/src/main.cpp b/src/main.cpp
@@ -101,19 +101,25 @@ Espfc::Espfc espfc;
 
   #elif defined(ESPFC_MULTI_CORE_RP2040)
 
+    bool core1_separate_stack = true;
+    volatile bool setup_done = false;
+
     // RP2040 multicore
-    void setup1()
-    {
-    }
+    // TODO: https://emalliab.wordpress.com/2021/04/18/raspberry-pi-pico-arduino-core-and-timers/
     void setup()
     {
       espfc.load();
       espfc.begin();
+      setup_done = true;
     }
     void loop()
     {
       espfc.update();
     }
+    void setup1()
+    {
+      while(!setup_done);
+    }
     void loop1()
     {
       espfc.updateOther();
Original file line number	Diff line number	Diff line change
		@@ -90,4 +90,4 @@

		#define ESPFC_DSP

		#include "Target/TargetEsp32Common.h"
		#include "./TargetEsp32Common.h"