/*\r
- FreeRTOS V7.5.0 - Copyright (C) 2013 Real Time Engineers Ltd.\r
+ FreeRTOS V8.0.0:rc1 - Copyright (C) 2014 Real Time Engineers Ltd.\r
+ All rights reserved\r
\r
VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.\r
\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 mainFLASH_DELAY ( ( portTickType ) 1000 / portTICK_RATE_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
/* 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
portTickType 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
projects / freertos / blobdiff