X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=FreeRTOS%2FDemo%2FPIC18_MPLAB%2Fmain3.c;h=a47cdc9f3ac7507afb4bb295110efc3578c951e7;hb=HEAD;hp=3a056695f95b794ba9d479773d47a92909d3fe5d;hpb=29ba679b4650a076bdb5d97b6eb578aec31eafc5;p=freertos diff --git a/FreeRTOS/Demo/PIC18_MPLAB/main3.c b/FreeRTOS/Demo/PIC18_MPLAB/main3.c index 3a056695f..a47cdc9f3 100644 --- a/FreeRTOS/Demo/PIC18_MPLAB/main3.c +++ b/FreeRTOS/Demo/PIC18_MPLAB/main3.c @@ -1,104 +1,65 @@ /* - FreeRTOS V7.2.0 - Copyright (C) 2012 Real Time Engineers Ltd. - - - *************************************************************************** - * * - * 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! * - * * - * >>> See http://www.FreeRTOS.org/Documentation for details. <<< * - * * - * Thank you for using FreeRTOS, and thank you for your support! * - * * - *************************************************************************** - - - 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. - - 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, training, latest information, - license and contact details. - - http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products, - including FreeRTOS+Trace - an indispensable productivity tool. - - 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. -*/ + * FreeRTOS Kernel V10.3.0 + * Copyright (C) 2020 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! + */ /* * THIS DEMO APPLICATION REQUIRES A LOOPBACK CONNECTOR TO BE FITTED TO THE PIC * USART PORT - connect pin 2 to pin 3 on J2. * - * Instead of the normal single demo application, the PIC18F demo is split - * into several smaller programs of which this is the third. This enables the - * demo's to be executed on the RAM limited 40 pin devices. The 64 and 80 pin - * devices require a more costly development platform and are not so readily + * Instead of the normal single demo application, the PIC18F demo is split + * into several smaller programs of which this is the third. This enables the + * demo's to be executed on the RAM limited 40 pin devices. The 64 and 80 pin + * devices require a more costly development platform and are not so readily * available. * * The RTOSDemo3 project is configured for a PIC18F452 device. Main3.c starts * 5 tasks (including the idle task). - * + * * The first task repeatedly transmits a string of characters on the PIC USART * port. The second task receives the characters, checking that the correct - * sequence is maintained (i.e. what is transmitted is identical to that - * received). Each transmitted and each received character causes an LED to + * sequence is maintained (i.e. what is transmitted is identical to that + * received). Each transmitted and each received character causes an LED to * flash. See demo/common/minimal/comtest. c for more information. * * The third task continuously performs a 32 bit calculation. This is a good - * test of the context switch mechanism as the 8 bit architecture requires + * test of the context switch mechanism as the 8 bit architecture requires * the use of several file registers to perform the 32 bit operations. See * demo/common/minimal/integer. c for more information. * * The third task is the check task. This periodically checks that the other * tasks are still running and have not experienced any errors. If no errors * have been reported by either the comms or integer tasks an LED is flashed - * with a frequency mainNO_ERROR_CHECK_PERIOD. If an error is discovered the + * with a frequency mainNO_ERROR_CHECK_PERIOD. If an error is discovered the * frequency is increased to mainERROR_FLASH_RATE. * * The check task also provides a visual indication of a system reset by - * flashing the one remaining LED (mainRESET_LED) when it starts. After + * flashing the one remaining LED (mainRESET_LED) when it starts. After * this initial flash mainRESET_LED should remain off. * - * http://www.FreeRTOS.org contains important information on the use of the + * http://www.FreeRTOS.org contains important information on the use of the * PIC18F port. */ @@ -106,7 +67,7 @@ Changes from V2.0.0 + Delay periods are now specified using variables and constants of - portTickType rather than unsigned long. + TickType_t rather than unsigned long. */ /* Scheduler include files. */ @@ -127,17 +88,17 @@ priority. */ /* The period between executions of the check task before and after an error has been discovered. If an error has been discovered the check task runs more frequently - increasing the LED flash rate. */ -#define mainNO_ERROR_CHECK_PERIOD ( ( portTickType ) 1000 / portTICK_RATE_MS ) -#define mainERROR_CHECK_PERIOD ( ( portTickType ) 100 / portTICK_RATE_MS ) +#define mainNO_ERROR_CHECK_PERIOD ( ( TickType_t ) 1000 / portTICK_PERIOD_MS ) +#define mainERROR_CHECK_PERIOD ( ( TickType_t ) 100 / portTICK_PERIOD_MS ) /* The period for which mainRESET_LED remain on every reset. */ -#define mainRESET_LED_PERIOD ( ( portTickType ) 500 / portTICK_RATE_MS ) +#define mainRESET_LED_PERIOD ( ( TickType_t ) 500 / portTICK_PERIOD_MS ) /* The LED that is toggled whenever a character is transmitted. mainCOMM_TX_RX_LED + 1 will be toggled every time a character is received. */ #define mainCOMM_TX_RX_LED ( ( unsigned portBASE_TYPE ) 2 ) -/* The LED that is flashed by the check task at a rate that indicates the +/* The LED that is flashed by the check task at a rate that indicates the error status. */ #define mainCHECK_TASK_LED ( ( unsigned portBASE_TYPE ) 1 ) @@ -149,9 +110,9 @@ error status. */ #define mainBAUD_RATE ( ( unsigned long ) 57600 ) /*-----------------------------------------------------------*/ -/* +/* * Task function which periodically checks the other tasks for errors. Flashes - * an LED at a rate that indicates whether an error has ever been detected. + * an LED at a rate that indicates whether an error has ever been detected. */ static void vErrorChecks( void *pvParameters ); @@ -174,7 +135,7 @@ void main( void ) vStartIntegerMathTasks( tskIDLE_PRIORITY ); /* Start the check task defined in this file. */ - xTaskCreate( vErrorChecks, ( const char * const ) "Check", configMINIMAL_STACK_SIZE, NULL, mainCHECK_TASK_PRIORITY, NULL ); + xTaskCreate( vErrorChecks, "Check", configMINIMAL_STACK_SIZE, NULL, mainCHECK_TASK_PRIORITY, NULL ); /* Start the scheduler. This will never return. */ vTaskStartScheduler(); @@ -183,7 +144,7 @@ void main( void ) static void vErrorChecks( void *pvParameters ) { -portTickType xDelayTime = mainNO_ERROR_CHECK_PERIOD; +TickType_t xDelayTime = mainNO_ERROR_CHECK_PERIOD; volatile unsigned long ulDummy = 3UL; /* Toggle the LED so we can see when a reset occurs. */ @@ -215,7 +176,7 @@ volatile unsigned long ulDummy = 3UL; xDelayTime = mainERROR_CHECK_PERIOD; } - /* Flash the LED for visual feedback. The rate of the flash will + /* Flash the LED for visual feedback. The rate of the flash will indicate the health of the system. */ vParTestToggleLED( mainCHECK_TASK_LED ); }