/*\r
- FreeRTOS V7.2.0 - Copyright (C) 2012 Real Time Engineers Ltd.\r
- \r
-\r
- ***************************************************************************\r
- * *\r
- * FreeRTOS tutorial books are available in pdf and paperback. *\r
- * Complete, revised, and edited pdf reference manuals are also *\r
- * available. *\r
- * *\r
- * Purchasing FreeRTOS documentation will not only help you, by *\r
- * ensuring you get running as quickly as possible and with an *\r
- * in-depth knowledge of how to use FreeRTOS, it will also help *\r
- * the FreeRTOS project to continue with its mission of providing *\r
- * professional grade, cross platform, de facto standard solutions *\r
- * for microcontrollers - completely free of charge! *\r
- * *\r
- * >>> See http://www.FreeRTOS.org/Documentation for details. <<< *\r
- * *\r
- * Thank you for using FreeRTOS, and thank you for your support! *\r
- * *\r
- ***************************************************************************\r
-\r
-\r
- This file is part of the FreeRTOS distribution.\r
-\r
- FreeRTOS is free software; you can redistribute it and/or modify it under\r
- the terms of the GNU General Public License (version 2) as published by the\r
- Free Software Foundation AND MODIFIED BY the FreeRTOS exception.\r
- >>>NOTE<<< The modification to the GPL is included to allow you to\r
- distribute a combined work that includes FreeRTOS without being obliged to\r
- provide the source code for proprietary components outside of the FreeRTOS\r
- kernel. FreeRTOS is distributed in the hope that it will be useful, but\r
- WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY\r
- or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for\r
- more details. You should have received a copy of the GNU General Public\r
- License and the FreeRTOS license exception along with FreeRTOS; if not it\r
- can be viewed here: http://www.freertos.org/a00114.html and also obtained\r
- by writing to Richard Barry, contact details for whom are available on the\r
- FreeRTOS WEB site.\r
-\r
- 1 tab == 4 spaces!\r
- \r
- ***************************************************************************\r
- * *\r
- * Having a problem? Start by reading the FAQ "My application does *\r
- * not run, what could be wrong? *\r
- * *\r
- * http://www.FreeRTOS.org/FAQHelp.html *\r
- * *\r
- ***************************************************************************\r
-\r
- \r
- http://www.FreeRTOS.org - Documentation, training, latest information, \r
- license and contact details.\r
- \r
- http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,\r
- including FreeRTOS+Trace - an indispensable productivity tool.\r
-\r
- Real Time Engineers ltd license FreeRTOS to High Integrity Systems, who sell \r
- the code with commercial support, indemnification, and middleware, under \r
- the OpenRTOS brand: http://www.OpenRTOS.com. High Integrity Systems also\r
- provide a safety engineered and independently SIL3 certified version under \r
- the SafeRTOS brand: http://www.SafeRTOS.com.\r
-*/\r
+ * FreeRTOS Kernel V10.0.0\r
+ * Copyright (C) 2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.\r
+ *\r
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of\r
+ * this software and associated documentation files (the "Software"), to deal in\r
+ * the Software without restriction, including without limitation the rights to\r
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of\r
+ * the Software, and to permit persons to whom the Software is furnished to do so,\r
+ * subject to the following conditions:\r
+ *\r
+ * The above copyright notice and this permission notice shall be included in all\r
+ * copies or substantial portions of the Software. If you wish to use our Amazon\r
+ * FreeRTOS name, please do so in a fair use way that does not cause confusion.\r
+ *\r
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\r
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS\r
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR\r
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER\r
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN\r
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\r
+ *\r
+ * http://www.FreeRTOS.org\r
+ * http://aws.amazon.com/freertos\r
+ *\r
+ * 1 tab == 4 spaces!\r
+ */\r
\r
/*\r
* Creates all the demo application tasks, then starts the scheduler. The WEB\r
* along with the max jitter time to the LCD (again via the LCD task), as\r
* described above.\r
*\r
- * Tick Hook - A tick hook is provided just for demonstration purposes. In \r
+ * Tick Hook - A tick hook is provided just for demonstration purposes. In\r
* this case it is used to periodically send an instruction to updated the\r
* MEMS input to the LCD task.\r
*\r
*/\r
\r
-/* CircleOS includes. Some of the CircleOS peripheral functionality is \r
+/* CircleOS includes. Some of the CircleOS peripheral functionality is\r
utilised, although CircleOS itself is not used. */\r
#include "circle.h"\r
\r
#define mainBITMAP_X ( 18 )\r
#define mainURL_Y ( 8 )\r
#define mainURL_X ( 78 )\r
-#define mainSPLASH_SCREEN_DELAY ( 2000 / portTICK_RATE_MS )\r
+#define mainSPLASH_SCREEN_DELAY ( 2000 / portTICK_PERIOD_MS )\r
\r
/* Text drawing related constants. */\r
#define mainLCD_CHAR_HEIGHT ( 13 )\r
#define mainMAX_MSG_LEN 25\r
\r
/* The time between cycles of the 'check' task. */\r
-#define mainCHECK_DELAY ( ( portTickType ) 5000 / portTICK_RATE_MS )\r
+#define mainCHECK_DELAY ( ( TickType_t ) 5000 / portTICK_PERIOD_MS )\r
\r
/* The period at which the MEMS input should be updated. */\r
-#define mainMEMS_DELAY ( ( portTickType ) 100 / portTICK_RATE_MS )\r
+#define mainMEMS_DELAY ( ( TickType_t ) 100 / portTICK_PERIOD_MS )\r
\r
/* The rate at which the flash task toggles the LED. */\r
-#define mainFLASH_DELAY ( ( portTickType ) 1000 / portTICK_RATE_MS )\r
+#define mainFLASH_DELAY ( ( TickType_t ) 1000 / portTICK_PERIOD_MS )\r
\r
/* The number of nano seconds between each processor clock. */\r
-#define mainNS_PER_CLOCK ( ( unsigned portLONG ) ( ( 1.0 / ( double ) configCPU_CLOCK_HZ ) * 1000000000.0 ) )\r
+#define mainNS_PER_CLOCK ( ( unsigned long ) ( ( 1.0 / ( double ) configCPU_CLOCK_HZ ) * 1000000000.0 ) )\r
\r
/* The two types of message that can be sent to the LCD task. */\r
#define mainUPDATE_BALL_MESSAGE ( 0 )\r
\r
/*\r
* A cut down version of sprintf() used to percent the HUGE GCC library\r
- * equivalent from being included in the binary image. \r
+ * equivalent from being included in the binary image.\r
*/\r
extern int sprintf(char *out, const char *format, ...);\r
\r
/*-----------------------------------------------------------*/\r
\r
/* The queue used to send messages to the LCD task. */\r
-xQueueHandle xLCDQueue;\r
+QueueHandle_t xLCDQueue;\r
\r
/*-----------------------------------------------------------*/\r
\r
/* Create the queue used by the LCD task. Messages for display on the LCD\r
are received via this queue. */\r
xLCDQueue = xQueueCreate( mainLCD_QUEUE_SIZE, sizeof( xLCDMessage ) );\r
- \r
+\r
/* Start the standard demo tasks. */\r
vStartBlockingQueueTasks( mainBLOCK_Q_PRIORITY );\r
vCreateBlockTimeTasks();\r
vStartPolledQueueTasks( mainQUEUE_POLL_PRIORITY );\r
\r
/* Start the tasks defined within this file/specific to this demo. */\r
- xTaskCreate( prvCheckTask, ( signed portCHAR * ) "Check", mainCHECK_TASK_STACK_SIZE, NULL, mainCHECK_TASK_PRIORITY, NULL ); \r
- xTaskCreate( prvLCDTask, ( signed portCHAR * ) "LCD", configLCD_TASK_STACK_SIZE, NULL, tskIDLE_PRIORITY, NULL );\r
- xTaskCreate( prvFlashTask, ( signed portCHAR * ) "Flash", configMINIMAL_STACK_SIZE, NULL, mainFLASH_TASK_PRIORITY, NULL );\r
+ xTaskCreate( prvCheckTask, "Check", mainCHECK_TASK_STACK_SIZE, NULL, mainCHECK_TASK_PRIORITY, NULL );\r
+ xTaskCreate( prvLCDTask, "LCD", configLCD_TASK_STACK_SIZE, NULL, tskIDLE_PRIORITY, NULL );\r
+ xTaskCreate( prvFlashTask, "Flash", configMINIMAL_STACK_SIZE, NULL, mainFLASH_TASK_PRIORITY, NULL );\r
\r
/* Configure the timers used by the fast interrupt timer test. */\r
vSetupTimerTest();\r
- \r
+\r
/* Start the scheduler. */\r
vTaskStartScheduler();\r
- \r
+\r
/* Will only get here if there was not enough heap space to create the\r
idle task. */\r
return 0;\r
void prvLCDTask( void *pvParameters )\r
{\r
xLCDMessage xMessage;\r
-portCHAR cY = mainLCD_CHAR_HEIGHT;\r
-const portCHAR * const pcString = "www.FreeRTOS.org";\r
-const portCHAR * const pcBlankLine = " ";\r
+char cY = mainLCD_CHAR_HEIGHT;\r
+const char * const pcString = "www.FreeRTOS.org";\r
+const char * const pcBlankLine = " ";\r
\r
DRAW_Init();\r
\r
\r
cY -= mainLCD_CHAR_HEIGHT;\r
if( cY <= ( mainLCD_CHAR_HEIGHT - 1 ) )\r
- { \r
+ {\r
/* Wrap the line onto which we are going to write the text. */\r
cY = mainLCD_MAX_Y;\r
}\r
- \r
+\r
/* Display the message. */\r
DRAW_DisplayString( 0, cY, xMessage.pcMessage, strlen( xMessage.pcMessage ) );\r
}\r
\r
static void prvCheckTask( void *pvParameters )\r
{\r
-portTickType xLastExecutionTime;\r
+TickType_t xLastExecutionTime;\r
xLCDMessage xMessage;\r
-static signed portCHAR cPassMessage[ mainMAX_MSG_LEN ];\r
-extern unsigned portSHORT usMaxJitter;\r
+static signed char cPassMessage[ mainMAX_MSG_LEN ];\r
+extern unsigned short usMaxJitter;\r
\r
/* Initialise the xLastExecutionTime variable on task entry. */\r
xLastExecutionTime = xTaskGetTickCount();\r
/* Setup the message we are going to send to the LCD task. */\r
xMessage.xMessageType = mainWRITE_STRING_MESSAGE;\r
xMessage.pcMessage = cPassMessage;\r
- \r
+\r
for( ;; )\r
{\r
/* Perform this check every mainCHECK_DELAY milliseconds. */\r
with the max measured jitter time also included (as per the\r
fast interrupt test described at the top of this file and on\r
the online documentation page for this demo application). */\r
- sprintf( ( portCHAR * ) cPassMessage, "PASS [%uns]", ( ( unsigned portLONG ) usMaxJitter ) * mainNS_PER_CLOCK );\r
+ sprintf( ( char * ) cPassMessage, "PASS [%uns]", ( ( unsigned long ) usMaxJitter ) * mainNS_PER_CLOCK );\r
}\r
\r
/* Send the message to the LCD gatekeeper for display. */\r
\r
void vApplicationTickHook( void )\r
{\r
-static unsigned portLONG ulCallCount;\r
+static unsigned long ulCallCount;\r
static const xLCDMessage xMemsMessage = { mainUPDATE_BALL_MESSAGE, NULL };\r
static portBASE_TYPE xHigherPriorityTaskWoken;\r
\r
}\r
\r
/* 2 wait states required on the flash. */\r
- *( ( unsigned portLONG * ) 0x40022000 ) = 0x02;\r
+ *( ( unsigned long * ) 0x40022000 ) = 0x02;\r
\r
/* HCLK = SYSCLK */\r
RCC_HCLKConfig( RCC_SYSCLK_Div1 );\r
NVIC_SetVectorTable( NVIC_VectTab_FLASH, 0x0 );\r
\r
NVIC_PriorityGroupConfig( NVIC_PriorityGroup_4 );\r
- \r
+\r
/* Configure HCLK clock as SysTick clock source. */\r
SysTick_CLKSourceConfig( SysTick_CLKSource_HCLK );\r
- \r
+\r
/* Misc initialisation, including some of the CircleOS features. Note\r
that CircleOS itself is not used. */\r
vParTestInitialise();\r
\r
static void prvFlashTask( void *pvParameters )\r
{\r
-portTickType xLastExecutionTime;\r
+TickType_t xLastExecutionTime;\r
\r
/* Initialise the xLastExecutionTime variable on task entry. */\r
xLastExecutionTime = xTaskGetTickCount();\r
\r
void starting_delay( unsigned long ul )\r
{\r
- vTaskDelay( ( portTickType ) ul );\r
+ vTaskDelay( ( TickType_t ) ul );\r
}\r
\r
\r
projects / freertos / blobdiff