Reduced ram allocation for some tasks

Ultrawipf · Ultrawipf · commit 3aa7aa0b4a24 · 2022-08-31T17:46:58.000+02:00
diff --git a/Firmware/FFBoard/Src/CommandInterface.cpp b/Firmware/FFBoard/Src/CommandInterface.cpp
@@ -297,8 +297,8 @@ void CDC_CommandInterface::sendReplies(const std::vector<CommandResult>& results
 void CDC_CommandInterface::batchDone(){
 	if(resultsBuffer.empty())
 		return;
-	Notify();
 	resultsBuffer.shrink_to_fit();
+	Notify();
 }
 
 /**
@@ -324,7 +324,7 @@ bool CDC_CommandInterface::readyToSend(){
  */
 
 extern UARTPort external_uart; // defined in cpp_target_config.cpp
-UART_CommandInterface::UART_CommandInterface(uint32_t baud) : UARTDevice(external_uart),Thread("UARTCMD", 256, 36),StringCommandInterface(512), baud(baud){ //
+UART_CommandInterface::UART_CommandInterface(uint32_t baud) : UARTDevice(external_uart),Thread("UARTCMD", 150, 36),StringCommandInterface(512), baud(baud){ //
 	uartconfig = uartport->getConfig();
 	if(baud != 0){
 		uartconfig.BaudRate = this->baud;
@@ -399,7 +399,7 @@ void UART_CommandInterface::uartRcv(char& buf){
 void UART_CommandInterface::batchDone(){
 	if(resultsBuffer.empty())
 		return;
-	Notify();
 	resultsBuffer.shrink_to_fit();
+	Notify();
 }
 
diff --git a/Firmware/FFBoard/Src/HidCommandInterface.cpp b/Firmware/FFBoard/Src/HidCommandInterface.cpp
@@ -19,7 +19,7 @@
 
 
 HID_CommandInterface* HID_CommandInterface::globalInterface = nullptr;
-HID_CommandInterface::HID_CommandInterface() : cpp_freertos::Thread("HIDCMD",256,18){
+HID_CommandInterface::HID_CommandInterface() : cpp_freertos::Thread("HIDCMD",128,18){
 	globalInterface = this;
 	this->Start();
 }
diff --git a/Firmware/FFBoard/Src/USBdevice.cpp b/Firmware/FFBoard/Src/USBdevice.cpp
@@ -11,7 +11,7 @@
 uint16_t _desc_str[USB_STRING_DESC_BUF_SIZE]; // String buffer
 
 USBdevice::USBdevice(const tusb_desc_device_t* deviceDesc,const uint8_t (*confDesc),const usb_string_desc_t* strings) :
-Thread("USB", 350, 40), desc_device(deviceDesc), desc_conf(confDesc), string_desc(strings) {
+Thread("USB", 256, 40), desc_device(deviceDesc), desc_conf(confDesc), string_desc(strings) {
 
 }
 
diff --git a/Firmware/FFBoard/UserExtensions/Src/EncoderBissC.cpp b/Firmware/FFBoard/UserExtensions/Src/EncoderBissC.cpp
@@ -24,7 +24,7 @@ const ClassIdentifier EncoderBissC::getInfo(){
 EncoderBissC::EncoderBissC() :
 		SPIDevice(ENCODER_SPI_PORT, ENCODER_SPI_PORT.getCsPins()[0]),
 		CommandHandler("bissenc",CLSID_ENCODER_BISS,0),
-		cpp_freertos::Thread("BISSENC",256,42) {
+		cpp_freertos::Thread("BISSENC",64,42) {
 	EncoderBissC::inUse = true;
 
 
diff --git a/Firmware/FFBoard/UserExtensions/Src/TMC4671.cpp b/Firmware/FFBoard/UserExtensions/Src/TMC4671.cpp
@@ -2873,7 +2873,7 @@ void TMC4671::setUpExtEncTimer(){
 /**
  * Medium priority task to update external encoders
  */
-TMC4671::TMC_ExternalEncoderUpdateThread::TMC_ExternalEncoderUpdateThread(TMC4671* tmc) : cpp_freertos::Thread("TMCENC",128,33),tmc(tmc){
+TMC4671::TMC_ExternalEncoderUpdateThread::TMC_ExternalEncoderUpdateThread(TMC4671* tmc) : cpp_freertos::Thread("TMCENC",80,33),tmc(tmc){
 	this->Start();
 }
 
diff --git a/Firmware/Targets/F407VG/Core/Inc/FreeRTOSConfig.h b/Firmware/Targets/F407VG/Core/Inc/FreeRTOSConfig.h
@@ -67,7 +67,7 @@
 #define configCPU_CLOCK_HZ                       ( SystemCoreClock )
 #define configTICK_RATE_HZ                       ((TickType_t)1000)
 #define configMAX_PRIORITIES                     ( 56 )
-#define configMINIMAL_STACK_SIZE                 ((uint16_t)128)
+#define configMINIMAL_STACK_SIZE                 ((uint16_t)64)
 #define configTOTAL_HEAP_SIZE                    ((size_t)0xffff)
 #define configMAX_TASK_NAME_LEN                  ( 16 )
 #define configUSE_TRACE_FACILITY                 1
@@ -94,7 +94,7 @@
 #define configUSE_TIMERS                         1
 #define configTIMER_TASK_PRIORITY                ( 2 )
 #define configTIMER_QUEUE_LENGTH                 10
-#define configTIMER_TASK_STACK_DEPTH             256
+#define configTIMER_TASK_STACK_DEPTH             128
 
 /* The following flag must be enabled only when using newlib */
 #define configUSE_NEWLIB_REENTRANT          1
diff --git a/Firmware/Targets/F407VG/Core/Src/main.c b/Firmware/Targets/F407VG/Core/Src/main.c
@@ -83,7 +83,7 @@ PCD_HandleTypeDef hpcd_USB_OTG_FS;
 osThreadId_t defaultTaskHandle;
 const osThreadAttr_t defaultTask_attributes = {
   .name = "defaultTask",
-  .stack_size = 1024 * 4,
+  .stack_size = 512 * 4,
   .priority = (osPriority_t) osPriorityBelowNormal,
 };
 /* USER CODE BEGIN PV */
diff --git a/Firmware/Targets/F407VG/OpenFFBoard_F407VG.ioc b/Firmware/Targets/F407VG/OpenFFBoard_F407VG.ioc
@@ -163,12 +163,14 @@ Dma.SPI3_TX.7.Priority=DMA_PRIORITY_MEDIUM
 Dma.SPI3_TX.7.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority,FIFOMode
 FREERTOS.FootprintOK=true
 FREERTOS.HEAP_NUMBER=4
-FREERTOS.IPParameters=Tasks01,configENABLE_FPU,configTOTAL_HEAP_SIZE,FootprintOK,configUSE_NEWLIB_REENTRANT,HEAP_NUMBER,configUSE_IDLE_HOOK,configUSE_MALLOC_FAILED_HOOK,configCHECK_FOR_STACK_OVERFLOW,configGENERATE_RUN_TIME_STATS,configRECORD_STACK_HIGH_ADDRESS,configUSE_STATS_FORMATTING_FUNCTIONS,configUSE_TRACE_FACILITY
-FREERTOS.Tasks01=defaultTask,16,1024,StartDefaultTask,As weak,NULL,Dynamic,NULL,NULL
+FREERTOS.IPParameters=Tasks01,configENABLE_FPU,configTOTAL_HEAP_SIZE,FootprintOK,configUSE_NEWLIB_REENTRANT,HEAP_NUMBER,configUSE_IDLE_HOOK,configUSE_MALLOC_FAILED_HOOK,configCHECK_FOR_STACK_OVERFLOW,configGENERATE_RUN_TIME_STATS,configRECORD_STACK_HIGH_ADDRESS,configUSE_STATS_FORMATTING_FUNCTIONS,configUSE_TRACE_FACILITY,configTIMER_TASK_STACK_DEPTH,configMINIMAL_STACK_SIZE
+FREERTOS.Tasks01=defaultTask,16,512,StartDefaultTask,As weak,NULL,Dynamic,NULL,NULL
 FREERTOS.configCHECK_FOR_STACK_OVERFLOW=2
 FREERTOS.configENABLE_FPU=1
 FREERTOS.configGENERATE_RUN_TIME_STATS=0
+FREERTOS.configMINIMAL_STACK_SIZE=64
 FREERTOS.configRECORD_STACK_HIGH_ADDRESS=1
+FREERTOS.configTIMER_TASK_STACK_DEPTH=128
 FREERTOS.configTOTAL_HEAP_SIZE=0xffff
 FREERTOS.configUSE_IDLE_HOOK=1
 FREERTOS.configUSE_MALLOC_FAILED_HOOK=1
@@ -717,7 +719,7 @@ ProjectManager.FreePins=false
 ProjectManager.HalAssertFull=false
 ProjectManager.HeapSize=0x400
 ProjectManager.KeepUserCode=true
-ProjectManager.LastFirmware=true
+ProjectManager.LastFirmware=false
 ProjectManager.LibraryCopy=1
 ProjectManager.MainLocation=Core/Src
 ProjectManager.MultiThreaded=true

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`
`20`	`20`
`21`	`21`	`HID_CommandInterface* HID_CommandInterface::globalInterface = nullptr;`
`22`		`-HID_CommandInterface::HID_CommandInterface() : cpp_freertos::Thread("HIDCMD",256,18){`
	`22`	`+HID_CommandInterface::HID_CommandInterface() : cpp_freertos::Thread("HIDCMD",128,18){`
`23`	`23`	`globalInterface = this;`
`24`	`24`	`this->Start();`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`uint16_t _desc_str[USB_STRING_DESC_BUF_SIZE]; // String buffer`
`12`	`12`
`13`	`13`	`USBdevice::USBdevice(const tusb_desc_device_t* deviceDesc,const uint8_t (confDesc),const usb_string_desc_t strings) :`
`14`		`-Thread("USB", 350, 40), desc_device(deviceDesc), desc_conf(confDesc), string_desc(strings) {`
	`14`	`+Thread("USB", 256, 40), desc_device(deviceDesc), desc_conf(confDesc), string_desc(strings) {`
`15`	`15`
`16`	`16`	`}`
`17`	`17`
Original file line number	Diff line number	Diff line change
`@@ -2873,7 +2873,7 @@ void TMC4671::setUpExtEncTimer(){`
`2873`	`2873`	`/**`
`2874`	`2874`	`* Medium priority task to update external encoders`
`2875`	`2875`	`*/`
`2876`		`-TMC4671::TMC_ExternalEncoderUpdateThread::TMC_ExternalEncoderUpdateThread(TMC4671* tmc) : cpp_freertos::Thread("TMCENC",128,33),tmc(tmc){`
	`2876`	`+TMC4671::TMC_ExternalEncoderUpdateThread::TMC_ExternalEncoderUpdateThread(TMC4671* tmc) : cpp_freertos::Thread("TMCENC",80,33),tmc(tmc){`
`2877`	`2877`	`this->Start();`
`2878`	`2878`	`}`
`2879`	`2879`