updated FreeRTOS (since "smp" branch was deprecated and merged to "ma…

…in" branch)

CMakeLists.txt

@@ -74,7 +74,7 @@ target_link_libraries(${TARGETNAME}
 	pico_stdlib
 	pico_flash
 	mbuspico_web_res
-	FreeRTOS-Kernel-Heap4 # FreeRTOS kernel and dynamic heap
+	FreeRTOS-Kernel-Heap4
 	mbedtls_crypto
 	mongoose
 	littlefs

FreeRTOS/FreeRTOSConfig.h

@@ -1,5 +1,5 @@
 /*
- * FreeRTOS V202111.00
+ * FreeRTOS V202212.00
  * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
@@ -19,10 +19,9 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
- * http://www.FreeRTOS.org
- * http://aws.amazon.com/freertos
+ * https://www.FreeRTOS.org
+ * https://github.com/FreeRTOS
  *
- * 1 tab == 4 spaces!
  */
 
 #ifndef FREERTOS_CONFIG_H
@@ -61,8 +60,7 @@
 #define configUSE_QUEUE_SETS                    1
 #define configUSE_TIME_SLICING                  1
 #define configUSE_NEWLIB_REENTRANT              0
-// todo need this for lwip FreeRTOS sys_arch to compile
-#define configENABLE_BACKWARD_COMPATIBILITY     1
+#define configENABLE_BACKWARD_COMPATIBILITY     1 // needed for lwip FreeRTOS sys_arch to compile
 #define configNUM_THREAD_LOCAL_STORAGE_POINTERS 5
 
 /* System */
@@ -76,19 +74,15 @@
 #define configAPPLICATION_ALLOCATED_HEAP        0
 
 /* Hook function related definitions. */
-#define configCHECK_FOR_STACK_OVERFLOW          0
-#define configUSE_MALLOC_FAILED_HOOK            0
+#define configCHECK_FOR_STACK_OVERFLOW          2
+#define configUSE_MALLOC_FAILED_HOOK            1
 #define configUSE_DAEMON_TASK_STARTUP_HOOK      0
 
 /* Run time and task stats gathering related definitions. */
 #define configGENERATE_RUN_TIME_STATS           0
 #define configUSE_TRACE_FACILITY                1
 #define configUSE_STATS_FORMATTING_FUNCTIONS    0
 
-/* Co-routine related definitions. */
-#define configUSE_CO_ROUTINES                   0
-#define configMAX_CO_ROUTINE_PRIORITIES         1
-
 /* Software timer related definitions. */
 #define configUSE_TIMERS                        1
 #define configTIMER_TASK_PRIORITY               ( configMAX_PRIORITIES - 1 )
@@ -102,14 +96,12 @@
 #define configMAX_API_CALL_INTERRUPT_PRIORITY   [dependent on processor and application]
 */
 
-#if FREE_RTOS_KERNEL_SMP // set by the RP2040 SMP port of FreeRTOS
 /* SMP port only */
-#define configNUM_CORES                         2
+#define configNUMBER_OF_CORES                   2
+#define configNUM_CORES                         configNUMBER_OF_CORES // needed to make pico-sdk (cyw43) run correctly, until its fixed there
 #define configTICK_CORE                         0
-#define configRUN_MULTIPLE_PRIORITIES           1
+#define configRUN_MULTIPLE_PRIORITIES           0
 #define configUSE_CORE_AFFINITY                 1
-#define configUSE_TASK_PREEMPTION_DISABLE       0
-#endif
 
 /* RP2040 specific */
 #define configSUPPORT_PICO_SYNC_INTEROP         1
@@ -140,43 +132,8 @@ to exclude the API function. */
 
 /* A header file that defines trace macro can be included here. */
 
-/* Include logging header files and define logging configurations in the 
- * following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the logging configurations for your application. It is required
- * to define LIBRARY_LOG_NAME, LIBRARY_LOG_LEVEL and SdkLog macros.
- * 3. Include the header file "logging_stack.h".
- */
-
-//#include "logging_levels.h"
-//#include "iot_logging_setup.h"
-
-/* Logging configurations for the application. */
-
-/* Set the application log name. */
-#ifndef LIBRARY_LOG_NAME
-	#define LIBRARY_LOG_NAME    "rpi-mbus"
-#endif 
-
-/* Set the logging verbosity level. */
-#ifndef LIBRARY_LOG_LEVEL
-	#define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif 
-
-/* Define the metadata information to add in each log.
- * The example here sets the metadata to [:]. */
-#if !defined( LOG_METADATA_FORMAT ) && !defined( LOG_METADATA_ARGS )
-	#define LOG_METADATA_FORMAT "[%s:%d]"
-	#define LOG_METADATA_ARGS __FILE__, __LINE__
-#endif
-
-/* Define the platform-specific logging function to call from
- * enabled logging macros. */
-#ifndef SdkLog
-	#define SdkLog( message )   printf(message "\n")
-#endif
-
-/************ End of logging configuration ****************/
+/* SMP Related config. */
+#define configUSE_PASSIVE_IDLE_HOOK             0
+#define portSUPPORT_SMP                         1
 
 #endif /* FREERTOS_CONFIG_H */
-