diff options
Diffstat (limited to 'FreeRTOS/Demo/WIN32-MSVC')
| -rw-r--r-- | FreeRTOS/Demo/WIN32-MSVC/FreeRTOSConfig.h | 1 | ||||
| -rw-r--r-- | FreeRTOS/Demo/WIN32-MSVC/Trace_Recorder_Configuration/trcConfig.h | 2 | ||||
| -rw-r--r-- | FreeRTOS/Demo/WIN32-MSVC/WIN32.vcxproj | 1 | ||||
| -rw-r--r-- | FreeRTOS/Demo/WIN32-MSVC/WIN32.vcxproj.filters | 3 | ||||
| -rw-r--r-- | FreeRTOS/Demo/WIN32-MSVC/main.c | 1 | ||||
| -rw-r--r-- | FreeRTOS/Demo/WIN32-MSVC/main_full.c | 7 |
6 files changed, 13 insertions, 2 deletions
diff --git a/FreeRTOS/Demo/WIN32-MSVC/FreeRTOSConfig.h b/FreeRTOS/Demo/WIN32-MSVC/FreeRTOSConfig.h index ff78188fd..a70d8fb61 100644 --- a/FreeRTOS/Demo/WIN32-MSVC/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/WIN32-MSVC/FreeRTOSConfig.h @@ -62,6 +62,7 @@ #define configUSE_ALTERNATIVE_API 0
#define configUSE_QUEUE_SETS 1
#define configUSE_TASK_NOTIFICATIONS 1
+#define configTASK_NOTIFICATION_ARRAY_ENTRIES 5
#define configSUPPORT_STATIC_ALLOCATION 1
#define configINITIAL_TICK_COUNT ( ( TickType_t ) 0 ) /* For test. */
#define configSTREAM_BUFFER_TRIGGER_LEVEL_TEST_MARGIN 1 /* As there are a lot of tasks running. */
diff --git a/FreeRTOS/Demo/WIN32-MSVC/Trace_Recorder_Configuration/trcConfig.h b/FreeRTOS/Demo/WIN32-MSVC/Trace_Recorder_Configuration/trcConfig.h index 610b0d97e..c8690d710 100644 --- a/FreeRTOS/Demo/WIN32-MSVC/Trace_Recorder_Configuration/trcConfig.h +++ b/FreeRTOS/Demo/WIN32-MSVC/Trace_Recorder_Configuration/trcConfig.h @@ -113,7 +113,7 @@ extern "C" { * TRC_FREERTOS_VERSION_9_0_2 If using FreeRTOS v9.0.2
* TRC_FREERTOS_VERSION_10_0_0 If using FreeRTOS v10.0.0 or later
*****************************************************************************/
-#define TRC_CFG_FREERTOS_VERSION TRC_FREERTOS_VERSION_10_0_0
+#define TRC_CFG_FREERTOS_VERSION TRC_FREERTOS_VERSION_10_4_0
/*******************************************************************************
* TRC_CFG_SCHEDULING_ONLY
diff --git a/FreeRTOS/Demo/WIN32-MSVC/WIN32.vcxproj b/FreeRTOS/Demo/WIN32-MSVC/WIN32.vcxproj index a97282612..69148ec42 100644 --- a/FreeRTOS/Demo/WIN32-MSVC/WIN32.vcxproj +++ b/FreeRTOS/Demo/WIN32-MSVC/WIN32.vcxproj @@ -105,6 +105,7 @@ <ClCompile Include="..\Common\Minimal\StreamBufferDemo.c" />
<ClCompile Include="..\Common\Minimal\StreamBufferInterrupt.c" />
<ClCompile Include="..\Common\Minimal\TaskNotify.c" />
+ <ClCompile Include="..\Common\Minimal\TaskNotifyArray.c" />
<ClCompile Include="..\Common\Minimal\timerdemo.c" />
<ClCompile Include="main.c">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
diff --git a/FreeRTOS/Demo/WIN32-MSVC/WIN32.vcxproj.filters b/FreeRTOS/Demo/WIN32-MSVC/WIN32.vcxproj.filters index ae43ea750..cf09e0db4 100644 --- a/FreeRTOS/Demo/WIN32-MSVC/WIN32.vcxproj.filters +++ b/FreeRTOS/Demo/WIN32-MSVC/WIN32.vcxproj.filters @@ -160,6 +160,9 @@ <ClCompile Include="..\Common\Minimal\MessageBufferAMP.c">
<Filter>Demo App Source\Full_Demo\Common Demo Tasks</Filter>
</ClCompile>
+ <ClCompile Include="..\Common\Minimal\TaskNotifyArray.c">
+ <Filter>Demo App Source\Full_Demo\Common Demo Tasks</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="FreeRTOSConfig.h">
diff --git a/FreeRTOS/Demo/WIN32-MSVC/main.c b/FreeRTOS/Demo/WIN32-MSVC/main.c index c26b641dd..6a45e9849 100644 --- a/FreeRTOS/Demo/WIN32-MSVC/main.c +++ b/FreeRTOS/Demo/WIN32-MSVC/main.c @@ -44,7 +44,6 @@ * port for further information:
* http://www.freertos.org/FreeRTOS-Windows-Simulator-Emulator-for-Visual-Studio-and-Eclipse-MingW.html
*
-
*
*******************************************************************************
*/
diff --git a/FreeRTOS/Demo/WIN32-MSVC/main_full.c b/FreeRTOS/Demo/WIN32-MSVC/main_full.c index a73e6459e..7637ae636 100644 --- a/FreeRTOS/Demo/WIN32-MSVC/main_full.c +++ b/FreeRTOS/Demo/WIN32-MSVC/main_full.c @@ -97,6 +97,7 @@ #include "EventGroupsDemo.h"
#include "IntSemTest.h"
#include "TaskNotify.h"
+#include "TaskNotifyArray.h"
#include "QueueSetPolling.h"
#include "StaticAllocation.h"
#include "blocktim.h"
@@ -183,6 +184,7 @@ int main_full( void ) /* Create the standard demo tasks. */
vStartTaskNotifyTask();
+ vStartTaskNotifyArrayTask();
vStartBlockingQueueTasks( mainBLOCK_Q_PRIORITY );
vStartSemaphoreTasks( mainSEM_TEST_PRIORITY );
vStartPolledQueueTasks( mainQUEUE_POLL_PRIORITY );
@@ -286,6 +288,10 @@ HeapStats_t xHeapStats; {
pcStatusMessage = "Error: Notification";
}
+ else if( xAreTaskNotificationArrayTasksStillRunning() != pdTRUE )
+ {
+ pcStatusMessage = "Error: NotificationArray";
+ }
else if( xAreInterruptSemaphoreTasksStillRunning() != pdTRUE )
{
pcStatusMessage = "Error: IntSem";
@@ -496,6 +502,7 @@ TaskHandle_t xTimerTask; /* Exercise using task notifications from an interrupt. */
xNotifyTaskFromISR();
+ xNotifyArrayTaskFromISR();
/* Writes to stream buffer byte by byte to test the stream buffer trigger
level functionality. */
|