X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=FreeRTOS%2FDemo%2FPIC18_WizC%2FDemo5%2Fmain.c;h=08e89da1566462646e5bbdeb0e465dba6304a3e1;hb=e23c63709bf25dfbd3fc685c688de550b720f97c;hp=d963171f3f13547748f41eef7dffbfef490fc55a;hpb=abc9255183aa4ad1b011116333f26570ccc7aa4b;p=freertos diff --git a/FreeRTOS/Demo/PIC18_WizC/Demo5/main.c b/FreeRTOS/Demo/PIC18_WizC/Demo5/main.c index d963171f3..08e89da15 100644 --- a/FreeRTOS/Demo/PIC18_WizC/Demo5/main.c +++ b/FreeRTOS/Demo/PIC18_WizC/Demo5/main.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.1 + * 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! + */ /* Changes from V3.0.0 @@ -69,29 +32,29 @@ Changes from V3.0.1 */ /* - * Instead of the normal single demo application, the PIC18F demo is split - * into several smaller programs of which this is the fifth. This enables the + * Instead of the normal single demo application, the PIC18F demo is split + * into several smaller programs of which this is the fifth. This enables the * demo's to be executed on the RAM limited PIC-devices. * - * The Demo5 project is configured for a PIC18F4620 device. Main.c starts 13 + * The Demo5 project is configured for a PIC18F4620 device. Main.c starts 13 * tasks (including the idle task). See the indicated files in the demo/common * directory for more information. * * demo/common/minimal/flop.c: Creates 8 tasks * demo/common/minimal/flash.c: Creates 3 tasks * - * Main.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 an error, the frequency of the LED flash will increase + * Main.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 an 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 * wizC PIC18F port. */ @@ -108,8 +71,8 @@ Changes from V3.0.1 /* 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 ) 10000 / portTICK_RATE_MS ) -#define mainERROR_CHECK_PERIOD ( ( portTickType ) 1000 / portTICK_RATE_MS ) +#define mainNO_ERROR_CHECK_PERIOD ( ( TickType_t ) 10000 / portTICK_PERIOD_MS ) +#define mainERROR_CHECK_PERIOD ( ( TickType_t ) 1000 / portTICK_PERIOD_MS ) #define mainCHECK_TASK_LED ( ( unsigned char ) 3 ) /* Priority definitions for some of the tasks. Other tasks just use the idle @@ -117,10 +80,10 @@ priority. */ #define mainCHECK_TASK_PRIORITY ( tskIDLE_PRIORITY + ( unsigned char ) 2 ) #define mainLED_FLASH_PRIORITY ( tskIDLE_PRIORITY + ( unsigned char ) 1 ) -/* 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 ( ( unsigned char ) 5 ) -#define mainNO_BLOCK ( ( portTickType ) 0 ) +#define mainNO_BLOCK ( ( TickType_t ) 0 ) #define mainBAUD_RATE ( ( unsigned long ) 57600 ) /* @@ -151,7 +114,7 @@ void main( void ) vStartLEDFlashTasks( mainLED_FLASH_PRIORITY ); /* Start the check task defined in this file. */ - xTaskCreate( vErrorChecks, ( const char * const ) "Check", portMINIMAL_STACK_SIZE, NULL, mainCHECK_TASK_PRIORITY, NULL ); + xTaskCreate( vErrorChecks, "Check", portMINIMAL_STACK_SIZE, NULL, mainCHECK_TASK_PRIORITY, NULL ); /* Start the scheduler. Will never return here. */ vTaskStartScheduler(); @@ -164,21 +127,21 @@ void main( void ) static portTASK_FUNCTION( vErrorChecks, pvParameters ) { -portTickType xLastCheckTime; -portTickType xDelayTime = mainNO_ERROR_CHECK_PERIOD; +TickType_t xLastCheckTime; +TickType_t xDelayTime = mainNO_ERROR_CHECK_PERIOD; char cErrorOccurred; - /* We need to initialise xLastCheckTime prior to the first call to + /* We need to initialise xLastCheckTime prior to the first call to vTaskDelayUntil(). */ xLastCheckTime = xTaskGetTickCount(); - + /* Cycle for ever, delaying then checking all the other tasks are still operating without error. */ for( ;; ) { /* Wait until it is time to check the other tasks again. */ vTaskDelayUntil( &xLastCheckTime, xDelayTime ); - + /* Check all the other tasks are running, and running without ever having an error. */ cErrorOccurred = prvCheckOtherTasksAreStillRunning();