Fix for bare metal core1

Author: awawa-dev

.github/workflows/push-master.yml

@@ -84,6 +84,7 @@ jobs:
         cmake -DOVERRIDE_BOOT_WORKAROUND=ON -DOVERRIDE_DATA_PIN=14 -DCMAKE_BUILD_TYPE=Release ..
         cmake --build .
         rm ../firmware/*_Spi.uf2
+        rm ../firmware/*_ws2801.uf2
         zip -j ../firmware/Adafruit_ItsyBitsy_RP2040.zip ../firmware/*
 
     - uses: actions/upload-artifact@v7.0.0
@@ -104,6 +105,7 @@ jobs:
         cmake -DOVERRIDE_DATA_PIN=15 -DCMAKE_BUILD_TYPE=Release ..
         cmake --build .
         rm ../firmware/*_Spi.uf2
+        rm ../firmware/*_ws2801.uf2
         zip -j ../firmware/Pimoroni_Plasma_Stick_RP2040_W.zip ../firmware/*
 
     - uses: actions/upload-artifact@v7.0.0

CMakeLists.txt

@@ -68,7 +68,7 @@ pico_sdk_init()
 
 # generic HyperSerialPico settings
 set(HyperSerialPicoCompanionIncludes ${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/sdk/config)
-set(HyperSerialPicoCompanionLibs FreeRTOS-Kernel freertos_config FreeRTOS-Kernel-Heap4 pico_stdlib pico_multicore hardware_pio hardware_dma hardware_spi)
+set(HyperSerialPicoCompanionLibs FreeRTOS-Kernel freertos_config FreeRTOS-Kernel-Heap1 pico_stdlib pico_multicore hardware_pio hardware_dma hardware_spi)
 file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/generated)
 file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/firmware)
 

include/base.h

@@ -46,7 +46,6 @@ class Base
 		TaskHandle_t processDataHandle = nullptr;
 		TaskHandle_t processSerialHandle = nullptr;
 		// semaphore to synchronize them
-		semaphore_t serialSemaphore;
 		SemaphoreHandle_t receiverSemaphore;
 		// current queue position
 		volatile int queueCurrent = 0;

include/calibration.h

@@ -129,7 +129,7 @@ class CalibrationConfig
 		void printCalibration(char (&output)[N])
 		{
 			snprintf(output, N, "RGBW => Gain: %i/255, red: %i, green: %i, blue: %i\r\n", gain, red, green, blue);
-			fputs(output, stdout);
+			tud_cdc_write_str(output);
 		}
 } calibrationConfig;
 

include/main.h

@@ -73,7 +73,6 @@ void processData()
 		if (base.queueCurrent >= MAX_BUFFER)
 		{
 			base.queueCurrent = 0;
-			yield();
 		}
 
 		switch (frameState.getState())
@@ -294,8 +293,6 @@ void processData()
 				currentTime = millis();
 				deltaTime = currentTime - statistics.getStartTime();
 				updateMainStatistics(currentTime, deltaTime, true);
-
-				yield();
 			}
 
 			frameState.setState(AwaProtocol::HEADER_A);

include/statistics.h

@@ -130,24 +130,23 @@ class
 			multicore_fifo_push_blocking(0xFF);
 		}
 
-		void printToSerial(TaskHandle_t taskHandle1, TaskHandle_t taskHandle2)
+		void printToSerial(TaskHandle_t taskHandleCore0)
 		{
 			char output[128];
 
-			snprintf(output, sizeof(output), "HyperHDR frames: %u (FPS), receiv.: %u, good: %u, incompl.: %u, mem1: %i, mem2: %i, heap: %zu\r\n",
+			snprintf(output, sizeof(output), "HyperHDR frames: %u (FPS), receiv.: %u, good: %u, incompl.: %u, core0: %i, heap: %zu\r\n",
 						finalShowFrames, finalTotalFrames,finalGoodFrames,(finalTotalFrames - finalGoodFrames),
-						(taskHandle1 != nullptr) ? uxTaskGetStackHighWaterMark(taskHandle1) : 0,
-						(taskHandle2 != nullptr) ? uxTaskGetStackHighWaterMark(taskHandle2) : 0,
+						(taskHandleCore0 != nullptr) ? uxTaskGetStackHighWaterMark(taskHandleCore0) : 0,
 						xPortGetFreeHeapSize());
-			fputs(output, stdout);
+			tud_cdc_write_str(output);
 
 			#if defined(NEOPIXEL_RGBW)
 				calibrationConfig.printCalibration(output);
 			#endif
 
 			if (welcomeMessage.exchange(false))
 			{
-				fputs(HELLO_MESSAGE, stdout);
+				tud_cdc_write_str(HELLO_MESSAGE);
 			}
 		}
 

source/main.cpp

@@ -30,6 +30,7 @@
 
 #include "FreeRTOS.h"
 #include "task.h"
+#include "tusb.h"
 #include "pico/multicore.h"
 #include "hardware/irq.h"
 #include "semphr.h"
@@ -136,10 +137,8 @@ static void core1()
 {
     for( ;; )
     {
-        if (sem_acquire_timeout_us(&base.serialSemaphore, portMAX_DELAY))
-        {
-            processData();
-        }
+        [[maybe_unused]] auto val = multicore_fifo_pop_blocking();
+        processData();
     }
 }
 
@@ -153,7 +152,11 @@ static void core0( void *pvParameters )
             do
             {
                 wanted = std::min(MAX_BUFFER - base.queueEnd, MAX_BUFFER - 1);
-                received = stdio_usb.in_chars((char*)(&(base.buffer[base.queueEnd])), wanted);
+
+                if (stdio_usb_connected() && tud_cdc_available()) {
+                    received = (int)tud_cdc_read(const_cast<uint8_t*>(&(base.buffer[base.queueEnd])), (uint32_t)wanted);
+                }
+
                 if (received > 0)
                 {
                     base.queueEnd = (base.queueEnd + received) % (MAX_BUFFER);
@@ -162,19 +165,28 @@ static void core0( void *pvParameters )
 
             if (statistics.printLogs.exchange(false))
             {
-                statistics.printToSerial(base.processDataHandle, base.processSerialHandle);
+                statistics.printToSerial(base.processSerialHandle);
+                tud_cdc_write_flush();
+                vTaskDelay(pdMS_TO_TICKS(5));
             }
 
-            sem_release(&base.serialSemaphore);
+            multicore_fifo_push_blocking(0xAA);
         }
     }
 }
 
 static void serialEvent(void *)
 {
-    BaseType_t xHigherPriorityTaskWoken = pdFALSE;
-    xSemaphoreGiveFromISR(base.receiverSemaphore, &xHigherPriorityTaskWoken);
-    portYIELD_FROM_ISR(xHigherPriorityTaskWoken);
+    if (xPortIsInsideInterrupt())
+    {
+        BaseType_t xHigherPriorityTaskWoken = pdFALSE;
+        xSemaphoreGiveFromISR(base.receiverSemaphore, &xHigherPriorityTaskWoken);
+        portYIELD_FROM_ISR(xHigherPriorityTaskWoken);
+    }
+    else
+    {
+        xSemaphoreGive(base.receiverSemaphore);
+    }
 }
 
 void on_fifo_irq()
@@ -190,8 +202,6 @@ int main(void)
 {
     stdio_init_all();
 
-    sem_init(&base.serialSemaphore, 0, 1);
-
     base.receiverSemaphore = xSemaphoreCreateBinary();
 
     multicore_fifo_clear_irq();