uGFX/ugfx
2
0
Fork 0
Code Issues 2 Pull requests Projects Releases Wiki Activity

Fix compile error in GDISP

Browse source 
Fix compile error with wrongly named include file
Revert lld_gdisp naming convention to gdisp_lld to fix problem and be
consitant with all other low level drivers.
This commit is contained in:
Andrew Hannam 2013-02-18 17:29:08 +10:00
parent a178b91c4f
commit 9329b22086
19 changed files with 8453 additions and 8453 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1140
drivers/gdisp/ILI9320/gdisp_lld.c
View file

File diff suppressed because it is too large Load diff

118
drivers/gdisp/ILI9320/gdisp_lld_board_example.h
View file

@ -1,59 +1,59 @@
/* /*
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/gdisp/ILI9320/gdisp_lld_board_example.h * @file drivers/gdisp/ILI9320/gdisp_lld_board_example.h
* @brief GDISP Graphic Driver subsystem board interface for the ILI9320 display. * @brief GDISP Graphic Driver subsystem board interface for the ILI9320 display.
* *
* @addtogroup GDISP * @addtogroup GDISP
* @{ * @{
*/ */
#ifndef GDISP_LLD_BOARD_H #ifndef GDISP_LLD_BOARD_H
#define GDISP_LLD_BOARD_H #define GDISP_LLD_BOARD_H
static __inline void lld_gdisp_init_board(void) { static __inline void gdisp_lld_init_board(void) {
#error "ILI9320: You must implement the init_board routine for your board" #error "ILI9320: You must implement the init_board routine for your board"
} }
static __inline void lld_gdisp_reset_pin(bool_t state) { static __inline void gdisp_lld_reset_pin(bool_t state) {
#error "ILI9320: You must implement setpin_reset routine for your board" #error "ILI9320: You must implement setpin_reset routine for your board"
} }
static __inline void lld_gdisp_write_index(uint16_t data) { static __inline void gdisp_lld_write_index(uint16_t data) {
#error "ILI9320: You must implement write_index routine for your board" #error "ILI9320: You must implement write_index routine for your board"
} }
static __inline void lld_gdisp_write_data(uint16_t data) { static __inline void gdisp_lld_write_data(uint16_t data) {
#error "ILI9320: You must implement write_data routine for your board" #error "ILI9320: You must implement write_data routine for your board"
} }
static __inline uint16_t lld_gdisp_read_data(void) { static __inline uint16_t gdisp_lld_read_data(void) {
#error "ILI9320: You must implement read_data routine for your board" #error "ILI9320: You must implement read_data routine for your board"
} }
/* if not available, just ignore the argument and return */ /* if not available, just ignore the argument and return */
static __inline uint16_t lld_gdisp_backlight(uint8_t percentage) { static __inline uint16_t gdisp_lld_backlight(uint8_t percentage) {
#error "ILI9320: You must implement set_backlight routine for your board" #error "ILI9320: You must implement set_backlight routine for your board"
} }
#endif /* GDISP_LLD_BOARD_H */ #endif /* GDISP_LLD_BOARD_H */
/** @} */ /** @} */

170
drivers/gdisp/ILI9320/gdisp_lld_board_olimex_stm32_lcd.h
View file

@ -1,85 +1,85 @@
/* /*
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/gdisp/ILI9320/gdisp_lld_board_olimex_stm32_lcd.h * @file drivers/gdisp/ILI9320/gdisp_lld_board_olimex_stm32_lcd.h
* @brief GDISP Graphic Driver subsystem board interface for the ILI9320 display. * @brief GDISP Graphic Driver subsystem board interface for the ILI9320 display.
* *
* @addtogroup GDISP * @addtogroup GDISP
* @{ * @{
*/ */
#ifndef GDISP_LLD_BOARD_H #ifndef GDISP_LLD_BOARD_H
#define GDISP_LLD_BOARD_H #define GDISP_LLD_BOARD_H
#define GDISP_REG (*((volatile uint16_t *) 0x60000000)) /* RS = 0 */ #define GDISP_REG (*((volatile uint16_t *) 0x60000000)) /* RS = 0 */
#define GDISP_RAM (*((volatile uint16_t *) 0x60100000)) /* RS = 1 */ #define GDISP_RAM (*((volatile uint16_t *) 0x60100000)) /* RS = 1 */
static __inline void lld_gdisp_init_board(void) { static __inline void gdisp_lld_init_board(void) {
/* FSMC setup for F1 */ /* FSMC setup for F1 */
rccEnableAHB(RCC_AHBENR_FSMCEN, 0); rccEnableAHB(RCC_AHBENR_FSMCEN, 0);
/* set pin modes */ /* set pin modes */
IOBus busD = {GPIOD, PAL_WHOLE_PORT, 0}; IOBus busD = {GPIOD, PAL_WHOLE_PORT, 0};
IOBus busE = {GPIOE, PAL_WHOLE_PORT, 0}; IOBus busE = {GPIOE, PAL_WHOLE_PORT, 0};
palSetBusMode(&busD, PAL_MODE_STM32_ALTERNATE_PUSHPULL); palSetBusMode(&busD, PAL_MODE_STM32_ALTERNATE_PUSHPULL);
palSetBusMode(&busE, PAL_MODE_STM32_ALTERNATE_PUSHPULL); palSetBusMode(&busE, PAL_MODE_STM32_ALTERNATE_PUSHPULL);
palSetPadMode(GPIOE, GPIOE_TFT_RST, PAL_MODE_OUTPUT_PUSHPULL); palSetPadMode(GPIOE, GPIOE_TFT_RST, PAL_MODE_OUTPUT_PUSHPULL);
palSetPadMode(GPIOD, GPIOD_TFT_LIGHT, PAL_MODE_OUTPUT_PUSHPULL); palSetPadMode(GPIOD, GPIOD_TFT_LIGHT, PAL_MODE_OUTPUT_PUSHPULL);
const unsigned char FSMC_Bank = 0; const unsigned char FSMC_Bank = 0;
/* FSMC timing */ /* FSMC timing */
FSMC_Bank1->BTCR[FSMC_Bank+1] = (6) | (10 << 8) | (10 << 16); FSMC_Bank1->BTCR[FSMC_Bank+1] = (6) | (10 << 8) | (10 << 16);
/* Bank1 NOR/SRAM control register configuration /* Bank1 NOR/SRAM control register configuration
* This is actually not needed as already set by default after reset */ * This is actually not needed as already set by default after reset */
FSMC_Bank1->BTCR[FSMC_Bank] = FSMC_BCR1_MWID_0 | FSMC_BCR1_WREN | FSMC_BCR1_MBKEN; FSMC_Bank1->BTCR[FSMC_Bank] = FSMC_BCR1_MWID_0 | FSMC_BCR1_WREN | FSMC_BCR1_MBKEN;
} }
static __inline void lld_gdisp_reset_pin(bool_t state) { static __inline void gdisp_lld_reset_pin(bool_t state) {
if(state) if(state)
palClearPad(GPIOE, GPIOE_TFT_RST); palClearPad(GPIOE, GPIOE_TFT_RST);
else else
palSetPad(GPIOE, GPIOE_TFT_RST); palSetPad(GPIOE, GPIOE_TFT_RST);
} }
static __inline void lld_gdisp_write_index(uint16_t reg) { static __inline void gdisp_lld_write_index(uint16_t reg) {
GDISP_REG = reg; GDISP_REG = reg;
} }
static __inline void lld_gdisp_write_data(uint16_t data) { static __inline void gdisp_lld_write_data(uint16_t data) {
GDISP_RAM = data; GDISP_RAM = data;
} }
static __inline uint16_t lld_gdisp_read_data(void) { static __inline uint16_t gdisp_lld_read_data(void) {
return GDISP_RAM; return GDISP_RAM;
} }
static __inline void lld_gdisp_backlight(uint8_t percent) { static __inline void gdisp_lld_backlight(uint8_t percent) {
if(percent == 100) if(percent == 100)
palClearPad(GPIOD, GPIOD_TFT_LIGHT); palClearPad(GPIOD, GPIOD_TFT_LIGHT);
else else
palSetPad(GPIOD, GPIOD_TFT_LIGHT); palSetPad(GPIOD, GPIOD_TFT_LIGHT);
} }
#endif /* GDISP_LLD_BOARD_H */ #endif /* GDISP_LLD_BOARD_H */
/** @} */ /** @} */

1160
drivers/gdisp/ILI9325/gdisp_lld.c
View file

File diff suppressed because it is too large Load diff

118
drivers/gdisp/ILI9325/gdisp_lld_board_example.h
View file

@ -1,59 +1,59 @@
/* /*
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/gdisp/ILI9325/gdisp_lld_board_example.h * @file drivers/gdisp/ILI9325/gdisp_lld_board_example.h
* @brief GDISP Graphic Driver subsystem board interface for the ILI9325 display. * @brief GDISP Graphic Driver subsystem board interface for the ILI9325 display.
* *
* @addtogroup GDISP * @addtogroup GDISP
* @{ * @{
*/ */
#ifndef GDISP_LLD_BOARD_H #ifndef GDISP_LLD_BOARD_H
#define GDISP_LLD_BOARD_H #define GDISP_LLD_BOARD_H
static __inline void lld_gdisp_init_board(void) { static __inline void gdisp_lld_init_board(void) {
#error "ILI9325: You must implement the init_board routine for your board" #error "ILI9325: You must implement the init_board routine for your board"
} }
static __inline void lld_gdisp_reset_pin(bool_t state) { static __inline void gdisp_lld_reset_pin(bool_t state) {
#error "ILI9325: You must implement setpin_reset routine for your board" #error "ILI9325: You must implement setpin_reset routine for your board"
} }
static __inline void lld_gdisp_write_index(uint16_t data) { static __inline void gdisp_lld_write_index(uint16_t data) {
#error "ILI9325: You must implement write_index routine for your board" #error "ILI9325: You must implement write_index routine for your board"
} }
static __inline void lld_gdisp_write_data(uint16_t data) { static __inline void gdisp_lld_write_data(uint16_t data) {
#error "ILI9325: You must implement write_data routine for your board" #error "ILI9325: You must implement write_data routine for your board"
} }
static __inline uint16_t lld_gdisp_read_data(void) { static __inline uint16_t gdisp_lld_read_data(void) {
#error "ILI9325: You must implement read_data routine for your board" #error "ILI9325: You must implement read_data routine for your board"
} }
/* if not available, just ignore the argument and return */ /* if not available, just ignore the argument and return */
static __inline uint16_t lld_gdisp_backlight(uint8_t percentage) { static __inline uint16_t gdisp_lld_backlight(uint8_t percentage) {
#error "ILI9325: You must implement set_backlight routine for your board" #error "ILI9325: You must implement set_backlight routine for your board"
} }
#endif /* GDISP_LLD_BOARD_H */ #endif /* GDISP_LLD_BOARD_H */
/** @} */ /** @} */

192
drivers/gdisp/ILI9325/gdisp_lld_board_hy_stm32_100p.h
View file

@ -1,96 +1,96 @@
/* /*
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/>.
*/ */
/* /*
driver quickly hacked together from a chinese sourcecode that came driver quickly hacked together from a chinese sourcecode that came
with the board and existing ili9320 code by Chris van Dongen (sjaak) with the board and existing ili9320 code by Chris van Dongen (sjaak)
(sjaak2002 at msn.com) (sjaak2002 at msn.com)
Also added rotation for 180 and 270 degrees and minor tweaks to Also added rotation for 180 and 270 degrees and minor tweaks to
setcursor setcursor
Added code comes without warranty and free bugs. Feel free to use Added code comes without warranty and free bugs. Feel free to use
or misuse the added code :D or misuse the added code :D
*/ */
/** /**
* @file drivers/gdisp/ILI9325/gdisp_lld_board_hy_stm32_100p.h * @file drivers/gdisp/ILI9325/gdisp_lld_board_hy_stm32_100p.h
* @brief GDISP Graphic Driver subsystem board interface for the ILI9325 display. * @brief GDISP Graphic Driver subsystem board interface for the ILI9325 display.
* *
* @addtogroup GDISP * @addtogroup GDISP
* @{ * @{
*/ */
#ifndef GDISP_LLD_BOARD_H #ifndef GDISP_LLD_BOARD_H
#define GDISP_LLD_BOARD_H #define GDISP_LLD_BOARD_H
#define GDISP_REG (*((volatile uint16_t *) 0x60000000)) /* RS = 0 */ #define GDISP_REG (*((volatile uint16_t *) 0x60000000)) /* RS = 0 */
#define GDISP_RAM (*((volatile uint16_t *) 0x60020000)) /* RS = 1 */ #define GDISP_RAM (*((volatile uint16_t *) 0x60020000)) /* RS = 1 */
static __inline void lld_gdisp_init_board(void) { static __inline void gdisp_lld_init_board(void) {
/* FSMC setup for F1 */ /* FSMC setup for F1 */
rccEnableAHB(RCC_AHBENR_FSMCEN, 0); rccEnableAHB(RCC_AHBENR_FSMCEN, 0);
/* set pin modes */ /* set pin modes */
/* IOBus busD = {GPIOD, PAL_WHOLE_PORT, 0}; /* IOBus busD = {GPIOD, PAL_WHOLE_PORT, 0};
IOBus busE = {GPIOE, PAL_WHOLE_PORT, 0}; IOBus busE = {GPIOE, PAL_WHOLE_PORT, 0};
palSetBusMode(&busD, PAL_MODE_STM32_ALTERNATE_PUSHPULL); palSetBusMode(&busD, PAL_MODE_STM32_ALTERNATE_PUSHPULL);
palSetBusMode(&busE, PAL_MODE_STM32_ALTERNATE_PUSHPULL); palSetBusMode(&busE, PAL_MODE_STM32_ALTERNATE_PUSHPULL);
palSetPadMode(GPIOE, GPIOE_TFT_RST, PAL_MODE_OUTPUT_PUSHPULL); palSetPadMode(GPIOE, GPIOE_TFT_RST, PAL_MODE_OUTPUT_PUSHPULL);
palSetPadMode(GPIOD, GPIOD_TFT_LIGHT, PAL_MODE_OUTPUT_PUSHPULL); */ palSetPadMode(GPIOD, GPIOD_TFT_LIGHT, PAL_MODE_OUTPUT_PUSHPULL); */
const unsigned char FSMC_Bank = 0; const unsigned char FSMC_Bank = 0;
/* FSMC timing */ /* FSMC timing */
FSMC_Bank1->BTCR[FSMC_Bank+1] = (6) | (10 << 8) | (10 << 16); FSMC_Bank1->BTCR[FSMC_Bank+1] = (6) | (10 << 8) | (10 << 16);
/* Bank1 NOR/SRAM control register configuration /* Bank1 NOR/SRAM control register configuration
* This is actually not needed as already set by default after reset */ * This is actually not needed as already set by default after reset */
FSMC_Bank1->BTCR[FSMC_Bank] = FSMC_BCR1_MWID_0 | FSMC_BCR1_WREN | FSMC_BCR1_MBKEN; FSMC_Bank1->BTCR[FSMC_Bank] = FSMC_BCR1_MWID_0 | FSMC_BCR1_WREN | FSMC_BCR1_MBKEN;
} }
static __inline void lld_gdisp_reset_pin(bool_t state) { static __inline void gdisp_lld_reset_pin(bool_t state) {
if(state) if(state)
palClearPad(GPIOE, GPIOE_TFT_RST); palClearPad(GPIOE, GPIOE_TFT_RST);
else else
palSetPad(GPIOE, GPIOE_TFT_RST); palSetPad(GPIOE, GPIOE_TFT_RST);
} }
static __inline void lld_gdisp_write_index(uint16_t reg) { static __inline void gdisp_lld_write_index(uint16_t reg) {
GDISP_REG = reg; GDISP_REG = reg;
} }
static __inline void lld_gdisp_write_data(uint16_t data) { static __inline void gdisp_lld_write_data(uint16_t data) {
GDISP_RAM = data; GDISP_RAM = data;
} }
static __inline uint16_t lld_gdisp_read_data(void) { static __inline uint16_t gdisp_lld_read_data(void) {
return GDISP_RAM; return GDISP_RAM;
} }
static __inline void lld_gdisp_backlight(uint8_t percent) { static __inline void gdisp_lld_backlight(uint8_t percent) {
percent=percent; // avoid a warning percent=percent; // avoid a warning
} }
#endif /* GDISP_LLD_BOARD_H */ #endif /* GDISP_LLD_BOARD_H */
/** @} */ /** @} */

1056
drivers/gdisp/Nokia6610GE12/gdisp_lld.c
View file

File diff suppressed because it is too large Load diff

966
drivers/gdisp/Nokia6610GE8/gdisp_lld.c
View file

@ -1,483 +1,483 @@
/* /*
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/gdisp/Nokia6610GE8/gdisp_lld.c * @file drivers/gdisp/Nokia6610GE8/gdisp_lld.c
* @brief GDISP Graphics Driver subsystem low level driver source for the Nokia6610 GE8 display. * @brief GDISP Graphics Driver subsystem low level driver source for the Nokia6610 GE8 display.
* *
* @addtogroup GDISP * @addtogroup GDISP
* @{ * @{
*/ */
#include "ch.h" #include "ch.h"
#include "hal.h" #include "hal.h"
#include "gfx.h" #include "gfx.h"
#if GFX_USE_GDISP /*|| defined(__DOXYGEN__)*/ #if GFX_USE_GDISP /*|| defined(__DOXYGEN__)*/
/* Include the emulation code for things we don't support */ /* Include the emulation code for things we don't support */
#include "gdisp/lld/emulation.c" #include "gdisp/lld/emulation.c"
/*===========================================================================*/ /*===========================================================================*/
/* Driver local definitions. */ /* Driver local definitions. */
/*===========================================================================*/ /*===========================================================================*/
#include "GE8.h" #include "GE8.h"
/* This controller is only ever used with a 132 x 132 display */ /* This controller is only ever used with a 132 x 132 display */
#if defined(GDISP_SCREEN_HEIGHT) #if defined(GDISP_SCREEN_HEIGHT)
#warning "GDISP: This low level driver does not support setting a screen size. It is being ignored." #warning "GDISP: This low level driver does not support setting a screen size. It is being ignored."
#undef GDISP_SCREEN_HEIGHT #undef GDISP_SCREEN_HEIGHT
#endif #endif
#if defined(GDISP_SCREEN_WIDTH) #if defined(GDISP_SCREEN_WIDTH)
#warning "GDISP: This low level driver does not support setting a screen size. It is being ignored." #warning "GDISP: This low level driver does not support setting a screen size. It is being ignored."
#undef GDISP_SCREEN_WIDTH #undef GDISP_SCREEN_WIDTH
#endif #endif
#define GDISP_SCREEN_HEIGHT 132 #define GDISP_SCREEN_HEIGHT 132
#define GDISP_SCREEN_WIDTH 132 #define GDISP_SCREEN_WIDTH 132
#define GDISP_INITIAL_CONTRAST 38 #define GDISP_INITIAL_CONTRAST 38
#define GDISP_INITIAL_BACKLIGHT 100 #define GDISP_INITIAL_BACKLIGHT 100
/*===========================================================================*/ /*===========================================================================*/
/* Driver exported variables. */ /* Driver exported variables. */
/*===========================================================================*/ /*===========================================================================*/
/*===========================================================================*/ /*===========================================================================*/
/* Driver local variables. */ /* Driver local variables. */
/*===========================================================================*/ /*===========================================================================*/
/*===========================================================================*/ /*===========================================================================*/
/* Driver local functions. */ /* Driver local functions. */
/*===========================================================================*/ /*===========================================================================*/
#if defined(GDISP_USE_CUSTOM_BOARD) && GDISP_USE_CUSTOM_BOARD #if defined(GDISP_USE_CUSTOM_BOARD) && GDISP_USE_CUSTOM_BOARD
/* Include the user supplied board definitions */ /* Include the user supplied board definitions */
#include "gdisp_lld_board.h" #include "gdisp_lld_board.h"
#elif defined(BOARD_OLIMEX_SAM7_EX256) #elif defined(BOARD_OLIMEX_SAM7_EX256)
#include "gdisp_lld_board_olimexsam7ex256.h" #include "gdisp_lld_board_olimexsam7ex256.h"
#else #else
/* Include the user supplied board definitions */ /* Include the user supplied board definitions */
#include "gdisp_lld_board.h" #include "gdisp_lld_board.h"
#endif #endif
// Some macros just to make reading the code easier // Some macros just to make reading the code easier
#define delayms(ms) chThdSleepMilliseconds(ms) #define delayms(ms) chThdSleepMilliseconds(ms)
#define write_data2(d1, d2) { write_data(d1); write_data(d2); } #define write_data2(d1, d2) { write_data(d1); write_data(d2); }
#define write_data3(d1, d2, d3) { write_data(d1); write_data(d2); write_data(d3); } #define write_data3(d1, d2, d3) { write_data(d1); write_data(d2); write_data(d3); }
#define write_cmd1(cmd, d1) { write_cmd(cmd); write_data(d1); } #define write_cmd1(cmd, d1) { write_cmd(cmd); write_data(d1); }
#define write_cmd2(cmd, d1, d2) { write_cmd(cmd); write_data2(d1, d2); } #define write_cmd2(cmd, d1, d2) { write_cmd(cmd); write_data2(d1, d2); }
#define write_cmd3(cmd, d1, d2, d3) { write_cmd(cmd); write_data3(d1, d2, d3); } #define write_cmd3(cmd, d1, d2, d3) { write_cmd(cmd); write_data3(d1, d2, d3); }
// A very common thing to do. // A very common thing to do.
// An inline function has been used here incase the parameters have side effects with the internal calculations. // An inline function has been used here incase the parameters have side effects with the internal calculations.
static __inline void setviewport(coord_t x, coord_t y, coord_t cx, coord_t cy) { static __inline void setviewport(coord_t x, coord_t y, coord_t cx, coord_t cy) {
write_cmd2(CASET, x, x+cx-1); // Column address set write_cmd2(CASET, x, x+cx-1); // Column address set
write_cmd2(PASET, y, y+cy-1); // Page address set write_cmd2(PASET, y, y+cy-1); // Page address set
} }
/*===========================================================================*/ /*===========================================================================*/
/* Driver interrupt handlers. */ /* Driver interrupt handlers. */
/*===========================================================================*/ /*===========================================================================*/
/*===========================================================================*/ /*===========================================================================*/
/* Driver exported functions. */ /* Driver exported functions. */
/*===========================================================================*/ /*===========================================================================*/
/* ---- Required Routines ---- */ /* ---- Required Routines ---- */
/* /*
The following 2 routines are required. The following 2 routines are required.
All other routines are optional. All other routines are optional.
*/ */
/** /**
* @brief Low level GDISP driver initialization. * @brief Low level GDISP driver initialization.
* *
* @notapi * @notapi
*/ */
bool_t lld_gdisp_init(void) { bool_t gdisp_lld_init(void) {
/* Initialise your display */ /* Initialise your display */
init_board(); init_board();
// Hardware reset // Hardware reset
setpin_reset(TRUE); setpin_reset(TRUE);
delayms(20); delayms(20);
setpin_reset(FALSE); setpin_reset(FALSE);
delayms(20); delayms(20);
// Get the bus for the following initialisation commands // Get the bus for the following initialisation commands
acquire_bus(); acquire_bus();
write_cmd3(DISCTL, 0x00, 0x20, 0x00); // Display control write_cmd3(DISCTL, 0x00, 0x20, 0x00); // Display control
// P1: 0x00 = 2 divisions, switching period=8 (default) // P1: 0x00 = 2 divisions, switching period=8 (default)
// P2: 0x20 = nlines/4 - 1 = 132/4 - 1 = 32) // P2: 0x20 = nlines/4 - 1 = 132/4 - 1 = 32)
// P3: 0x00 = no inversely highlighted lines // P3: 0x00 = no inversely highlighted lines
write_cmd1(COMSCN, 0x01); // COM scan P1: 0x01 = Scan 1->80, 160<-81 write_cmd1(COMSCN, 0x01); // COM scan P1: 0x01 = Scan 1->80, 160<-81
write_cmd(OSCON); // Internal oscilator ON write_cmd(OSCON); // Internal oscilator ON
write_cmd(SLPOUT); // Sleep out write_cmd(SLPOUT); // Sleep out
write_cmd1(PWRCTR, 0x0F); // Power control - reference voltage regulator on, circuit voltage follower on, BOOST ON write_cmd1(PWRCTR, 0x0F); // Power control - reference voltage regulator on, circuit voltage follower on, BOOST ON
write_cmd3(DATCTL, 0x48, 0x00, 0x02); // Data control write_cmd3(DATCTL, 0x48, 0x00, 0x02); // Data control
// P1: 0x01 = page address inverted, column address normal, address scan in column direction // P1: 0x01 = page address inverted, column address normal, address scan in column direction
// P2: 0x00 = RGB sequence (default value) // P2: 0x00 = RGB sequence (default value)
// P3: 0x02 = Grayscale -> 16 (selects 12-bit color, type A) // P3: 0x02 = Grayscale -> 16 (selects 12-bit color, type A)
write_cmd2(VOLCTR, GDISP_INITIAL_CONTRAST, 0x03); // Voltage control (contrast setting) write_cmd2(VOLCTR, GDISP_INITIAL_CONTRAST, 0x03); // Voltage control (contrast setting)
// P1 = Contrast // P1 = Contrast
// P2 = 3 resistance ratio (only value that works) // P2 = 3 resistance ratio (only value that works)
delayms(100); // allow power supply to stabilize delayms(100); // allow power supply to stabilize
write_cmd(DISON); // Turn on the display write_cmd(DISON); // Turn on the display
// Release the bus // Release the bus
release_bus(); release_bus();
/* Turn on the back-light */ /* Turn on the back-light */
set_backlight(GDISP_INITIAL_BACKLIGHT); set_backlight(GDISP_INITIAL_BACKLIGHT);
/* Initialise the GDISP structure to match */ /* Initialise the GDISP structure to match */
GDISP.Width = GDISP_SCREEN_WIDTH; GDISP.Width = GDISP_SCREEN_WIDTH;
GDISP.Height = GDISP_SCREEN_HEIGHT; GDISP.Height = GDISP_SCREEN_HEIGHT;
GDISP.Orientation = GDISP_ROTATE_0; GDISP.Orientation = GDISP_ROTATE_0;
GDISP.Powermode = powerOn; GDISP.Powermode = powerOn;
GDISP.Backlight = GDISP_INITIAL_BACKLIGHT; GDISP.Backlight = GDISP_INITIAL_BACKLIGHT;
GDISP.Contrast = GDISP_INITIAL_CONTRAST; GDISP.Contrast = GDISP_INITIAL_CONTRAST;
#if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP #if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP
GDISP.clipx0 = 0; GDISP.clipx0 = 0;
GDISP.clipy0 = 0; GDISP.clipy0 = 0;
GDISP.clipx1 = GDISP.Width; GDISP.clipx1 = GDISP.Width;
GDISP.clipy1 = GDISP.Height; GDISP.clipy1 = GDISP.Height;
#endif #endif
return TRUE; return TRUE;
} }
/** /**
* @brief Draws a pixel on the display. * @brief Draws a pixel on the display.
* *
* @param[in] x X location of the pixel * @param[in] x X location of the pixel
* @param[in] y Y location of the pixel * @param[in] y Y location of the pixel
* @param[in] color The color of the pixel * @param[in] color The color of the pixel
* *
* @notapi * @notapi
*/ */
void lld_gdisp_draw_pixel(coord_t x, coord_t y, color_t color) { void gdisp_lld_draw_pixel(coord_t x, coord_t y, color_t color) {
#if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP #if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP
if (x < GDISP.clipx0 || y < GDISP.clipy0 || x >= GDISP.clipx1 || y >= GDISP.clipy1) return; if (x < GDISP.clipx0 || y < GDISP.clipy0 || x >= GDISP.clipx1 || y >= GDISP.clipy1) return;
#endif #endif
acquire_bus(); acquire_bus();
setviewport(x, y, 1, 1); setviewport(x, y, 1, 1);
write_cmd3(RAMWR, 0, (color>>8) & 0x0F, color & 0xFF); write_cmd3(RAMWR, 0, (color>>8) & 0x0F, color & 0xFF);
release_bus(); release_bus();
} }
/* ---- Optional Routines ---- */ /* ---- Optional Routines ---- */
#if GDISP_HARDWARE_FILLS || defined(__DOXYGEN__) #if GDISP_HARDWARE_FILLS || defined(__DOXYGEN__)
/** /**
* @brief Fill an area with a color. * @brief Fill an area with a color.
* *
* @param[in] x, y The start filled area * @param[in] x, y The start filled area
* @param[in] cx, cy The width and height to be filled * @param[in] cx, cy The width and height to be filled
* @param[in] color The color of the fill * @param[in] color The color of the fill
* *
* @notapi * @notapi
*/ */
void lld_gdisp_fill_area(coord_t x, coord_t y, coord_t cx, coord_t cy, color_t color) { void gdisp_lld_fill_area(coord_t x, coord_t y, coord_t cx, coord_t cy, color_t color) {
unsigned i, tuples; unsigned i, tuples;
#if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP #if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP
if (x < GDISP.clipx0) { cx -= GDISP.clipx0 - x; x = GDISP.clipx0; } if (x < GDISP.clipx0) { cx -= GDISP.clipx0 - x; x = GDISP.clipx0; }
if (y < GDISP.clipy0) { cy -= GDISP.clipy0 - y; y = GDISP.clipy0; } if (y < GDISP.clipy0) { cy -= GDISP.clipy0 - y; y = GDISP.clipy0; }
if (cx <= 0 || cy <= 0 || x >= GDISP.clipx1 || y >= GDISP.clipy1) return; if (cx <= 0 || cy <= 0 || x >= GDISP.clipx1 || y >= GDISP.clipy1) return;
if (x+cx > GDISP.clipx1) cx = GDISP.clipx1 - x; if (x+cx > GDISP.clipx1) cx = GDISP.clipx1 - x;
if (y+cy > GDISP.clipy1) cy = GDISP.clipy1 - y; if (y+cy > GDISP.clipy1) cy = GDISP.clipy1 - y;
#endif #endif
tuples = (cx*cy+1)/2; // With an odd sized area we over-print by one pixel. tuples = (cx*cy+1)/2; // With an odd sized area we over-print by one pixel.
// This extra pixel is ignored by the controller. // This extra pixel is ignored by the controller.
acquire_bus(); acquire_bus();
setviewport(x, y, cx, cy); setviewport(x, y, cx, cy);
write_cmd(RAMWR); write_cmd(RAMWR);
for(i=0; i < tuples; i++) for(i=0; i < tuples; i++)
write_data3(((color >> 4) & 0xFF), (((color << 4) & 0xF0)|((color >> 8) & 0x0F)), (color & 0xFF)); write_data3(((color >> 4) & 0xFF), (((color << 4) & 0xF0)|((color >> 8) & 0x0F)), (color & 0xFF));
release_bus(); release_bus();
} }
#endif #endif
#if GDISP_HARDWARE_BITFILLS || defined(__DOXYGEN__) #if GDISP_HARDWARE_BITFILLS || defined(__DOXYGEN__)
/** /**
* @brief Fill an area with a bitmap. * @brief Fill an area with a bitmap.
* *
* @param[in] x, y The start filled area * @param[in] x, y The start filled area
* @param[in] cx, cy The width and height to be filled * @param[in] cx, cy The width and height to be filled
* @param[in] srcx, srcy The bitmap position to start the fill from * @param[in] srcx, srcy The bitmap position to start the fill from
* @param[in] srccx The width of a line in the bitmap. * @param[in] srccx The width of a line in the bitmap.
* @param[in] buffer The pixels to use to fill the area. * @param[in] buffer The pixels to use to fill the area.
* *
* @notapi * @notapi
*/ */
void lld_gdisp_blit_area_ex(coord_t x, coord_t y, coord_t cx, coord_t cy, coord_t srcx, coord_t srcy, coord_t srccx, const pixel_t *buffer) { void gdisp_lld_blit_area_ex(coord_t x, coord_t y, coord_t cx, coord_t cy, coord_t srcx, coord_t srcy, coord_t srccx, const pixel_t *buffer) {
coord_t endx, endy, lg; coord_t endx, endy, lg;
color_t c1, c2; color_t c1, c2;
#if GDISP_PACKED_PIXELS #if GDISP_PACKED_PIXELS
coord_t pos; coord_t pos;
const uint8_t *p; const uint8_t *p;
#endif #endif
#if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP #if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP
if (x < GDISP.clipx0) { cx -= GDISP.clipx0 - x; srcx += GDISP.clipx0 - x; x = GDISP.clipx0; } if (x < GDISP.clipx0) { cx -= GDISP.clipx0 - x; srcx += GDISP.clipx0 - x; x = GDISP.clipx0; }
if (y < GDISP.clipy0) { cy -= GDISP.clipy0 - y; srcy += GDISP.clipy0 - y; y = GDISP.clipy0; } if (y < GDISP.clipy0) { cy -= GDISP.clipy0 - y; srcy += GDISP.clipy0 - y; y = GDISP.clipy0; }
if (srcx+cx > srccx) cx = srccx - srcx; if (srcx+cx > srccx) cx = srccx - srcx;
if (cx <= 0 || cy <= 0 || x >= GDISP.clipx1 || y >= GDISP.clipy1) return; if (cx <= 0 || cy <= 0 || x >= GDISP.clipx1 || y >= GDISP.clipy1) return;
if (x+cx > GDISP.clipx1) cx = GDISP.clipx1 - x; if (x+cx > GDISP.clipx1) cx = GDISP.clipx1 - x;
if (y+cy > GDISP.clipy1) cy = GDISP.clipy1 - y; if (y+cy > GDISP.clipy1) cy = GDISP.clipy1 - y;
#endif #endif
/* What are our end points */ /* What are our end points */
endx = srcx + cx; endx = srcx + cx;
endy = y + cy; endy = y + cy;
acquire_bus(); acquire_bus();
setviewport(x, y, cx, cy); setviewport(x, y, cx, cy);
write_cmd(RAMWR); write_cmd(RAMWR);
#if !GDISP_PACKED_PIXELS #if !GDISP_PACKED_PIXELS
// Although this controller uses packed pixels we support unpacked pixel // Although this controller uses packed pixels we support unpacked pixel
// formats in this blit by packing the data as we feed it to the controller. // formats in this blit by packing the data as we feed it to the controller.
lg = srccx - cx; lg = srccx - cx;
buffer += srcy * srccx + srcx; buffer += srcy * srccx + srcx;
x = srcx; x = srcx;
while (1) { while (1) {
/* Get a pixel */ /* Get a pixel */
c1 = *buffer++; c1 = *buffer++;
if (++x >= endx) { if (++x >= endx) {
if (++y >= endy) { if (++y >= endy) {
/* Odd pixel at end */ /* Odd pixel at end */
write_data3(0, ((c1 >> 8) & 0x0F), (c1 & 0xFF)); write_data3(0, ((c1 >> 8) & 0x0F), (c1 & 0xFF));
break; break;
} }
x = srcx; x = srcx;
buffer += lg; buffer += lg;
} }
/* Get the next pixel */ /* Get the next pixel */
c2 = *buffer++; c2 = *buffer++;
write_data3(((c1 >> 4) & 0xFF), (((c1 << 4) & 0xF0)|((c2 >> 8) & 0x0F)), (c2 & 0xFF)); write_data3(((c1 >> 4) & 0xFF), (((c1 << 4) & 0xF0)|((c2 >> 8) & 0x0F)), (c2 & 0xFF));
if (++x >= endx) { if (++x >= endx) {
if (++y >= endy) if (++y >= endy)
break; break;
x = srcx; x = srcx;
buffer += lg; buffer += lg;
} }
} }
#else #else
// Although this controller uses packed pixels, we may have to feed it into // Although this controller uses packed pixels, we may have to feed it into
// the controller with different packing to the source bitmap // the controller with different packing to the source bitmap
#if !GDISP_PACKED_LINES #if !GDISP_PACKED_LINES
srccx = (srccx + 1) & ~1; srccx = (srccx + 1) & ~1;
#endif #endif
pos = srcy*srccx; pos = srcy*srccx;
lg = (srccx - cx)/2*3; lg = (srccx - cx)/2*3;
p = ((const uint8_t *)buffer) + ((pos+srcx)/2 * 3); p = ((const uint8_t *)buffer) + ((pos+srcx)/2 * 3);
x = srcx; x = srcx;
while (1) { while (1) {
/* Get a pixel */ /* Get a pixel */
switch((pos+x)&1) { switch((pos+x)&1) {
case 0: c1 = (((color_t)p[0]) << 4)|(((color_t)p[1])>>4); break; case 0: c1 = (((color_t)p[0]) << 4)|(((color_t)p[1])>>4); break;
case 1: c1 = (((color_t)p[1]&0x0F) << 8)|((color_t)p[1]); break; case 1: c1 = (((color_t)p[1]&0x0F) << 8)|((color_t)p[1]); break;
} }
if (++x >= endx) { if (++x >= endx) {
if (++y >= endy) { if (++y >= endy) {
/* Odd pixel at end */ /* Odd pixel at end */
write_data3(0, ((c1 >> 8) & 0x0F), (c1 & 0xFF)); write_data3(0, ((c1 >> 8) & 0x0F), (c1 & 0xFF));
break; break;
} }
x = srcx; x = srcx;
p += lg; p += lg;
pos += srccx; pos += srccx;
} }
/* Get the next pixel */ /* Get the next pixel */
switch((pos+x)&1) { switch((pos+x)&1) {
case 0: c2 = (((color_t)p[0]) << 4)|(((color_t)p[1])>>4); break; case 0: c2 = (((color_t)p[0]) << 4)|(((color_t)p[1])>>4); break;
case 1: c2 = (((color_t)p[1]&0x0F) << 8)|((color_t)p[1]); break; case 1: c2 = (((color_t)p[1]&0x0F) << 8)|((color_t)p[1]); break;
} }
write_data3(((c1 >> 4) & 0xFF), (((c1 << 4) & 0xF0)|((c2 >> 8) & 0x0F)), (c2 & 0xFF)); write_data3(((c1 >> 4) & 0xFF), (((c1 << 4) & 0xF0)|((c2 >> 8) & 0x0F)), (c2 & 0xFF));
if (++x >= endx) { if (++x >= endx) {
if (++y >= endy) if (++y >= endy)
break; break;
x = srcx; x = srcx;
p += lg; p += lg;
pos += srccx; pos += srccx;
} }
} }
#endif #endif
release_bus(); release_bus();
} }
#endif #endif
#if (GDISP_NEED_PIXELREAD && GDISP_HARDWARE_PIXELREAD) #if (GDISP_NEED_PIXELREAD && GDISP_HARDWARE_PIXELREAD)
/** /**
* @brief Get the color of a particular pixel. * @brief Get the color of a particular pixel.
* @note If x,y is off the screen, the result is undefined. * @note If x,y is off the screen, the result is undefined.
* *
* @param[in] x, y The start of the text * @param[in] x, y The start of the text
* *
* @notapi * @notapi
*/ */
color_t lld_gdisp_get_pixel_color(coord_t x, coord_t y) { color_t gdisp_lld_get_pixel_color(coord_t x, coord_t y) {
/* NOT IMPLEMENTED */ /* NOT IMPLEMENTED */
/* Some board hardware might support this in the future. /* Some board hardware might support this in the future.
* The Olimex board doesn't. * The Olimex board doesn't.
*/ */
} }
#endif #endif
#if (GDISP_NEED_SCROLL && GDISP_HARDWARE_SCROLL) #if (GDISP_NEED_SCROLL && GDISP_HARDWARE_SCROLL)
/** /**
* @brief Scroll vertically a section of the screen. * @brief Scroll vertically a section of the screen.
* @note If x,y + cx,cy is off the screen, the result is undefined. * @note If x,y + cx,cy is off the screen, the result is undefined.
* @note If lines is >= cy, it is equivelent to a area fill with bgcolor. * @note If lines is >= cy, it is equivelent to a area fill with bgcolor.
* *
* @param[in] x, y The start of the area to be scrolled * @param[in] x, y The start of the area to be scrolled
* @param[in] cx, cy The size of the area to be scrolled * @param[in] cx, cy The size of the area to be scrolled
* @param[in] lines The number of lines to scroll (Can be positive or negative) * @param[in] lines The number of lines to scroll (Can be positive or negative)
* @param[in] bgcolor The color to fill the newly exposed area. * @param[in] bgcolor The color to fill the newly exposed area.
* *
* @notapi * @notapi
*/ */
void lld_gdisp_vertical_scroll(coord_t x, coord_t y, coord_t cx, coord_t cy, int lines, color_t bgcolor) { void gdisp_lld_vertical_scroll(coord_t x, coord_t y, coord_t cx, coord_t cy, int lines, color_t bgcolor) {
/* NOT IMPLEMENTED */ /* NOT IMPLEMENTED */
/* The hardware seems capable of doing this. /* The hardware seems capable of doing this.
* It is just really complex so we leave it out for now. * It is just really complex so we leave it out for now.
*/ */
} }
#endif #endif
#if GDISP_HARDWARE_CONTROL || defined(__DOXYGEN__) #if GDISP_HARDWARE_CONTROL || defined(__DOXYGEN__)
/** /**
* @brief Driver Control * @brief Driver Control
* @details Unsupported control codes are ignored. * @details Unsupported control codes are ignored.
* @note The value parameter should always be typecast to (void *). * @note The value parameter should always be typecast to (void *).
* @note There are some predefined and some specific to the low level driver. * @note There are some predefined and some specific to the low level driver.
* @note GDISP_CONTROL_POWER - Takes a gdisp_powermode_t * @note GDISP_CONTROL_POWER - Takes a gdisp_powermode_t
* GDISP_CONTROL_ORIENTATION - Takes a gdisp_orientation_t * GDISP_CONTROL_ORIENTATION - Takes a gdisp_orientation_t
* GDISP_CONTROL_BACKLIGHT - Takes an int from 0 to 100. For a driver * GDISP_CONTROL_BACKLIGHT - Takes an int from 0 to 100. For a driver
* that only supports off/on anything other * that only supports off/on anything other
* than zero is on. * than zero is on.
* GDISP_CONTROL_CONTRAST - Takes an int from 0 to 100. * GDISP_CONTROL_CONTRAST - Takes an int from 0 to 100.
* GDISP_CONTROL_LLD - Low level driver control constants start at * GDISP_CONTROL_LLD - Low level driver control constants start at
* this value. * this value.
* *
* @param[in] what What to do. * @param[in] what What to do.
* @param[in] value The value to use (always cast to a void *). * @param[in] value The value to use (always cast to a void *).
* *
* @notapi * @notapi
*/ */
void lld_gdisp_control(unsigned what, void *value) { void gdisp_lld_control(unsigned what, void *value) {
/* The hardware is capable of supporting... /* The hardware is capable of supporting...
* GDISP_CONTROL_POWER - not implemented yet * GDISP_CONTROL_POWER - not implemented yet
* GDISP_CONTROL_ORIENTATION - not implemented yet * GDISP_CONTROL_ORIENTATION - not implemented yet
* GDISP_CONTROL_BACKLIGHT - supported (the OlimexSAM7EX256 board.h currently only implements off/on although PWM is supported by the hardware) * GDISP_CONTROL_BACKLIGHT - supported (the OlimexSAM7EX256 board.h currently only implements off/on although PWM is supported by the hardware)
* GDISP_CONTROL_CONTRAST - supported * GDISP_CONTROL_CONTRAST - supported
*/ */
switch(what) { switch(what) {
#if 0 #if 0
// NOT IMPLEMENTED YET // NOT IMPLEMENTED YET
case GDISP_CONTROL_POWER: case GDISP_CONTROL_POWER:
if (GDISP.Powermode == (gdisp_powermode_t)value) if (GDISP.Powermode == (gdisp_powermode_t)value)
return; return;
switch((gdisp_powermode_t)value) { switch((gdisp_powermode_t)value) {
case powerOff: case powerOff:
// Code here // Code here
break; break;
case powerOn: case powerOn:
// Code here // Code here
/* You may need this --- /* You may need this ---
* if (GDISP.Powermode != powerSleep) * if (GDISP.Powermode != powerSleep)
* lld_gdisp_init(); * gdisp_lld_init();
*/ */
break; break;
case powerSleep: case powerSleep:
/* Code here */ /* Code here */
break; break;
default: default:
return; return;
} }
GDISP.Powermode = (gdisp_powermode_t)value; GDISP.Powermode = (gdisp_powermode_t)value;
return; return;
#endif #endif
#if 0 #if 0
// NOT IMPLEMENTED YET // NOT IMPLEMENTED YET
case GDISP_CONTROL_ORIENTATION: case GDISP_CONTROL_ORIENTATION:
if (GDISP.Orientation == (gdisp_orientation_t)value) if (GDISP.Orientation == (gdisp_orientation_t)value)
return; return;
// WriteSpiData(0x48); // no mirror Y (temporary to satisfy Olimex bmptoarray utility) // WriteSpiData(0x48); // no mirror Y (temporary to satisfy Olimex bmptoarray utility)
// WriteSpiData(0xC8); // restore to (mirror x and y, reverse rgb) // WriteSpiData(0xC8); // restore to (mirror x and y, reverse rgb)
switch((gdisp_orientation_t)value) { switch((gdisp_orientation_t)value) {
case GDISP_ROTATE_0: case GDISP_ROTATE_0:
// Code here // Code here
GDISP.Height = GDISP_SCREEN_HEIGHT; GDISP.Height = GDISP_SCREEN_HEIGHT;
GDISP.Width = GDISP_SCREEN_WIDTH; GDISP.Width = GDISP_SCREEN_WIDTH;
break; break;
case GDISP_ROTATE_90: case GDISP_ROTATE_90:
// Code here // Code here
GDISP.Height = GDISP_SCREEN_WIDTH; GDISP.Height = GDISP_SCREEN_WIDTH;
GDISP.Width = GDISP_SCREEN_HEIGHT; GDISP.Width = GDISP_SCREEN_HEIGHT;
break; break;
case GDISP_ROTATE_180: case GDISP_ROTATE_180:
// Code here // Code here
GDISP.Height = GDISP_SCREEN_HEIGHT; GDISP.Height = GDISP_SCREEN_HEIGHT;
GDISP.Width = GDISP_SCREEN_WIDTH; GDISP.Width = GDISP_SCREEN_WIDTH;
break; break;
case GDISP_ROTATE_270: case GDISP_ROTATE_270:
// Code here // Code here
GDISP.Height = GDISP_SCREEN_WIDTH; GDISP.Height = GDISP_SCREEN_WIDTH;
GDISP.Width = GDISP_SCREEN_HEIGHT; GDISP.Width = GDISP_SCREEN_HEIGHT;
break; break;
default: default:
return; return;
} }
#if GDISP_NEED_CLIP || GDISP_NEED_VALIDATION #if GDISP_NEED_CLIP || GDISP_NEED_VALIDATION
GDISP.clipx0 = 0; GDISP.clipx0 = 0;
GDISP.clipy0 = 0; GDISP.clipy0 = 0;
GDISP.clipx1 = GDISP.Width; GDISP.clipx1 = GDISP.Width;
GDISP.clipy1 = GDISP.Height; GDISP.clipy1 = GDISP.Height;
#endif #endif
GDISP.Orientation = (gdisp_orientation_t)value; GDISP.Orientation = (gdisp_orientation_t)value;
return; return;
#endif #endif
case GDISP_CONTROL_BACKLIGHT: case GDISP_CONTROL_BACKLIGHT:
if ((unsigned)value > 100) value = (void *)100; if ((unsigned)value > 100) value = (void *)100;
set_backlight((unsigned)value); set_backlight((unsigned)value);
GDISP.Backlight = (unsigned)value; GDISP.Backlight = (unsigned)value;
return; return;
case GDISP_CONTROL_CONTRAST: case GDISP_CONTROL_CONTRAST:
if ((unsigned)value > 100) value = (void *)100; if ((unsigned)value > 100) value = (void *)100;
acquire_bus(); acquire_bus();
write_cmd2(VOLCTR, (unsigned)value, 0x03); write_cmd2(VOLCTR, (unsigned)value, 0x03);
release_bus(); release_bus();
GDISP.Contrast = (unsigned)value; GDISP.Contrast = (unsigned)value;
return; return;
} }
} }
#endif #endif
#endif /* GFX_USE_GDISP */ #endif /* GFX_USE_GDISP */
/** @} */ /** @} */

1142
drivers/gdisp/S6D1121/gdisp_lld.c
View file

File diff suppressed because it is too large Load diff

1166
drivers/gdisp/SSD1289/gdisp_lld.c
View file

File diff suppressed because it is too large Load diff

1226
drivers/gdisp/SSD1963/gdisp_lld.c
View file

File diff suppressed because it is too large Load diff

266
drivers/gdisp/TestStub/gdisp_lld.c
View file

@ -1,133 +1,133 @@
/* /*
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/gdisp/TestStub/gdisp_lld.c * @file drivers/gdisp/TestStub/gdisp_lld.c
* @brief GDISP Graphics Driver subsystem low level driver source (stub). * @brief GDISP Graphics Driver subsystem low level driver source (stub).
* *
* @addtogroup GDISP * @addtogroup GDISP
* @{ * @{
*/ */
#include "ch.h" #include "ch.h"
#include "hal.h" #include "hal.h"
#include "gfx.h" #include "gfx.h"
#if GFX_USE_GDISP /*|| defined(__DOXYGEN__)*/ #if GFX_USE_GDISP /*|| defined(__DOXYGEN__)*/
/* Include the emulation code for things we don't support */ /* Include the emulation code for things we don't support */
#include "gdisp/lld/emulation.c" #include "gdisp/lld/emulation.c"
#ifndef GDISP_SCREEN_HEIGHT #ifndef GDISP_SCREEN_HEIGHT
#define GDISP_SCREEN_HEIGHT 128 #define GDISP_SCREEN_HEIGHT 128
#endif #endif
#ifndef GDISP_SCREEN_WIDTH #ifndef GDISP_SCREEN_WIDTH
#define GDISP_SCREEN_WIDTH 128 #define GDISP_SCREEN_WIDTH 128
#endif #endif
/* ---- Required Routines ---- */ /* ---- Required Routines ---- */
/* /*
The following 2 routines are required. The following 2 routines are required.
All other routines are optional. All other routines are optional.
*/ */
/** /**
* @brief Low level GDISP driver initialization. * @brief Low level GDISP driver initialization.
* *
* @notapi * @notapi
*/ */
bool_t lld_gdisp_init(void) { bool_t gdisp_lld_init(void) {
/* Initialise the GDISP structure */ /* Initialise the GDISP structure */
GDISP.Width = GDISP_SCREEN_WIDTH; GDISP.Width = GDISP_SCREEN_WIDTH;
GDISP.Height = GDISP_SCREEN_HEIGHT; GDISP.Height = GDISP_SCREEN_HEIGHT;
GDISP.Orientation = GDISP_ROTATE_0; GDISP.Orientation = GDISP_ROTATE_0;
GDISP.Powermode = powerOff; GDISP.Powermode = powerOff;
GDISP.Backlight = 100; GDISP.Backlight = 100;
GDISP.Contrast = 50; GDISP.Contrast = 50;
#if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP #if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP
GDISP.clipx0 = 0; GDISP.clipx0 = 0;
GDISP.clipy0 = 0; GDISP.clipy0 = 0;
GDISP.clipx1 = GDISP.Width; GDISP.clipx1 = GDISP.Width;
GDISP.clipy1 = GDISP.Height; GDISP.clipy1 = GDISP.Height;
#endif #endif
return TRUE; return TRUE;
} }
/** /**
* @brief Draws a pixel on the display. * @brief Draws a pixel on the display.
* *
* @param[in] x X location of the pixel * @param[in] x X location of the pixel
* @param[in] y Y location of the pixel * @param[in] y Y location of the pixel
* @param[in] color The color of the pixel * @param[in] color The color of the pixel
* *
* @notapi * @notapi
*/ */
void lld_gdisp_draw_pixel(coord_t x, coord_t y, color_t color) { void gdisp_lld_draw_pixel(coord_t x, coord_t y, color_t color) {
(void)x; (void)x;
(void)y; (void)y;
(void)color; (void)color;
} }
/* ---- Optional Routines ---- */ /* ---- Optional Routines ---- */
#if (GDISP_NEED_PIXELREAD && GDISP_HARDWARE_PIXELREAD) || defined(__DOXYGEN__) #if (GDISP_NEED_PIXELREAD && GDISP_HARDWARE_PIXELREAD) || defined(__DOXYGEN__)
/** /**
* @brief Get the color of a particular pixel. * @brief Get the color of a particular pixel.
* @note Optional. * @note Optional.
* @note If x,y is off the screen, the result is undefined. * @note If x,y is off the screen, the result is undefined.
* *
* @param[in] x, y The start of the text * @param[in] x, y The start of the text
* *
* @notapi * @notapi
*/ */
color_t lld_gdisp_get_pixel_color(coord_t x, coord_t y) { color_t gdisp_lld_get_pixel_color(coord_t x, coord_t y) {
(void)x; (void)x;
(void)y; (void)y;
return 0; return 0;
} }
#endif #endif
#if (GDISP_NEED_SCROLL && GDISP_HARDWARE_SCROLL) || defined(__DOXYGEN__) #if (GDISP_NEED_SCROLL && GDISP_HARDWARE_SCROLL) || defined(__DOXYGEN__)
/** /**
* @brief Scroll vertically a section of the screen. * @brief Scroll vertically a section of the screen.
* @note Optional. * @note Optional.
* @note If x,y + cx,cy is off the screen, the result is undefined. * @note If x,y + cx,cy is off the screen, the result is undefined.
* @note If lines is >= cy, it is equivelent to a area fill with bgcolor. * @note If lines is >= cy, it is equivelent to a area fill with bgcolor.
* *
* @param[in] x, y The start of the area to be scrolled * @param[in] x, y The start of the area to be scrolled
* @param[in] cx, cy The size of the area to be scrolled * @param[in] cx, cy The size of the area to be scrolled
* @param[in] lines The number of lines to scroll (Can be positive or negative) * @param[in] lines The number of lines to scroll (Can be positive or negative)
* @param[in] bgcolor The color to fill the newly exposed area. * @param[in] bgcolor The color to fill the newly exposed area.
* *
* @notapi * @notapi
*/ */
void lld_gdisp_vertical_scroll(coord_t x, coord_t y, coord_t cx, coord_t cy, int lines, color_t bgcolor) { void gdisp_lld_vertical_scroll(coord_t x, coord_t y, coord_t cx, coord_t cy, int lines, color_t bgcolor) {
(void)x; (void)x;
(void)y; (void)y;
(void)cx; (void)cx;
(void)cy; (void)cy;
(void)lines; (void)lines;
(void)bgcolor; (void)bgcolor;
} }
#endif #endif
#endif /* GFX_USE_GDISP */ #endif /* GFX_USE_GDISP */
/** @} */ /** @} */

2052
drivers/multiple/Win32/gdisp_lld.c
View file

File diff suppressed because it is too large Load diff

582
include/gdisp/gdisp.h
View file

@ -1,291 +1,291 @@
/* /*
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 include/gdisp/gdisp.h * @file include/gdisp/gdisp.h
* @brief GDISP Graphic Driver subsystem header file. * @brief GDISP Graphic Driver subsystem header file.
* *
* @addtogroup GDISP * @addtogroup GDISP
* *
* @details The GDISP module provides high level abstraction to interface pixel oriented graphic displays. * @details The GDISP module provides high level abstraction to interface pixel oriented graphic displays.
* *
* @pre GFX_USE_GDISP must be set to TRUE in gfxconf.h * @pre GFX_USE_GDISP must be set to TRUE in gfxconf.h
* *
* @{ * @{
*/ */
#ifndef _GDISP_H #ifndef _GDISP_H
#define _GDISP_H #define _GDISP_H
#include "gfx.h" #include "gfx.h"
/* This type definition is defined here as it gets used in other gfx sub-systems even /* This type definition is defined here as it gets used in other gfx sub-systems even
* if GFX_USE_GDISP is FALSE. * if GFX_USE_GDISP is FALSE.
*/ */
/** /**
* @brief The type for a coordinate or length on the screen. * @brief The type for a coordinate or length on the screen.
*/ */
typedef int16_t coord_t; typedef int16_t coord_t;
#if GFX_USE_GDISP || defined(__DOXYGEN__) #if GFX_USE_GDISP || defined(__DOXYGEN__)
/*===========================================================================*/ /*===========================================================================*/
/* Driver constants. */ /* Driver constants. */
/*===========================================================================*/ /*===========================================================================*/
/** /**
* @name Some basic colors * @name Some basic colors
* @{ * @{
*/ */
#define White HTML2COLOR(0xFFFFFF) #define White HTML2COLOR(0xFFFFFF)
#define Black HTML2COLOR(0x000000) #define Black HTML2COLOR(0x000000)
#define Gray HTML2COLOR(0x808080) #define Gray HTML2COLOR(0x808080)
#define Grey Gray #define Grey Gray
#define Blue HTML2COLOR(0x0000FF) #define Blue HTML2COLOR(0x0000FF)
#define Red HTML2COLOR(0xFF0000) #define Red HTML2COLOR(0xFF0000)
#define Fuchsia HTML2COLOR(0xFF00FF) #define Fuchsia HTML2COLOR(0xFF00FF)
#define Magenta Fuchsia #define Magenta Fuchsia
#define Green HTML2COLOR(0x008000) #define Green HTML2COLOR(0x008000)
#define Yellow HTML2COLOR(0xFFFF00) #define Yellow HTML2COLOR(0xFFFF00)
#define Aqua HTML2COLOR(0x00FFFF) #define Aqua HTML2COLOR(0x00FFFF)
#define Cyan Aqua #define Cyan Aqua
#define Lime HTML2COLOR(0x00FF00) #define Lime HTML2COLOR(0x00FF00)
#define Maroon HTML2COLOR(0x800000) #define Maroon HTML2COLOR(0x800000)
#define Navy HTML2COLOR(0x000080) #define Navy HTML2COLOR(0x000080)
#define Olive HTML2COLOR(0x808000) #define Olive HTML2COLOR(0x808000)
#define Purple HTML2COLOR(0x800080) #define Purple HTML2COLOR(0x800080)
#define Silver HTML2COLOR(0xC0C0C0) #define Silver HTML2COLOR(0xC0C0C0)
#define Teal HTML2COLOR(0x008080) #define Teal HTML2COLOR(0x008080)
#define Orange HTML2COLOR(0xFFA500) #define Orange HTML2COLOR(0xFFA500)
#define Pink HTML2COLOR(0xFFC0CB) #define Pink HTML2COLOR(0xFFC0CB)
#define SkyBlue HTML2COLOR(0x87CEEB) #define SkyBlue HTML2COLOR(0x87CEEB)
/** @} */ /** @} */
/*===========================================================================*/ /*===========================================================================*/
/* Low Level Driver details and error checks. */ /* Low Level Driver details and error checks. */
/*===========================================================================*/ /*===========================================================================*/
/* Include the low level driver information */ /* Include the low level driver information */
#include "gdisp/lld/gdisp_lld.h" #include "gdisp/lld/gdisp_lld.h"
/*===========================================================================*/ /*===========================================================================*/
/* Type definitions */ /* Type definitions */
/*===========================================================================*/ /*===========================================================================*/
/** /**
* @brief Type for the text justification. * @brief Type for the text justification.
*/ */
typedef enum justify {justifyLeft, justifyCenter, justifyRight} justify_t; typedef enum justify {justifyLeft, justifyCenter, justifyRight} justify_t;
/** /**
* @brief Type for the font metric. * @brief Type for the font metric.
*/ */
typedef enum fontmetric {fontHeight, fontDescendersHeight, fontLineSpacing, fontCharPadding, fontMinWidth, fontMaxWidth} fontmetric_t; typedef enum fontmetric {fontHeight, fontDescendersHeight, fontLineSpacing, fontCharPadding, fontMinWidth, fontMaxWidth} fontmetric_t;
/*===========================================================================*/ /*===========================================================================*/
/* External declarations. */ /* External declarations. */
/*===========================================================================*/ /*===========================================================================*/
#if (GDISP_NEED_TEXT && GDISP_OLD_FONT_DEFINITIONS) || defined(__DOXYGEN__) #if (GDISP_NEED_TEXT && GDISP_OLD_FONT_DEFINITIONS) || defined(__DOXYGEN__)
#if GDISP_INCLUDE_FONT_SMALL #if GDISP_INCLUDE_FONT_SMALL
extern const struct font fontSmall; extern const struct font fontSmall;
extern const struct font fontSmallDouble; extern const struct font fontSmallDouble;
extern const struct font fontSmallNarrow; extern const struct font fontSmallNarrow;
#endif #endif
#if GDISP_INCLUDE_FONT_LARGER #if GDISP_INCLUDE_FONT_LARGER
extern const struct font fontLarger; extern const struct font fontLarger;
extern const struct font fontLargerDouble; extern const struct font fontLargerDouble;
extern const struct font fontLargerNarrow; extern const struct font fontLargerNarrow;
#endif #endif
#if GDISP_INCLUDE_FONT_UI1 #if GDISP_INCLUDE_FONT_UI1
extern const struct font fontUI1; extern const struct font fontUI1;
extern const struct font fontUI1Double; extern const struct font fontUI1Double;
extern const struct font fontUI1Narrow; extern const struct font fontUI1Narrow;
#endif #endif
#if GDISP_INCLUDE_FONT_UI2 #if GDISP_INCLUDE_FONT_UI2
extern const struct font fontUI2; extern const struct font fontUI2;
extern const struct font fontUI2Double; extern const struct font fontUI2Double;
extern const struct font fontUI2Narrow; extern const struct font fontUI2Narrow;
#endif #endif
#if GDISP_INCLUDE_FONT_LARGENUMBERS #if GDISP_INCLUDE_FONT_LARGENUMBERS
extern const struct font fontLargeNumbers; extern const struct font fontLargeNumbers;
extern const struct font fontLargeNumbersDouble; extern const struct font fontLargeNumbersDouble;
extern const struct font fontLargeNumbersNarrow; extern const struct font fontLargeNumbersNarrow;
#endif #endif
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#if GDISP_NEED_MULTITHREAD || GDISP_NEED_ASYNC #if GDISP_NEED_MULTITHREAD || GDISP_NEED_ASYNC
/* These routines can be hardware accelerated /* These routines can be hardware accelerated
* - Do not add a routine here unless it has also been added to the hardware acceleration layer * - Do not add a routine here unless it has also been added to the hardware acceleration layer
*/ */
/* Base Functions */ /* Base Functions */
bool_t gdispInit(void); bool_t gdispInit(void);
bool_t gdispIsBusy(void); bool_t gdispIsBusy(void);
/* Drawing Functions */ /* Drawing Functions */
void gdispClear(color_t color); void gdispClear(color_t color);
void gdispDrawPixel(coord_t x, coord_t y, color_t color); void gdispDrawPixel(coord_t x, coord_t y, color_t color);
void gdispDrawLine(coord_t x0, coord_t y0, coord_t x1, coord_t y1, color_t color); void gdispDrawLine(coord_t x0, coord_t y0, coord_t x1, coord_t y1, color_t color);
void gdispFillArea(coord_t x, coord_t y, coord_t cx, coord_t cy, color_t color); void gdispFillArea(coord_t x, coord_t y, coord_t cx, coord_t cy, color_t color);
void gdispBlitAreaEx(coord_t x, coord_t y, coord_t cx, coord_t cy, coord_t srcx, coord_t srcy, coord_t srccx, const pixel_t *buffer); void gdispBlitAreaEx(coord_t x, coord_t y, coord_t cx, coord_t cy, coord_t srcx, coord_t srcy, coord_t srccx, const pixel_t *buffer);
/* Clipping Functions */ /* Clipping Functions */
#if GDISP_NEED_CLIP #if GDISP_NEED_CLIP
void gdispSetClip(coord_t x, coord_t y, coord_t cx, coord_t cy); void gdispSetClip(coord_t x, coord_t y, coord_t cx, coord_t cy);
#endif #endif
/* Circle Functions */ /* Circle Functions */
#if GDISP_NEED_CIRCLE #if GDISP_NEED_CIRCLE
void gdispDrawCircle(coord_t x, coord_t y, coord_t radius, color_t color); void gdispDrawCircle(coord_t x, coord_t y, coord_t radius, color_t color);
void gdispFillCircle(coord_t x, coord_t y, coord_t radius, color_t color); void gdispFillCircle(coord_t x, coord_t y, coord_t radius, color_t color);
#endif #endif
/* Ellipse Functions */ /* Ellipse Functions */
#if GDISP_NEED_ELLIPSE #if GDISP_NEED_ELLIPSE
void gdispDrawEllipse(coord_t x, coord_t y, coord_t a, coord_t b, color_t color); void gdispDrawEllipse(coord_t x, coord_t y, coord_t a, coord_t b, color_t color);
void gdispFillEllipse(coord_t x, coord_t y, coord_t a, coord_t b, color_t color); void gdispFillEllipse(coord_t x, coord_t y, coord_t a, coord_t b, color_t color);
#endif #endif
/* Arc Functions */ /* Arc Functions */
#if GDISP_NEED_ARC #if GDISP_NEED_ARC
void gdispDrawArc(coord_t x, coord_t y, coord_t radius, coord_t startangle, coord_t endangle, color_t color); void gdispDrawArc(coord_t x, coord_t y, coord_t radius, coord_t startangle, coord_t endangle, color_t color);
void gdispFillArc(coord_t x, coord_t y, coord_t radius, coord_t startangle, coord_t endangle, color_t color); void gdispFillArc(coord_t x, coord_t y, coord_t radius, coord_t startangle, coord_t endangle, color_t color);
#endif #endif
/* Basic Text Rendering Functions */ /* Basic Text Rendering Functions */
#if GDISP_NEED_TEXT #if GDISP_NEED_TEXT
void gdispDrawChar(coord_t x, coord_t y, char c, font_t font, color_t color); void gdispDrawChar(coord_t x, coord_t y, char c, font_t font, color_t color);
void gdispFillChar(coord_t x, coord_t y, char c, font_t font, color_t color, color_t bgcolor); void gdispFillChar(coord_t x, coord_t y, char c, font_t font, color_t color, color_t bgcolor);
#endif #endif
/* Read a pixel Function */ /* Read a pixel Function */
#if GDISP_NEED_PIXELREAD #if GDISP_NEED_PIXELREAD
color_t gdispGetPixelColor(coord_t x, coord_t y); color_t gdispGetPixelColor(coord_t x, coord_t y);
#endif #endif
/* Scrolling Function - clears the area scrolled out */ /* Scrolling Function - clears the area scrolled out */
#if GDISP_NEED_SCROLL #if GDISP_NEED_SCROLL
void gdispVerticalScroll(coord_t x, coord_t y, coord_t cx, coord_t cy, int lines, color_t bgcolor); void gdispVerticalScroll(coord_t x, coord_t y, coord_t cx, coord_t cy, int lines, color_t bgcolor);
#endif #endif
/* Set driver specific control */ /* Set driver specific control */
#if GDISP_NEED_CONTROL #if GDISP_NEED_CONTROL
void gdispControl(unsigned what, void *value); void gdispControl(unsigned what, void *value);
#endif #endif
/* Query driver specific data */ /* Query driver specific data */
void *gdispQuery(unsigned what); void *gdispQuery(unsigned what);
#else #else
/* The same as above but use the low level driver directly if no multi-thread support is needed */ /* The same as above but use the low level driver directly if no multi-thread support is needed */
#define gdispInit(gdisp) lld_gdisp_init() #define gdispInit(gdisp) gdisp_lld_init()
#define gdispIsBusy() FALSE #define gdispIsBusy() FALSE
#define gdispClear(color) lld_gdisp_clear(color) #define gdispClear(color) gdisp_lld_clear(color)
#define gdispDrawPixel(x, y, color) lld_gdisp_draw_pixel(x, y, color) #define gdispDrawPixel(x, y, color) gdisp_lld_draw_pixel(x, y, color)
#define gdispDrawLine(x0, y0, x1, y1, color) lld_gdisp_draw_line(x0, y0, x1, y1, color) #define gdispDrawLine(x0, y0, x1, y1, color) gdisp_lld_draw_line(x0, y0, x1, y1, color)
#define gdispFillArea(x, y, cx, cy, color) lld_gdisp_fill_area(x, y, cx, cy, color) #define gdispFillArea(x, y, cx, cy, color) gdisp_lld_fill_area(x, y, cx, cy, color)
#define gdispBlitAreaEx(x, y, cx, cy, sx, sy, scx, buf) lld_gdisp_blit_area_ex(x, y, cx, cy, sx, sy, scx, buf) #define gdispBlitAreaEx(x, y, cx, cy, sx, sy, scx, buf) gdisp_lld_blit_area_ex(x, y, cx, cy, sx, sy, scx, buf)
#define gdispSetClip(x, y, cx, cy) lld_gdisp_set_clip(x, y, cx, cy) #define gdispSetClip(x, y, cx, cy) gdisp_lld_set_clip(x, y, cx, cy)
#define gdispDrawCircle(x, y, radius, color) lld_gdisp_draw_circle(x, y, radius, color) #define gdispDrawCircle(x, y, radius, color) gdisp_lld_draw_circle(x, y, radius, color)
#define gdispFillCircle(x, y, radius, color) lld_gdisp_fill_circle(x, y, radius, color) #define gdispFillCircle(x, y, radius, color) gdisp_lld_fill_circle(x, y, radius, color)
#define gdispDrawArc(x, y, radius, sangle, eangle, color) lld_gdisp_draw_arc(x, y, radius, sangle, eangle, color) #define gdispDrawArc(x, y, radius, sangle, eangle, color) gdisp_lld_draw_arc(x, y, radius, sangle, eangle, color)
#define gdispFillArc(x, y, radius, sangle, eangle, color) lld_gdisp_fill_arc(x, y, radius, sangle, eangle, color) #define gdispFillArc(x, y, radius, sangle, eangle, color) gdisp_lld_fill_arc(x, y, radius, sangle, eangle, color)
#define gdispDrawEllipse(x, y, a, b, color) lld_gdisp_draw_ellipse(x, y, a, b, color) #define gdispDrawEllipse(x, y, a, b, color) gdisp_lld_draw_ellipse(x, y, a, b, color)
#define gdispFillEllipse(x, y, a, b, color) lld_gdisp_fill_ellipse(x, y, a, b, color) #define gdispFillEllipse(x, y, a, b, color) gdisp_lld_fill_ellipse(x, y, a, b, color)
#define gdispDrawChar(x, y, c, font, color) lld_gdisp_draw_char(x, y, c, font, color) #define gdispDrawChar(x, y, c, font, color) gdisp_lld_draw_char(x, y, c, font, color)
#define gdispFillChar(x, y, c, font, color, bgcolor) lld_gdisp_fill_char(x, y, c, font, color, bgcolor) #define gdispFillChar(x, y, c, font, color, bgcolor) gdisp_lld_fill_char(x, y, c, font, color, bgcolor)
#define gdispGetPixelColor(x, y) lld_gdisp_get_pixel_color(x, y) #define gdispGetPixelColor(x, y) gdisp_lld_get_pixel_color(x, y)
#define gdispVerticalScroll(x, y, cx, cy, lines, bgcolor) lld_gdisp_vertical_scroll(x, y, cx, cy, lines, bgcolor) #define gdispVerticalScroll(x, y, cx, cy, lines, bgcolor) gdisp_lld_vertical_scroll(x, y, cx, cy, lines, bgcolor)
#define gdispControl(what, value) lld_gdisp_control(what, value) #define gdispControl(what, value) gdisp_lld_control(what, value)
#define gdispQuery(what) lld_gdisp_query(what) #define gdispQuery(what) gdisp_lld_query(what)
#endif #endif
/* These routines are not hardware accelerated /* These routines are not hardware accelerated
* - Do not add a hardware accelerated routines here. * - Do not add a hardware accelerated routines here.
*/ */
/* Extra drawing functions */ /* Extra drawing functions */
void gdispDrawBox(coord_t x, coord_t y, coord_t cx, coord_t cy, color_t color); void gdispDrawBox(coord_t x, coord_t y, coord_t cx, coord_t cy, color_t color);
/* Extra Text Functions */ /* Extra Text Functions */
#if GDISP_NEED_TEXT #if GDISP_NEED_TEXT
void gdispDrawString(coord_t x, coord_t y, const char *str, font_t font, color_t color); void gdispDrawString(coord_t x, coord_t y, const char *str, font_t font, color_t color);
void gdispFillString(coord_t x, coord_t y, const char *str, font_t font, color_t color, color_t bgcolor); void gdispFillString(coord_t x, coord_t y, const char *str, font_t font, color_t color, color_t bgcolor);
void gdispDrawStringBox(coord_t x, coord_t y, coord_t cx, coord_t cy, const char* str, font_t font, color_t color, justify_t justify); void gdispDrawStringBox(coord_t x, coord_t y, coord_t cx, coord_t cy, const char* str, font_t font, color_t color, justify_t justify);
void gdispFillStringBox(coord_t x, coord_t y, coord_t cx, coord_t cy, const char* str, font_t font, color_t color, color_t bgColor, justify_t justify); void gdispFillStringBox(coord_t x, coord_t y, coord_t cx, coord_t cy, const char* str, font_t font, color_t color, color_t bgColor, justify_t justify);
coord_t gdispGetFontMetric(font_t font, fontmetric_t metric); coord_t gdispGetFontMetric(font_t font, fontmetric_t metric);
coord_t gdispGetCharWidth(char c, font_t font); coord_t gdispGetCharWidth(char c, font_t font);
coord_t gdispGetStringWidth(const char* str, font_t font); coord_t gdispGetStringWidth(const char* str, font_t font);
font_t gdispOpenFont(const char *name); font_t gdispOpenFont(const char *name);
void gdispCloseFont(font_t font); void gdispCloseFont(font_t font);
const char *gdispGetFontName(font_t font); const char *gdispGetFontName(font_t font);
#endif #endif
/* Extra Arc Functions */ /* Extra Arc Functions */
#if GDISP_NEED_ARC #if GDISP_NEED_ARC
void gdispDrawRoundedBox(coord_t x, coord_t y, coord_t cx, coord_t cy, coord_t radius, color_t color); void gdispDrawRoundedBox(coord_t x, coord_t y, coord_t cx, coord_t cy, coord_t radius, color_t color);
void gdispFillRoundedBox(coord_t x, coord_t y, coord_t cx, coord_t cy, coord_t radius, color_t color); void gdispFillRoundedBox(coord_t x, coord_t y, coord_t cx, coord_t cy, coord_t radius, color_t color);
#endif #endif
/* Support routine for packed pixel formats */ /* Support routine for packed pixel formats */
#ifndef gdispPackPixels #ifndef gdispPackPixels
void gdispPackPixels(const pixel_t *buf, coord_t cx, coord_t x, coord_t y, color_t color); void gdispPackPixels(const pixel_t *buf, coord_t cx, coord_t x, coord_t y, color_t color);
#endif #endif
/* /*
* Macro definitions * Macro definitions
*/ */
/* Now obsolete functions */ /* Now obsolete functions */
#define gdispBlitArea(x, y, cx, cy, buffer) gdispBlitAreaEx(x, y, cx, cy, 0, 0, cx, buffer) #define gdispBlitArea(x, y, cx, cy, buffer) gdispBlitAreaEx(x, y, cx, cy, 0, 0, cx, buffer)
/* Macro definitions for common gets and sets */ /* Macro definitions for common gets and sets */
#define gdispSetPowerMode(powerMode) gdispControl(GDISP_CONTROL_POWER, (void *)(unsigned)(powerMode)) #define gdispSetPowerMode(powerMode) gdispControl(GDISP_CONTROL_POWER, (void *)(unsigned)(powerMode))
#define gdispSetOrientation(newOrientation) gdispControl(GDISP_CONTROL_ORIENTATION, (void *)(unsigned)(newOrientation)) #define gdispSetOrientation(newOrientation) gdispControl(GDISP_CONTROL_ORIENTATION, (void *)(unsigned)(newOrientation))
#define gdispSetBacklight(percent) gdispControl(GDISP_CONTROL_BACKLIGHT, (void *)(unsigned)(percent)) #define gdispSetBacklight(percent) gdispControl(GDISP_CONTROL_BACKLIGHT, (void *)(unsigned)(percent))
#define gdispSetContrast(percent) gdispControl(GDISP_CONTROL_CONTRAST, (void *)(unsigned)(percent)) #define gdispSetContrast(percent) gdispControl(GDISP_CONTROL_CONTRAST, (void *)(unsigned)(percent))
#define gdispGetWidth() ((coord_t)(unsigned)gdispQuery(GDISP_QUERY_WIDTH)) #define gdispGetWidth() ((coord_t)(unsigned)gdispQuery(GDISP_QUERY_WIDTH))
#define gdispGetHeight() ((coord_t)(unsigned)gdispQuery(GDISP_QUERY_HEIGHT)) #define gdispGetHeight() ((coord_t)(unsigned)gdispQuery(GDISP_QUERY_HEIGHT))
#define gdispGetPowerMode() ((gdisp_powermode_t)(unsigned)gdispQuery(GDISP_QUERY_POWER)) #define gdispGetPowerMode() ((gdisp_powermode_t)(unsigned)gdispQuery(GDISP_QUERY_POWER))
#define gdispGetOrientation() ((gdisp_orientation_t)(unsigned)gdispQuery(GDISP_QUERY_ORIENTATION)) #define gdispGetOrientation() ((gdisp_orientation_t)(unsigned)gdispQuery(GDISP_QUERY_ORIENTATION))
#define gdispGetBacklight() ((coord_t)(unsigned)gdispQuery(GDISP_QUERY_BACKLIGHT)) #define gdispGetBacklight() ((coord_t)(unsigned)gdispQuery(GDISP_QUERY_BACKLIGHT))
#define gdispGetContrast() ((coord_t)(unsigned)gdispQuery(GDISP_QUERY_CONTRAST)) #define gdispGetContrast() ((coord_t)(unsigned)gdispQuery(GDISP_QUERY_CONTRAST))
/* More interesting macro's */ /* More interesting macro's */
#define gdispUnsetClip() gdispSetClip(0,0,gdispGetWidth(),gdispGetHeight()) #define gdispUnsetClip() gdispSetClip(0,0,gdispGetWidth(),gdispGetHeight())
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* GFX_USE_GDISP */ #endif /* GFX_USE_GDISP */
#endif /* _GDISP_H */ #endif /* _GDISP_H */
/** @} */ /** @} */

1544
include/gdisp/lld/emulation.c
View file

File diff suppressed because it is too large Load diff

1078
include/gdisp/lld/gdisp_lld.h
View file

File diff suppressed because it is too large Load diff

386
include/gdisp/lld/gdisp_lld_msgs.h
View file

@ -1,193 +1,193 @@
/* /*
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 include/gdisp/lld/gdisp_lld_msgs.h * @file include/gdisp/lld/gdisp_lld_msgs.h
* @brief GDISP Graphic Driver subsystem low level driver message structures. * @brief GDISP Graphic Driver subsystem low level driver message structures.
* *
* @addtogroup GDISP * @addtogroup GDISP
* @{ * @{
*/ */
#ifndef _GDISP_LLD_MSGS_H #ifndef _GDISP_LLD_MSGS_H
#define _GDISP_LLD_MSGS_H #define _GDISP_LLD_MSGS_H
/* This file describes the message API for gdisp_lld */ /* This file describes the message API for gdisp_lld */
#if GFX_USE_GDISP && GDISP_NEED_MSGAPI #if GFX_USE_GDISP && GDISP_NEED_MSGAPI
typedef enum gdisp_msgaction { typedef enum gdisp_msgaction {
GDISP_LLD_MSG_NOP, GDISP_LLD_MSG_NOP,
GDISP_LLD_MSG_INIT, GDISP_LLD_MSG_INIT,
GDISP_LLD_MSG_CLEAR, GDISP_LLD_MSG_CLEAR,
GDISP_LLD_MSG_DRAWPIXEL, GDISP_LLD_MSG_DRAWPIXEL,
GDISP_LLD_MSG_FILLAREA, GDISP_LLD_MSG_FILLAREA,
GDISP_LLD_MSG_BLITAREA, GDISP_LLD_MSG_BLITAREA,
GDISP_LLD_MSG_DRAWLINE, GDISP_LLD_MSG_DRAWLINE,
#if GDISP_NEED_CLIP #if GDISP_NEED_CLIP
GDISP_LLD_MSG_SETCLIP, GDISP_LLD_MSG_SETCLIP,
#endif #endif
#if GDISP_NEED_CIRCLE #if GDISP_NEED_CIRCLE
GDISP_LLD_MSG_DRAWCIRCLE, GDISP_LLD_MSG_DRAWCIRCLE,
GDISP_LLD_MSG_FILLCIRCLE, GDISP_LLD_MSG_FILLCIRCLE,
#endif #endif
#if GDISP_NEED_ELLIPSE #if GDISP_NEED_ELLIPSE
GDISP_LLD_MSG_DRAWELLIPSE, GDISP_LLD_MSG_DRAWELLIPSE,
GDISP_LLD_MSG_FILLELLIPSE, GDISP_LLD_MSG_FILLELLIPSE,
#endif #endif
#if GDISP_NEED_ARC #if GDISP_NEED_ARC
GDISP_LLD_MSG_DRAWARC, GDISP_LLD_MSG_DRAWARC,
GDISP_LLD_MSG_FILLARC, GDISP_LLD_MSG_FILLARC,
#endif #endif
#if GDISP_NEED_TEXT #if GDISP_NEED_TEXT
GDISP_LLD_MSG_DRAWCHAR, GDISP_LLD_MSG_DRAWCHAR,
GDISP_LLD_MSG_FILLCHAR, GDISP_LLD_MSG_FILLCHAR,
#endif #endif
#if GDISP_NEED_PIXELREAD #if GDISP_NEED_PIXELREAD
GDISP_LLD_MSG_GETPIXELCOLOR, GDISP_LLD_MSG_GETPIXELCOLOR,
#endif #endif
#if GDISP_NEED_SCROLL #if GDISP_NEED_SCROLL
GDISP_LLD_MSG_VERTICALSCROLL, GDISP_LLD_MSG_VERTICALSCROLL,
#endif #endif
#if GDISP_NEED_CONTROL #if GDISP_NEED_CONTROL
GDISP_LLD_MSG_CONTROL, GDISP_LLD_MSG_CONTROL,
#endif #endif
GDISP_LLD_MSG_QUERY, GDISP_LLD_MSG_QUERY,
} gdisp_msgaction_t; } gdisp_msgaction_t;
typedef union gdisp_lld_msg { typedef union gdisp_lld_msg {
gdisp_msgaction_t action; gdisp_msgaction_t action;
struct gdisp_lld_msg_init { struct gdisp_lld_msg_init {
gdisp_msgaction_t action; // GDISP_LLD_MSG_INIT gdisp_msgaction_t action; // GDISP_LLD_MSG_INIT
} init; } init;
struct gdisp_lld_msg_clear { struct gdisp_lld_msg_clear {
gdisp_msgaction_t action; // GDISP_LLD_MSG_CLEAR gdisp_msgaction_t action; // GDISP_LLD_MSG_CLEAR
color_t color; color_t color;
} clear; } clear;
struct gdisp_lld_msg_drawpixel { struct gdisp_lld_msg_drawpixel {
gdisp_msgaction_t action; // GDISP_LLD_MSG_DRAWPIXEL gdisp_msgaction_t action; // GDISP_LLD_MSG_DRAWPIXEL
coord_t x, y; coord_t x, y;
color_t color; color_t color;
} drawpixel; } drawpixel;
struct gdisp_lld_msg_fillarea { struct gdisp_lld_msg_fillarea {
gdisp_msgaction_t action; // GDISP_LLD_MSG_FILLAREA gdisp_msgaction_t action; // GDISP_LLD_MSG_FILLAREA
coord_t x, y; coord_t x, y;
coord_t cx, cy; coord_t cx, cy;
color_t color; color_t color;
} fillarea; } fillarea;
struct gdisp_lld_msg_blitarea { struct gdisp_lld_msg_blitarea {
gdisp_msgaction_t action; // GDISP_LLD_MSG_BLITAREA gdisp_msgaction_t action; // GDISP_LLD_MSG_BLITAREA
coord_t x, y; coord_t x, y;
coord_t cx, cy; coord_t cx, cy;
coord_t srcx, srcy; coord_t srcx, srcy;
coord_t srccx; coord_t srccx;
const pixel_t *buffer; const pixel_t *buffer;
} blitarea; } blitarea;
struct gdisp_lld_msg_setclip { struct gdisp_lld_msg_setclip {
gdisp_msgaction_t action; // GDISP_LLD_MSG_SETCLIP gdisp_msgaction_t action; // GDISP_LLD_MSG_SETCLIP
coord_t x, y; coord_t x, y;
coord_t cx, cy; coord_t cx, cy;
} setclip; } setclip;
struct gdisp_lld_msg_drawline { struct gdisp_lld_msg_drawline {
gdisp_msgaction_t action; // GDISP_LLD_MSG_DRAWLINE gdisp_msgaction_t action; // GDISP_LLD_MSG_DRAWLINE
coord_t x0, y0; coord_t x0, y0;
coord_t x1, y1; coord_t x1, y1;
color_t color; color_t color;
} drawline; } drawline;
struct gdisp_lld_msg_drawcircle { struct gdisp_lld_msg_drawcircle {
gdisp_msgaction_t action; // GDISP_LLD_MSG_DRAWCIRCLE gdisp_msgaction_t action; // GDISP_LLD_MSG_DRAWCIRCLE
coord_t x, y; coord_t x, y;
coord_t radius; coord_t radius;
color_t color; color_t color;
} drawcircle; } drawcircle;
struct gdisp_lld_msg_fillcircle { struct gdisp_lld_msg_fillcircle {
gdisp_msgaction_t action; // GDISP_LLD_MSG_FILLCIRCLE gdisp_msgaction_t action; // GDISP_LLD_MSG_FILLCIRCLE
coord_t x, y; coord_t x, y;
coord_t radius; coord_t radius;
color_t color; color_t color;
} fillcircle; } fillcircle;
struct gdisp_lld_msg_drawellipse { struct gdisp_lld_msg_drawellipse {
gdisp_msgaction_t action; // GDISP_LLD_MSG_DRAWELLIPSE gdisp_msgaction_t action; // GDISP_LLD_MSG_DRAWELLIPSE
coord_t x, y; coord_t x, y;
coord_t a, b; coord_t a, b;
color_t color; color_t color;
} drawellipse; } drawellipse;
struct gdisp_lld_msg_fillellipse { struct gdisp_lld_msg_fillellipse {
gdisp_msgaction_t action; // GDISP_LLD_MSG_FILLELLIPSE gdisp_msgaction_t action; // GDISP_LLD_MSG_FILLELLIPSE
coord_t x, y; coord_t x, y;
coord_t a, b; coord_t a, b;
color_t color; color_t color;
} fillellipse; } fillellipse;
struct gdisp_lld_msg_drawarc { struct gdisp_lld_msg_drawarc {
gdisp_msgaction_t action; // GDISP_LLD_MSG_DRAWARC gdisp_msgaction_t action; // GDISP_LLD_MSG_DRAWARC
coord_t x, y; coord_t x, y;
coord_t radius; coord_t radius;
coord_t startangle, endangle; coord_t startangle, endangle;
color_t color; color_t color;
} drawcircle; } drawarc;
struct gdisp_lld_msg_fillarc { struct gdisp_lld_msg_fillarc {
gdisp_msgaction_t action; // GDISP_LLD_MSG_FILLARC gdisp_msgaction_t action; // GDISP_LLD_MSG_FILLARC
coord_t x, y; coord_t x, y;
coord_t radius; coord_t radius;
coord_t startangle, endangle; coord_t startangle, endangle;
color_t color; color_t color;
} fillcircle; } fillarc;
struct gdisp_lld_msg_drawchar { struct gdisp_lld_msg_drawchar {
gdisp_msgaction_t action; // GDISP_LLD_MSG_DRAWCHAR gdisp_msgaction_t action; // GDISP_LLD_MSG_DRAWCHAR
coord_t x, y; coord_t x, y;
char c; char c;
font_t font; font_t font;
color_t color; color_t color;
} drawchar; } drawchar;
struct gdisp_lld_msg_fillchar { struct gdisp_lld_msg_fillchar {
gdisp_msgaction_t action; // GDISP_LLD_MSG_FILLCHAR gdisp_msgaction_t action; // GDISP_LLD_MSG_FILLCHAR
coord_t x, y; coord_t x, y;
char c; char c;
font_t font; font_t font;
color_t color; color_t color;
color_t bgcolor; color_t bgcolor;
} fillchar; } fillchar;
struct gdisp_lld_msg_getpixelcolor { struct gdisp_lld_msg_getpixelcolor {
gdisp_msgaction_t action; // GDISP_LLD_MSG_GETPIXELCOLOR gdisp_msgaction_t action; // GDISP_LLD_MSG_GETPIXELCOLOR
coord_t x, y; coord_t x, y;
color_t result; color_t result;
} getpixelcolor; } getpixelcolor;
struct gdisp_lld_msg_verticalscroll { struct gdisp_lld_msg_verticalscroll {
gdisp_msgaction_t action; // GDISP_LLD_MSG_VERTICALSCROLL gdisp_msgaction_t action; // GDISP_LLD_MSG_VERTICALSCROLL
coord_t x, y; coord_t x, y;
coord_t cx, cy; coord_t cx, cy;
int lines; int lines;
color_t bgcolor; color_t bgcolor;
} verticalscroll; } verticalscroll;
struct gdisp_lld_msg_control { struct gdisp_lld_msg_control {
gdisp_msgaction_t action; // GDISP_LLD_MSG_CONTROL gdisp_msgaction_t action; // GDISP_LLD_MSG_CONTROL
int what; int what;
void * value; void * value;
} control; } control;
struct gdisp_lld_msg_query { struct gdisp_lld_msg_query {
gdisp_msgaction_t action; // GDISP_LLD_MSG_QUERY gdisp_msgaction_t action; // GDISP_LLD_MSG_QUERY
int what; int what;
void * result; void * result;
} query; } query;
} gdisp_lld_msg_t; } gdisp_lld_msg_t;
#endif /* GFX_USE_GDISP && GDISP_NEED_MSGAPI */ #endif /* GFX_USE_GDISP && GDISP_NEED_MSGAPI */
#endif /* _GDISP_LLD_MSGS_H */ #endif /* _GDISP_LLD_MSGS_H */
/** @} */ /** @} */

2536
src/gdisp/gdisp.c
View file

File diff suppressed because it is too large Load diff

8
src/gwin/gwin.mk
View file

@ -1,5 +1,5 @@
GFXSRC += $(GFXLIB)/src/gwin/gwin.c \ GFXSRC += $(GFXLIB)/src/gwin/gwin.c \
$(GFXLIB)/src/gwin/console.c \ $(GFXLIB)/src/gwin/console.c \
$(GFXLIB)/src/gwin/button.c \ $(GFXLIB)/src/gwin/button.c \
$(GFXLIB)/src/gwin/graph.c $(GFXLIB)/src/gwin/graph.c