X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=FreeRTOS%2FDemo%2FRX200_RX210-RSK_Renesas%2FRTOSDemo%2FButtonAndLCD.c;h=90b1fcd06e74115c745ad42c6076e649b5e3613d;hb=3d511cabadf346c67f0f56e15e999c02ca0393ed;hp=15bb3bdd2dc04fb28b9ff58bae3dda0eaceb8f30;hpb=90f4c3885b2e63f57a7172c148f67b96cf44eca2;p=freertos diff --git a/FreeRTOS/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/ButtonAndLCD.c b/FreeRTOS/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/ButtonAndLCD.c index 15bb3bdd2..90b1fcd06 100644 --- a/FreeRTOS/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/ButtonAndLCD.c +++ b/FreeRTOS/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/ButtonAndLCD.c @@ -1,67 +1,66 @@ /* - FreeRTOS V7.1.1 - Copyright (C) 2012 Real Time Engineers Ltd. - + FreeRTOS V8.1.2 - Copyright (C) 2014 Real Time Engineers Ltd. + All rights reserved + + VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION. *************************************************************************** * * - * FreeRTOS tutorial books are available in pdf and paperback. * - * Complete, revised, and edited pdf reference manuals are also * - * available. * - * * - * Purchasing FreeRTOS documentation will not only help you, by * - * ensuring you get running as quickly as possible and with an * - * in-depth knowledge of how to use FreeRTOS, it will also help * - * the FreeRTOS project to continue with its mission of providing * - * professional grade, cross platform, de facto standard solutions * - * for microcontrollers - completely free of charge! * + * FreeRTOS provides completely free yet professionally developed, * + * robust, strictly quality controlled, supported, and cross * + * platform software that has become a de facto standard. * * * - * >>> See http://www.FreeRTOS.org/Documentation for details. <<< * + * 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 for using FreeRTOS, and thank you for your support! * + * 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. See the GNU General Public License for - more details. You should have received a copy of the GNU General Public - License and the FreeRTOS license exception along with FreeRTOS; if not it - can be viewed here: http://www.freertos.org/a00114.html and also obtained - by writing to Richard Barry, contact details for whom are available on the - FreeRTOS WEB site. + 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? * + * not run, what could be wrong?" * * * * http://www.FreeRTOS.org/FAQHelp.html * * * *************************************************************************** - - http://www.FreeRTOS.org - Documentation, training, latest information, - license and contact details. - + 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. + 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. - Real Time Engineers ltd license FreeRTOS to High Integrity Systems, who sell - the code with commercial support, indemnification, and middleware, under - the OpenRTOS brand: http://www.OpenRTOS.com. High Integrity Systems also - provide a safety engineered and independently SIL3 certified version under - the SafeRTOS brand: http://www.SafeRTOS.com. + 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! */ /* Scheduler includes. */ @@ -93,7 +92,7 @@ display. */ /* Defines the minimum time that must pass between consecutive button presses to accept a button press as a unique press rather than just a bounce. */ -#define lcdMIN_TIME_BETWEEN_INTERRUPTS_MS ( 125UL / portTICK_RATE_MS ) +#define lcdMIN_TIME_BETWEEN_INTERRUPTS_MS ( 125UL / portTICK_PERIOD_MS ) /* Button interrupt handlers. */ #pragma interrupt ( prvIRQ1_Handler( vect = 65, enable ) ) @@ -145,17 +144,17 @@ static void prvDisplayNextString( unsigned char ucLine, char *pcString ); * lcdMIN_TIME_BETWEEN_INTERRUPTS_MS milliseconds have passed since the button * was last pushed (for debouncing). */ -static portBASE_TYPE prvSendCommandOnDebouncedInput( portTickType *pxTimeLastInterrupt, unsigned char ucCommand ); +static portBASE_TYPE prvSendCommandOnDebouncedInput( TickType_t *pxTimeLastInterrupt, unsigned char ucCommand ); /*-----------------------------------------------------------*/ /* The queue used to pass commands from the button interrupt handlers to the prvLCDTaskLine2() task. */ -static xQueueHandle xButtonCommandQueue = NULL; +static QueueHandle_t xButtonCommandQueue = NULL; /* The mutex used to ensure only one task writes to the display at any one time. */ -static xSemaphoreHandle xLCDMutex = NULL; +static SemaphoreHandle_t xLCDMutex = NULL; /* The string that is scrolled up and down the first line of the display. */ static const char cDataString1[] = " http://www.FreeRTOS.org "; @@ -207,7 +206,7 @@ unsigned char ucDirection = lcdRIGHT_TO_LEFT; for( ;; ) { - vTaskDelay( pxLCDParamaters->Speed / portTICK_RATE_MS ); + vTaskDelay( pxLCDParamaters->Speed / portTICK_PERIOD_MS ); /* Write the string. */ prvDisplayNextString( pxLCDParamaters->Line, &( pxLCDParamaters->ptr_str[ usPosition ] ) ); @@ -224,7 +223,7 @@ static void prvLCDTaskLine2( void *pvParameters ) struct _LCD_Params *pxLCDParamaters = ( struct _LCD_Params * ) pvParameters; unsigned short usPosition = 0U; unsigned char ucDirection = lcdRIGHT_TO_LEFT, ucStatus = lcdRUNNING, ucQueueData; -portTickType xDelayTicks = ( pxLCDParamaters->Speed / portTICK_RATE_MS ); +TickType_t xDelayTicks = ( pxLCDParamaters->Speed / portTICK_PERIOD_MS ); for(;;) { @@ -252,7 +251,7 @@ portTickType xDelayTicks = ( pxLCDParamaters->Speed / portTICK_RATE_MS ); if( ucStatus == lcdRUNNING ) { - xDelayTicks = ( pxLCDParamaters->Speed / portTICK_RATE_MS ); + xDelayTicks = ( pxLCDParamaters->Speed / portTICK_PERIOD_MS ); } else { @@ -373,10 +372,10 @@ static char cSingleLine[ lcdSTRING_LEN + 1 ]; } /*-----------------------------------------------------------*/ -static portBASE_TYPE prvSendCommandOnDebouncedInput( portTickType *pxTimeLastInterrupt, unsigned char ucCommand ) +static portBASE_TYPE prvSendCommandOnDebouncedInput( TickType_t *pxTimeLastInterrupt, unsigned char ucCommand ) { portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE; -portTickType xCurrentTickCount; +TickType_t xCurrentTickCount; /* Check the time now for debouncing purposes. */ xCurrentTickCount = xTaskGetTickCountFromISR(); @@ -398,7 +397,7 @@ portTickType xCurrentTickCount; static void prvIRQ1_Handler( void ) { -static portTickType xTimeLastInterrupt = 0UL; +static TickType_t xTimeLastInterrupt = 0UL; static const unsigned char ucCommand = lcdSHIFT_BACK_COMMAND; portBASE_TYPE xHigherPriorityTaskWoken; @@ -409,7 +408,7 @@ portBASE_TYPE xHigherPriorityTaskWoken; static void prvIRQ3_Handler(void) { -static portTickType xTimeLastInterrupt = 0UL; +static TickType_t xTimeLastInterrupt = 0UL; static const unsigned char ucCommand = lcdSTART_STOP_COMMAND; portBASE_TYPE xHigherPriorityTaskWoken; @@ -420,7 +419,7 @@ portBASE_TYPE xHigherPriorityTaskWoken; static void prvIRQ4_Handler(void) { -static portTickType xTimeLastInterrupt = 0UL; +static TickType_t xTimeLastInterrupt = 0UL; static const unsigned char ucCommand = lcdSHIFT_FORWARD_COMMAND; portBASE_TYPE xHigherPriorityTaskWoken;