TDISP to take ROWS and COLUMNS from board file

TDISP to take ROWS and COLUMNS from board file
ugfx_release_2.6
Andrew Hannam 2013-02-18 17:31:49 +10:00
parent 9329b22086
commit 2ed57aea77
2 changed files with 225 additions and 212 deletions

View File

@ -1,164 +1,164 @@
/* /*
ChibiOS/GFX - Copyright (C) 2012 ChibiOS/GFX - Copyright (C) 2012
Joel Bodenmann aka Tectu <joel@unormal.org> Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX. This file is part of ChibiOS/GFX.
ChibiOS/GFX is free software; you can redistribute it and/or modify ChibiOS/GFX is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (at your option) any later version.
ChibiOS/GFX is distributed in the hope that it will be useful, ChibiOS/GFX is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
/** /**
* @file drivers/tdisp/HD44780/tdisp_lld.c * @file drivers/tdisp/HD44780/tdisp_lld.c
* @brief TDISP driver subsystem low level driver source for the HD44780 display * @brief TDISP driver subsystem low level driver source for the HD44780 display
* *
* @addtogroup TDISP * @addtogroup TDISP
* @{ * @{
*/ */
#include "ch.h" #include "ch.h"
#include "hal.h" #include "hal.h"
#include "gfx.h" #include "gfx.h"
#if GFX_USE_TDISP /*|| defined(__DOXYGEN__)*/ #if GFX_USE_TDISP /*|| defined(__DOXYGEN__)*/
/* The user may override the default display size */ /* Include the hardware interface details */
#ifndef TDISP_COLUMNS #if defined(TDISP_USE_CUSTOM_BOARD) && TDISP_USE_CUSTOM_BOARD
#define TDISP_COLUMNS 16 /* Include the user supplied board definitions */
#endif #include "tdisp_lld_board.h"
#ifndef TDISP_ROWS #elif defined(BOARD_UNKNOWN)
#define TDISP_ROWS 2 #include "gdisp_lld_board_unknown.h"
#endif #else
/* Include the user supplied board definitions */
/* Controller Specific Properties */ #include "gdisp_lld_board.h"
#define CUSTOM_CHAR_COUNT 8 #endif
#define CUSTOM_CHAR_XBITS 5
#define CUSTOM_CHAR_YBITS 8 /* The user may override the default display size */
#ifndef TDISP_COLUMNS
/* Define the properties of our controller */ #define TDISP_COLUMNS 16
tdispStruct TDISP = { #endif
TDISP_COLUMNS, TDISP_ROWS, /* cols, rows */ #ifndef TDISP_ROWS
CUSTOM_CHAR_XBITS, CUSTOM_CHAR_YBITS, /* charBitsX, charBitsY */ #define TDISP_ROWS 2
CUSTOM_CHAR_COUNT /* maxCustomChars */ #endif
};
/* Controller Specific Properties */
/* Include the hardware interface details */ #define CUSTOM_CHAR_COUNT 8
#if defined(TDISP_USE_CUSTOM_BOARD) && TDISP_USE_CUSTOM_BOARD #define CUSTOM_CHAR_XBITS 5
/* Include the user supplied board definitions */ #define CUSTOM_CHAR_YBITS 8
#include "tdisp_lld_board.h"
#elif defined(BOARD_UNKNOWN) /* Define the properties of our controller */
#include "gdisp_lld_board_unknown.h" tdispStruct TDISP = {
#else TDISP_COLUMNS, TDISP_ROWS, /* cols, rows */
/* Include the user supplied board definitions */ CUSTOM_CHAR_XBITS, CUSTOM_CHAR_YBITS, /* charBitsX, charBitsY */
#include "gdisp_lld_board.h" CUSTOM_CHAR_COUNT /* maxCustomChars */
#endif };
/* Our display control */ /* Our display control */
#define DISPLAY_ON 0x04 #define DISPLAY_ON 0x04
#define CURSOR_ON 0x02 #define CURSOR_ON 0x02
#define CURSOR_BLINK 0x01 #define CURSOR_BLINK 0x01
static uint8_t displaycontrol; static uint8_t displaycontrol;
bool_t tdisp_lld_init(void) { bool_t tdisp_lld_init(void) {
/* initialise hardware */ /* initialise hardware */
init_board(); init_board();
/* wait some time */ /* wait some time */
chThdSleepMilliseconds(50); chThdSleepMilliseconds(50);
write_cmd(0x38); write_cmd(0x38);
chThdSleepMilliseconds(64); chThdSleepMilliseconds(64);
displaycontrol = DISPLAY_ON | CURSOR_ON | CURSOR_BLINK; // The default displaycontrol displaycontrol = DISPLAY_ON | CURSOR_ON | CURSOR_BLINK; // The default displaycontrol
write_cmd(0x08 | displaycontrol); write_cmd(0x08 | displaycontrol);
chThdSleepMicroseconds(50); chThdSleepMicroseconds(50);
write_cmd(0x01); // Clear the screen write_cmd(0x01); // Clear the screen
chThdSleepMilliseconds(5); chThdSleepMilliseconds(5);
write_cmd(0x06); write_cmd(0x06);
chThdSleepMicroseconds(50); chThdSleepMicroseconds(50);
return TRUE; return TRUE;
} }
void tdisp_lld_clear(void) { void tdisp_lld_clear(void) {
write_cmd(0x01); write_cmd(0x01);
} }
void tdisp_lld_draw_char(char c) { void tdisp_lld_draw_char(char c) {
write_data(c); write_data(c);
} }
void tdisp_lld_set_cursor(coord_t col, coord_t row) { void tdisp_lld_set_cursor(coord_t col, coord_t row) {
static const uint8_t row_offsets[] = { 0x00, 0x40, 0x14, 0x54 }; static const uint8_t row_offsets[] = { 0x00, 0x40, 0x14, 0x54 };
/* /*
* Short-cut: * Short-cut:
* *
* If x and y = 0 then use the home command. * If x and y = 0 then use the home command.
* *
* Note: There is probably no advantage as both commands are a single byte * Note: There is probably no advantage as both commands are a single byte
*/ */
// if (col == 0 && row == 0) { // if (col == 0 && row == 0) {
// write_cmd(0x02); // write_cmd(0x02);
// return; // return;
// } // }
write_cmd(0x80 | (col + row_offsets[row])); write_cmd(0x80 | (col + row_offsets[row]));
} }
void tdisp_lld_create_char(uint8_t address, uint8_t *charmap) { void tdisp_lld_create_char(uint8_t address, uint8_t *charmap) {
int i; int i;
write_cmd(0x40 | (address << 3)); write_cmd(0x40 | (address << 3));
for(i = 0; i < CUSTOM_CHAR_YBITS; i++) for(i = 0; i < CUSTOM_CHAR_YBITS; i++)
write_data(charmap[i]); write_data(charmap[i]);
} }
void tdisp_lld_control(uint16_t what, void *value) { void tdisp_lld_control(uint16_t what, void *value) {
switch(what) { switch(what) {
case TDISP_CTRL_BACKLIGHT: case TDISP_CTRL_BACKLIGHT:
if ((uint8_t)value) if ((uint8_t)value)
displaycontrol |= DISPLAY_ON; displaycontrol |= DISPLAY_ON;
else else
displaycontrol &= ~DISPLAY_ON; displaycontrol &= ~DISPLAY_ON;
write_cmd(0x08 | displaycontrol); write_cmd(0x08 | displaycontrol);
break; break;
case TDISP_CTRL_CURSOR: case TDISP_CTRL_CURSOR:
switch((cursorshape)value) { switch((cursorshape)value) {
case cursorOff: case cursorOff:
displaycontrol &= ~CURSOR_ON; displaycontrol &= ~CURSOR_ON;
break; break;
case cursorBlock: case cursorBlock:
case cursorUnderline: case cursorUnderline:
case cursorBar: case cursorBar:
displaycontrol = (displaycontrol | CURSOR_ON) & ~CURSOR_BLINK; displaycontrol = (displaycontrol | CURSOR_ON) & ~CURSOR_BLINK;
break; break;
case cursorBlinkingBlock: case cursorBlinkingBlock:
case cursorBlinkingUnderline: case cursorBlinkingUnderline:
case cursorBlinkingBar: case cursorBlinkingBar:
default: default:
displaycontrol |= (CURSOR_ON | CURSOR_BLINK); displaycontrol |= (CURSOR_ON | CURSOR_BLINK);
break; break;
} }
write_cmd(0x08 | displaycontrol); write_cmd(0x08 | displaycontrol);
break; break;
} }
} }
#endif /* GFX_USE_TDISP */ #endif /* GFX_USE_TDISP */
/** @} */ /** @} */

View File

@ -1,48 +1,61 @@
/* /*
ChibiOS/GFX - Copyright (C) 2012 ChibiOS/GFX - Copyright (C) 2012
Joel Bodenmann aka Tectu <joel@unormal.org> Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX. This file is part of ChibiOS/GFX.
ChibiOS/GFX is free software; you can redistribute it and/or modify ChibiOS/GFX is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (at your option) any later version.
ChibiOS/GFX is distributed in the hope that it will be useful, ChibiOS/GFX is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
/** /**
* @file drivers/tdisp/HD44780/tdisp_lld_board_example.h * @file drivers/tdisp/HD44780/tdisp_lld_board_example.h
* @brief TDISP driver subsystem board interface for the HD44780 display * @brief TDISP driver subsystem board interface for the HD44780 display
* *
* @addtogroup TDISP * @addtogroup TDISP
* @{ * @{
*/ */
#ifndef _TDISP_LLD_BOARD_H #ifndef _TDISP_LLD_BOARD_H
#define _TDISP_LLD_BOARD_H #define _TDISP_LLD_BOARD_H
static void init_board(void) { /**
/* Code here */ * The board may override the default display size.
#error "tdispHD44780: You must supply a definition for init_board for your board" * Uncomment the below if your board needs a non-standard size.
} */
/*
static void write_cmd(uint8_t data) { #ifndef TDISP_COLUMNS
/* Code here */ #define TDISP_COLUMNS 16
#error "tdispHD44780: You must supply a definition for write_cmd for your board" #endif
} #ifndef TDISP_ROWS
#define TDISP_ROWS 2
static void write_data(uint8_t data) { #endif
/* Code here */ */
#error "tdispHD44780: You must supply a definition for write_data for your board"
} static void init_board(void) {
/* Code here */
#endif /* _TDISP_LLD_BOARD_H */ #error "tdispHD44780: You must supply a definition for init_board for your board"
/** @} */ }
static void write_cmd(uint8_t data) {
/* Code here */
#error "tdispHD44780: You must supply a definition for write_cmd for your board"
}
static void write_data(uint8_t data) {
/* Code here */
#error "tdispHD44780: You must supply a definition for write_data for your board"
}
#endif /* _TDISP_LLD_BOARD_H */
/** @} */