X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=FreeRTOS%2FDemo%2FPIC24_MPLAB%2Flcd.c;h=a6402f94f5a96d031c50c71db5fef20556566dd9;hb=97fffb1d1d396472be491bbdb38503c7dc2ba44d;hp=686190934865c460bd54334c35f16b35c6f343a7;hpb=abc9255183aa4ad1b011116333f26570ccc7aa4b;p=freertos diff --git a/FreeRTOS/Demo/PIC24_MPLAB/lcd.c b/FreeRTOS/Demo/PIC24_MPLAB/lcd.c index 686190934..a6402f94f 100644 --- a/FreeRTOS/Demo/PIC24_MPLAB/lcd.c +++ b/FreeRTOS/Demo/PIC24_MPLAB/lcd.c @@ -1,66 +1,29 @@ /* - FreeRTOS V7.5.2 - Copyright (C) 2013 Real Time Engineers Ltd. - - VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION. - - *************************************************************************** - * * - * FreeRTOS provides completely free yet professionally developed, * - * robust, strictly quality controlled, supported, and cross * - * platform software that has become a de facto standard. * - * * - * Help yourself get started quickly and support the FreeRTOS * - * project by purchasing a FreeRTOS tutorial book, reference * - * manual, or both from: http://www.FreeRTOS.org/Documentation * - * * - * Thank you! * - * * - *************************************************************************** - - This file is part of the FreeRTOS distribution. - - FreeRTOS is free software; you can redistribute it and/or modify it under - the terms of the GNU General Public License (version 2) as published by the - Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception. - - >>! NOTE: The modification to the GPL is included to allow you to distribute - >>! a combined work that includes FreeRTOS without being obliged to provide - >>! the source code for proprietary components outside of the FreeRTOS - >>! kernel. - - FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - FOR A PARTICULAR PURPOSE. Full license text is available from the following - link: http://www.freertos.org/a00114.html - - 1 tab == 4 spaces! - - *************************************************************************** - * * - * Having a problem? Start by reading the FAQ "My application does * - * not run, what could be wrong?" * - * * - * http://www.FreeRTOS.org/FAQHelp.html * - * * - *************************************************************************** - - http://www.FreeRTOS.org - Documentation, books, training, latest versions, - license and Real Time Engineers Ltd. contact details. - - http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products, - including FreeRTOS+Trace - an indispensable productivity tool, a DOS - compatible FAT file system, and our tiny thread aware UDP/IP stack. - - http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High - Integrity Systems to sell under the OpenRTOS brand. Low cost OpenRTOS - licenses offer ticketed support, indemnification and middleware. - - http://www.SafeRTOS.com - High Integrity Systems also provide a safety - engineered and independently SIL3 certified version for use in safety and - mission critical applications that require provable dependability. - - 1 tab == 4 spaces! -*/ + * FreeRTOS Kernel V10.1.0 + * Copyright (C) 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * http://www.FreeRTOS.org + * http://aws.amazon.com/freertos + * + * 1 tab == 4 spaces! + */ /* Scheduler includes. */ #include "FreeRTOS.h" @@ -86,12 +49,12 @@ static void prvSetupLCD( void ); /* * Move to the first (0) or second (1) row of the LCD. */ -static void prvLCDGotoRow( unsigned portSHORT usRow ); +static void prvLCDGotoRow( unsigned short usRow ); /* * Write a string of text to the LCD. */ -static void prvLCDPutString( portCHAR *pcString ); +static void prvLCDPutString( char *pcString ); /* * Clear the LCD. @@ -117,12 +80,12 @@ static void prvLCDClear( void ); /*-----------------------------------------------------------*/ /* The queue used to send messages to the LCD task. */ -xQueueHandle xLCDQueue; +QueueHandle_t xLCDQueue; /*-----------------------------------------------------------*/ -xQueueHandle xStartLCDTask( void ) +QueueHandle_t xStartLCDTask( void ) { /* Create the queue used by the LCD task. Messages for display on the LCD are received via this queue. */ @@ -130,13 +93,13 @@ xQueueHandle xStartLCDTask( void ) /* Start the task that will write to the LCD. The LCD hardware is initialised from within the task itself so delays can be used. */ - xTaskCreate( vLCDTask, ( signed portCHAR * ) "LCD", configMINIMAL_STACK_SIZE, NULL, tskIDLE_PRIORITY + 1, NULL ); + xTaskCreate( vLCDTask, "LCD", configMINIMAL_STACK_SIZE, NULL, tskIDLE_PRIORITY + 1, NULL ); return xLCDQueue; } /*-----------------------------------------------------------*/ -static void prvLCDGotoRow( unsigned portSHORT usRow ) +static void prvLCDGotoRow( unsigned short usRow ) { if( usRow == 0 ) { @@ -153,7 +116,7 @@ static void prvLCDGotoRow( unsigned portSHORT usRow ) } /*-----------------------------------------------------------*/ -static void prvLCDPutString( portCHAR *pcString ) +static void prvLCDPutString( char *pcString ) { /* Write out each character with appropriate delay between each. */ while( *pcString ) @@ -205,7 +168,7 @@ static void prvSetupLCD( void ) static void vLCDTask( void *pvParameters ) { xLCDMessage xMessage; -unsigned portSHORT usRow = 0; +unsigned short usRow = 0; /* Remove compiler warnigns. */ ( void ) pvParameters;