From: richardbarry Date: Fri, 16 Sep 2011 14:49:18 +0000 (+0000) Subject: Moved some files into the include folder that were previously in the root. X-Git-Tag: V7.0.2~9 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=acb8ee9551ee7e772a1b8fa14567ef3809d681bb;p=freertos Moved some files into the include folder that were previously in the root. git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@1601 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- diff --git a/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/Renesas-Files/hd44780.h b/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/Renesas-Files/hd44780.h deleted file mode 100644 index 5bfb3009f..000000000 --- a/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/Renesas-Files/hd44780.h +++ /dev/null @@ -1,56 +0,0 @@ -/*-----------------------------------------------------------------------*/ -/* EZ-LCD - Generic control module include/configuration file */ -/*-----------------------------------------------------------------------*/ - -#ifndef _EZ_LCD -#define _EZ_LCD - -/*--------------------------------------------------*/ -/* Configuration Options */ -/*--------------------------------------------------*/ - -#define _LCD_ROWS 2 /* Number of Rows (1,2 or 4) */ -#define _LCD_COLS 8 /* Number of Columns (8..40) */ - -#define _USE_CURSOR 0 /* 1:Enable lcd_cursor function */ -#define _USE_CGRAM 0 /* 1:Enable lcd_setcg function */ - -#define _USE_FUEL 0 /* 1:Enable lcd_put_fuel function (_USE_CGRAM must be 1) */ - -#define _USE_BAR 0 /* 1:Enable lcd_put_bar function (_USE_CGRAM must be 1) */ -#define _MAX_BAR 255 /* Maximum value for lcd_put_bar function */ - -#define _USE_POINT 0 /* 1:Enable lcd_put_point function (_USE_CGRAM must be 1) */ -#define _MAX_POINT 255 /* Maximum value for lcd_put_point function */ - -#define _BASE_GRAPH 0 /* Common user character used by lcd_put_bar/lcd_put_point function (2 chars from this) */ - - - -/*--------------------------------------------------*/ -/* API declareations */ -/*--------------------------------------------------*/ - -#include - -#ifdef __cplusplus -extern "C" { -#endif -void lcd_init (void); -void lcd_locate (uint8_t, uint8_t); -void lcd_putc (uint8_t); -void lcd_cursor (uint8_t); -void lcd_setcg (uint8_t, uint8_t, const uint8_t*); -void lcd_put_fuel (int8_t, uint8_t); -void lcd_put_bar (uint16_t, uint8_t, uint8_t); -void lcd_put_point (uint16_t, uint8_t, uint8_t); -#ifdef __cplusplus -} -#endif - -#define CSR_OFF 0 -#define CSR_BLOCK 1 -#define CSR_UNDER 2 - - -#endif /* #ifndef _EZLCD */ diff --git a/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/Renesas-Files/lcd.h b/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/Renesas-Files/lcd.h deleted file mode 100644 index 1818da4f9..000000000 --- a/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/Renesas-Files/lcd.h +++ /dev/null @@ -1,97 +0,0 @@ -#ifndef LCD_H -#define LCD_H -/*********************************************************************************** - -FILE NAME lcd.h - -DESCRIPTION Driver for KS0066u LCD Module Controller (8 characters by 2 lines ) - on the Renesas RSK boards - header file - -Copyright : 2006 Renesas Technology Europe Ltd. -Copyright : 2006 Renesas Technology Corporation. -All Rights Reserved -***********************************************************************************/ - -/*********************************************************************************** -Revision History -DD.MM.YYYY OSO-UID Description -26.07.2006 RTE-MBA First Release -***********************************************************************************/ -void InitialiseDisplay( void ); -void DisplayString(unsigned char position, char * string); -void LCD_write(unsigned char data_or_ctrl, unsigned char value); -void LCD_nibble_write(unsigned char data_or_ctrl, unsigned char value); -void DisplayDelay(unsigned long int units); - - -#define SET_BIT_HIGH (1) -#define SET_BIT_LOW (0) -#define SET_BYTE_HIGH (0xFF) -#define SET_BYTE_LOW (0x00) - -struct _LCD_Params { - unsigned char Line; - unsigned short Speed; - char *ptr_str; -}; - -void prvLCDTaskLine1( void *pvParameters ); -void prvLCDTaskLine2( void *pvParameters ); - - -/* RS Register Select pin */ -#define RS_PIN PORTJ.PODR.BIT.B1 -/* Display Enable pin */ -#define EN_PIN PORTJ.PODR.BIT.B3 -/* Data bus port */ -#define DATA_PORT PORTH.PODR.BYTE -/* Bit mask from entire port */ -#define DATA_PORT_MASK 0x0F -/* Number of bits data needs to shift */ -#define DATA_PORT_SHIFT 0 - - -#define DATA_WR 1 -#define CTRL_WR 0 - -/* Set to ensure base delay of 1microS minimum */ -//#define DELAY_TIMING 0x2F -#define DELAY_TIMING 50 -/* number of lines on the LCD display */ -#define NUMB_CHARS_PER_LINE 8 -/* Maximum charactors per line of LCD display. */ -#define MAXIMUM_LINES 2 - -#define LCD_LINE1 0 -#define LCD_LINE2 16 - -/**********************************************************************************/ -/* LCD commands - use LCD_write function to write these commands to the LCD. */ -/**********************************************************************************/ -/* Clear LCD display and home cursor */ -#define LCD_CLEAR 0x01 -/* move cursor to line 1 */ -#define LCD_HOME_L1 0x80 -/* move cursor to line 2 */ -#define LCD_HOME_L2 0xC0 -/* Cursor auto decrement after R/W */ -#define CURSOR_MODE_DEC 0x04 -/* Cursor auto increment after R/W */ -#define CURSOR_MODE_INC 0x06 -/* Setup, 4 bits,2 lines, 5X7 */ -#define FUNCTION_SET 0x28 -/* Display ON with Cursor */ -#define LCD_CURSOR_ON 0x0E -/* Display ON with Cursor off */ -#define LCD_CURSOR_OFF 0x0C -/* Display on with blinking cursor */ -#define LCD_CURSOR_BLINK 0x0D -/*Move Cursor Left One Position */ -#define LCD_CURSOR_LEFT 0x10 -/* Move Cursor Right One Position */ -#define LCD_CURSOR_RIGHT 0x14 - -#define LCD_DISPLAY_ON 0x04 -#define LCD_TWO_LINE 0x08 - -#endif \ No newline at end of file diff --git a/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/include/hd44780.h b/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/include/hd44780.h new file mode 100644 index 000000000..5bfb3009f --- /dev/null +++ b/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/include/hd44780.h @@ -0,0 +1,56 @@ +/*-----------------------------------------------------------------------*/ +/* EZ-LCD - Generic control module include/configuration file */ +/*-----------------------------------------------------------------------*/ + +#ifndef _EZ_LCD +#define _EZ_LCD + +/*--------------------------------------------------*/ +/* Configuration Options */ +/*--------------------------------------------------*/ + +#define _LCD_ROWS 2 /* Number of Rows (1,2 or 4) */ +#define _LCD_COLS 8 /* Number of Columns (8..40) */ + +#define _USE_CURSOR 0 /* 1:Enable lcd_cursor function */ +#define _USE_CGRAM 0 /* 1:Enable lcd_setcg function */ + +#define _USE_FUEL 0 /* 1:Enable lcd_put_fuel function (_USE_CGRAM must be 1) */ + +#define _USE_BAR 0 /* 1:Enable lcd_put_bar function (_USE_CGRAM must be 1) */ +#define _MAX_BAR 255 /* Maximum value for lcd_put_bar function */ + +#define _USE_POINT 0 /* 1:Enable lcd_put_point function (_USE_CGRAM must be 1) */ +#define _MAX_POINT 255 /* Maximum value for lcd_put_point function */ + +#define _BASE_GRAPH 0 /* Common user character used by lcd_put_bar/lcd_put_point function (2 chars from this) */ + + + +/*--------------------------------------------------*/ +/* API declareations */ +/*--------------------------------------------------*/ + +#include + +#ifdef __cplusplus +extern "C" { +#endif +void lcd_init (void); +void lcd_locate (uint8_t, uint8_t); +void lcd_putc (uint8_t); +void lcd_cursor (uint8_t); +void lcd_setcg (uint8_t, uint8_t, const uint8_t*); +void lcd_put_fuel (int8_t, uint8_t); +void lcd_put_bar (uint16_t, uint8_t, uint8_t); +void lcd_put_point (uint16_t, uint8_t, uint8_t); +#ifdef __cplusplus +} +#endif + +#define CSR_OFF 0 +#define CSR_BLOCK 1 +#define CSR_UNDER 2 + + +#endif /* #ifndef _EZLCD */ diff --git a/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/include/lcd.h b/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/include/lcd.h new file mode 100644 index 000000000..1818da4f9 --- /dev/null +++ b/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/include/lcd.h @@ -0,0 +1,97 @@ +#ifndef LCD_H +#define LCD_H +/*********************************************************************************** + +FILE NAME lcd.h + +DESCRIPTION Driver for KS0066u LCD Module Controller (8 characters by 2 lines ) + on the Renesas RSK boards - header file + +Copyright : 2006 Renesas Technology Europe Ltd. +Copyright : 2006 Renesas Technology Corporation. +All Rights Reserved +***********************************************************************************/ + +/*********************************************************************************** +Revision History +DD.MM.YYYY OSO-UID Description +26.07.2006 RTE-MBA First Release +***********************************************************************************/ +void InitialiseDisplay( void ); +void DisplayString(unsigned char position, char * string); +void LCD_write(unsigned char data_or_ctrl, unsigned char value); +void LCD_nibble_write(unsigned char data_or_ctrl, unsigned char value); +void DisplayDelay(unsigned long int units); + + +#define SET_BIT_HIGH (1) +#define SET_BIT_LOW (0) +#define SET_BYTE_HIGH (0xFF) +#define SET_BYTE_LOW (0x00) + +struct _LCD_Params { + unsigned char Line; + unsigned short Speed; + char *ptr_str; +}; + +void prvLCDTaskLine1( void *pvParameters ); +void prvLCDTaskLine2( void *pvParameters ); + + +/* RS Register Select pin */ +#define RS_PIN PORTJ.PODR.BIT.B1 +/* Display Enable pin */ +#define EN_PIN PORTJ.PODR.BIT.B3 +/* Data bus port */ +#define DATA_PORT PORTH.PODR.BYTE +/* Bit mask from entire port */ +#define DATA_PORT_MASK 0x0F +/* Number of bits data needs to shift */ +#define DATA_PORT_SHIFT 0 + + +#define DATA_WR 1 +#define CTRL_WR 0 + +/* Set to ensure base delay of 1microS minimum */ +//#define DELAY_TIMING 0x2F +#define DELAY_TIMING 50 +/* number of lines on the LCD display */ +#define NUMB_CHARS_PER_LINE 8 +/* Maximum charactors per line of LCD display. */ +#define MAXIMUM_LINES 2 + +#define LCD_LINE1 0 +#define LCD_LINE2 16 + +/**********************************************************************************/ +/* LCD commands - use LCD_write function to write these commands to the LCD. */ +/**********************************************************************************/ +/* Clear LCD display and home cursor */ +#define LCD_CLEAR 0x01 +/* move cursor to line 1 */ +#define LCD_HOME_L1 0x80 +/* move cursor to line 2 */ +#define LCD_HOME_L2 0xC0 +/* Cursor auto decrement after R/W */ +#define CURSOR_MODE_DEC 0x04 +/* Cursor auto increment after R/W */ +#define CURSOR_MODE_INC 0x06 +/* Setup, 4 bits,2 lines, 5X7 */ +#define FUNCTION_SET 0x28 +/* Display ON with Cursor */ +#define LCD_CURSOR_ON 0x0E +/* Display ON with Cursor off */ +#define LCD_CURSOR_OFF 0x0C +/* Display on with blinking cursor */ +#define LCD_CURSOR_BLINK 0x0D +/*Move Cursor Left One Position */ +#define LCD_CURSOR_LEFT 0x10 +/* Move Cursor Right One Position */ +#define LCD_CURSOR_RIGHT 0x14 + +#define LCD_DISPLAY_ON 0x04 +#define LCD_TWO_LINE 0x08 + +#endif \ No newline at end of file