From de85a1496e28bdbeb716c432161e7271ca3358ec Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Thu, 29 Nov 2012 00:45:17 +0100 Subject: [PATCH] removed xxx_unknown.h board files from ginput drivers --- .../ADS7843/ginput_lld_mouse_board_unknown.h | 97 ---------- .../MCU/ginput_lld_mouse_board_unknown.h | 174 ------------------ 2 files changed, 271 deletions(-) delete mode 100644 drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_unknown.h delete mode 100644 drivers/ginput/touch/MCU/ginput_lld_mouse_board_unknown.h diff --git a/drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_unknown.h b/drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_unknown.h deleted file mode 100644 index 510a1525..00000000 --- a/drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_unknown.h +++ /dev/null @@ -1,97 +0,0 @@ -/* - ChibiOS/GFX - Copyright (C) 2012 - Joel Bodenmann aka Tectu - - This file is part of ChibiOS/GFX. - - 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 - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - ChibiOS/GFX is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . -*/ - -/** - * @file drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_unknown.h - * @brief GINPUT Touch low level driver source for the ADS7843 on some unknown board. - * - * @addtogroup GINPUT_MOUSE - * @{ - */ - -#ifndef _GINPUT_LLD_MOUSE_BOARD_H -#define _GINPUT_LLD_MOUSE_BOARD_H - -/** - * @brief Initialise the board for the touch. - * - * @notapi - */ -static __inline void init_board(void) { - spiStart(TOUCH_SPIDriver, TOUCH_SPIConfig); -} - -/** - * @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(TOUCH_PressedPort, TOUCH_PressedPin); -} - -/** - * @brief Aquire the bus ready for readings - * - * @notapi - */ -static __inline void aquire_bus(void) { - #if defined(SPI_USE_MUTUAL_EXCLUSION) - spiAcquireBus(TOUCH_SPIDriver); - #endif - - GINPUT_TOUCH_SPI_PROLOGUE(); - palClearPad(TOUCH_SPIConfig->ssport, TOUCH_SPIConfig->sspad); -} - -/** - * @brief Release the bus after readings - * - * @notapi - */ -static __inline void release_bus(void) { - palSetPad(TOUCH_SPIConfig->ssport, TOUCH_SPIConfig->sspad); - GINPUT_TOUCH_SPI_EPILOGUE(); - - #if defined(SPI_USE_MUTUAL_EXCLUSION) - spiReleaseBus(tsDriver->spip); - #endif -} - -/** - * @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}; - - txbuf[0] = cmd; - spiExchange(TOUCH_SPIDriver, 3, txbuf, rxbuf); - return (rxbuf[1] << 5) | (rxbuf[2] >> 3); -} - -#endif /* _GINPUT_LLD_MOUSE_BOARD_H */ -/** @} */ diff --git a/drivers/ginput/touch/MCU/ginput_lld_mouse_board_unknown.h b/drivers/ginput/touch/MCU/ginput_lld_mouse_board_unknown.h deleted file mode 100644 index f16661c8..00000000 --- a/drivers/ginput/touch/MCU/ginput_lld_mouse_board_unknown.h +++ /dev/null @@ -1,174 +0,0 @@ -/* - ChibiOS/GFX - Copyright (C) 2012 - Joel Bodenmann aka Tectu - - This file is part of ChibiOS/GFX. - - 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 - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - ChibiOS/GFX is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . -*/ - -/** - * @file drivers/ginput/touch/MCU/ginput_lld_mouse_board_unknown.h - * @brief GINPUT Touch low level driver source for the MCU on some unknown board. - * - * @addtogroup GINPUT_MOUSE - * @{ - */ - -#ifndef _GINPUT_LLD_MOUSE_BOARD_H -#define _GINPUT_LLD_MOUSE_BOARD_H - -#define ADC_NUM_CHANNELS 2 -#define ADC_BUF_DEPTH 1 - -static const ADCConversionGroup adc_y_config = { - FALSE, - ADC_NUM_CHANNELS, - NULL, - NULL, - 0, 0, - 0, 0, - ADC_SQR1_NUM_CH(ADC_NUM_CHANNELS), - 0, - ADC_SQR3_SQ2_N(ADC_CHANNEL_IN12) | ADC_SQR3_SQ1_N(ADC_CHANNEL_IN13) -}; - -static const ADCConversionGroup adc_x_config = { - FALSE, - ADC_NUM_CHANNELS, - NULL, - NULL, - 0, 0, - 0, 0, - ADC_SQR1_NUM_CH(ADC_NUM_CHANNELS), - 0, - ADC_SQR3_SQ2_N(ADC_CHANNEL_IN10) | ADC_SQR3_SQ1_N(ADC_CHANNEL_IN11) -}; - -/** - * @brief Initialise the board for the mouse/touch. - * - * @notapi - */ -static __inline void init_board(void) { - /* Code here */ - #error "ginputMCU: You must supply a definition for init_board for your board - - adcStart(ts->adc_driver, NULL); -} - -/** - * @brief Check whether the surface is currently touched - * @return TRUE if the surface is currently touched - * - * @notapi - */ -static __inline bool_t getpin_pressed(void) { - /* Code here */ - #error "ginputMCU: You must supply a definition for getpin_pressed for your board" - palSetPadMode(ts->yd_port, ts->yd_pin, PAL_MODE_INPUT_PULLDOWN); - palSetPadMode(ts->yu_port, ts->yu_pin, PAL_MODE_INPUT); - palSetPadMode(ts->xl_port, ts->xl_pin, PAL_MODE_INPUT); - palSetPadMode(ts->xr_port, ts->xr_pin, PAL_MODE_OUTPUT_PUSHPULL); - palSetPad(ts->xr_port, ts->xr_pin); - - return palReadPad(ts->yd_port, ts->yd_pin); -} - -/** - * @brief Aquire the bus ready for readings - * - * @notapi - */ -static __inline void aquire_bus(void) { - /* Code here */ - #error "ginputMCU: You must supply a definition for aquire_bus for your board" -} - -/** - * @brief Release the bus after readings - * - * @notapi - */ -static __inline void release_bus(void) { - /* Code here */ - #error "ginputMCU: You must supply a definition for release_bus for your board" -} - -/** - * @brief Read an x value from touch controller - * @return The value read from the controller - * - * @notapi - */ -static __inline uint16_t read_x_value(void) { - /* Code here */ - #error "ginputMCU: You must supply a definition for read_x_value for your board" - uint16_t val1, val2; - adcsample_t samples[ADC_NUM_CHANNELS * ADC_BUF_DEPTH]; - - palSetPadMode(ts->yd_port, ts->yd_pin, PAL_MODE_INPUT_ANALOG); - palSetPadMode(ts->yu_port, ts->yu_pin, PAL_MODE_INPUT_ANALOG); - palSetPadMode(ts->xl_port, ts->xl_pin, PAL_MODE_OUTPUT_PUSHPULL); - palSetPadMode(ts->xr_port, ts->xr_pin, PAL_MODE_OUTPUT_PUSHPULL); - - palSetPad(ts->xl_port, ts->xl_pin); - palClearPad(ts->xr_port, ts->xr_pin); - chThdSleepMilliseconds(1); - adcConvert(ts->adc_driver, &adc_x_config, samples, ADC_BUF_DEPTH); - val1 = ((samples[0] + samples[1])/2); - - palClearPad(ts->xl_port, ts->xl_pin); - palSetPad(ts->xr_port, ts->xr_pin); - chThdSleepMilliseconds(1); - adcConvert(ts->adc_driver, &adc_x_config, samples, ADC_BUF_DEPTH); - val2 = ((samples[0] + samples[1])/2); - - return ((val1+((1<<12)-val2))/4); -} - -/** - * @brief Read an y value from touch controller - * @return The value read from the controller - * - * @notapi - */ -static __inline uint16_t read_y_value(void) { - /* Code here */ - #error "ginputMCU: You must supply a definition for read_y_value for your board" - uint16_t val1, val2; - adcsample_t samples[ADC_NUM_CHANNELS * ADC_BUF_DEPTH]; - - palSetPadMode(ts->xl_port, ts->xl_pin, PAL_MODE_INPUT_ANALOG); - palSetPadMode(ts->xr_port, ts->xr_pin, PAL_MODE_INPUT_ANALOG); - palSetPadMode(ts->yd_port, ts->yd_pin, PAL_MODE_OUTPUT_PUSHPULL); - palSetPadMode(ts->yu_port, ts->yu_pin, PAL_MODE_OUTPUT_PUSHPULL); - - palSetPad(ts->yu_port, ts->yu_pin); - palClearPad(ts->yd_port, ts->yd_pin); - chThdSleepMilliseconds(1); - adcConvert(ts->adc_driver, &adc_y_config, samples, ADC_BUF_DEPTH); - val1 = ((samples[0] + samples[1])/2); - - palClearPad(ts->yu_port, ts->yu_pin); - palSetPad(ts->yd_port, ts->yd_pin); - chThdSleepMilliseconds(1); - adcConvert(ts->adc_driver, &adc_y_config, samples, ADC_BUF_DEPTH); - val2 = ((samples[0] + samples[1])/2); - - return ((val1+((1<<12)-val2))/4); -} - -#endif /* _GINPUT_LLD_MOUSE_BOARD_H */ -/** @} */