diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 99122b7e3e9..8c50e566902 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -81,7 +81,7 @@ jobs: # Therefore, we can just download it. mkdir -p freertos/FreeRTOS-Plus/Source/Application-Protocols/coreMQTT-Agent/source/dependency/coreMQTT/docs/doxygen/output wget -O freertos/FreeRTOS-Plus/Source/Application-Protocols/coreMQTT-Agent/source/dependency/coreMQTT/docs/doxygen/output/mqtt.tag \ - "https://freertos.org/Documentation/api-ref/coreMQTT/docs/doxygen/output/mqtt.tag" + "https://freertos.github.io/coreMQTT/main/mqtt.tag" - name: Generate doxygen ZIP uses: FreeRTOS/CI-CD-Github-Actions/doxygen@main diff --git a/FreeRTOS/Source b/FreeRTOS/Source index 29b202a41e0..53c7e7c46f2 160000 --- a/FreeRTOS/Source +++ b/FreeRTOS/Source @@ -1 +1 @@ -Subproject commit 29b202a41e0e2810272b5765805d9fa4af247736 +Subproject commit 53c7e7c46f20dbd941d3f17116725d8fda9e6b90 diff --git a/FreeRTOS/Test/CMock/tasks/tasks_1_utest.c b/FreeRTOS/Test/CMock/tasks/tasks_1_utest.c index ded460d23fe..1c38023f195 100644 --- a/FreeRTOS/Test/CMock/tasks/tasks_1_utest.c +++ b/FreeRTOS/Test/CMock/tasks/tasks_1_utest.c @@ -5377,6 +5377,9 @@ void test_xTaskGenericNotify_success_eIncrement_ISR( void ) /* prvAddTaskToReadyList */ listINSERT_END_Expect( &pxReadyTasksLists[ ptcb->uxPriority ], &ptcb->xStateListItem ); + /* prvResetNextTaskUnblockTime */ + listLIST_IS_EMPTY_ExpectAndReturn( pxDelayedTaskList, pdFALSE ); + listGET_ITEM_VALUE_OF_HEAD_ENTRY_ExpectAndReturn( pxDelayedTaskList, 1000 ); /* API Call */ ret_task_notify = xTaskGenericNotifyFromISR( ptcb, @@ -5415,6 +5418,10 @@ void test_xTaskGenericNotify_success_eSetValueWithOverwrite_ISR( void ) /* prvAddTaskToReadyList */ listINSERT_END_Expect( &pxReadyTasksLists[ ptcb->uxPriority ], &ptcb->xStateListItem ); + /* prvResetNextTaskUnblockTime */ + listLIST_IS_EMPTY_ExpectAndReturn( pxDelayedTaskList, pdFALSE ); + listGET_ITEM_VALUE_OF_HEAD_ENTRY_ExpectAndReturn( pxDelayedTaskList, 1000 ); + /* API Call */ ret_task_notify = xTaskGenericNotifyFromISR( ptcb, uxIndexToNotify, @@ -5452,6 +5459,10 @@ void test_xTaskGenericNotify_success_eSetValueWithoutOverwrite_ISR( void ) /* prvAddTaskToReadyList */ listINSERT_END_Expect( &pxReadyTasksLists[ ptcb->uxPriority ], &ptcb->xStateListItem ); + /* prvResetNextTaskUnblockTime */ + listLIST_IS_EMPTY_ExpectAndReturn( pxDelayedTaskList, pdFALSE ); + listGET_ITEM_VALUE_OF_HEAD_ENTRY_ExpectAndReturn( pxDelayedTaskList, 1000 ); + /* API Call */ ret_task_notify = xTaskGenericNotifyFromISR( ptcb, uxIndexToNotify, @@ -5561,6 +5572,9 @@ void test_xTaskGenericNotify_success_default_ISR( void ) /* prvAddTaskToReadyList */ listINSERT_END_Expect( &pxReadyTasksLists[ ptcb->uxPriority ], &ptcb->xStateListItem ); + /* prvResetNextTaskUnblockTime */ + listLIST_IS_EMPTY_ExpectAndReturn( pxDelayedTaskList, pdTRUE ); + /* API Call */ ret_task_notify = xTaskGenericNotifyFromISR( ptcb, uxIndexToNotify, @@ -5606,6 +5620,9 @@ void test_xTaskGenericNotify_success_default_ISR_task_woken_null( void ) /* prvAddTaskToReadyList */ listINSERT_END_Expect( &pxReadyTasksLists[ ptcb->uxPriority ], &ptcb->xStateListItem ); + /* prvResetNextTaskUnblockTime */ + listLIST_IS_EMPTY_ExpectAndReturn( pxDelayedTaskList, pdTRUE ); + /* API Call */ ret_task_notify = xTaskGenericNotifyFromISR( ptcb, uxIndexToNotify, @@ -5802,6 +5819,9 @@ void test_vTaskGenericNotifyGiveFromISR_success( void ) listREMOVE_ITEM_Expect( &( task_to_notify->xStateListItem ) ); /* prvAddTaskToReadyList */ listINSERT_END_Expect( &( pxReadyTasksLists[ task_to_notify->uxPriority ] ), &task_to_notify->xStateListItem ); + /* prvResetNextTaskUnblockTime */ + listLIST_IS_EMPTY_ExpectAndReturn( pxDelayedTaskList, pdFALSE ); + listGET_ITEM_VALUE_OF_HEAD_ENTRY_ExpectAndReturn( pxDelayedTaskList, 1000 ); /* API Call */ vTaskGenericNotifyGiveFromISR( task_to_notify, diff --git a/README.md b/README.md index 8fc881f9d7e..9a78012dbba 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ The [FreeRTOS 202212.00](https://github.com/FreeRTOS/FreeRTOS/tree/202212.00) release updates FreeRTOS Kernel, FreeRTOS+TCP, coreMQTT, corePKCS11, coreHTTP, coreJSON, AWS IoT Over-the-air-Updates (OTA), AWS IoT Device Shadow, AWS IoT Jobs, AWS IoT Device Defender, Backoff Algorithm, AWS IoT Fleet Provisioning, coreSNTP, SigV4, and FreeRTOS Cellular Interface libraries to their [LTS 2.0](https://github.com/FreeRTOS/FreeRTOS-LTS/blob/202210-LTS/CHANGELOG.md) versions. It also updates coreMQTT Agent to v1.2.0 to be compatible with coreMQTT v2.X.X, and updates MbedTLS to v3.2.1. This release also adds Visual Studio static library projects for the FreeRTOS Kernel, FreeRTOS+TCP, Logging, MbedTLS, coreHTTP, and corePKCS11. With the addition of the static library projects, all Visual Studio projects have been updated to use them. Additionally, all demos dependent on coreMQTT have been updated to work with coreMQTT v2.X.X. ## Getting started -The [FreeRTOS.org](https://www.freertos.org) website contains a [FreeRTOS Kernel Quick Start Guide](https://www.freertos.org/FreeRTOS-quick-start-guide.html), a [list of supported devices and compilers](https://www.freertos.org/RTOS_ports.html), the [API reference](https://www.freertos.org/a00106.html), and many other resources. +The [FreeRTOS.org](https://www.freertos.org) website contains a [FreeRTOS Kernel Quick Start Guide](https://www.freertos.org/Documentation/01-FreeRTOS-quick-start/01-Beginners-guide/02-Quick-start-guide), a [list of supported devices and compilers](https://www.freertos.org/RTOS_ports.html), the [API reference](https://www.freertos.org/Documentation/02-Kernel/04-API-references/01-Task-creation/00-TaskHandle), and many other resources. ### Getting help -You can use your Github login to get support from both the FreeRTOS community and directly from the primary FreeRTOS developers on our [active support forum](https://forums.freertos.org). The [FAQ](https://www.freertos.org/FAQ.html) provides another support resource. +You can use your Github login to get support from both the FreeRTOS community and directly from the primary FreeRTOS developers on our [active support forum](https://forums.freertos.org). The [FAQ](https://www.freertos.org/Why-FreeRTOS/FAQs) provides another support resource. ## Cloning this repository This repo uses [Git Submodules](https://git-scm.com/book/en/v2/Git-Tools-Submodules) to bring in dependent components. diff --git a/manifest.yml b/manifest.yml index 78a8807efd9..85c31dfddc8 100644 --- a/manifest.yml +++ b/manifest.yml @@ -5,7 +5,7 @@ license: "MIT" dependencies: - name: "FreeRTOS-Kernel" - version: "29b202a41" + version: "53c7e7c46" repository: type: "git" url: "https://github.com/FreeRTOS/FreeRTOS-Kernel.git"