diff --git a/Demo/NEC_V850ES_Fx3_IAR/main.c b/Demo/NEC_V850ES_Fx3_IAR/main.c
index 9777f886f..c6d5d2568 100644
--- a/Demo/NEC_V850ES_Fx3_IAR/main.c
+++ b/Demo/NEC_V850ES_Fx3_IAR/main.c
@@ -65,6 +65,7 @@
#include "GenQTest.h"
#include "QPeek.h"
#include "recmutex.h"
+#include "comtest2.h"
/*
* Priority definitions for most of the tasks in the demo application. Some
@@ -78,12 +79,17 @@
#define mainCREATOR_TASK_PRIORITY ( tskIDLE_PRIORITY + 2 )
#define mainINTEGER_TASK_PRIORITY ( tskIDLE_PRIORITY )
#define mainGEN_QUEUE_TASK_PRIORITY ( tskIDLE_PRIORITY )
+#define mainCOMTEST_PRIORITY ( tskIDLE_PRIORITY + 1 )
/* The period between executions of the check task. */
#define mainNO_ERROR_DELAY ( ( portTickType ) 3000 / portTICK_RATE_MS )
#define mainERROR_DELAY ( ( portTickType ) 500 / portTICK_RATE_MS )
#define mainCHECK_TASK_LED ( 3 )
+#define mainCOMTEST_LED ( 5 )
+
+#define mainBAUD_RATE ( 9600 )
+
/* The task function for the "Check" task. */
static void prvCheckTask( void *pvParameters );
@@ -112,7 +118,7 @@ void vRegTestFailed( void )
void main( void )
{
prvSetupHardware();
-
+
vStartLEDFlashTasks( mainFLASH_PRIORITY );
vStartSemaphoreTasks( mainSEM_TEST_PRIORITY );
vStartPolledQueueTasks( mainQUEUE_POLL_PRIORITY );
@@ -120,6 +126,7 @@ void main( void )
vStartQueuePeekTasks();
vStartRecursiveMutexTasks();
vStartBlockingQueueTasks( mainBLOCK_Q_PRIORITY );
+ vAltStartComTestTasks( mainCOMTEST_PRIORITY, mainBAUD_RATE, mainCOMTEST_LED );
/* Create the tasks defined within this file. */
xTaskCreate( prvCheckTask, "Check", configMINIMAL_STACK_SIZE, NULL, mainCHECK_TASK_PRIORITY, NULL );
@@ -195,6 +202,11 @@ portTickType xDelayPeriod = mainNO_ERROR_DELAY, xLastWakeTime;
{
xDelayPeriod = mainERROR_DELAY;
}
+
+ if( xAreComTestTasksStillRunning() != pdTRUE )
+ {
+ xDelayPeriod = mainERROR_DELAY;
+ }
vParTestToggleLED( mainCHECK_TASK_LED );
}
diff --git a/Demo/NEC_V850ES_Fx3_IAR/rtosdemo.ewp b/Demo/NEC_V850ES_Fx3_IAR/rtosdemo.ewp
index 6a6dc84d8..42db43982 100644
--- a/Demo/NEC_V850ES_Fx3_IAR/rtosdemo.ewp
+++ b/Demo/NEC_V850ES_Fx3_IAR/rtosdemo.ewp
@@ -1650,6 +1650,9 @@
$PROJ_DIR$\..\Common\Minimal\BlockQ.c
+
+ $PROJ_DIR$\..\Common\Minimal\comtest.c
+
$PROJ_DIR$\..\Common\Minimal\death.c
@@ -1681,6 +1684,9 @@
$PROJ_DIR$\RegTest.s85
+
+ $PROJ_DIR$\serial\serial.c
+
kernel source
diff --git a/Demo/NEC_V850ES_Fx3_IAR/settings/rtosdemo.dbgdt b/Demo/NEC_V850ES_Fx3_IAR/settings/rtosdemo.dbgdt
index 5dc531757..a06761584 100644
--- a/Demo/NEC_V850ES_Fx3_IAR/settings/rtosdemo.dbgdt
+++ b/Demo/NEC_V850ES_Fx3_IAR/settings/rtosdemo.dbgdt
@@ -27,7 +27,7 @@
-
+
TabID-757-1323
@@ -43,7 +43,7 @@
- 0
+ 0
TabID-11505-1326
@@ -55,20 +55,20 @@
- 0
+ 0
- TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_V850ES_Fx3_IAR\main.c092413141310TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_V850ES_Fx3_IAR\RegTest.s8507231273127TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_V850ES_Fx3_IAR\LEDtoggle\LED.c0951010410104TextEditorC:\Devtools\IAR Systems\Embedded Workbench 5.0\v850\lib\dl85esnn.h0000TextEditorC:\Devtools\IAR Systems\Embedded Workbench 5.0\v850\inc\io70f3385.h0182300TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\Minimal\flash.c07234713532TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_V850ES_Fx3_IAR\FreeRTOSConfig.h08142594259TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\Minimal\PollQ.c084405040500100000010000001
+ TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_V850ES_Fx3_IAR\main.c083427742770TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_V850ES_Fx3_IAR\RegTest.s8507231273127TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_V850ES_Fx3_IAR\LEDtoggle\LED.c0951010410104TextEditorC:\Devtools\IAR Systems\Embedded Workbench 5.0\v850\lib\dl85esnn.h0000TextEditorC:\Devtools\IAR Systems\Embedded Workbench 5.0\v850\inc\io70f3385.h0213447734480TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\Minimal\flash.c07234713532TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_V850ES_Fx3_IAR\FreeRTOSConfig.h08142594259TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\Minimal\PollQ.c08440504050TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_V850ES_Fx3_IAR\serial\serial.c06329032903TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_V850ES_Fx3_IAR\ParTest\ParTest.c05800TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\IAR\V850ES_Fx3\port.c015573267339TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\Minimal\comtest.c024610777108050100000010000001
- iaridepm.enu1debuggergui.enu1-2-2740490-2-2240200142857203666292857755601-2-21981682-2-216842001002381203666142857203666
+ iaridepm.enu1debuggergui.enu1-2-2740490-2-2240200142857203666292857755601-2-21981682-2-216842001002381203666142857203666
diff --git a/Demo/NEC_V850ES_Fx3_IAR/settings/rtosdemo.wsdt b/Demo/NEC_V850ES_Fx3_IAR/settings/rtosdemo.wsdt
index c4419a244..e88bb238b 100644
--- a/Demo/NEC_V850ES_Fx3_IAR/settings/rtosdemo.wsdt
+++ b/Demo/NEC_V850ES_Fx3_IAR/settings/rtosdemo.wsdt
@@ -35,14 +35,14 @@
- TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_V850ES_Fx3_IAR\main.c092413141310TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_V850ES_Fx3_IAR\RegTest.s8507231273127TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_V850ES_Fx3_IAR\LEDtoggle\LED.c0951010410104TextEditorC:\Devtools\IAR Systems\Embedded Workbench 5.0\v850\lib\dl85esnn.h0000TextEditorC:\Devtools\IAR Systems\Embedded Workbench 5.0\v850\inc\io70f3385.h0182300TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\Minimal\flash.c07234713532TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_V850ES_Fx3_IAR\FreeRTOSConfig.h08142594259TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\Minimal\PollQ.c084405040500100000010000001
+ TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_V850ES_Fx3_IAR\main.c083427742770TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_V850ES_Fx3_IAR\RegTest.s8507231273127TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_V850ES_Fx3_IAR\LEDtoggle\LED.c0951010410104TextEditorC:\Devtools\IAR Systems\Embedded Workbench 5.0\v850\lib\dl85esnn.h0000TextEditorC:\Devtools\IAR Systems\Embedded Workbench 5.0\v850\inc\io70f3385.h0213447734480TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\Minimal\flash.c07234713532TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_V850ES_Fx3_IAR\FreeRTOSConfig.h08142594259TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\Minimal\PollQ.c08440504050TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_V850ES_Fx3_IAR\serial\serial.c06329032903TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_V850ES_Fx3_IAR\ParTest\ParTest.c05800TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\IAR\V850ES_Fx3\port.c015573267339TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\Minimal\comtest.c024610777108050100000010000001
- iaridepm.enu1-2-2740314-2-2316205188095208758188095755601-2-21981682-2-216842001002381203666142857203666
+ iaridepm.enu1-2-2740314-2-2316205188095208758188095755601-2-21981682-2-216842001002381203666142857203666