CloudEdge/FreeRTOS-Kernel
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable the Win32 comprehensive test/demo build and run when configUSE_QUEUE_SETS is set to 0.

Browse Source
This commit is contained in:
Richard Barry 2019-12-27 21:02:23 +00:00
parent 70dbc12579
commit 7ddea8fc8b
1 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
FreeRTOS/Demo/WIN32-MSVC/main_full.c
View File

@ -193,11 +193,9 @@ int main_full( void )
vStartRecursiveMutexTasks(); vStartRecursiveMutexTasks();
vStartCountingSemaphoreTasks(); vStartCountingSemaphoreTasks();
vStartDynamicPriorityTasks(); vStartDynamicPriorityTasks();
vStartQueueSetTasks();
vStartQueueOverwriteTask( mainQUEUE_OVERWRITE_PRIORITY ); vStartQueueOverwriteTask( mainQUEUE_OVERWRITE_PRIORITY );
vStartEventGroupTasks(); vStartEventGroupTasks();
vStartInterruptSemaphoreTasks(); vStartInterruptSemaphoreTasks();
vStartQueueSetPollingTask();
vCreateBlockTimeTasks(); vCreateBlockTimeTasks();
vCreateAbortDelayTasks(); vCreateAbortDelayTasks();
xTaskCreate( prvDemoQueueSpaceFunctions, "QSpace", configMINIMAL_STACK_SIZE, NULL, tskIDLE_PRIORITY, NULL ); xTaskCreate( prvDemoQueueSpaceFunctions, "QSpace", configMINIMAL_STACK_SIZE, NULL, tskIDLE_PRIORITY, NULL );
@ -209,6 +207,13 @@ int main_full( void )
vStartStreamBufferInterruptDemo(); vStartStreamBufferInterruptDemo();
vStartMessageBufferAMPTasks( configMINIMAL_STACK_SIZE ); vStartMessageBufferAMPTasks( configMINIMAL_STACK_SIZE );
#if( configUSE_QUEUE_SETS == 1 )
{
vStartQueueSetTasks();
vStartQueueSetPollingTask();
}
#endif
#if( configSUPPORT_STATIC_ALLOCATION == 1 ) #if( configSUPPORT_STATIC_ALLOCATION == 1 )
{ {
vStartStaticallyAllocatedTasks(); vStartStaticallyAllocatedTasks();
@ -333,18 +338,10 @@ HeapStats_t xHeapStats;
{ {
pcStatusMessage = "Error: Dynamic"; pcStatusMessage = "Error: Dynamic";
} }
else if( xAreQueueSetTasksStillRunning() != pdPASS )
{
pcStatusMessage = "Error: Queue set";
}
else if( xIsQueueOverwriteTaskStillRunning() != pdPASS ) else if( xIsQueueOverwriteTaskStillRunning() != pdPASS )
{ {
pcStatusMessage = "Error: Queue overwrite"; pcStatusMessage = "Error: Queue overwrite";
} }
else if( xAreQueueSetPollTasksStillRunning() != pdPASS )
{
pcStatusMessage = "Error: Queue set polling";
}
else if( xAreBlockTimeTestTasksStillRunning() != pdPASS ) else if( xAreBlockTimeTestTasksStillRunning() != pdPASS )
{ {
pcStatusMessage = "Error: Block time"; pcStatusMessage = "Error: Block time";
@ -362,6 +359,17 @@ HeapStats_t xHeapStats;
pcStatusMessage = "Error: Message buffer AMP"; pcStatusMessage = "Error: Message buffer AMP";
} }
#if( configUSE_QUEUE_SETS == 1 )
else if( xAreQueueSetTasksStillRunning() != pdPASS )
{
pcStatusMessage = "Error: Queue set";
}
else if( xAreQueueSetPollTasksStillRunning() != pdPASS )
{
pcStatusMessage = "Error: Queue set polling";
}
#endif
#if( configSUPPORT_STATIC_ALLOCATION == 1 ) #if( configSUPPORT_STATIC_ALLOCATION == 1 )
else if( xAreStaticAllocationTasksStillRunning() != pdPASS ) else if( xAreStaticAllocationTasksStillRunning() != pdPASS )
{ {
@ -471,10 +479,14 @@ TaskHandle_t xTimerTask;
/* Call the periodic queue overwrite from ISR demo. */ /* Call the periodic queue overwrite from ISR demo. */
vQueueOverwritePeriodicISRDemo(); vQueueOverwritePeriodicISRDemo();
#if( configUSE_QUEUE_SETS == 1 ) /* Remove the tests if queue sets are not defined. */
{
/* Write to a queue that is in use as part of the queue set demo to /* Write to a queue that is in use as part of the queue set demo to
demonstrate using queue sets from an ISR. */ demonstrate using queue sets from an ISR. */
vQueueSetAccessQueueSetFromISR(); vQueueSetAccessQueueSetFromISR();
vQueueSetPollingInterruptAccess(); vQueueSetPollingInterruptAccess();
}
#endif
/* Exercise event groups from interrupts. */ /* Exercise event groups from interrupts. */
vPeriodicEventGroupsProcessing(); vPeriodicEventGroupsProcessing();