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,12 @@ 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@release-v4.4
+        with:
+          target: esp32s2
+          path: './Firmware/Targets/ESP32S2'
+
       - uses: actions/upload-artifact@v2
         with:
           name: OpenFFBoard-Firmware-${{ matrix.target }}

Firmware/FFBoard/Inc/CommandInterface.h

@@ -16,7 +16,7 @@
 
 #ifdef HW_ESP32S2
 #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_ESP32S2
+#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

@@ -15,7 +15,7 @@
 
 #ifdef HW_ESP32S2
 #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

@@ -24,7 +24,7 @@
 
 #ifdef HW_ESP32S2
 #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

@@ -15,7 +15,7 @@
 
 #ifdef HW_ESP32S2
 #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

@@ -17,7 +17,7 @@
 
 #ifdef HW_ESP32S2
 #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,7 +22,7 @@ extern "C" {
 
 #include "eeprom_addresses.h"
 #include "main.h"
-
+#include "DebugLog.h"
 
 void cppmain();
 #ifndef HW_ESP32S2

Firmware/FFBoard/Src/CommandInterface.cpp

@@ -223,7 +223,7 @@ void StringCommandInterface::generateReplyFromCmd(std::string& replyPart,const P
  */
 
 
-CDC_CommandInterface::CDC_CommandInterface() : StringCommandInterface(32), Thread("CDCCMD", 512, 37) {
+CDC_CommandInterface::CDC_CommandInterface() : StringCommandInterface(32), Thread("CDCCMD", COMMANDINTERFACE_THREAD_MEM, COMMANDINTERFACE_THREAD_PRIO) {
 	parser.setClearBufferTimeout(parserTimeout);
 	this->Start();
 }
@@ -252,11 +252,13 @@ void CDC_CommandInterface::Run(){
 void CDC_CommandInterface::sendReplies(const std::vector<CommandResult>& results,CommandInterface* originalInterface){
 
 	if(HAL_GetTick() - lastSendTime > parserTimeout){
+		FFB_LOGE("parserTimeout");
 		resultsBuffer.clear(); // Empty buffer because we were not able to reply in time to prevent the full buffer from blocking future commands
 		//CDCcomm::clearRemainingBuffer(0);
 	}
 
 	if( (!enableBroadcastFromOtherInterfaces && originalInterface != this) ){
+		FFB_LOGW("not originalInterface");
 		return;
 	}
 	lastSendTime = HAL_GetTick();

Firmware/FFBoard/Src/FFBoardMainCommandThread.cpp

@@ -126,8 +126,11 @@ void FFBoardMainCommandThread::executeCommands(std::vector<ParsedCommand> comman
 				while(!itf->readyToSend() && --remainingTime){
 					Delay(1);
 				}
-				if(remainingTime)
+				if(remainingTime) {
 					itf->sendReplies(results, commandInterface);
+				} else {
+					FFB_LOGE("sendReplies wait for ready timeout");
+				}
 			}
 		}
 	}