From e2df6fb93624ddf611b3cf00ff1660a2213a4274 Mon Sep 17 00:00:00 2001 From: rtel Date: Tue, 26 Aug 2014 16:23:09 +0000 Subject: [PATCH] Minor edits prior to tagging V8.1.0. git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2291 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- .../CORTEX_A5_SAMA5D3x_Xplained_IAR/6119.inf | 101 +++ .../FreeRTOSConfig.h | 18 +- .../RTOSDemo/src/lwIP_Demo/main_lwIP.c | 6 +- .../src/LCD/font.h | 33 - .../CORTEX_LPC1768_GCC_RedSuite/src/LCD/lcd.c | 308 -------- .../CORTEX_LPC1768_GCC_RedSuite/src/LCD/lcd.h | 92 --- .../src/LCD/lcd_commands.h | 53 -- .../src/LCD/lcd_driver.c | 190 ----- .../src/LCD/lcd_driver.h | 36 - .../src/LCD/system_fixed_be_8_15.c | 673 ------------------ .../CORTEX_LPC1768_GCC_RedSuite/src/main.c | 9 +- FreeRTOS/Source/include/FreeRTOS.h | 4 +- 12 files changed, 125 insertions(+), 1398 deletions(-) create mode 100644 FreeRTOS/Demo/CORTEX_A5_SAMA5D3x_Xplained_IAR/6119.inf delete mode 100644 FreeRTOS/Demo/CORTEX_LPC1768_GCC_RedSuite/src/LCD/font.h delete mode 100644 FreeRTOS/Demo/CORTEX_LPC1768_GCC_RedSuite/src/LCD/lcd.c delete mode 100644 FreeRTOS/Demo/CORTEX_LPC1768_GCC_RedSuite/src/LCD/lcd.h delete mode 100644 FreeRTOS/Demo/CORTEX_LPC1768_GCC_RedSuite/src/LCD/lcd_commands.h delete mode 100644 FreeRTOS/Demo/CORTEX_LPC1768_GCC_RedSuite/src/LCD/lcd_driver.c delete mode 100644 FreeRTOS/Demo/CORTEX_LPC1768_GCC_RedSuite/src/LCD/lcd_driver.h delete mode 100644 FreeRTOS/Demo/CORTEX_LPC1768_GCC_RedSuite/src/LCD/system_fixed_be_8_15.c diff --git a/FreeRTOS/Demo/CORTEX_A5_SAMA5D3x_Xplained_IAR/6119.inf b/FreeRTOS/Demo/CORTEX_A5_SAMA5D3x_Xplained_IAR/6119.inf new file mode 100644 index 000000000..b04272b0f --- /dev/null +++ b/FreeRTOS/Demo/CORTEX_A5_SAMA5D3x_Xplained_IAR/6119.inf @@ -0,0 +1,101 @@ +; +; Windows USB CDC Driver Setup File for ATMEL AT91SAM products +; +; On Windows 7, right click to update driver software. It may take a while to +; get this option, even if you cancel the auto driver search. +; choose "browse my computer for driver software", +; choose "let me pick from a list of device drivers on my computer", +; Click "have disk" and browse to this .inf file +; If there is a problem, right click and uninstall, checking delete driver software. + +;------------------------------------------------------------------------------ + +[Version] +Signature="$Windows NT$" +Class=Ports +ClassGuid={4D36E978-E325-11CE-BFC1-08002BE10318} +Provider=%ATMEL% +LayoutFile=layout.inf + +DriverVer= 03/09/2011,2.0.0.0 + +[Manufacturer] +%ATMEL%=DeviceList,NTamd64 + +[DestinationDirs] +DefaultDestDir=12 + + +;------------------------------------------------------------------------------ +; Windows 2000/XP/Vista32 Support +;------------------------------------------------------------------------------ +[DriverInstall.nt] +include=mdmcpq.inf +CopyFiles=DriverCopyFiles.nt +AddReg=DriverInstall.nt.AddReg + +[DriverCopyFiles.nt] +usbser.sys,,,0x20 + +[DriverInstall.nt.AddReg] +HKR,,DevLoader,,*ntkern +HKR,,NTMPDriver,,usbser.sys +HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider" + +[DriverInstall.nt.Services] +AddService=usbser, 0x00000002, DriverService.nt + +[DriverService.nt] +DisplayName=%USBtoSerialConverter% +ServiceType=1 +StartType=3 +ErrorControl=1 +ServiceBinary=%12%\usbser.sys + +;------------------------------------------------------------------------------ +; Windows Vista64 Support +;------------------------------------------------------------------------------ + +[DriverInstall.NTamd64] +include=mdmcpq.inf +CopyFiles=DriverCopyFiles.NTamd64 +AddReg=DriverInstall.NTamd64.AddReg + +[DriverCopyFiles.NTamd64] +usbser.sys,,,0x20 + +[DriverInstall.NTamd64.AddReg] +HKR,,DevLoader,,*ntkern +HKR,,NTMPDriver,,usbser.sys +HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider" + + +[DriverInstall.NTamd64.Services] +AddService=usbser, 0x00000002, DriverService.NTamd64 + +[DriverService.NTamd64] +DisplayName=%USBtoSerialConverter% +ServiceType=1 +StartType=3 +ErrorControl=1 +ServiceBinary=%12%\usbser.sys + + +;------------------------------------------------------------------------------ +; VID/PID Settings +;------------------------------------------------------------------------------ +[SourceDisksFiles] +[SourceDisksNames] +[DeviceList] +%USBtoSerialConverter%=DriverInstall, USB\VID_03EB&PID_6119 + +[DeviceList.NTamd64] +%USBtoSerialConverter%=DriverInstall, USB\VID_03EB&PID_6119 + +;------------------------------------------------------------------------------ +; String Definitions +;------------------------------------------------------------------------------ +[Strings] + +ATMEL="ATMEL Corp." ; String value for the ATMEL symbol +USBtoSerialConverter="AT91 USB to Serial Converter" ; String value for the USBtoSerialConverter symbol diff --git a/FreeRTOS/Demo/CORTEX_A5_SAMA5D3x_Xplained_IAR/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_A5_SAMA5D3x_Xplained_IAR/FreeRTOSConfig.h index 77ce323e8..e47cadf5c 100644 --- a/FreeRTOS/Demo/CORTEX_A5_SAMA5D3x_Xplained_IAR/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/CORTEX_A5_SAMA5D3x_Xplained_IAR/FreeRTOSConfig.h @@ -129,12 +129,26 @@ readable ASCII form. See the notes in the implementation of vTaskList() within FreeRTOS/Source/tasks.c for limitations. */ #define configUSE_STATS_FORMATTING_FUNCTIONS 1 -/* FPU has 16 (rather than 32) d registers. */ +/* Cortex-A specific setting: FPU has 16 (rather than 32) d registers. See: +http://www.FreeRTOS.org/Using-FreeRTOS-on-Cortex-A-MPUs-without-a-GIC.html */ #define configFPU_D32 0 -#define configPIT_PIVR ( *( ( volatile uint32_t * ) 0xFFFFFE38UL ) ) +/* Cortex-A specific setting: The address of the register within the interrupt +controller from which the address of the current interrupt's handling function +can be obtained. See: +http://www.FreeRTOS.org/Using-FreeRTOS-on-Cortex-A-MPUs-without-a-GIC.html #define configINTERRUPT_VECTOR_ADDRESS 0xFFFFF010UL + +/* Cortex-A specific setting: The address of End of Interrupt register within +the interrupt controller. See: +http://www.FreeRTOS.org/Using-FreeRTOS-on-Cortex-A-MPUs-without-a-GIC.html */ #define configEOI_ADDRESS 0xFFFFF038UL + +/* Cortex-A specific setting: configCLEAR_TICK_INTERRUPT() is a macro that is +called by the RTOS kernel's tick handler to clear the source of the tick +interrupt. See: +http://www.FreeRTOS.org/Using-FreeRTOS-on-Cortex-A-MPUs-without-a-GIC.html */ +#define configPIT_PIVR ( *( ( volatile uint32_t * ) 0xFFFFFE38UL ) ) #define configCLEAR_TICK_INTERRUPT() ( void ) configPIT_PIVR /* Read PIT_PIVR to clear interrupt. */ /* Prevent C code being included in assembly files when the IAR compiler is diff --git a/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/src/lwIP_Demo/main_lwIP.c b/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/src/lwIP_Demo/main_lwIP.c index 512868a5b..507e5bd02 100644 --- a/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/src/lwIP_Demo/main_lwIP.c +++ b/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/src/lwIP_Demo/main_lwIP.c @@ -86,9 +86,9 @@ * a netmask are also located at the bottom of FreeRTOSConfig.h. * * When connected correctly the demo uses the lwIP sockets API to create - * a FreeRTOS+CLI command console, and the lwIP raw API to create a create a - * basic HTTP web server with server side includes that generate dynamic run - * time web pages. See http://www.freertos.org/RTOS-Xilinx-Zynq.html for more + * a FreeRTOS+CLI command console, and the lwIP raw API to create a basic HTTP + * web server with server side includes that generate dynamic run time web + * pages. See http://www.freertos.org/RTOS-Xilinx-Zynq.html for more * information. * * To connect to FreeRTOS+CLI, open a command prompt and enter "telnet " diff --git a/FreeRTOS/Demo/CORTEX_LPC1768_GCC_RedSuite/src/LCD/font.h b/FreeRTOS/Demo/CORTEX_LPC1768_GCC_RedSuite/src/LCD/font.h deleted file mode 100644 index c7f07ca43..000000000 --- a/FreeRTOS/Demo/CORTEX_LPC1768_GCC_RedSuite/src/LCD/font.h +++ /dev/null @@ -1,33 +0,0 @@ -//***************************************************************************** -// +--+ -// | ++----+ -// +-++ | -// | | -// +-+--+ | -// | +--+--+ -// +----+ Copyright (c) 2009 Code Red Technologies Ltd. -// -// font.h - header file for font data contained in system_fixed_be_8_15.c -// -// Software License Agreement -// -// The software is owned by Code Red Technologies and/or its suppliers, and is -// protected under applicable copyright laws. All rights are reserved. Any -// use in violation of the foregoing restrictions may subject the user to criminal -// sanctions under applicable laws, as well as to civil liability for the breach -// of the terms and conditions of this license. -// -// THIS SOFTWARE IS PROVIDED "AS IS". NO WARRANTIES, WHETHER EXPRESS, IMPLIED -// OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE APPLY TO THIS SOFTWARE. -// USE OF THIS SOFTWARE FOR COMMERCIAL DEVELOPMENT AND/OR EDUCATION IS SUBJECT -// TO A CURRENT END USER LICENSE AGREEMENT (COMMERCIAL OR EDUCATIONAL) WITH -// CODE RED TECHNOLOGIES LTD. - -#ifndef FONT_H_ -#define FONT_H_ - -extern const unsigned char font_data_table[]; -extern const unsigned char font_index_table[]; - -#endif /*FONT_H_*/ diff --git a/FreeRTOS/Demo/CORTEX_LPC1768_GCC_RedSuite/src/LCD/lcd.c b/FreeRTOS/Demo/CORTEX_LPC1768_GCC_RedSuite/src/LCD/lcd.c deleted file mode 100644 index fed36a9f9..000000000 --- a/FreeRTOS/Demo/CORTEX_LPC1768_GCC_RedSuite/src/LCD/lcd.c +++ /dev/null @@ -1,308 +0,0 @@ -//***************************************************************************** -// +--+ -// | ++----+ -// +-++ | -// | | -// +-+--+ | -// | +--+--+ -// +----+ Copyright (c) 2009 Code Red Technologies Ltd. -// -// lcd.c contains various routines to plot to the LCD display on the RDB1768 -// development board. -// -// Software License Agreement -// -// The software is owned by Code Red Technologies and/or its suppliers, and is -// protected under applicable copyright laws. All rights are reserved. Any -// use in violation of the foregoing restrictions may subject the user to criminal -// sanctions under applicable laws, as well as to civil liability for the breach -// of the terms and conditions of this license. -// -// THIS SOFTWARE IS PROVIDED "AS IS". NO WARRANTIES, WHETHER EXPRESS, IMPLIED -// OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE APPLY TO THIS SOFTWARE. -// USE OF THIS SOFTWARE FOR COMMERCIAL DEVELOPMENT AND/OR EDUCATION IS SUBJECT -// TO A CURRENT END USER LICENSE AGREEMENT (COMMERCIAL OR EDUCATIONAL) WITH -// CODE RED TECHNOLOGIES LTD. - -#include "lcd_commands.h" -#include "lcd.h" -#include "lcd_driver.h" -#include "font.h" - -#include // to provice abs() function - -// Routine to draw a filled rectangle to the LCD. -// Two corners of rectangle are at (xmin,ymin) and (xmax,ymax). -// The Rectangle is filled with the RGB565 color specified -void LCD_FilledRect(int xmin,int xmax,int ymin,int ymax,int color) -{ - int i; - - // Specify to LCD controller coordinates we are writing to... - LCDdriver_WriteCom(DD_CASET); // Set the column address - LCDdriver_WriteData(xmin); // min address - LCDdriver_WriteData(xmax); // max address - LCDdriver_WriteCom(DD_RASET); // Set the row address - LCDdriver_WriteData(ymin + 1); // min address - LCDdriver_WriteData(ymax + 1); // max address - LCDdriver_WriteCom(DD_RAMWR); // RAM Write command - - // Plot the color data to the LCD buffer - for(i = ((xmax - xmin + 1) * (ymax - ymin + 1)); i > 0; i--) - { - LCDdriver_WriteData(color >> 8); // top 8 bits of RGB565 color - LCDdriver_WriteData(color); // bottom 8 bits of RGB565 color - } -} - -// Routine to draw an unfilled rectangle to the LCD. -// Two corners of rectangle are at (xmin,ymin) and (xmax,ymax). -// The Rectangle is drawn in the RGB565 color specified -void LCD_Rect(int xmin,int xmax,int ymin,int ymax,int color) -{ - // Draw 4 lines of rectange as 4 filled rectanges, each of 1 pixel wide - LCD_FilledRect(xmin,xmin,ymin,ymax,color); - LCD_FilledRect(xmax,xmax,ymin,ymax,color); - LCD_FilledRect(xmin,xmax,ymin,ymin,color); - LCD_FilledRect(xmin,xmax,ymax,ymax,color); -} - - - -// Plot a point on the screen in the 6:5:6 color format -void LCD_PlotPoint(int x,int y,int color) -{ - LCDdriver_WriteCom(DD_CASET); // Set the column address - LCDdriver_WriteData(x); // min address - LCDdriver_WriteData(x); // max address - LCDdriver_WriteCom(DD_RASET); // Set the row address - LCDdriver_WriteData(y + 1); // min address - LCDdriver_WriteData(y + 1); // max address - LCDdriver_WriteCom(DD_RAMWR); // RAM Write command - LCDdriver_WriteData(color >> 8); // top 8 bits of RGB565 color - LCDdriver_WriteData(color); // top 8 bits of RGB565 color -} - -// Routine to draw a filled circle to the LCD. -// The centre of the circle is at (x0,y0) and the circle has the -// specifed radius. The circle is filled with the RGB565 color -// The circle is drawn using the "Midpoint circle algorithm", -// also known as "Bresenham's circle algorithm". In order to fill -// the circle, the algorithm has been modifed to draw a line between -// each two points, rather than plotting the two points individually. -void LCD_FilledCircle (int x0, int y0, int radius, int color) -{ - int f = 1 - radius; - int ddF_x = 1; - int ddF_y = -2 * radius; - int x = 0; - int y = radius; - - LCD_FilledRect(x0, x0 ,y0 - radius,y0 + radius, color); - LCD_FilledRect(x0 - radius, x0 + radius ,y0,y0, color); - - while(x < y) - { - if(f >= 0) - { - y--; - ddF_y += 2; - f += ddF_y; - } - x++; - ddF_x += 2; - f += ddF_x; - - LCD_FilledRect(x0-x, x0+x ,y0 +y, y0 + y, color); - LCD_FilledRect(x0-x, x0+x ,y0 - y, y0 - y, color); - LCD_FilledRect(x0-y, x0+y ,y0 + x, y0 + x, color); - LCD_FilledRect(x0-y, x0+y ,y0 - x, y0 - x, color); - } -} - -// Routine to draw an unfilled circle to the LCD. -// The centre of the circle is at (x0,y0) and the circle has the -// specifed radius. The circle is drawn in the RGB565 color -// The circle is drawn using the "Midpoint circle algorithm", -// also known as "Bresenham's circle algorithm". -void LCD_Circle (int x0, int y0, int radius, int color) -{ - int f = 1 - radius; - int ddF_x = 1; - int ddF_y = -2 * radius; - int x = 0; - int y = radius; - - LCD_PlotPoint(x0, y0 + radius, color); - LCD_PlotPoint(x0, y0 - radius, color); - LCD_PlotPoint(x0 + radius, y0, color); - LCD_PlotPoint(x0 - radius, y0, color); - - while(x < y) - { - if(f >= 0) - { - y--; - ddF_y += 2; - f += ddF_y; - } - x++; - ddF_x += 2; - f += ddF_x; - LCD_PlotPoint(x0 + x, y0 + y, color); - LCD_PlotPoint(x0 - x, y0 + y, color); - LCD_PlotPoint(x0 + x, y0 - y, color); - LCD_PlotPoint(x0 - x, y0 - y, color); - LCD_PlotPoint(x0 + y, y0 + x, color); - LCD_PlotPoint(x0 - y, y0 + x, color); - LCD_PlotPoint(x0 + y, y0 - x, color); - LCD_PlotPoint(x0 - y, y0 - x, color); - } -} - -// Routine to draw a line in the RGB565 color to the LCD. -// The line is drawn from (xmin,ymin) to (xmax,ymax). -// The algorithm used to draw the line is "Bresenham's line -// algorithm". -#define SWAP(a, b) a ^= b; b ^= a; a ^= b; - -void LCD_Line (int xmin,int xmax,int ymin,int ymax,int color) -{ - int Dx = xmax - xmin; - int Dy = ymax - ymin; - int steep = (abs(Dy) >= abs(Dx)); - if (steep) { - SWAP(xmin, ymin); - SWAP(xmax, ymax); - // recompute Dx, Dy after swap - Dx = xmax - xmin; - Dy = ymax - ymin; - } - int xstep = 1; - if (Dx < 0) { - xstep = -1; - Dx = -Dx; - } - int ystep = 1; - if (Dy < 0) { - ystep = -1; - Dy = -Dy; - } - int TwoDy = 2*Dy; - int TwoDyTwoDx = TwoDy - 2*Dx; // 2*Dy - 2*Dx - int E = TwoDy - Dx; //2*Dy - Dx - int y = ymin; - int xDraw, yDraw; - int x; - for (x = xmin; x != xmax; x += xstep) { - if (steep) { - xDraw = y; - yDraw = x; - } else { - xDraw = x; - yDraw = y; - } - // plot - LCD_PlotPoint(xDraw, yDraw, color); - // next - if (E > 0) { - E += TwoDyTwoDx; //E += 2*Dy - 2*Dx; - y = y + ystep; - } else { - E += TwoDy; //E += 2*Dy; - } - } -} - -// Routine to clear the LCD. -// Implemented by drawing a black rectangle across the whole screen -void LCD_ClearScreen(void) -{ - LCD_FilledRect (0,LCD_MAX_X,0 , LCD_MAX_Y, COLOR_BLACK); -} - - - -// Routine to write a single character to screen in the font pointed -// to by pBitMap. This routine is intended to be used via the -// LCD_PrintChar() and LCD_PrintString() routines, rather than called -// directly from user code. -void LCD_WriteBitMap8x15(int x, int y, int height, int width, unsigned char *pBitMap, int color) -{ - int xmax = x + width - 1; // start at zero - int ymax = y + height - 1; // start at zero - int iRow, iCol; - unsigned char ucRowData; - - LCDdriver_WriteCom(DD_CASET); // Column address set - LCDdriver_WriteData(x); // Start column - LCDdriver_WriteData(xmax); // End column - LCDdriver_WriteCom(DD_RASET); // Row address set - LCDdriver_WriteData(y); // Start row - LCDdriver_WriteData(ymax); // End row - LCDdriver_WriteCom(DD_RAMWR); // Memory write - - - for(iRow=0;iRow> 8); - LCDdriver_WriteData(color); - } - else // black pixel - { - LCDdriver_WriteData(0x00); - LCDdriver_WriteData(0x00); - } - - ucRowData = ucRowData<<1; - } - } - -} - - -// Prints the character 'c' to the LCD in the appropriate color. -void LCD_PrintChar(int x, int y, unsigned char c, int color ) -{ - const unsigned char index = font_index_table[c]; - const unsigned int offset = index * 15; - unsigned char *pData = (unsigned char *)&font_data_table[offset]; - - LCD_WriteBitMap8x15(x, y, 15, 8, pData, color); -} - -// Prints the string to the LCD in the appropriate color. -void LCD_PrintString(int x, int y, char *pcString, int iStrLen, int color) -{ - unsigned char index; - unsigned int offset; - unsigned char *pData; - unsigned char c; - int i; - - for(i=0;i> 19) | \ - ((((c) & 0x0000ff00) >> 5) & 0x000007e0) | \ - ((((c) & 0x000000ff) << 8) & 0x0000f800)) - -// Define a basic set of 24bit colors, based on the standard "websafe" set -#define COLOR24_AQUA 0x00FFFF -#define COLOR24_GREY 0x808080 -#define COLOR24_NAVY 0x000080 -#define COLOR24_SILVER 0xC0C0C0 -#define COLOR24_BLACK 0x000000 -#define COLOR24_GREEN 0x008000 -#define COLOR24_OLIVE 0x808000 -#define COLOR24_TEAL 0x008080 -#define COLOR24_BLUE 0x0000FF -#define COLOR24_LIME 0x00FF00 -#define COLOR24_PURPLE 0x800080 -#define COLOR24_WHITE 0xFFFFFF -#define COLOR24_FUCHSIA 0xFF00FF -#define COLOR24_MAROON 0x800000 -#define COLOR24_RED 0xFF0000 -#define COLOR24_YELLOW 0xFFFF00 - -// Create a set of RGB565 colors that can be used directly within code -#define COLOR_AQUA TRANSLATE24BIT_TO_RGB565(COLOR24_AQUA) -#define COLOR_GREY TRANSLATE24BIT_TO_RGB565(COLOR24_GREY) -#define COLOR_NAVY TRANSLATE24BIT_TO_RGB565(COLOR24_NAVY) -#define COLOR_SILVER TRANSLATE24BIT_TO_RGB565(COLOR24_SILVER) -#define COLOR_BLACK TRANSLATE24BIT_TO_RGB565(COLOR24_BLACK) -#define COLOR_GREEN TRANSLATE24BIT_TO_RGB565(COLOR24_GREEN) -#define COLOR_OLIVE TRANSLATE24BIT_TO_RGB565(COLOR24_OLIVE) -#define COLOR_TEAL TRANSLATE24BIT_TO_RGB565(COLOR24_TEAL) -#define COLOR_BLUE TRANSLATE24BIT_TO_RGB565(COLOR24_BLUE) -#define COLOR_LIME TRANSLATE24BIT_TO_RGB565(COLOR24_LIME) -#define COLOR_PURPLE TRANSLATE24BIT_TO_RGB565(COLOR24_PURPLE) -#define COLOR_WHITE TRANSLATE24BIT_TO_RGB565(COLOR24_WHITE) -#define COLOR_FUCHSIA TRANSLATE24BIT_TO_RGB565(COLOR24_FUCHSIA) -#define COLOR_MAROON TRANSLATE24BIT_TO_RGB565(COLOR24_MAROON) -#define COLOR_RED TRANSLATE24BIT_TO_RGB565(COLOR24_RED) -#define COLOR_YELLOW TRANSLATE24BIT_TO_RGB565(COLOR24_YELLOW) - - -void LCD_Line (int xmin,int xmax,int ymin,int ymax,int color); -void LCD_FilledRect(int xmin,int xmax,int ymin,int ymax,int color); -void LCD_Rect(int xmin,int xmax,int ymin,int ymax,int color); -void LCD_WriteBitMap8x15(int x, int y, int height, int width, unsigned char *pBitMap, int color); -void LCD_PlotPoint(int x,int y,int color); -void LCD_Circle (int x0, int y0, int radius, int color); -void LCD_FilledCircle (int x0, int y0, int radius, int color); -void LCD_ClearScreen(void); -void LCD_WriteBitMap8x15(int x, int y, int height, int width, unsigned char *pBitMap, int color); -void LCD_PrintChar(int x, int y, unsigned char c, int color ); -void LCD_PrintString(int x, int y, char *pcString, int iStrLen, int color); - - -#endif /*LCD_H_*/ \ No newline at end of file diff --git a/FreeRTOS/Demo/CORTEX_LPC1768_GCC_RedSuite/src/LCD/lcd_commands.h b/FreeRTOS/Demo/CORTEX_LPC1768_GCC_RedSuite/src/LCD/lcd_commands.h deleted file mode 100644 index 37ebb3907..000000000 --- a/FreeRTOS/Demo/CORTEX_LPC1768_GCC_RedSuite/src/LCD/lcd_commands.h +++ /dev/null @@ -1,53 +0,0 @@ -//***************************************************************************** -// +--+ -// | ++----+ -// +-++ | -// | | -// +-+--+ | -// | +--+--+ -// +----+ Copyright (c) 2009 Code Red Technologies Ltd. -// -// lcd_commands.h contains defines mapping onto the commands accepted by the -// Sitronix ST7637 LCD Controller/driver used on the RDB1768 development board.// -// -// Software License Agreement -// -// The software is owned by Code Red Technologies and/or its suppliers, and is -// protected under applicable copyright laws. All rights are reserved. Any -// use in violation of the foregoing restrictions may subject the user to criminal -// sanctions under applicable laws, as well as to civil liability for the breach -// of the terms and conditions of this license. -// -// THIS SOFTWARE IS PROVIDED "AS IS". NO WARRANTIES, WHETHER EXPRESS, IMPLIED -// OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE APPLY TO THIS SOFTWARE. -// USE OF THIS SOFTWARE FOR COMMERCIAL DEVELOPMENT AND/OR EDUCATION IS SUBJECT -// TO A CURRENT END USER LICENSE AGREEMENT (COMMERCIAL OR EDUCATIONAL) WITH -// CODE RED TECHNOLOGIES LTD. - -#ifndef LCD_COMMANDS_H_ -#define LCD_COMMANDS_H_ - -#define DD_NOP 0x00 -#define DD_SWRESET 0x01 //SW reset the display -#define DD_SLPIN 0x10 //Sleep in and booster off -#define DD_SLPOUT 0x11 //Sleep out and booster on -#define DD_NORON 0x13 //Partial mode off (Normal mode on) -#define DD_DISPOFF 0x28 //Display Off -#define DD_DISPON 0x29 //Display On -#define DD_CASET 0x2a //Column address set -#define DD_RASET 0x2b //Row address set -#define DD_RAMWR 0x2c //Memory write -#define DD_MADCTR 0x36 //Memory Data Access Control -#define DD_COLORMOD 0x3a //Set the color mode for the display -#define DD_ColScanDir 0xb7 //Set the column scanning direction -#define DD_VopSet 0xc0 //LCD supply voltage set -#define DD_BiasSel 0xc3 //Bias selection -#define DD_BstMbpXSel 0xc4 //Booster setting -#define DD_AUTOLOADSET 0xd7 //Control auto load of ROM data -#define DD_EPCTIN 0xe0 //OTP control RD/WR -#define DD_EPREAD 0xe3 //OTP read -#define DD_EPCTOUT 0xe1 //OTP control cancel - - -#endif /*LCD_COMMANDS_H_*/ diff --git a/FreeRTOS/Demo/CORTEX_LPC1768_GCC_RedSuite/src/LCD/lcd_driver.c b/FreeRTOS/Demo/CORTEX_LPC1768_GCC_RedSuite/src/LCD/lcd_driver.c deleted file mode 100644 index 857a07dcd..000000000 --- a/FreeRTOS/Demo/CORTEX_LPC1768_GCC_RedSuite/src/LCD/lcd_driver.c +++ /dev/null @@ -1,190 +0,0 @@ -//***************************************************************************** -// +--+ -// | ++----+ -// +-++ | -// | | -// +-+--+ | -// | +--+--+ -// +----+ Copyright (c) 2009 Code Red Technologies Ltd. -// -// lcd_driver.c contains the lowest level access routines for the Sitronix -// ST7637 LCD Controller/driver used on the RDB1768 development board. -// -// -// Software License Agreement -// -// The software is owned by Code Red Technologies and/or its suppliers, and is -// protected under applicable copyright laws. All rights are reserved. Any -// use in violation of the foregoing restrictions may subject the user to criminal -// sanctions under applicable laws, as well as to civil liability for the breach -// of the terms and conditions of this license. -// -// THIS SOFTWARE IS PROVIDED "AS IS". NO WARRANTIES, WHETHER EXPRESS, IMPLIED -// OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE APPLY TO THIS SOFTWARE. -// USE OF THIS SOFTWARE FOR COMMERCIAL DEVELOPMENT AND/OR EDUCATION IS SUBJECT -// TO A CURRENT END USER LICENSE AGREEMENT (COMMERCIAL OR EDUCATIONAL) WITH -// CODE RED TECHNOLOGIES LTD. - -#include "NXP/LPC17xx/LPC17xx.h" -#include "lcd_driver.h" -#include "lcd_commands.h" - -// Bits within GPIO port 2 used for LCD driver -#define LCD_CSB_PIN (1<<13) -#define LCD_A0_PIN (1<<8) -#define LCD_WR_PIN (1<<11) -#define LCD_RD_PIN (1<<12) -#define LCD_DATA_PIN 0xff - -// Bit within GPIO port 3 used for LCD driver -#define LCD_RESB_PIN (1<<25) - -// Bits to configure as outputs for driving LCD -#define LCD_PORT2_DIRECTIONS (LCD_CSB_PIN | LCD_A0_PIN | LCD_WR_PIN | LCD_RD_PIN | LCD_DATA_PIN) -#define LCD_PORT3_DIRECTIONS (LCD_RESB_PIN) - -// Define names for GPIO port 2 and 3 registers to better indicate in code -// the operation being carried out on the LCD driver hardware. -#define LCD_DATA_CLR FIO2CLR -#define LCD_DATA_SET FIO2SET - -#define LCD_CSB_CLR FIO2CLR -#define LCD_CSB_SET FIO2SET - -#define LCD_RESB_CLR FIO3CLR -#define LCD_RESB_SET FIO3SET - -#define LCD_A0_CLR FIO2CLR -#define LCD_A0_SET FIO2SET - -#define LCD_WR_CLR FIO2CLR -#define LCD_WR_SET FIO2SET - -#define LCD_RD_CLR FIO2CLR -#define LCD_RD_SET FIO2SET - -// Routine to write data to LCD driver. Normally called in combination -// with LCDdriver_WriteCom() routine -void LCDdriver_WriteData(unsigned char LCD_Data) -{ - LCD_DATA_CLR = LCD_DATA_PIN; - LCD_DATA_SET = LCD_Data; - LCD_CSB_CLR = LCD_CSB_PIN; - LCD_WR_CLR = LCD_WR_PIN; - LCD_WR_SET = LCD_WR_PIN; - LCD_CSB_SET = LCD_CSB_PIN; -} - -// Routine to configure set LCD driver to accept particular command. -// A call to this routine will normally be followed by a call -// to LCDdriver_WriteData() to transfer appropriate parameters to driver. -void LCDdriver_WriteCom(unsigned char LCD_Command) -{ - LCD_DATA_CLR = LCD_DATA_PIN; - LCD_DATA_SET = LCD_Command; - LCD_A0_CLR = LCD_A0_PIN; - LCD_CSB_CLR = LCD_CSB_PIN; - LCD_WR_CLR = LCD_WR_PIN; - LCD_WR_SET = LCD_WR_PIN; - LCD_CSB_SET = LCD_CSB_PIN; - LCD_A0_SET = LCD_A0_PIN; -} - -// Function to add short delays in writing things to the LCD. -void ms_delay(int n) -{ - volatile int d; - for (d=0; d'): (width=8, offset=450) */ -0x00, 0x00, 0x00, 0x60, 0x30, 0x18, 0x0C, 0x06, -0x0C, 0x18, 0x30, 0x60, 0x00, 0x00, 0x00, - -/* character 0x003F ('?'): (width=8, offset=465) */ -0x00, 0x00, 0x00, 0x3C, 0x66, 0x66, 0x0C, 0x18, -0x18, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, - -/* character 0x0040 ('@'): (width=8, offset=480) */ -0x00, 0x00, 0x00, 0x7E, 0xC3, 0xC3, 0xCF, 0xDB, -0xDB, 0xCF, 0xC0, 0x7F, 0x00, 0x00, 0x00, - -/* character 0x0041 ('A'): (width=8, offset=495) */ -0x00, 0x00, 0x00, 0x18, 0x3C, 0x66, 0x66, 0x66, -0x7E, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, - -/* character 0x0042 ('B'): (width=8, offset=510) */ -0x00, 0x00, 0x00, 0x7C, 0x66, 0x66, 0x66, 0x7C, -0x66, 0x66, 0x66, 0x7C, 0x00, 0x00, 0x00, - -/* character 0x0043 ('C'): (width=8, offset=525) */ -0x00, 0x00, 0x00, 0x3C, 0x66, 0x66, 0x60, 0x60, -0x60, 0x66, 0x66, 0x3C, 0x00, 0x00, 0x00, - -/* character 0x0044 ('D'): (width=8, offset=540) */ -0x00, 0x00, 0x00, 0x78, 0x6C, 0x66, 0x66, 0x66, -0x66, 0x66, 0x6C, 0x78, 0x00, 0x00, 0x00, - -/* character 0x0045 ('E'): (width=8, offset=555) */ -0x00, 0x00, 0x00, 0x7E, 0x60, 0x60, 0x60, 0x7C, -0x60, 0x60, 0x60, 0x7E, 0x00, 0x00, 0x00, - -/* character 0x0046 ('F'): (width=8, offset=570) */ -0x00, 0x00, 0x00, 0x7E, 0x60, 0x60, 0x60, 0x7C, -0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, - -/* character 0x0047 ('G'): (width=8, offset=585) */ -0x00, 0x00, 0x00, 0x3C, 0x66, 0x66, 0x60, 0x60, -0x6E, 0x66, 0x66, 0x3E, 0x00, 0x00, 0x00, - -/* character 0x0048 ('H'): (width=8, offset=600) */ -0x00, 0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x7E, -0x66, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, - -/* character 0x0049 ('I'): (width=8, offset=615) */ -0x00, 0x00, 0x00, 0x3C, 0x18, 0x18, 0x18, 0x18, -0x18, 0x18, 0x18, 0x3C, 0x00, 0x00, 0x00, - -/* character 0x004A ('J'): (width=8, offset=630) */ -0x00, 0x00, 0x00, 0x06, 0x06, 0x06, 0x06, 0x06, -0x06, 0x66, 0x66, 0x3C, 0x00, 0x00, 0x00, - -/* character 0x004B ('K'): (width=8, offset=645) */ -0x00, 0x00, 0x00, 0x66, 0x66, 0x6C, 0x6C, 0x78, -0x6C, 0x6C, 0x66, 0x66, 0x00, 0x00, 0x00, - -/* character 0x004C ('L'): (width=8, offset=660) */ -0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, -0x60, 0x60, 0x60, 0x7E, 0x00, 0x00, 0x00, - -/* character 0x004D ('M'): (width=8, offset=675) */ -0x00, 0x00, 0x00, 0x63, 0x63, 0x77, 0x6B, 0x6B, -0x6B, 0x63, 0x63, 0x63, 0x00, 0x00, 0x00, - -/* character 0x004E ('N'): (width=8, offset=690) */ -0x00, 0x00, 0x00, 0x63, 0x63, 0x73, 0x7B, 0x6F, -0x67, 0x63, 0x63, 0x63, 0x00, 0x00, 0x00, - -/* character 0x004F ('O'): (width=8, offset=705) */ -0x00, 0x00, 0x00, 0x3C, 0x66, 0x66, 0x66, 0x66, -0x66, 0x66, 0x66, 0x3C, 0x00, 0x00, 0x00, - -/* character 0x0050 ('P'): (width=8, offset=720) */ -0x00, 0x00, 0x00, 0x7C, 0x66, 0x66, 0x66, 0x7C, -0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, - -/* character 0x0051 ('Q'): (width=8, offset=735) */ -0x00, 0x00, 0x00, 0x3C, 0x66, 0x66, 0x66, 0x66, -0x66, 0x66, 0x66, 0x3C, 0x0C, 0x06, 0x00, - -/* character 0x0052 ('R'): (width=8, offset=750) */ -0x00, 0x00, 0x00, 0x7C, 0x66, 0x66, 0x66, 0x7C, -0x6C, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, - -/* character 0x0053 ('S'): (width=8, offset=765) */ -0x00, 0x00, 0x00, 0x3C, 0x66, 0x60, 0x30, 0x18, -0x0C, 0x06, 0x66, 0x3C, 0x00, 0x00, 0x00, - -/* character 0x0054 ('T'): (width=8, offset=780) */ -0x00, 0x00, 0x00, 0x7E, 0x18, 0x18, 0x18, 0x18, -0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, - -/* character 0x0055 ('U'): (width=8, offset=795) */ -0x00, 0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x66, -0x66, 0x66, 0x66, 0x3C, 0x00, 0x00, 0x00, - -/* character 0x0056 ('V'): (width=8, offset=810) */ -0x00, 0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x66, -0x66, 0x66, 0x3C, 0x18, 0x00, 0x00, 0x00, - -/* character 0x0057 ('W'): (width=8, offset=825) */ -0x00, 0x00, 0x00, 0x63, 0x63, 0x63, 0x6B, 0x6B, -0x6B, 0x36, 0x36, 0x36, 0x00, 0x00, 0x00, - -/* character 0x0058 ('X'): (width=8, offset=840) */ -0x00, 0x00, 0x00, 0x66, 0x66, 0x34, 0x18, 0x18, -0x2C, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, - -/* character 0x0059 ('Y'): (width=8, offset=855) */ -0x00, 0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x3C, -0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, - -/* character 0x005A ('Z'): (width=8, offset=870) */ -0x00, 0x00, 0x00, 0x7E, 0x06, 0x06, 0x0C, 0x18, -0x30, 0x60, 0x60, 0x7E, 0x00, 0x00, 0x00, - -/* character 0x005B ('['): (width=8, offset=885) */ -0x00, 0x00, 0x00, 0x3C, 0x30, 0x30, 0x30, 0x30, -0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x3C, - -/* character 0x005C ('\'): (width=8, offset=900) */ -0x00, 0x00, 0x00, 0x60, 0x60, 0x30, 0x30, 0x18, -0x18, 0x0C, 0x0C, 0x06, 0x06, 0x00, 0x00, - -/* character 0x005D (']'): (width=8, offset=915) */ -0x00, 0x00, 0x00, 0x3C, 0x0C, 0x0C, 0x0C, 0x0C, -0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x3C, - -/* character 0x005E ('^'): (width=8, offset=930) */ -0x00, 0x18, 0x3C, 0x66, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - -/* character 0x005F ('_'): (width=8, offset=945) */ -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, - -/* character 0x0060 ('`'): (width=8, offset=960) */ -0x00, 0x38, 0x18, 0x0C, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - -/* character 0x0061 ('a'): (width=8, offset=975) */ -0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0x06, 0x06, -0x3E, 0x66, 0x66, 0x3E, 0x00, 0x00, 0x00, - -/* character 0x0062 ('b'): (width=8, offset=990) */ -0x00, 0x00, 0x00, 0x60, 0x60, 0x7C, 0x66, 0x66, -0x66, 0x66, 0x66, 0x7C, 0x00, 0x00, 0x00, - -/* character 0x0063 ('c'): (width=8, offset=1005) */ -0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0x66, 0x60, -0x60, 0x60, 0x66, 0x3C, 0x00, 0x00, 0x00, - -/* character 0x0064 ('d'): (width=8, offset=1020) */ -0x00, 0x00, 0x00, 0x06, 0x06, 0x3E, 0x66, 0x66, -0x66, 0x66, 0x66, 0x3E, 0x00, 0x00, 0x00, - -/* character 0x0065 ('e'): (width=8, offset=1035) */ -0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0x66, 0x66, -0x7E, 0x60, 0x60, 0x3C, 0x00, 0x00, 0x00, - -/* character 0x0066 ('f'): (width=8, offset=1050) */ -0x00, 0x00, 0x00, 0x1E, 0x30, 0x30, 0x30, 0x7E, -0x30, 0x30, 0x30, 0x30, 0x00, 0x00, 0x00, - -/* character 0x0067 ('g'): (width=8, offset=1065) */ -0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x66, 0x66, -0x66, 0x66, 0x66, 0x3E, 0x06, 0x06, 0x7C, - -/* character 0x0068 ('h'): (width=8, offset=1080) */ -0x00, 0x00, 0x00, 0x60, 0x60, 0x7C, 0x66, 0x66, -0x66, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, - -/* character 0x0069 ('i'): (width=8, offset=1095) */ -0x00, 0x00, 0x18, 0x18, 0x00, 0x78, 0x18, 0x18, -0x18, 0x18, 0x18, 0x7E, 0x00, 0x00, 0x00, - -/* character 0x006A ('j'): (width=8, offset=1110) */ -0x00, 0x00, 0x0C, 0x0C, 0x00, 0x3C, 0x0C, 0x0C, -0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x78, - -/* character 0x006B ('k'): (width=8, offset=1125) */ -0x00, 0x00, 0x00, 0x60, 0x60, 0x66, 0x66, 0x6C, -0x78, 0x6C, 0x66, 0x66, 0x00, 0x00, 0x00, - -/* character 0x006C ('l'): (width=8, offset=1140) */ -0x00, 0x00, 0x00, 0x78, 0x18, 0x18, 0x18, 0x18, -0x18, 0x18, 0x18, 0x7E, 0x00, 0x00, 0x00, - -/* character 0x006D ('m'): (width=8, offset=1155) */ -0x00, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x6B, 0x6B, -0x6B, 0x6B, 0x6B, 0x63, 0x00, 0x00, 0x00, - -/* character 0x006E ('n'): (width=8, offset=1170) */ -0x00, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x66, 0x66, -0x66, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, - -/* character 0x006F ('o'): (width=8, offset=1185) */ -0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0x66, 0x66, -0x66, 0x66, 0x66, 0x3C, 0x00, 0x00, 0x00, - -/* character 0x0070 ('p'): (width=8, offset=1200) */ -0x00, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x66, 0x66, -0x66, 0x66, 0x66, 0x7C, 0x60, 0x60, 0x60, - -/* character 0x0071 ('q'): (width=8, offset=1215) */ -0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x66, 0x66, -0x66, 0x66, 0x66, 0x3E, 0x06, 0x06, 0x06, - -/* character 0x0072 ('r'): (width=8, offset=1230) */ -0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x6E, 0x70, -0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, - -/* character 0x0073 ('s'): (width=8, offset=1245) */ -0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x60, 0x60, -0x3C, 0x06, 0x06, 0x7C, 0x00, 0x00, 0x00, - -/* character 0x0074 ('t'): (width=8, offset=1260) */ -0x00, 0x00, 0x00, 0x30, 0x30, 0x7E, 0x30, 0x30, -0x30, 0x30, 0x30, 0x1E, 0x00, 0x00, 0x00, - -/* character 0x0075 ('u'): (width=8, offset=1275) */ -0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x66, 0x66, -0x66, 0x66, 0x66, 0x3E, 0x00, 0x00, 0x00, - -/* character 0x0076 ('v'): (width=8, offset=1290) */ -0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x66, 0x66, -0x66, 0x66, 0x3C, 0x18, 0x00, 0x00, 0x00, - -/* character 0x0077 ('w'): (width=8, offset=1305) */ -0x00, 0x00, 0x00, 0x00, 0x00, 0x63, 0x6B, 0x6B, -0x6B, 0x6B, 0x36, 0x36, 0x00, 0x00, 0x00, - -/* character 0x0078 ('x'): (width=8, offset=1320) */ -0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x66, 0x3C, -0x18, 0x3C, 0x66, 0x66, 0x00, 0x00, 0x00, - -/* character 0x0079 ('y'): (width=8, offset=1335) */ -0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x66, 0x66, -0x66, 0x66, 0x66, 0x3C, 0x0C, 0x18, 0xF0, - -/* character 0x007A ('z'): (width=8, offset=1350) */ -0x00, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x06, 0x0C, -0x18, 0x30, 0x60, 0x7E, 0x00, 0x00, 0x00, - -/* character 0x007B ('{'): (width=8, offset=1365) */ -0x00, 0x00, 0x00, 0x0C, 0x18, 0x18, 0x18, 0x30, -0x60, 0x30, 0x18, 0x18, 0x18, 0x0C, 0x00, - -/* character 0x007C ('|'): (width=8, offset=1380) */ -0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, -0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, - -/* character 0x007D ('}'): (width=8, offset=1395) */ -0x00, 0x00, 0x00, 0x30, 0x18, 0x18, 0x18, 0x0C, -0x06, 0x0C, 0x18, 0x18, 0x18, 0x30, 0x00, - -/* character 0x007E ('~'): (width=8, offset=1410) */ -0x00, 0x00, 0x00, 0x71, 0xDB, 0x8E, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - -/* character 0x007F (''): (width=8, offset=1425) */ -0x00, 0x00, 0x00, 0x7E, 0x7E, 0x7E, 0x7E, 0x7E, -0x7E, 0x7E, 0x7E, 0x7E, 0x00, 0x00, 0x00, - -}; - - -/******************************************************************************************* - Index table is used to find the mapping index of a character. - - If you can find a simple mathematical expression for index mapping, you can use that. - If you do not have such a mathematical expression, this index table is just for you. - - To get the index of character 'A', you can use the following expression: - - const unsigned char index = index_table['A']; - - *******************************************************************************************/ -const unsigned char font_index_table[] = { -/* index hexcode decimal char */ -/* ===== ======= ======= ==== */ - 0, /* 00 0 . */ - 0, /* 01 1 . */ - 0, /* 02 2 . */ - 0, /* 03 3 . */ - 0, /* 04 4 . */ - 0, /* 05 5 . */ - 0, /* 06 6 . */ - 0, /* 07 7 . */ - 0, /* 08 8 . */ - 0, /* 09 9 . */ - 0, /* 0A 10 . */ - 0, /* 0B 11 . */ - 0, /* 0C 12 . */ - 0, /* 0D 13 . */ - 0, /* 0E 14 . */ - 0, /* 0F 15 . */ - 0, /* 10 16 . */ - 0, /* 11 17 . */ - 0, /* 12 18 . */ - 0, /* 13 19 . */ - 0, /* 14 20 . */ - 0, /* 15 21 . */ - 0, /* 16 22 . */ - 0, /* 17 23 . */ - 0, /* 18 24 . */ - 0, /* 19 25 . */ - 0, /* 1A 26 . */ - 0, /* 1B 27 . */ - 0, /* 1C 28 . */ - 0, /* 1D 29 . */ - 0, /* 1E 30 . */ - 0, /* 1F 31 . */ - 0, /* 20 32 */ - 1, /* 21 33 ! */ - 2, /* 22 34 " */ - 3, /* 23 35 # */ - 4, /* 24 36 $ */ - 5, /* 25 37 % */ - 6, /* 26 38 & */ - 7, /* 27 39 ' */ - 8, /* 28 40 ( */ - 9, /* 29 41 ) */ - 10, /* 2A 42 * */ - 11, /* 2B 43 + */ - 12, /* 2C 44 , */ - 13, /* 2D 45 - */ - 14, /* 2E 46 . */ - 15, /* 2F 47 / */ - 16, /* 30 48 0 */ - 17, /* 31 49 1 */ - 18, /* 32 50 2 */ - 19, /* 33 51 3 */ - 20, /* 34 52 4 */ - 21, /* 35 53 5 */ - 22, /* 36 54 6 */ - 23, /* 37 55 7 */ - 24, /* 38 56 8 */ - 25, /* 39 57 9 */ - 26, /* 3A 58 : */ - 27, /* 3B 59 ; */ - 28, /* 3C 60 < */ - 29, /* 3D 61 = */ - 30, /* 3E 62 > */ - 31, /* 3F 63 ? */ - 32, /* 40 64 @ */ - 33, /* 41 65 A */ - 34, /* 42 66 B */ - 35, /* 43 67 C */ - 36, /* 44 68 D */ - 37, /* 45 69 E */ - 38, /* 46 70 F */ - 39, /* 47 71 G */ - 40, /* 48 72 H */ - 41, /* 49 73 I */ - 42, /* 4A 74 J */ - 43, /* 4B 75 K */ - 44, /* 4C 76 L */ - 45, /* 4D 77 M */ - 46, /* 4E 78 N */ - 47, /* 4F 79 O */ - 48, /* 50 80 P */ - 49, /* 51 81 Q */ - 50, /* 52 82 R */ - 51, /* 53 83 S */ - 52, /* 54 84 T */ - 53, /* 55 85 U */ - 54, /* 56 86 V */ - 55, /* 57 87 W */ - 56, /* 58 88 X */ - 57, /* 59 89 Y */ - 58, /* 5A 90 Z */ - 59, /* 5B 91 [ */ - 60, /* 5C 92 \ */ - 61, /* 5D 93 ] */ - 62, /* 5E 94 ^ */ - 63, /* 5F 95 _ */ - 64, /* 60 96 ` */ - 65, /* 61 97 a */ - 66, /* 62 98 b */ - 67, /* 63 99 c */ - 68, /* 64 100 d */ - 69, /* 65 101 e */ - 70, /* 66 102 f */ - 71, /* 67 103 g */ - 72, /* 68 104 h */ - 73, /* 69 105 i */ - 74, /* 6A 106 j */ - 75, /* 6B 107 k */ - 76, /* 6C 108 l */ - 77, /* 6D 109 m */ - 78, /* 6E 110 n */ - 79, /* 6F 111 o */ - 80, /* 70 112 p */ - 81, /* 71 113 q */ - 82, /* 72 114 r */ - 83, /* 73 115 s */ - 84, /* 74 116 t */ - 85, /* 75 117 u */ - 86, /* 76 118 v */ - 87, /* 77 119 w */ - 88, /* 78 120 x */ - 89, /* 79 121 y */ - 90, /* 7A 122 z */ - 91, /* 7B 123 { */ - 92, /* 7C 124 | */ - 93, /* 7D 125 } */ - 94, /* 7E 126 ~ */ - 95, /* 7F 127  */ - 0, /* 80 128 ? */ - 0, /* 81 129 � */ - 0, /* 82 130 ? */ - 0, /* 83 131 ? */ - 0, /* 84 132 ? */ - 0, /* 85 133 ? */ - 0, /* 86 134 ? */ - 0, /* 87 135 ? */ - 0, /* 88 136 ? */ - 0, /* 89 137 ? */ - 0, /* 8A 138 ? */ - 0, /* 8B 139 ? */ - 0, /* 8C 140 ? */ - 0, /* 8D 141 � */ - 0, /* 8E 142 ? */ - 0, /* 8F 143 � */ - 0, /* 90 144 � */ - 0, /* 91 145 ? */ - 0, /* 92 146 ? */ - 0, /* 93 147 ? */ - 0, /* 94 148 ? */ - 0, /* 95 149 ? */ - 0, /* 96 150 ? */ - 0, /* 97 151 ? */ - 0, /* 98 152 ? */ - 0, /* 99 153 ? */ - 0, /* 9A 154 ? */ - 0, /* 9B 155 ? */ - 0, /* 9C 156 ? */ - 0, /* 9D 157 � */ - 0, /* 9E 158 ? */ - 0, /* 9F 159 ? */ - 0, /* A0 160 � */ - 0, /* A1 161 � */ - 0, /* A2 162 � */ - 0, /* A3 163 � */ - 0, /* A4 164 � */ - 0, /* A5 165 � */ - 0, /* A6 166 � */ - 0, /* A7 167 � */ - 0, /* A8 168 � */ - 0, /* A9 169 � */ - 0, /* AA 170 � */ - 0, /* AB 171 � */ - 0, /* AC 172 � */ - 0, /* AD 173 � */ - 0, /* AE 174 � */ - 0, /* AF 175 � */ - 0, /* B0 176 � */ - 0, /* B1 177 � */ - 0, /* B2 178 � */ - 0, /* B3 179 � */ - 0, /* B4 180 � */ - 0, /* B5 181 � */ - 0, /* B6 182 � */ - 0, /* B7 183 � */ - 0, /* B8 184 � */ - 0, /* B9 185 � */ - 0, /* BA 186 � */ - 0, /* BB 187 � */ - 0, /* BC 188 � */ - 0, /* BD 189 � */ - 0, /* BE 190 � */ - 0, /* BF 191 � */ - 0, /* C0 192 � */ - 0, /* C1 193 � */ - 0, /* C2 194 � */ - 0, /* C3 195 � */ - 0, /* C4 196 � */ - 0, /* C5 197 � */ - 0, /* C6 198 � */ - 0, /* C7 199 � */ - 0, /* C8 200 � */ - 0, /* C9 201 � */ - 0, /* CA 202 � */ - 0, /* CB 203 � */ - 0, /* CC 204 � */ - 0, /* CD 205 � */ - 0, /* CE 206 � */ - 0, /* CF 207 � */ - 0, /* D0 208 � */ - 0, /* D1 209 � */ - 0, /* D2 210 � */ - 0, /* D3 211 � */ - 0, /* D4 212 � */ - 0, /* D5 213 � */ - 0, /* D6 214 � */ - 0, /* D7 215 � */ - 0, /* D8 216 � */ - 0, /* D9 217 � */ - 0, /* DA 218 � */ - 0, /* DB 219 � */ - 0, /* DC 220 � */ - 0, /* DD 221 � */ - 0, /* DE 222 � */ - 0, /* DF 223 � */ - 0, /* E0 224 � */ - 0, /* E1 225 � */ - 0, /* E2 226 � */ - 0, /* E3 227 � */ - 0, /* E4 228 � */ - 0, /* E5 229 � */ - 0, /* E6 230 � */ - 0, /* E7 231 � */ - 0, /* E8 232 � */ - 0, /* E9 233 � */ - 0, /* EA 234 � */ - 0, /* EB 235 � */ - 0, /* EC 236 � */ - 0, /* ED 237 � */ - 0, /* EE 238 � */ - 0, /* EF 239 � */ - 0, /* F0 240 � */ - 0, /* F1 241 � */ - 0, /* F2 242 � */ - 0, /* F3 243 � */ - 0, /* F4 244 � */ - 0, /* F5 245 � */ - 0, /* F6 246 � */ - 0, /* F7 247 � */ - 0, /* F8 248 � */ - 0, /* F9 249 � */ - 0, /* FA 250 � */ - 0, /* FB 251 � */ - 0, /* FC 252 � */ - 0, /* FD 253 � */ - 0, /* FE 254 � */ - 0, /* FF 255 � */ -}; - - - diff --git a/FreeRTOS/Demo/CORTEX_LPC1768_GCC_RedSuite/src/main.c b/FreeRTOS/Demo/CORTEX_LPC1768_GCC_RedSuite/src/main.c index 7485b256c..90423b908 100644 --- a/FreeRTOS/Demo/CORTEX_LPC1768_GCC_RedSuite/src/main.c +++ b/FreeRTOS/Demo/CORTEX_LPC1768_GCC_RedSuite/src/main.c @@ -106,10 +106,6 @@ #include "QPeek.h" #include "recmutex.h" -/* Red Suite includes. */ -#include "lcd_driver.h" -#include "lcd.h" - /*-----------------------------------------------------------*/ /* The time between cycles of the 'check' functionality (defined within the @@ -190,12 +186,13 @@ char cIPAddress[ 16 ]; /* Enough space for "xxx.xxx.xxx.xxx\0". */ xTaskCreate( vUSBTask, "USB", configMINIMAL_STACK_SIZE, ( void * ) NULL, tskIDLE_PRIORITY, NULL ); /* Display the IP address, then create the uIP task. The WEB server runs - in this task. */ + in this task. --- Due to tool changes since this demo was created the LCD + is no longer used. LCDdriver_initialisation(); LCD_PrintString( 5, 10, "FreeRTOS.org", 14, COLOR_GREEN); sprintf( cIPAddress, "%d.%d.%d.%d", configIP_ADDR0, configIP_ADDR1, configIP_ADDR2, configIP_ADDR3 ); LCD_PrintString( 5, 30, cIPAddress, 14, COLOR_RED); - xTaskCreate( vuIP_Task, "uIP", mainBASIC_WEB_STACK_SIZE, ( void * ) NULL, mainUIP_TASK_PRIORITY, NULL ); + xTaskCreate( vuIP_Task, "uIP", mainBASIC_WEB_STACK_SIZE, ( void * ) NULL, mainUIP_TASK_PRIORITY, NULL ); */ /* Start the scheduler. */ vTaskStartScheduler(); diff --git a/FreeRTOS/Source/include/FreeRTOS.h b/FreeRTOS/Source/include/FreeRTOS.h index 0c820eccb..96d745ae6 100644 --- a/FreeRTOS/Source/include/FreeRTOS.h +++ b/FreeRTOS/Source/include/FreeRTOS.h @@ -99,7 +99,7 @@ extern "C" { /* configUSE_PORT_OPTIMISED_TASK_SELECTION must be defined before portable.h is included as it is used by the port layer. */ #ifndef configUSE_PORT_OPTIMISED_TASK_SELECTION - #define configUSE_PORT_OPTIMISED_TASK_SELECTION 0 + #define configUSE_PORT_OPTIMISED_TASK_SELECTION 1 #endif /* Definitions specific to the port being used. */ @@ -609,7 +609,7 @@ is included as it is used by the port layer. */ #ifndef tracePEND_FUNC_CALL_FROM_ISR #define tracePEND_FUNC_CALL_FROM_ISR(xFunctionToPend, pvParameter1, ulParameter2, ret) -#endif +#endif #ifndef traceQUEUE_REGISTRY_ADD #define traceQUEUE_REGISTRY_ADD(xQueue, pcQueueName) -- 2.39.5