update tinyusb

Author: TDA-2030

.github/workflows/build-firmware.yml

@@ -6,6 +6,7 @@ on:
     branches: 
       - master
       - development
+      - feature/add_esp32s2
   pull_request:
     branches:
       - master
@@ -30,6 +31,8 @@ jobs:
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v2
+        with:
+          submodules: 'recursive'
 
       - run: mkdir -p /tmp/armtc # make temp directory
 
@@ -54,6 +57,13 @@ jobs:
           make -C ./Firmware clean
           make -j16 -C ./Firmware MCU_TARGET=${{ matrix.target }} OUTPUT_DIR=Output
 
+      - name: Build ESP32S2
+        uses: espressif/esp-idf-ci-action@main
+        with:
+          esp_idf_version: v4.4
+          target: esp32s2
+          path: './Firmware/Targets/ESP32S2'
+
       - uses: actions/upload-artifact@v2
         with:
           name: OpenFFBoard-Firmware-${{ matrix.target }}

Firmware/FFBoard/Inc/CommandInterface.h

@@ -14,9 +14,9 @@
 #include "thread.hpp"
 #include "CommandHandler.h"
 
-#ifdef HW_ESP32S2
+#ifdef HW_ESP32SX
 #define COMMANDINTERFACE_THREAD_MEM 2048
-#define COMMANDINTERFACE_THREAD_PRIO 9
+#define COMMANDINTERFACE_THREAD_PRIO (36*25/56)
 #else
 #define COMMANDINTERFACE_THREAD_MEM 256
 #define COMMANDINTERFACE_THREAD_PRIO 36

Firmware/FFBoard/Inc/DebugLog.h

@@ -0,0 +1,40 @@
+
+#ifndef DEBUGLOG_H_
+#define DEBUGLOG_H_
+
+#include "target_constants.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// LOG DEBUG
+#ifdef HW_ESP32SX
+#define FFB_LOGI(format, ...) do {                                          \
+            ESP_LOGI(__FILE__, "%s(%d): " format, __FUNCTION__, __LINE__ __VA_OPT__(,) __VA_ARGS__);        \
+    } while(0)
+#define FFB_LOGW(format, ...) do {                                          \
+            ESP_LOGW(__FILE__, "%s(%d): " format, __FUNCTION__, __LINE__ __VA_OPT__(,) __VA_ARGS__);        \
+    } while(0)
+#define FFB_LOGE(format, ...) do {                                          \
+            ESP_LOGE(__FILE__, "%s(%d): " format, __FUNCTION__, __LINE__ __VA_OPT__(,) __VA_ARGS__);        \
+    } while(0)
+#define FFB_LOGD(format, ...) do {                                          \
+            ESP_LOGD(__FILE__, "%s(%d): " format, __FUNCTION__, __LINE__ __VA_OPT__(,) __VA_ARGS__);        \
+    } while(0)
+
+#else
+
+#define FFB_LOGI(format, ...) 
+#define FFB_LOGW(format, ...) 
+#define FFB_LOGE(format, ...) 
+#define FFB_LOGD(format, ...) 
+
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* DEBUGLOG_H_ */

Firmware/FFBoard/Inc/ErrorHandler.h

@@ -13,9 +13,9 @@
 #include "CommandHandler.h"
 #include "target_constants.h"
 
-#ifdef HW_ESP32S2
+#ifdef HW_ESP32SX
 #define ERROR_PRINTER_MEM 4096
-#define ERROR_PRINTER_PRIO 10
+#define ERROR_PRINTER_PRIO 19*25/56
 #else
 #define ERROR_PRINTER_MEM 512
 #define ERROR_PRINTER_PRIO 19

Firmware/FFBoard/Inc/FFBoardMainCommandThread.h

@@ -22,9 +22,9 @@
 
 #include "CommandInterface.h"
 
-#ifdef HW_ESP32S2
+#ifdef HW_ESP32SX
 #define FFBOARDMAINCOMMANDTHREAD_MEM 4096
-#define FFBOARDMAINCOMMANDTHREAD_PRIO 6
+#define FFBOARDMAINCOMMANDTHREAD_PRIO 35*25/56
 #else
 #define FFBOARDMAINCOMMANDTHREAD_MEM 1024
 #define FFBOARDMAINCOMMANDTHREAD_PRIO 35

Firmware/FFBoard/Inc/HidCommandInterface.h

@@ -13,9 +13,9 @@
 #include "ffb_defs.h"
 #include "CommandHandler.h"
 
-#ifdef HW_ESP32S2
+#ifdef HW_ESP32SX
 #define HID_COMMANDINTERFACE_MEM 2048
-#define HID_COMMANDINTERFACE_PRIO 10
+#define HID_COMMANDINTERFACE_PRIO 18*25/56
 #else
 #define HID_COMMANDINTERFACE_MEM 256
 #define HID_COMMANDINTERFACE_PRIO 18

Firmware/FFBoard/Inc/USBdevice.h

@@ -15,9 +15,9 @@
 
 #define USB_STRING_DESC_BUF_SIZE 32
 
-#ifdef HW_ESP32S2
+#ifdef HW_ESP32SX
 #define USBDEVICE_MEM 4096
-#define USBDEVICE_PRIO 10
+#define USBDEVICE_PRIO 40*25/56
 #else
 #define USBDEVICE_MEM 256
 #define USBDEVICE_PRIO 40

Firmware/FFBoard/Inc/cppmain.h

@@ -22,10 +22,10 @@ extern "C" {
 
 #include "eeprom_addresses.h"
 #include "main.h"
-
+#include "DebugLog.h"
 
 void cppmain();
-#ifndef HW_ESP32S2
+#ifndef HW_ESP32SX
 #include "cmsis_compiler.h"
 void usb_init();
 void tudThread(void *argument);
@@ -34,7 +34,7 @@ void tudThread(void *argument);
 }
 
 static inline bool inIsr(){
-#ifdef HW_ESP32S2
+#ifdef HW_ESP32SX
 	return xPortInIsrContext();
 #else
 	return (__get_PRIMASK() != 0U) || (__get_IPSR() != 0U);
@@ -58,7 +58,7 @@ T clip(T v, C l, C h)
 {
   return { v > h ? h : v < l ? l : v };
 }
-#ifdef HW_ESP32S2
+#ifdef HW_ESP32SX
 #define micros() esp_timer_get_time() // Returns microsecond scaled time
 #else
 uint32_t micros(); // Returns microsecond scaled time

Firmware/FFBoard/Inc/critical.hpp

@@ -65,7 +65,7 @@ class CriticalSection {
          */
         static inline void Enter()
         {
-            #ifndef HW_ESP32S2
+            #ifndef HW_ESP32SX
             taskENTER_CRITICAL();
             #endif
         }
@@ -75,7 +75,7 @@ class CriticalSection {
          */
         static inline void Exit()
         {
-            #ifndef HW_ESP32S2
+            #ifndef HW_ESP32SX
             taskEXIT_CRITICAL();
             #endif
         }

Firmware/FFBoard/Inc/tickhook.hpp

@@ -44,7 +44,7 @@
 #include "task.h"
 #include <list>
 
-#if ( configUSE_TICK_HOOK == 1) && !defined(HW_ESP32S2)
+#if ( configUSE_TICK_HOOK == 1) && !defined(HW_ESP32SX)
 
 /**
  *  FreeRTOS expects this function to exist and requires it to be