X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=FreeRTOS%2FDemo%2FPIC18_MPLAB%2Fmain1.c;h=2576cefd1dcf9860a9d6373632ca1e2468258583;hb=04f5830e5a04fd6d0d953fefe62e3c2ae922a5b1;hp=b558356611745a16198115bb818708aa36abbfcf;hpb=4fc98ea9360d27da61c0096a3a46abcf64ca400d;p=freertos diff --git a/FreeRTOS/Demo/PIC18_MPLAB/main1.c b/FreeRTOS/Demo/PIC18_MPLAB/main1.c index b55835661..2576cefd1 100644 --- a/FreeRTOS/Demo/PIC18_MPLAB/main1.c +++ b/FreeRTOS/Demo/PIC18_MPLAB/main1.c @@ -1,102 +1,129 @@ /* - FreeRTOS V7.3.0 - Copyright (C) 2012 Real Time Engineers Ltd. + FreeRTOS V8.2.0rc1 - Copyright (C) 2014 Real Time Engineers Ltd. + All rights reserved - FEATURES AND PORTS ARE ADDED TO FREERTOS ALL THE TIME. PLEASE VISIT - http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION. + VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION. + + 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 on the following + link: http://www.freertos.org/a00114.html + + 1 tab == 4 spaces! *************************************************************************** * * - * FreeRTOS tutorial books are available in pdf and paperback. * - * Complete, revised, and edited pdf reference manuals are also * - * available. * + * Having a problem? Start by reading the FAQ "My application does * + * not run, what could be wrong?". Have you defined configASSERT()? * + * * + * http://www.FreeRTOS.org/FAQHelp.html * * * - * 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. <<< * + * FreeRTOS provides completely free yet professionally developed, * + * robust, strictly quality controlled, supported, and cross * + * platform software that is more than just the market leader, it * + * is the industry's de facto standard. * * * - * Thank you for using FreeRTOS, and thank you for your support! * + * Help yourself get started quickly while simultaneously helping * + * to support the FreeRTOS project by purchasing a FreeRTOS * + * tutorial book, reference manual, or both: * + * http://www.FreeRTOS.org/Documentation * * * *************************************************************************** + *************************************************************************** + * * + * Investing in training allows your team to be as productive as * + * possible as early as possible, lowering your overall development * + * cost, and enabling you to bring a more robust product to market * + * earlier than would otherwise be possible. Richard Barry is both * + * the architect and key author of FreeRTOS, and so also the world's * + * leading authority on what is the world's most popular real time * + * kernel for deeply embedded MCU designs. Obtaining your training * + * from Richard ensures your team will gain directly from his in-depth * + * product knowledge and years of usage experience. Contact Real Time * + * Engineers Ltd to enquire about the FreeRTOS Masterclass, presented * + * by Richard Barry: http://www.FreeRTOS.org/contact + * * + *************************************************************************** - 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?" * + * You are receiving this top quality software for free. Please play * + * fair and reciprocate by reporting any suspected issues and * + * participating in the community forum: * + * http://www.FreeRTOS.org/support * * * - * http://www.FreeRTOS.org/FAQHelp.html * + * Thank you! * * * *************************************************************************** - - http://www.FreeRTOS.org - Documentation, training, latest versions, 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. - 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.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate. + Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS. + + http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High + Integrity Systems ltd. to sell under the OpenRTOS brand. Low cost OpenRTOS + licenses offer ticketed support, indemnification and commercial 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! */ /* - * Instead of the normal single demo application, the PIC18F demo is split - * into several smaller programs of which this is the first. 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 first. 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 RTOSDemo1 project is configured for a PIC18F452 device. Main1.c starts 5 + * The RTOSDemo1 project is configured for a PIC18F452 device. Main1.c starts 5 * tasks (including the idle task). * - * The first task runs at the idle priority. It repeatedly performs a 32bit - * calculation and checks it's result against the expected value. This checks - * that the temporary storage utilised by the compiler to hold intermediate - * results does not get corrupted when the task gets switched in and out. See + * The first task runs at the idle priority. It repeatedly performs a 32bit + * calculation and checks it's result against the expected value. This checks + * that the temporary storage utilised by the compiler to hold intermediate + * results does not get corrupted when the task gets switched in and out. See * demo/common/minimal/integer.c for more information. * - * The second and third tasks pass an incrementing value between each other on + * The second and third tasks pass an incrementing value between each other on * a message queue. See demo/common/minimal/PollQ.c for more information. * - * Main1.c also creates a check task. This periodically checks that all the - * other tasks are still running and have not experienced any unexpected - * results. If all the other tasks are executing correctly an LED is flashed - * once every mainCHECK_PERIOD milliseconds. If any of the tasks have not - * executed, or report and error, the frequency of the LED flash will increase + * Main1.c also creates a check task. This periodically checks that all the + * other tasks are still running and have not experienced any unexpected + * results. If all the other tasks are executing correctly an LED is flashed + * once every mainCHECK_PERIOD milliseconds. If any of the tasks have not + * executed, or report and error, the frequency of the LED flash will increase * to mainERROR_FLASH_RATE. * * On entry to main an 'X' is transmitted. Monitoring the serial port using a - * dumb terminal allows for verification that the device is not continuously + * dumb terminal allows for verification that the device is not continuously * being reset (no more than one 'X' should be transmitted). * - * 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. */ @@ -104,7 +131,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. */ @@ -120,8 +147,8 @@ Changes from V2.0.0 /* 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 ) /* Priority definitions for some of the tasks. Other tasks just use the idle priority. */ @@ -131,10 +158,10 @@ priority. */ /* The LED that is flashed by the check task. */ #define mainCHECK_TASK_LED ( 0 ) -/* Constants required for the communications. Only one character is ever +/* Constants required for the communications. Only one character is ever transmitted. */ #define mainCOMMS_QUEUE_LENGTH ( 5 ) -#define mainNO_BLOCK ( ( portTickType ) 0 ) +#define mainNO_BLOCK ( ( TickType_t ) 0 ) #define mainBAUD_RATE ( ( unsigned long ) 9600 ) /* @@ -166,7 +193,7 @@ void main( void ) vStartPolledQueueTasks( mainQUEUE_POLL_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. Will never return here. */ vTaskStartScheduler(); @@ -175,7 +202,7 @@ void main( void ) static void vErrorChecks( void *pvParameters ) { -portTickType xDelayTime = mainNO_ERROR_CHECK_PERIOD; +TickType_t xDelayTime = mainNO_ERROR_CHECK_PERIOD; portBASE_TYPE xErrorOccurred; /* Cycle for ever, delaying then checking all the other tasks are still