From 6b1af0641cef5cdfbfa953e9e19c2c14b4e2aee0 Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Sun, 10 Nov 2013 22:09:20 +0100 Subject: [PATCH] fixed Embest board --- .../gdisp/board_SSD1289_firebullstm32f103.h | 108 ------------------ ...input_lld_mouse_board_firebull_stm32f103.h | 90 --------------- boards/base/Embest-STM32-DMSTF4BB/board.mk | 1 + boards/base/Embest-STM32-DMSTF4BB/readme.txt | 3 +- 4 files changed, 2 insertions(+), 200 deletions(-) delete mode 100644 boards/addons/gdisp/board_SSD1289_firebullstm32f103.h delete mode 100644 boards/addons/ginput/touch/ADS7843/ginput_lld_mouse_board_firebull_stm32f103.h diff --git a/boards/addons/gdisp/board_SSD1289_firebullstm32f103.h b/boards/addons/gdisp/board_SSD1289_firebullstm32f103.h deleted file mode 100644 index 99d37299..00000000 --- a/boards/addons/gdisp/board_SSD1289_firebullstm32f103.h +++ /dev/null @@ -1,108 +0,0 @@ -/* - * This file is subject to the terms of the GFX License. If a copy of - * the license was not distributed with this file, you can obtain one at: - * - * http://ugfx.org/license.html - */ - -/** - * @file drivers/gdisp/SSD1289/board_SSD1289_firebullstm32f103.h - * @brief GDISP Graphic Driver subsystem board interface for the SSD1289 display. - */ - -#ifndef _GDISP_LLD_BOARD_H -#define _GDISP_LLD_BOARD_H - -// For a multiple display configuration we would put all this in a structure and then -// set g->board to that structure. -#define SET_CS palSetPad(GPIOD, 12); -#define CLR_CS palClearPad(GPIOD, 12); -#define SET_RS palSetPad(GPIOD, 13); -#define CLR_RS palClearPad(GPIOD, 13); -#define SET_WR palSetPad(GPIOD, 14); -#define CLR_WR palClearPad(GPIOD, 14); -#define SET_RD palSetPad(GPIOD, 15); -#define CLR_RD palClearPad(GPIOD, 15); - -static inline void init_board(GDisplay *g) { - - // As we are not using multiple displays we set g->board to NULL as we don't use it. - g->board = 0; - - switch(g->controllerdisplay) { - case 0: // Set up for Display 0 - palSetGroupMode(GPIOE, PAL_WHOLE_PORT, 0, PAL_MODE_OUTPUT_PUSHPULL); - palSetPadMode(GPIOD, 12, PAL_MODE_OUTPUT_PUSHPULL); - palSetPadMode(GPIOD, 13, PAL_MODE_OUTPUT_PUSHPULL); - palSetPadMode(GPIOD, 14, PAL_MODE_OUTPUT_PUSHPULL); - palSetPadMode(GPIOD, 15, PAL_MODE_OUTPUT_PUSHPULL); - - // Configure the pins to a well know state - SET_RS; - SET_RD; - SET_WR; - CLR_CS; - break; - } -} - -static inline void post_init_board(GDisplay *g) { - (void) g; -} - -static inline void setpin_reset(GDisplay *g, bool_t state) { - (void) g; - (void) state; - /* Nothing to do here - reset pin tied to Vcc */ -} - -static inline void set_backlight(GDisplay *g, uint8_t percent) { - (void) g; - (void) percent; - /* Nothing to do here - Backlight always on */ -} - -static inline void acquire_bus(GDisplay *g) { - (void) g; -} - -static inline void release_bus(GDisplay *g) { - (void) g; -} - -static inline void write_index(GDisplay *g, uint16_t index) { - (void) g; - palWritePort(GPIOE, index); - CLR_RS; CLR_WR; SET_WR; SET_RS; -} - -static inline void write_data(GDisplay *g, uint16_t data) { - (void) g; - palWritePort(GPIOE, data); - CLR_WR; SET_WR; -} - -static inline void setreadmode(GDisplay *g) { - (void) g; - // change pin mode to digital input - palSetGroupMode(GPIOE, PAL_WHOLE_PORT, 0, PAL_MODE_INPUT); - CLR_RD; -} - -static inline void setwritemode(GDisplay *g) { - (void) g; - // change pin mode back to digital output - SET_RD; - palSetGroupMode(GPIOE, PAL_WHOLE_PORT, 0, PAL_MODE_OUTPUT_PUSHPULL); -} - -static inline uint16_t read_data(GDisplay *g) { - return palReadPort(GPIOE); -} - -#if defined(GDISP_USE_DMA) - #error "GDISP - SSD1289: The GPIO interface does not support DMA" -#endif - -#endif /* _GDISP_LLD_BOARD_H */ - diff --git a/boards/addons/ginput/touch/ADS7843/ginput_lld_mouse_board_firebull_stm32f103.h b/boards/addons/ginput/touch/ADS7843/ginput_lld_mouse_board_firebull_stm32f103.h deleted file mode 100644 index 63e9e3dd..00000000 --- a/boards/addons/ginput/touch/ADS7843/ginput_lld_mouse_board_firebull_stm32f103.h +++ /dev/null @@ -1,90 +0,0 @@ -/* - * This file is subject to the terms of the GFX License. If a copy of - * the license was not distributed with this file, you can obtain one at: - * - * http://ugfx.org/license.html - */ - -/** - * @file drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_firebull_stm32f103.h - * @brief GINPUT ouch low level driver source for the ADS7843 on the FireBull STM32F103-FB board. - * - * @defgroup Mouse Mouse - * @ingroup GINPUT - * @{ - */ - -#ifndef _GINPUT_LLD_MOUSE_BOARD_H -#define _GINPUT_LLD_MOUSE_BOARD_H - -static const SPIConfig spicfg = { - NULL, - GPIOC, - 6, - /* SPI_CR1_BR_2 |*/ SPI_CR1_BR_1 | SPI_CR1_BR_0, -}; - -/** - * @brief Initialise the board for the touch. - * - * @notapi - */ -static inline void init_board(void) { - spiStart(&SPID1, &spicfg); -} - -/** - * @brief Check whether the surface is currently touched - * @return TRUE if the surface is currently touched - * - * @notapi - */ -static inline bool_t getpin_pressed(void) { - return (!palReadPad(GPIOC, 4)); -} -/** - * @brief Aquire the bus ready for readings - * - * @notapi - */ -static inline void aquire_bus(void) { - spiAcquireBus(&SPID1); - //TOUCHSCREEN_SPI_PROLOGUE(); - palClearPad(GPIOC, 6); -} - -/** - * @brief Release the bus after readings - * - * @notapi - */ -static inline void release_bus(void) { - palSetPad(GPIOC, 6); - spiReleaseBus(&SPID1); - //TOUCHSCREEN_SPI_EPILOGUE(); -} - -/** - * @brief Read a value from touch controller - * @return The value read from the controller - * - * params[in] port The controller port to read. - * - * @notapi - */ -static inline uint16_t read_value(uint16_t port) { - static uint8_t txbuf[3] = {0}; - static uint8_t rxbuf[3] = {0}; - uint16_t ret; - - txbuf[0] = port; - - spiExchange(&SPID1, 3, txbuf, rxbuf); - - ret = (rxbuf[1] << 5) | (rxbuf[2] >> 3); - - return ret; -} - -#endif /* _GINPUT_LLD_MOUSE_BOARD_H */ -/** @} */ diff --git a/boards/base/Embest-STM32-DMSTF4BB/board.mk b/boards/base/Embest-STM32-DMSTF4BB/board.mk index 4b8448c2..3795b43d 100644 --- a/boards/base/Embest-STM32-DMSTF4BB/board.mk +++ b/boards/base/Embest-STM32-DMSTF4BB/board.mk @@ -2,6 +2,7 @@ GFXINC += $(GFXLIB)/boards/base/Embest-STM32-DMSTF4BB GFXSRC += GFXDEFS += -DGFX_USE_CHIBIOS=TRUE +include $(GFXLIB)/boards/base/Embest-STM32-DMSTF4BB/chibios_board/board.mk include $(GFXLIB)/drivers/gdisp/SSD2119/gdisp_lld.mk include $(GFXLIB)/drivers/ginput/touch/STMPE811/ginput_lld.mk diff --git a/boards/base/Embest-STM32-DMSTF4BB/readme.txt b/boards/base/Embest-STM32-DMSTF4BB/readme.txt index 8095f1bb..48499d39 100644 --- a/boards/base/Embest-STM32-DMSTF4BB/readme.txt +++ b/boards/base/Embest-STM32-DMSTF4BB/readme.txt @@ -2,6 +2,5 @@ This directory contains the interface for the Embest-STM32-DMSTF4BB board running ChibiOS/RT. As this is not a standard ChibiOS/RT supported board, the necessary board files have -also been provided in the ChibiOS_Board directory - include that board.mk in your -Makefile as well. +also been provided in the chibios_board directory