From 42e9becdb9c89100fdb570609c5beb33caa75150 Mon Sep 17 00:00:00 2001
From: KLASSENTS <klassen@elron.tech>
Date: Wed, 26 Mar 2025 16:30:07 +0700
Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=A1=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?=
 =?UTF-8?q?=D0=B0=D0=B5=D1=82,=20=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D1=8C=D1=81=D0=BA=D0=B8=D0=B5=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=B5=D1=80=D1=8B=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20?=
 =?UTF-8?q?=D1=82=D0=BE=D0=B6=D0=B5=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0?=
 =?UTF-8?q?=D1=8E=D1=82.=20=D0=9E=D1=81=D1=82=D0=B0=D0=BB=D0=BE=D1=81?=
 =?UTF-8?q?=D1=8C=20=D0=BF=D1=80=D0=B8=D0=B4=D1=83=D0=BC=D0=B0=D1=82=D1=8C?=
 =?UTF-8?q?,=20=D0=BA=D0=B0=D0=BA=20=D0=B2=20trap=5Fentry=20=D0=B8=D0=B4?=
 =?UTF-8?q?=D1=82=D0=B8=20=D0=B2=20=D0=BD=D1=83=D0=B6=D0=BD=D1=83=D1=8E=20?=
 =?UTF-8?q?=D1=84=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D1=8E,=20=D0=B5=D1=81?=
 =?UTF-8?q?=D0=BB=D0=B8=20=D0=B1=D0=B8=D0=B1=D0=BB=D0=B8=D0=BE=D1=82=D0=B5?=
 =?UTF-8?q?=D0=BA=D0=B0=20=D0=BD=D0=B5=20=D0=BF=D0=BE=D0=B4=D0=BA=D0=BB?=
 =?UTF-8?q?=D1=8E=D1=87=D0=B5=D0=BD=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cores/arduino/mik32/shared/ldscripts/spifi_cpp.ld | 1 +
 cores/arduino/mik32/shared/runtime/crt0.S         | 3 ++-
 libraries/FreeRTOS/src/FreeRTOSConfig.h           | 5 ++---
 libraries/FreeRTOS/src/portASM.S                  | 3 ++-
 libraries/FreeRTOS/src/variantHooks.cpp           | 5 ++---
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/cores/arduino/mik32/shared/ldscripts/spifi_cpp.ld b/cores/arduino/mik32/shared/ldscripts/spifi_cpp.ld
index 20ded45..0e80a68 100644
--- a/cores/arduino/mik32/shared/ldscripts/spifi_cpp.ld
+++ b/cores/arduino/mik32/shared/ldscripts/spifi_cpp.ld
@@ -123,6 +123,7 @@ SECTIONS {
         PROVIDE(__STACK_START__ = .);
         . += STACK_SIZE;
         PROVIDE(__C_STACK_TOP__ = .);
+        PROVIDE(__freertos_irq_stack_top = .);
         PROVIDE(__STACK_END__ = .);
     } >ram
 
diff --git a/cores/arduino/mik32/shared/runtime/crt0.S b/cores/arduino/mik32/shared/runtime/crt0.S
index ee9d26f..de2ec06 100644
--- a/cores/arduino/mik32/shared/runtime/crt0.S
+++ b/cores/arduino/mik32/shared/runtime/crt0.S
@@ -112,8 +112,9 @@ SystemInit:
 .section .trap_text, "ax"
 // .org should be consistent with
 // default mtvec value (set in scr1_arch_description.svh)
-//.org 0xC0     //j raw_trap_handler
+//.org 0xC0     
 trap_entry:
+    //j raw_trap_handler
     j freertos_risc_v_trap_handler
 
 raw_trap_handler:
diff --git a/libraries/FreeRTOS/src/FreeRTOSConfig.h b/libraries/FreeRTOS/src/FreeRTOSConfig.h
index e3ba88a..29332cc 100644
--- a/libraries/FreeRTOS/src/FreeRTOSConfig.h
+++ b/libraries/FreeRTOS/src/FreeRTOSConfig.h
@@ -42,12 +42,12 @@ extern "C" {
 #define configMAX_PRIORITIES                4
 #define configMAX_TASK_NAME_LEN             16
 
-#define configTOTAL_HEAP_SIZE               ( ( size_t ) 3*1024 )
+#define configTOTAL_HEAP_SIZE               ( ( size_t ) 5*1024 )
 
 /* Set the stack depth type to be uint16_t, otherwise it defaults to StackType_t */
 #define configSTACK_DEPTH_TYPE              uint16_t
 
-#define configMINIMAL_STACK_SIZE            256
+#define configMINIMAL_STACK_SIZE            192
 // #define configISR_STACK_SIZE_WORDS          128 // todo сколько надо?
 #define configCHECK_FOR_STACK_OVERFLOW      1
 #define configUSE_TRACE_FACILITY            0
@@ -122,5 +122,4 @@ to exclude the API function. */
     #endif
 #endif
 
-
 #endif /* FREERTOS_CONFIG_H */
diff --git a/libraries/FreeRTOS/src/portASM.S b/libraries/FreeRTOS/src/portASM.S
index 8298232..bd10105 100644
--- a/libraries/FreeRTOS/src/portASM.S
+++ b/libraries/FreeRTOS/src/portASM.S
@@ -92,6 +92,7 @@ definitions. */
 .extern pullNextTime
 .extern uxTimerIncrementsForOneTick /* size_t type so 32-bit on 32-bit core and 64-bits on 64-bit core. */
 .extern xTaskReturnAddress
+.extern trap_handler
 
 .weak freertos_risc_v_application_exception_handler
 .weak freertos_risc_v_application_interrupt_handler
@@ -366,7 +367,7 @@ handle_interrupt:
 #endif /* portasmHAS_MTIME */
 
 application_interrupt_handler:
-    call freertos_risc_v_application_interrupt_handler
+    call trap_handler
     j processed_source
 
 handle_exception:
diff --git a/libraries/FreeRTOS/src/variantHooks.cpp b/libraries/FreeRTOS/src/variantHooks.cpp
index 1db2c7c..b915350 100644
--- a/libraries/FreeRTOS/src/variantHooks.cpp
+++ b/libraries/FreeRTOS/src/variantHooks.cpp
@@ -38,10 +38,9 @@ extern void loop(void);
 
 /*-----------------------------------------------------------*/
 
-void initVariant(void) __attribute__((used, retain)); // todo удалить лишний атрибут?
-
-void initVariant(void)
+void initVariant(void) // todo удалить
 {
+    initTestPin();
     setup();                    // the normal Arduino setup() function is run here.
     post_init();
     vTaskStartScheduler();      // initialise and run the freeRTOS scheduler. Execution should never return here.