Prepare for V9.0.0 release.

[freertos] / FreeRTOS / Demo / PIC32MX_MPLAB / main_full.c

diff --git a/FreeRTOS/Demo/PIC32MX_MPLAB/main_full.c b/FreeRTOS/Demo/PIC32MX_MPLAB/main_full.c
index 16d7de2ca95f5a225be90253c1c1b1f44e535a01..68e4b2c56191ad4d1a85657012064ba1b2202982 100644 (file)
--- a/FreeRTOS/Demo/PIC32MX_MPLAB/main_full.c
+++ b/FreeRTOS/Demo/PIC32MX_MPLAB/main_full.c
@@ -89,6 +89,9 @@
  * message to the LCD send the message on a queue to the LCD task instead of\r
  * accessing the LCD themselves.  The LCD task just blocks on the queue waiting\r
  * for messages - waking and displaying the messages as they arrive.\r
+ * **NOTE** The LCD driver has a dependency on the PLIB library, which is no\r
+ * longer provided by Microchip, so LCD functionality has been removed from this\r
+ * demo - however the source files remain in the distribution.\r
  *\r
  * "Check" timer - The check software timer period is initially set to three\r
  * seconds.  The callback function associated with the check software timer\r
@@ -115,6 +118,10 @@
  *\r
  *     + The UART is allocated a priority of 2. This means it can interrupt the\r
  *    RTOS tick, and can also safely use queues.\r
+ *    **NOTE** The UART driver has a dependency on the PLIB library, which is no\r
+ *    longer provided by Microchip, so UART functionality has been removed from\r
+ *    this demo - however the source files remain in the distribution.\r
+ *\r
  *  + Two timers are configured to generate interrupts just to test the nesting\r
  *    and queue access mechanisms. These timers are allocated priorities 2 and 3\r
  *    respectively. Even though they both access the same two queues, the\r
@@ -147,7 +154,6 @@
 #include "GenQTest.h"\r
 #include "QPeek.h"\r
 #include "lcd.h"\r
-#include "comtest2.h"\r
 #include "timertest.h"\r
 #include "IntQueue.h"\r
 \r
@@ -170,13 +176,6 @@ in ticks using the portTICK_PERIOD_MS constant. */
 #define mainINTEGER_TASK_PRIORITY           ( tskIDLE_PRIORITY )\r
 #define mainGEN_QUEUE_TASK_PRIORITY                    ( tskIDLE_PRIORITY )\r
 \r
-/* The LED used by the comtest tasks.  mainCOM_TEST_LED + 1 is also used.\r
-See the comtest.c file for more information. */\r
-#define mainCOM_TEST_LED                                       ( 4 )\r
-\r
-/* Baud rate used by the comtest tasks. */\r
-#define mainCOM_TEST_BAUD_RATE                         ( 115200 )\r
-\r
 /* Misc. */\r
 #define mainDONT_BLOCK                                         ( 0 )\r
 \r
@@ -251,10 +250,6 @@ int main_full( void )
 {\r
 TimerHandle_t xTimer = NULL;\r
 \r
-       /* Create the LCD task - this returns the queue to use when writing\r
-       messages to the LCD. */\r
-       xLCDQueue = xStartLCDTask();\r
-\r
        /* Create all the other standard demo tasks. */\r
        vStartLEDFlashTimers( mainNUM_FLASH_TIMER_LEDS );\r
     vCreateBlockTimeTasks();\r
@@ -267,13 +262,6 @@ TimerHandle_t xTimer = NULL;
        xTaskCreate( prvRegTestTask1, "Reg1", configMINIMAL_STACK_SIZE, NULL, tskIDLE_PRIORITY, NULL );\r
        xTaskCreate( prvRegTestTask2, "Reg2", configMINIMAL_STACK_SIZE, NULL, tskIDLE_PRIORITY, NULL );\r
 \r
-    /* The PIC32MX795 uses an 8 deep fifo where TX interrupts are asserted\r
-       whilst the TX buffer is empty.  This causes an issue with the test driver so\r
-       it is not used in this demo */\r
-       #if !defined(__32MX795F512L__)\r
-               vAltStartComTestTasks( mainCOM_TEST_PRIORITY, mainCOM_TEST_BAUD_RATE, mainCOM_TEST_LED );\r
-       #endif\r
-\r
        /* Create the software timer that performs the 'check' functionality, as\r
        described at the top of this file. */\r
        xTimer = xTimerCreate(  "CheckTimer",/* A text name, purely to help debugging. */\r
@@ -391,19 +379,12 @@ static xLCDMessage xMessage = { ( 200 / portTICK_PERIOD_MS ), cStringBuffer };
        {\r
                xMessage.pcMessage = "Error: Int queue";\r
        }\r
-       #if !defined(__32MX795F512L__)\r
-               else if( xAreComTestTasksStillRunning() != pdTRUE )\r
-               {\r
-                       xMessage.pcMessage = "Error: COM test";\r
-               }\r
-       #endif\r
 \r
        if( xMessage.pcMessage != cStringBuffer )\r
        {\r
                /* An error string has been logged.  If the timer period has not yet\r
                been changed it should be changed now.  Increasing the frequency of the\r
-               LED gives visual feedback of the error status (although it is written\r
-               to the LCD too!). */\r
+               LED gives visual feedback of the error status. */\r
                if( lChangedTimerPeriodAlready == pdFALSE )\r
                {\r
                        lChangedTimerPeriodAlready = pdTRUE;\r
@@ -422,9 +403,6 @@ static xLCDMessage xMessage = { ( 200 / portTICK_PERIOD_MS ), cStringBuffer };
                sprintf( cStringBuffer, "Pass %u", ( unsigned int ) ulHighFrequencyTimerInterrupts );\r
        }\r
 \r
-       /* Send the status message to the LCD task for display on the LCD.  This is\r
-       a timer callback function, so the queue send function *must not* block. */\r
-       xQueueSend( xLCDQueue, &xMessage, mainDONT_BLOCK );\r
        vParTestToggleLED( mainCHECK_LED );\r
 }\r
 /*-----------------------------------------------------------*/\r