diff --git a/libraries/FreeRTOS/src/FreeRTOSConfig.h b/libraries/FreeRTOS/src/FreeRTOSConfig.h index f3af4f5..3d914b5 100644 --- a/libraries/FreeRTOS/src/FreeRTOSConfig.h +++ b/libraries/FreeRTOS/src/FreeRTOSConfig.h @@ -6,10 +6,6 @@ #ifndef FREERTOS_CONFIG_H #define FREERTOS_CONFIG_H -// #include "plf.h" -//#include "arch.h" -//#include "rtc.h" -//#include "mtimer.h" #ifdef __cplusplus extern "C" { #endif @@ -27,13 +23,11 @@ extern "C" { * THESE PARAMETERS ARE DESCRIBED WITHIN THE 'CONFIGURATION' SECTION OF THE * FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE. * - * See http://www.freertos.org/a00110.html. + * See https://www.freertos.org/a00110.html. *----------------------------------------------------------*/ -// #define configMTIME_BASE_ADDRESS ( SCR1_TIMER->MTIME ) -// #define configMTIMECMP_BASE_ADDRESS ( SCR1_TIMER->MTIMECMP ) -#define configMTIME_BASE_ADDRESS 0//((uintptr_t)&SCR1_TIMER->MTIME) -#define configMTIMECMP_BASE_ADDRESS 0//((uintptr_t)&SCR1_TIMER->MTIMECMP) +#define configMTIME_BASE_ADDRESS SCR1_TIMER_BASE_ADDRESS//((uintptr_t)&SCR1_TIMER->MTIME) +#define configMTIMECMP_BASE_ADDRESS SCR1_TIMER_BASE_ADDRESS//((uintptr_t)&SCR1_TIMER->MTIMECMP) /* Delay definition - here, the user can choose which delay implementation is required. * The default is to change nothing. */ @@ -128,4 +122,5 @@ to exclude the API function. */ #endif #endif + #endif /* FREERTOS_CONFIG_H */ diff --git a/libraries/FreeRTOS/src/list.c b/libraries/FreeRTOS/src/list.c index 3fb2229..b0f89e4 100644 --- a/libraries/FreeRTOS/src/list.c +++ b/libraries/FreeRTOS/src/list.c @@ -211,7 +211,6 @@ void vListInsert( List_t * const pxList, } /*-----------------------------------------------------------*/ - UBaseType_t uxListRemove( ListItem_t * const pxItemToRemove ) { /* The list item knows which list it is in. Obtain the list from the list diff --git a/libraries/FreeRTOS/src/queue.c b/libraries/FreeRTOS/src/queue.c index 6eb59a3..e39d9e5 100644 --- a/libraries/FreeRTOS/src/queue.c +++ b/libraries/FreeRTOS/src/queue.c @@ -1,6 +1,6 @@ /* * FreeRTOS Kernel V11.1.0 - * Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT * diff --git a/libraries/FreeRTOS/src/variantHooks.cpp b/libraries/FreeRTOS/src/variantHooks.cpp index f6cd254..85a57a3 100644 --- a/libraries/FreeRTOS/src/variantHooks.cpp +++ b/libraries/FreeRTOS/src/variantHooks.cpp @@ -38,6 +38,8 @@ extern void loop(void); /*-----------------------------------------------------------*/ +void initVariant(void) __attribute__ ((OS_main)); + void initVariant(void) { setup(); // the normal Arduino setup() function is run here. @@ -51,12 +53,10 @@ void initVariant(void) * now all that remains is to configure the machine timer comparison register * and enable this interrupt. */ -void vPortSetupTimerInterrupt(void) -{ +// void vPortSetupTimerInterrupt(void) +// { - SCR1_TIMER->MTIMEH; SCR1_TIMER->MTIME; - SCR1_TIMER->MTIMECMP; SCR1_TIMER->MTIMECMPH; -} +// } /*-----------------------------------------------------------*/ #if ( configUSE_IDLE_HOOK == 1 ) @@ -152,7 +152,7 @@ void vApplicationStackOverflowHook( TaskHandle_t xTask __attribute__ ((unused)), for(;;) { - // _delay_ms(2000); + delay(2000); prvBlinkMainLed(); // Main LED slow blink. } } @@ -212,7 +212,6 @@ void vApplicationAssertHook() { prvSetMainLedOn(); // Main LED on. for(;;) { - // todo тут тоже заменить delay(100); prvBlinkMainLed(); // Led off.