Merge branch 'main' of gitlab.enterpriselab.ch:adis_team_gueti_roaster/adis_hs2022_team_4 into main

# Conflicts:
#	ADIS_tinyK22_SplitFlap/source/multi-splitflap.h

ADIS_tinyK22_SplitFlap/source/IncludeMcuLibConfig.h

@@ -115,9 +115,9 @@ add_compile_options(-include "../config/IncludeMcuLibConfig.h")
 /* ------------------- RTOS ---------------------------*/
 #define McuLib_CONFIG_SDK_USE_FREERTOS       (1)
 /* #define configUSE_SEGGER_SYSTEM_VIEWER_HOOKS (1) */
-/*#define configTOTAL_HEAP_SIZE                (24*1024)*/
-/* #define configUSE_HEAP_SECTION_NAME          (1) */
-/* #define configHEAP_SECTION_NAME_STRING       ".bss.$SRAM_LOWER.FreeRTOS" */
+#define configTOTAL_HEAP_SIZE                (24*1024)
+#define configUSE_HEAP_SECTION_NAME          (1)
+#define configHEAP_SECTION_NAME_STRING       ".bss.$SRAM_LOWER.FreeRTOS"
 /* ------------------- FatFS ---------------------------*/
 #define McuLib_CONFIG_USE_FAT_FS             (0)
 /* ---------------------------------------------------------------------------------------*/

ADIS_tinyK22_SplitFlap/source/application.c

@@ -24,7 +24,7 @@
 #define LED_BLUE_PIN 2U
 
 /* number of splitflaps that are connected / used. max 4. */
-#define NUM_SF_USED 2
+#define NUM_SF_USED 4
 
 /* vars */
 static McuLED_Handle_t LED_blue;

ADIS_tinyK22_SplitFlap/source/shell.c

@@ -144,7 +144,9 @@ static const McuShell_ParseCommandCallback CmdParserTable[] =
   ini_ParseCommand,
   McuMinINI_ParseCommand,
   NVMC_ParseCommand,
+#if PL_CONFIG_USE_RS485
   RS485_ParseCommand,
+#endif
   NULL /* Sentinel */
 };