/*\r
- FreeRTOS V7.5.3 - Copyright (C) 2013 Real Time Engineers Ltd. \r
+ FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd.\r
All rights reserved\r
\r
VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.\r
*/\r
static void prvSetupLCD( void );\r
\r
-/* \r
- * Move to the first (0) or second (1) row of the LCD. \r
+/*\r
+ * Move to the first (0) or second (1) row of the LCD.\r
*/\r
-static void prvLCDGotoRow( unsigned portSHORT usRow );\r
+static void prvLCDGotoRow( unsigned short usRow );\r
\r
-/* \r
- * Write a string of text to the LCD. \r
+/*\r
+ * Write a string of text to the LCD.\r
*/\r
-static void prvLCDPutString( portCHAR *pcString );\r
+static void prvLCDPutString( char *pcString );\r
\r
-/* \r
- * Clear the LCD. \r
+/*\r
+ * Clear the LCD.\r
*/\r
static void prvLCDClear( void );\r
\r
#define PMAEN *( ( unsigned short * ) 0x60c )\r
\r
/* LCD R/W signal. */\r
-#define lcdRW LATDbits.LATD5 \r
+#define lcdRW LATDbits.LATD5\r
\r
/* LCD lcdRS signal. */\r
-#define lcdRS LATBbits.LATB15 \r
+#define lcdRS LATBbits.LATB15\r
\r
/* LCD lcdE signal . */\r
-#define lcdE LATDbits.LATD4 \r
+#define lcdE LATDbits.LATD4\r
\r
/* Control signal pin direction. */\r
-#define RW_TRIS TRISDbits.TRISD5 \r
+#define RW_TRIS TRISDbits.TRISD5\r
#define RS_TRIS TRISBbits.TRISB15\r
#define E_TRIS TRISDbits.TRISD4\r
\r
/* Port for LCD data */\r
-#define lcdDATA LATE \r
+#define lcdDATA LATE\r
#define lcdDATAPORT PORTE\r
\r
/* I/O setup for data Port. */\r
-#define TRISDATA TRISE \r
+#define TRISDATA TRISE\r
\r
/* The length of the queue used to send messages to the LCD gatekeeper task. */\r
#define lcdQUEUE_SIZE 3\r
/* The queue used to send messages to the LCD task. */\r
xQueueHandle xLCDQueue;\r
\r
-static void prvLCDCommand( portCHAR cCommand );\r
-static void prvLCDData( portCHAR cChar );\r
+static void prvLCDCommand( char cCommand );\r
+static void prvLCDData( char cChar );\r
\r
/*-----------------------------------------------------------*/\r
\r
\r
/* Start the task that will write to the LCD. The LCD hardware is\r
initialised from within the task itself so delays can be used. */\r
- xTaskCreate( vLCDTask, ( signed portCHAR * ) "LCD", configMINIMAL_STACK_SIZE, NULL, tskIDLE_PRIORITY + 1, NULL );\r
+ xTaskCreate( vLCDTask, "LCD", configMINIMAL_STACK_SIZE, NULL, tskIDLE_PRIORITY + 1, NULL );\r
\r
return xLCDQueue;\r
}\r
/*-----------------------------------------------------------*/\r
\r
-static void prvLCDGotoRow( unsigned portSHORT usRow )\r
+static void prvLCDGotoRow( unsigned short usRow )\r
{\r
if( usRow == 0 )\r
{\r
}\r
/*-----------------------------------------------------------*/\r
\r
-static void prvLCDCommand( portCHAR cCommand ) \r
+static void prvLCDCommand( char cCommand )\r
{\r
/* Prepare RD0 - RD7. */\r
- lcdDATA &= 0xFF00; \r
+ lcdDATA &= 0xFF00;\r
\r
/* Command byte to lcd. */\r
- lcdDATA |= cCommand; \r
+ lcdDATA |= cCommand;\r
\r
/* Ensure lcdRW is 0. */\r
- lcdRW = 0; \r
+ lcdRW = 0;\r
lcdRS = 0;\r
\r
/* Toggle lcdE line. */\r
- lcdE = 1; \r
+ lcdE = 1;\r
vTaskDelay( lcdVERY_SHORT_DELAY );\r
lcdE = 0;\r
\r
}\r
/*-----------------------------------------------------------*/\r
\r
-static void prvLCDData( portCHAR cChar )\r
+static void prvLCDData( char cChar )\r
{\r
/* ensure lcdRW is 0. */\r
- lcdRW = 0; \r
+ lcdRW = 0;\r
\r
/* Assert register select to 1. */\r
- lcdRS = 1; \r
+ lcdRS = 1;\r
\r
/* Prepare RD0 - RD7. */\r
- lcdDATA &= 0xFF00; \r
+ lcdDATA &= 0xFF00;\r
\r
/* Data byte to lcd. */\r
- lcdDATA |= cChar; \r
- lcdE = 1; \r
+ lcdDATA |= cChar;\r
+ lcdE = 1;\r
Nop();\r
Nop();\r
Nop();\r
\r
/* Toggle lcdE signal. */\r
- lcdE = 0; \r
+ lcdE = 0;\r
\r
/* Negate register select to 0. */\r
- lcdRS = 0; \r
+ lcdRS = 0;\r
\r
vTaskDelay( lcdVERY_SHORT_DELAY );\r
}\r
/*-----------------------------------------------------------*/\r
\r
-static void prvLCDPutString( portCHAR *pcString )\r
+static void prvLCDPutString( char *pcString )\r
{\r
/* Write out each character with appropriate delay between each. */\r
while( *pcString )\r
{\r
/* Wait for proper power up. */\r
vTaskDelay( lcdLONG_DELAY );\r
- \r
+\r
/* Set initial states for the data and control pins */\r
- LATE &= 0xFF00; \r
+ LATE &= 0xFF00;\r
\r
/* R/W state set low. */\r
- lcdRW = 0; \r
+ lcdRW = 0;\r
\r
/* lcdRS state set low. */\r
- lcdRS = 0; \r
+ lcdRS = 0;\r
\r
/* lcdE state set low. */\r
- lcdE = 0; \r
+ lcdE = 0;\r
\r
/* Set data and control pins to outputs */\r
TRISE &= 0xFF00;\r
\r
/* lcdRW pin set as output. */\r
- RW_TRIS = 0; \r
+ RW_TRIS = 0;\r
\r
/* lcdRS pin set as output. */\r
- RS_TRIS = 0; \r
+ RS_TRIS = 0;\r
\r
/* lcdE pin set as output. */\r
- E_TRIS = 0; \r
+ E_TRIS = 0;\r
\r
/* 1st LCD initialization sequence */\r
lcdDATA &= 0xFF00;\r
lcdDATA |= 0x0038;\r
- lcdE = 1; \r
+ lcdE = 1;\r
Nop();\r
Nop();\r
Nop();\r
\r
/* Toggle lcdE signal. */\r
- lcdE = 0; \r
+ lcdE = 0;\r
\r
vTaskDelay( lcdSHORT_DELAY );\r
vTaskDelay( lcdSHORT_DELAY );\r
vTaskDelay( lcdSHORT_DELAY );\r
- \r
+\r
/* 2nd LCD initialization sequence */\r
lcdDATA &= 0xFF00;\r
lcdDATA |= 0x0038;\r
- lcdE = 1; \r
+ lcdE = 1;\r
+ Nop();\r
Nop();\r
Nop();\r
- Nop(); \r
\r
/* Toggle lcdE signal. */\r
- lcdE = 0; \r
+ lcdE = 0;\r
\r
vTaskDelay( lcdSHORT_DELAY );\r
\r
/* 3rd LCD initialization sequence */\r
lcdDATA &= 0xFF00;\r
lcdDATA |= 0x0038;\r
- lcdE = 1; \r
+ lcdE = 1;\r
+ Nop();\r
Nop();\r
Nop();\r
- Nop(); \r
\r
/* Toggle lcdE signal. */\r
- lcdE = 0; \r
+ lcdE = 0;\r
\r
vTaskDelay( lcdSHORT_DELAY );\r
\r
\r
/* Function set. */\r
- prvLCDCommand( 0x38 ); \r
+ prvLCDCommand( 0x38 );\r
\r
/* Display on/off control, cursor blink off (0x0C). */\r
- prvLCDCommand( 0x0C ); \r
+ prvLCDCommand( 0x0C );\r
\r
/* Entry mode set (0x06). */\r
- prvLCDCommand( 0x06 ); \r
+ prvLCDCommand( 0x06 );\r
\r
- prvLCDCommand( lcdCLEAR ); \r
+ prvLCDCommand( lcdCLEAR );\r
}\r
/*-----------------------------------------------------------*/\r
\r
static void vLCDTask( void *pvParameters )\r
{\r
xLCDMessage xMessage;\r
-unsigned portSHORT usRow = 0;\r
+unsigned short usRow = 0;\r
\r
/* Initialise the hardware. This uses delays so must not be called prior\r
to the scheduler being started. */\r
usRow++;\r
prvLCDPutString( xMessage.pcMessage );\r
\r
- /* Delay the requested amount of time to ensure the text just written \r
+ /* Delay the requested amount of time to ensure the text just written\r
to the LCD is not overwritten. */\r
- vTaskDelay( xMessage.xMinDisplayTime ); \r
+ vTaskDelay( xMessage.xMinDisplayTime );\r
}\r
}\r
\r
projects / freertos / blobdiff