Further toolchain build tests/debugging

- revert back to standard toolchain
- Fix USB deadlock
- Fix CS timing problem on SPI flash

Author: jankae

.github/workflows/Build.yml

@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - main
-      - siglent
+      - build_FW_test
   pull_request:
     branches:
       - main
@@ -207,13 +207,7 @@ jobs:
       - name: Install toolchain
         run: |
           sudo apt-get update
-          sudo apt install -y build-essential binutils-arm-none-eabi 
-
-          # Ubuntu 24.04 comes with version 10.3 of the ARM GCC toolchain. For some reason builds with that version result in buggy file reading/writing and unstable USB connections.
-          # Manually install older version of the toolchain which does not have the problem
-          wget https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2020q2/gcc-arm-none-eabi-9-2020-q2-update-x86_64-linux.tar.bz2
-          tar -xvjf gcc-arm-none-eabi-9-2020-q2-update-x86_64-linux.tar.bz2 -C /opt
-
+          sudo apt install -y build-essential gcc-arm-none-eabi binutils-arm-none-eabi 
           sudo git clone https://github.com/raspberrypi/pico-sdk.git /opt/pico-sdk
           sudo git -C /opt/pico-sdk checkout 2.1.1
           sudo git -C /opt/pico-sdk submodule update --init
@@ -236,7 +230,6 @@ jobs:
       - name: Build application
         run: |
           export PICO_SDK_PATH=/opt/pico-sdk
-          export PATH=/opt/gcc-arm-none-eabi-9-2020-q2-update/bin:$PATH
           cd Software/LibreCAL
           mkdir build && cd build
           cmake ..

Software/LibreCAL/src/Flash.cpp

@@ -3,15 +3,13 @@
 #include "FreeRTOS.h"
 #include "task.h"
 #include <cstring>
+#include "pico/time.h"
 
 #include <stdio.h>
 
-#define LOG_DEBUG(s, ...) //printf(s, __VA_ARGS__)
-#define LOG_INFO(s...) //printf(s)
-#define LOG_ERR(s...) //printf(s)
-//#define LOG_ERR(s, ...) printf(s, __VA_ARGS__)
-//#define LOG_ERR(s, ...) printf(s, __VA_ARGS__)
-//#define LOG_ERR(s, ...) printf(s, __VA_ARGS__)
+#define LOG_LEVEL	LOG_LEVEL_INFO
+#define LOG_MODULE	"Flash"
+#include "Log.h"
 
 bool Flash::isPresent() {
 	xSemaphoreTakeRecursive(mutex, portMAX_DELAY);
@@ -50,16 +48,16 @@ void Flash::read(uint32_t address, uint16_t length, void *dest) {
 	xSemaphoreGiveRecursive(mutex);
 }
 
-bool Flash::write(uint32_t address, uint16_t length, const void *src) {
+bool Flash::write(uint32_t address, uint16_t length, const uint8_t *src) {
 	xSemaphoreTakeRecursive(mutex, portMAX_DELAY);
 	if(address % PageSize != 0 || length%PageSize != 0) {
 		// only writes to complete pages allowed
-		LOG_ERR("Invalid write address/size: %lu/%u", address, length);
+		LOG_ERR("Invalid write address/size: 0x%08x/%u", address, length);
 		xSemaphoreGiveRecursive(mutex);
 		return false;
 	}
 	address &= 0x00FFFFFF;
-	LOG_DEBUG("Writing %u bytes to address %lu", length, address);
+	LOG_DEBUG("Writing %u bytes to address 0x%08x", length, address);
 	while(length > 0) {
 		EnableWrite();
 		CS(false);
@@ -101,6 +99,7 @@ void Flash::EnableWrite() {
 	uint8_t wel = 0x06;
 	spi_write_blocking(spi, &wel, 1);
 	CS(true);
+	sleep_us(1);
 }
 
 bool Flash::eraseChip() {
@@ -111,14 +110,15 @@ bool Flash::eraseChip() {
 	uint8_t chip_erase = 0x60;
 	spi_write_blocking(spi, &chip_erase, 1);
 	CS(true);
+	sleep_us(1);
 	return WaitBusy(25000);
 }
 
 bool Flash::eraseSector(uint32_t address) {
 	xSemaphoreTakeRecursive(mutex, portMAX_DELAY);
 	// align address with sector address
 	address -= address % SectorSize;
-	LOG_INFO("Erasing sector at %lu", address);
+	LOG_INFO("Erasing sector at 0x%08x", address);
 	EnableWrite();
 	CS(false);
 	uint8_t cmd[4] = {
@@ -129,6 +129,7 @@ bool Flash::eraseSector(uint32_t address) {
 	};
 	spi_write_blocking(spi, cmd, 4);
 	CS(true);
+	sleep_us(1);
 	bool ret =  WaitBusy(25000);
 	xSemaphoreGiveRecursive(mutex);
 	return ret;
@@ -138,7 +139,7 @@ bool Flash::erase32Block(uint32_t address) {
 	xSemaphoreTakeRecursive(mutex, portMAX_DELAY);
 	// align address with block address
 	address -= address % Block32Size;
-	LOG_INFO("Erasing 32kB block at %lu", address);
+	LOG_INFO("Erasing 32kB block at 0x%08x", address);
 	EnableWrite();
 	CS(false);
 	uint8_t cmd[4] = {
@@ -149,6 +150,7 @@ bool Flash::erase32Block(uint32_t address) {
 	};
 	spi_write_blocking(spi, cmd, 4);
 	CS(true);
+	sleep_us(1);
 	bool ret =  WaitBusy(25000);
 	xSemaphoreGiveRecursive(mutex);
 	return ret;
@@ -158,7 +160,7 @@ bool Flash::erase64Block(uint32_t address) {
 	xSemaphoreTakeRecursive(mutex, portMAX_DELAY);
 	// align address with block address
 	address -= address % Block64Size;
-	LOG_INFO("Erasing 64kB block at %lu", address);
+	LOG_INFO("Erasing 64kB block at 0x%08x", address);
 	EnableWrite();
 	CS(false);
 	uint8_t cmd[4] = {

Software/LibreCAL/src/Flash.hpp

@@ -24,7 +24,7 @@ class Flash {
 
 	bool isPresent();
 	void read(uint32_t address, uint16_t length, void *dest);
-	bool write(uint32_t address, uint16_t length, const void *src);
+	bool write(uint32_t address, uint16_t length, const uint8_t *src);
 	bool eraseChip();
 	bool eraseSector(uint32_t address);
 	bool erase32Block(uint32_t address);

Software/LibreCAL/src/Touchstone.cpp

@@ -6,6 +6,10 @@
 #include <cstdio>
 #include <cstring>
 
+#define LOG_LEVEL	LOG_LEVEL_INFO
+#define LOG_MODULE	"Touchstone"
+#include "Log.h"
+
 static FIL writeFile;
 static bool writeFileOpen = false;
 
@@ -324,6 +328,7 @@ extern FATFS fs1;
 
 bool Touchstone::clearFactory() {
 	if(!writeFactory) {
+		LOG_ERR("Factory deletion not allowed");
 		return false;
 	}
 
@@ -335,16 +340,21 @@ bool Touchstone::clearFactory() {
 
 	// format the factory drive
 	BYTE work[FF_MAX_SS];
-	if(f_mkfs("1:", 0, work, sizeof(work)) != FR_OK) {
+	FRESULT status;
+	if((status = f_mkfs("1:", 0, work, sizeof(work))) != FR_OK) {
+		LOG_ERR("mkfs failed: %d", status);
 		return false;
 	}
-	if(f_setlabel("1:LibreCAL_R") != FR_OK) {
+	if((status = f_mount(&fs1, "1:", 1)) != FR_OK) {
+		LOG_ERR("mount failed: %d", status);
 		return false;
 	}
-	if(f_mount(&fs1, "1:", 1) != FR_OK) {
+	if((status = f_setlabel("1:LibreCAL_R")) != FR_OK) {
+		LOG_ERR("set label failed: %d", status);
 		return false;
 	}
 
+
     // needs to recreate the information file
     return createInfoFile();
 }

Software/LibreCAL/src/USB/usb.c

@@ -108,10 +108,12 @@ static void tinyUSB_task(void* ptr) {
 	}
 }
 
+static TaskHandle_t usb_task;
+
 void usb_init(usbd_recv_callback_t receive_callback) {
 	callback = receive_callback;
 	tud_init(0);
-	xTaskCreate(tinyUSB_task, "TinyUSB", 1024, NULL, 1, NULL);
+	xTaskCreate(tinyUSB_task, "TinyUSB", 1024, NULL, 3, &usb_task);
 }
 bool usb_transmit(const uint8_t *data, uint16_t length, uint8_t i) {
 	if(i == USB_INTERFACE_CDC) {

Software/LibreCAL/src/freertos.c

@@ -3,13 +3,16 @@
 
 void vApplicationGetIdleTaskMemory( StaticTask_t **ppxIdleTaskTCBBuffer, StackType_t **ppxIdleTaskStackBuffer, uint32_t *pulIdleTaskStackSize );
 
-void vApplicationStackOverflowHook(xTaskHandle xTask, signed char *pcTaskName);
+void vApplicationStackOverflowHook(xTaskHandle xTask, char *pcTaskName);
 
-__attribute__((weak)) void vApplicationStackOverflowHook(xTaskHandle xTask, signed char *pcTaskName)
+__attribute__((weak)) void vApplicationStackOverflowHook(xTaskHandle xTask, char *pcTaskName)
 {
    /* Run time stack overflow checking is performed if
    configCHECK_FOR_STACK_OVERFLOW is defined to 1 or 2. This hook function is
    called if a stack overflow is detected. */
+	while(1) {
+
+	}
 }
 
 static StaticTask_t xIdleTaskTCBBuffer;

Software/LibreCAL/src/main.cpp

@@ -166,6 +166,8 @@ static void defaultTask(void* ptr) {
 	}
 }
 
+static TaskHandle_t main_task;
+
 int main(void) {
 #ifdef ENABLE_UART
 	Log_Init();
@@ -209,7 +211,7 @@ int main(void) {
 	Heater::SetTarget(35);
 	SCPI::Init(usb_transmit);
 
-	xTaskCreate(defaultTask, "defaultTask", 16384, NULL, 3, NULL);
+	xTaskCreate(defaultTask, "defaultTask", 16384, NULL, 3, &main_task);
 
 	vTaskStartScheduler();
 	return 0;