diff options
| author | Andrew Hannam <andrewh@inmarket.com.au> | 2012-12-20 00:03:33 -0800 |
|---|---|---|
| committer | Andrew Hannam <andrewh@inmarket.com.au> | 2012-12-20 00:03:33 -0800 |
| commit | b669bf98f1bc57672b222c6cdac759d0a30858ed (patch) | |
| tree | 99c19a5aa83b94fba9df0a88f1c84fcf42a2b771 /drivers | |
| parent | f31a1f7f4aeb09bc09d49944daaf2f38fddd94e7 (diff) | |
| parent | e00f8593e85245a847280dafe10e5a834268557e (diff) | |
| download | uGFX-b669bf98f1bc57672b222c6cdac759d0a30858ed.tar.gz uGFX-b669bf98f1bc57672b222c6cdac759d0a30858ed.tar.bz2 uGFX-b669bf98f1bc57672b222c6cdac759d0a30858ed.zip | |
Merge pull request #12 from Tectu/master
Merge Tectu Changes
Diffstat (limited to 'drivers')
33 files changed, 86 insertions, 1249 deletions
diff --git a/drivers/gdisp/SSD1289/gdisp_lld.c b/drivers/gdisp/SSD1289/gdisp_lld.c index 49600349..6b7069c9 100644 --- a/drivers/gdisp/SSD1289/gdisp_lld.c +++ b/drivers/gdisp/SSD1289/gdisp_lld.c @@ -95,7 +95,7 @@ static __inline void set_cursor(coord_t x, coord_t y) { }
}
-static __inline void set_viewport(coord_t x, coord_t y, coord_t cx, coord_t cy) {
+void set_viewport(coord_t x, coord_t y, coord_t cx, coord_t cy) {
set_cursor(x, y);
@@ -134,6 +134,19 @@ static __inline void set_viewport(coord_t x, coord_t y, coord_t cx, coord_t cy) set_cursor(x, y);
}
+void reset_viewport(void) {
+ switch(GDISP.Orientation) {
+ case GDISP_ROTATE_0:
+ case GDISP_ROTATE_180:
+ set_viewport(0, 0, GDISP_SCREEN_WIDTH, GDISP_SCREEN_HEIGHT);
+ break;
+ case GDISP_ROTATE_90:
+ case GDISP_ROTATE_270:
+ set_viewport(0, 0, GDISP_SCREEN_HEIGHT, GDISP_SCREEN_WIDTH);
+ break;
+ }
+}
+
/*===========================================================================*/
/* Driver interrupt handlers. */
/*===========================================================================*/
@@ -167,9 +180,9 @@ bool_t GDISP_LLD(init)(void) { acquire_bus();
write_reg(0x0000,0x0001); delay(5);
- write_reg(0x0003,0xA8A4); delay(5);
- write_reg(0x000C,0x0000); delay(5);
- write_reg(0x000D,0x080C); delay(5);
+ write_reg(0x0003,0xA8A4); delay(5);
+ write_reg(0x000C,0x0000); delay(5);
+ write_reg(0x000D,0x080C); delay(5);
write_reg(0x000E,0x2B00); delay(5);
write_reg(0x001E,0x00B0); delay(5);
write_reg(0x0001,0x2B3F); delay(5);
@@ -277,14 +290,15 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) { * @notapi
*/
void GDISP_LLD(clear)(color_t color) {
- unsigned i;
+ unsigned i;
acquire_bus();
- set_cursor(0, 0);
- stream_start();
- for(i = 0; i < GDISP_SCREEN_WIDTH * GDISP_SCREEN_HEIGHT; i++)
- write_data(color);
- stream_stop();
+ reset_viewport();
+ set_cursor(0, 0);
+ stream_start();
+ for(i = 0; i < GDISP_SCREEN_WIDTH * GDISP_SCREEN_HEIGHT; i++)
+ write_data(color);
+ stream_stop();
release_bus();
}
#endif
@@ -485,6 +499,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) { * @notapi
*/
void GDISP_LLD(control)(unsigned what, void *value) {
+ acquire_bus();
switch(what) {
case GDISP_CONTROL_POWER:
if (GDISP.Powermode == (gdisp_powermode_t)value)
@@ -557,6 +572,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) { case GDISP_CONTROL_CONTRAST:
*/
}
+ release_bus();
}
#endif
diff --git a/drivers/ginput/toggle/Pal/ginput_lld_toggle.c b/drivers/ginput/toggle/Pal/ginput_lld_toggle.c index a3a360d8..e2ecc116 100644 --- a/drivers/ginput/toggle/Pal/ginput_lld_toggle.c +++ b/drivers/ginput/toggle/Pal/ginput_lld_toggle.c @@ -22,7 +22,8 @@ * @file drivers/ginput/toggle/Pal/ginput_lld_toggle.c
* @brief GINPUT Toggle low level driver source for the ChibiOS PAL hardware.
*
- * @addtogroup GINPUT_TOGGLE
+ * @defgroup Toggle Toggle
+ * @ingroup GINPUT
* @{
*/
diff --git a/drivers/ginput/toggle/Pal/ginput_lld_toggle_board_example.h b/drivers/ginput/toggle/Pal/ginput_lld_toggle_board_example.h index a96178b0..20fc44b5 100644 --- a/drivers/ginput/toggle/Pal/ginput_lld_toggle_board_example.h +++ b/drivers/ginput/toggle/Pal/ginput_lld_toggle_board_example.h @@ -22,7 +22,8 @@ * @file drivers/ginput/toggle/Pal/ginput_lld_toggle_board_example.h
* @brief GINPUT Toggle low level driver source for the ChibiOS PAL hardware on the example board.
*
- * @addtogroup GINPUT_TOGGLE
+ * @defgroup Toggle Toggle
+ * @ingroup GINPUT
* @{
*/
diff --git a/drivers/ginput/toggle/Pal/ginput_lld_toggle_board_olimexsam7ex256.h b/drivers/ginput/toggle/Pal/ginput_lld_toggle_board_olimexsam7ex256.h index 3ba5858d..4f3d6800 100644 --- a/drivers/ginput/toggle/Pal/ginput_lld_toggle_board_olimexsam7ex256.h +++ b/drivers/ginput/toggle/Pal/ginput_lld_toggle_board_olimexsam7ex256.h @@ -22,7 +22,8 @@ * @file drivers/ginput/toggle/Pal/ginput_lld_toggle_board_olimexsam7ex256.h
* @brief GINPUT Toggle low level driver source for the ChibiOS PAL hardware on the Olimex SAM7EX256 board.
*
- * @addtogroup GINPUT_TOGGLE
+ * @defgroup Toggle Toggle
+ * @ingroup GINPUT
* @{
*/
diff --git a/drivers/ginput/toggle/Pal/ginput_lld_toggle_config.h b/drivers/ginput/toggle/Pal/ginput_lld_toggle_config.h index 774be200..162d35df 100644 --- a/drivers/ginput/toggle/Pal/ginput_lld_toggle_config.h +++ b/drivers/ginput/toggle/Pal/ginput_lld_toggle_config.h @@ -22,7 +22,8 @@ * @file drivers/ginput/toggle/Pal/ginput_lld_toggle_config.h
* @brief GINPUT Toggle Driver configuration header.
*
- * @addtogroup GDISP
+ * @defgroup Toggle Toggle
+ * @ingroup GINPUT
* @{
*/
diff --git a/drivers/ginput/touch/ADS7843/ginput_lld_mouse.c b/drivers/ginput/touch/ADS7843/ginput_lld_mouse.c index a308c0dc..65065176 100644 --- a/drivers/ginput/touch/ADS7843/ginput_lld_mouse.c +++ b/drivers/ginput/touch/ADS7843/ginput_lld_mouse.c @@ -22,7 +22,8 @@ * @file drivers/ginput/touch/ADS7843/ginput_lld_mouse.c
* @brief GINPUT Touch low level driver source for the ADS7843.
*
- * @addtogroup GINPUT_MOUSE
+ * @defgroup Mouse Mouse
+ * @ingroup GINPUT
* @{
*/
@@ -38,6 +39,8 @@ #include "ginput_lld_mouse_board.h"
#elif defined(BOARD_FIREBULL_STM32_F103)
#include "ginput_lld_mouse_board_firebull_stm32f103.h"
+#elif defined(BOARD_OLIMEX_STM32_E407)
+ #include "ginput_lld_mouse_board_olimex_stm32_e407.h"
#else
#include "ginput_lld_mouse_board_example.h"
#endif
diff --git a/drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_example.h b/drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_example.h index 9fbbaa56..9f4f2dc1 100644 --- a/drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_example.h +++ b/drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_example.h @@ -22,7 +22,8 @@ * @file drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_example.h
* @brief GINPUT Touch low level driver source for the ADS7843 on the example board.
*
- * @addtogroup GINPUT_MOUSE
+ * @defgroup Mouse Mouse
+ * @ingroup GINPUT
* @{
*/
diff --git a/drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_firebull_stm32f103.h b/drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_firebull_stm32f103.h index 9df301a4..04d77be6 100644 --- a/drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_firebull_stm32f103.h +++ b/drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_firebull_stm32f103.h @@ -22,7 +22,8 @@ * @file drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_example.h
* @brief GINPUT Touch low level driver source for the ADS7843 on the example board.
*
- * @addtogroup GINPUT_MOUSE
+ * @defgroup Mouse Mouse
+ * @ingroup GINPUT
* @{
*/
diff --git a/drivers/ginput/touch/XPT2046/ginput_lld_mouse_board_firebull_stm32f103.h b/drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_olimex_stm32_e407.h index 893ec865..6c5f7e37 100644 --- a/drivers/ginput/touch/XPT2046/ginput_lld_mouse_board_firebull_stm32f103.h +++ b/drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_olimex_stm32_e407.h @@ -19,10 +19,11 @@ */
/**
- * @file drivers/ginput/touch/XPT2046/ginput_lld_mouse_board_example.h
- * @brief GINPUT Touch low level driver source for the XPT2046 on the example board.
+ * @file drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_olimex_stm32_e407.h
+ * @brief GINPUT Touch low level driver source for the ADS7843 on an Olimex STM32E407.
*
- * @addtogroup GINPUT_MOUSE
+ * @defgroup Mouse Mouse
+ * @ingroup GINPUT
* @{
*/
@@ -31,8 +32,8 @@ static const SPIConfig spicfg = {
NULL,
- GPIOC,
- 6,
+ GPIOG,
+ 10,
/* SPI_CR1_BR_2 |*/ SPI_CR1_BR_1 | SPI_CR1_BR_0,
};
@@ -42,7 +43,7 @@ static const SPIConfig spicfg = { * @notapi
*/
static __inline void init_board(void) {
- spiStart(&SPID1, &spicfg);
+ spiStart(&SPID2, &spicfg);
}
/**
@@ -52,7 +53,7 @@ static __inline void init_board(void) { * @notapi
*/
static __inline bool_t getpin_pressed(void) {
- return (!palReadPad(GPIOC, 4));
+ return (!palReadPad(GPIOG, 0));
}
/**
* @brief Aquire the bus ready for readings
@@ -60,9 +61,9 @@ static __inline bool_t getpin_pressed(void) { * @notapi
*/
static __inline void aquire_bus(void) {
- spiAcquireBus(&SPID1);
+ spiAcquireBus(&SPID2);
//TOUCHSCREEN_SPI_PROLOGUE();
- palClearPad(GPIOC, 6);
+ palClearPad(GPIOG, 10);
}
/**
@@ -71,8 +72,8 @@ static __inline void aquire_bus(void) { * @notapi
*/
static __inline void release_bus(void) {
- palSetPad(GPIOC, 6);
- spiReleaseBus(&SPID1);
+ palSetPad(GPIOG, 10);
+ spiReleaseBus(&SPID2);
//TOUCHSCREEN_SPI_EPILOGUE();
}
@@ -91,7 +92,7 @@ static __inline uint16_t read_value(uint16_t port) { txbuf[0] = port;
- spiExchange(&SPID1, 3, txbuf, rxbuf);
+ spiExchange(&SPID2, 3, txbuf, rxbuf);
ret = (rxbuf[1] << 5) | (rxbuf[2] >> 3);
diff --git a/drivers/ginput/touch/ADS7843/ginput_lld_mouse_config.h b/drivers/ginput/touch/ADS7843/ginput_lld_mouse_config.h index 688f3486..30a13841 100644 --- a/drivers/ginput/touch/ADS7843/ginput_lld_mouse_config.h +++ b/drivers/ginput/touch/ADS7843/ginput_lld_mouse_config.h @@ -21,9 +21,12 @@ * @file drivers/ginput/touch/ADS7843/ginput_lld_mouse_config.h
* @brief GINPUT LLD header file for mouse/touch driver.
*
- * @addtogroup GINPUT_LLD_MOUSE
+ * @defgroup Mouse Mouse
+ * @ingroup GINPUT
+ *
* @{
*/
+
#ifndef _LLD_GINPUT_MOUSE_CONFIG_H
#define _LLD_GINPUT_MOUSE_CONFIG_H
diff --git a/drivers/ginput/touch/MCU/ginput_lld_mouse.c b/drivers/ginput/touch/MCU/ginput_lld_mouse.c index 61b512cd..b43a14e7 100644 --- a/drivers/ginput/touch/MCU/ginput_lld_mouse.c +++ b/drivers/ginput/touch/MCU/ginput_lld_mouse.c @@ -22,7 +22,9 @@ * @file drivers/ginput/touch/MCU/ginput_lld_mouse.c
* @brief GINPUT Touch low level driver source for the MCU.
*
- * @addtogroup GINPUT_MOUSE
+ * @defgroup Mouse Mouse
+ * @ingroup GINPUT
+ *
* @{
*/
diff --git a/drivers/ginput/touch/MCU/ginput_lld_mouse_board_example.h b/drivers/ginput/touch/MCU/ginput_lld_mouse_board_example.h index 5a09b274..913d50c9 100644 --- a/drivers/ginput/touch/MCU/ginput_lld_mouse_board_example.h +++ b/drivers/ginput/touch/MCU/ginput_lld_mouse_board_example.h @@ -22,7 +22,9 @@ * @file drivers/ginput/touch/MCU/ginput_lld_mouse_board_example.h
* @brief GINPUT Touch low level driver source for the MCU on the example board.
*
- * @addtogroup GINPUT_MOUSE
+ * @defgroup Mouse Mouse
+ * @ingroup GINPUT
+ *
* @{
*/
diff --git a/drivers/ginput/touch/MCU/ginput_lld_mouse_board_olimex_stm32_lcd.h b/drivers/ginput/touch/MCU/ginput_lld_mouse_board_olimex_stm32_lcd.h index 2fa6fe44..510e8e81 100644 --- a/drivers/ginput/touch/MCU/ginput_lld_mouse_board_olimex_stm32_lcd.h +++ b/drivers/ginput/touch/MCU/ginput_lld_mouse_board_olimex_stm32_lcd.h @@ -22,7 +22,9 @@ * @file drivers/ginput/touch/MCU/ginput_lld_mouse_board_olimex_stm32_lcd.h
* @brief GINPUT Touch low level driver source for the MCU on the example board.
*
- * @addtogroup GINPUT_MOUSE
+ * @defgroup Mouse Mouse
+ * @ingroup GINPUT
+ *
* @{
*/
diff --git a/drivers/ginput/touch/MCU/ginput_lld_mouse_config.h b/drivers/ginput/touch/MCU/ginput_lld_mouse_config.h index 4711625b..1b5c7b6b 100644 --- a/drivers/ginput/touch/MCU/ginput_lld_mouse_config.h +++ b/drivers/ginput/touch/MCU/ginput_lld_mouse_config.h @@ -21,21 +21,24 @@ * @file drivers/ginput/touch/MCU/ginput_lld_mouse_config.h
* @brief GINPUT LLD header file for touch driver.
*
- * @addtogroup GINPUT_LLD_MOUSE
+ * @defgroup Mouse Mouse
+ * @ingroup GINPUT
+ *
* @{
*/
+
#ifndef _LLD_GINPUT_MOUSE_CONFIG_H
#define _LLD_GINPUT_MOUSE_CONFIG_H
#define GINPUT_MOUSE_EVENT_TYPE GEVENT_TOUCH
#define GINPUT_MOUSE_NEED_CALIBRATION TRUE
#define GINPUT_MOUSE_LLD_CALIBRATION_LOADSAVE FALSE
-#define GINPUT_MOUSE_MAX_CALIBRATION_ERROR 10
+#define GINPUT_MOUSE_MAX_CALIBRATION_ERROR 12
#define GINPUT_MOUSE_READ_CYCLES 4
-#define GINPUT_MOUSE_POLL_PERIOD 100
-#define GINPUT_MOUSE_MAX_CLICK_JITTER 4
-#define GINPUT_MOUSE_MAX_MOVE_JITTER 4
-#define GINPUT_MOUSE_CLICK_TIME 700
+#define GINPUT_MOUSE_POLL_PERIOD 25
+#define GINPUT_MOUSE_MAX_CLICK_JITTER 2
+#define GINPUT_MOUSE_MAX_MOVE_JITTER 2
+#define GINPUT_MOUSE_CLICK_TIME 500
#endif /* _LLD_GINPUT_MOUSE_CONFIG_H */
/** @} */
diff --git a/drivers/ginput/touch/XPT2046/ginput_lld.mk b/drivers/ginput/touch/XPT2046/ginput_lld.mk deleted file mode 100644 index c513d54c..00000000 --- a/drivers/ginput/touch/XPT2046/ginput_lld.mk +++ /dev/null @@ -1,5 +0,0 @@ -# List the required driver.
-GFXSRC += $(GFXLIB)/drivers/ginput/touch/XPT2046/ginput_lld_mouse.c
-
-# Required include directories
-GFXINC += $(GFXLIB)/drivers/ginput/touchXPT20466
diff --git a/drivers/ginput/touch/XPT2046/ginput_lld_mouse.c b/drivers/ginput/touch/XPT2046/ginput_lld_mouse.c deleted file mode 100644 index 9fb35c9b..00000000 --- a/drivers/ginput/touch/XPT2046/ginput_lld_mouse.c +++ /dev/null @@ -1,141 +0,0 @@ -/*
- ChibiOS/GFX - Copyright (C) 2012
- Joel Bodenmann aka Tectu <joel@unormal.org>
-
- 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 <http://www.gnu.org/licenses/>.
-*/
-
-/**
- * @file drivers/ginput/touch/XPT2046/ginput_lld_mouse.c
- * @brief GINPUT Touch low level driver source for the XPT2046.
- *
- * @addtogroup GINPUT_MOUSE
- * @{
- */
-
-#include "ch.h"
-#include "hal.h"
-#include "gfx.h"
-
-#if (GFX_USE_GINPUT && GINPUT_NEED_MOUSE) /*|| defined(__DOXYGEN__)*/
-
-#include "ginput/lld/mouse.h"
-
-#if defined(GINPUT_MOUSE_USE_CUSTOM_BOARD) && GINPUT_MOUSE_USE_CUSTOM_BOARD
- #include "ginput_lld_mouse_board.h"
-#elif defined(BOARD_FIREBULL_STM32_F103)
- #include "ginput_lld_mouse_board_firebull_stm32f103.h"
-#else
- #include "ginput_lld_mouse_board_example.h"
-#endif
-
-static uint16_t sampleBuf[7];
-static coord_t lastx, lasty;
-
-/**
- * @brief 7-point median filtering code for touch samples
- *
- * @note This is an internally used routine only.
- *
- * @notapi
- */
-static void filter(void) {
- uint16_t temp;
- int i,j;
-
- for(i = 0; i < 4; i++) {
- for(j = i; j < 7; j++) {
- if(sampleBuf[i] > sampleBuf[j]) {
- /* Swap the values */
- temp = sampleBuf[i];
- sampleBuf[i] = sampleBuf[j];
- sampleBuf[j] = temp;
- }
- }
- }
-}
-
-/**
- * @brief Initialise the mouse/touch.
- *
- * @notapi
- */
-void ginput_lld_mouse_init(void) {
- init_board();
-}
-
-/**
- * @brief Read the mouse/touch position.
- *
- * @param[in] pt A pointer to the structure to fill
- *
- * @note For drivers that don't support returning a position
- * when the touch is up (most touch devices), it should
- * return the previous position with the new Z value.
- * The z value is the pressure for those touch devices
- * that support it (-100 to 100 where > 0 is touched)
- * or, 0 or 100 for those drivers that don't.
- *
- * @notapi
- */
-void ginput_lld_mouse_get_reading(MouseReading *pt) {
- uint16_t i;
-
- // If touch-off return the previous results
- if (!getpin_pressed()) {
- pt->x = lastx;
- pt->y = lasty;
- pt->z = 0;
- pt->buttons = 0;
- return;
- }
-
- // Read the port to get the touch settings
- aquire_bus();
-
- /* Get the X value
- * Discard the first conversion - very noisy and keep the ADC on hereafter
- * till we are done with the sampling. Note that PENIRQ is disabled while reading.
- * Finally switch on PENIRQ once again - perform a dummy read.
- * Once we have the readings, find the medium using our filter function
- */
- read_value(0xD1);
- for(i = 0; i < 7; i++)
- sampleBuf[i] = read_value(0xD1);
- read_value(0xD0);
- filter();
- lastx = (coord_t)sampleBuf[3];
-
- /* Get the Y value using the same process as above */
- read_value(0x91);
- for(i = 0; i < 7; i++)
- sampleBuf[i] = read_value(0x91);
- read_value(0x90);
- filter();
- lasty = (coord_t)sampleBuf[3];
-
- // Release the bus
- release_bus();
-
- // Return the results
- pt->x = lastx;
- pt->y = lasty;
- pt->z = 100;
- pt->buttons = GINPUT_TOUCH_PRESSED;
-}
-
-#endif /* GFX_USE_GINPUT && GINPUT_NEED_MOUSE */
-/** @} */
diff --git a/drivers/ginput/touch/XPT2046/ginput_lld_mouse_board_example.h b/drivers/ginput/touch/XPT2046/ginput_lld_mouse_board_example.h deleted file mode 100644 index 8c11c96e..00000000 --- a/drivers/ginput/touch/XPT2046/ginput_lld_mouse_board_example.h +++ /dev/null @@ -1,87 +0,0 @@ -/*
- ChibiOS/GFX - Copyright (C) 2012
- Joel Bodenmann aka Tectu <joel@unormal.org>
-
- 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 <http://www.gnu.org/licenses/>.
-*/
-
-/**
- * @file drivers/ginput/touch/XPT2046/ginput_lld_mouse_board_example.h
- * @brief GINPUT Touch low level driver source for the XPT2046 on the example 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) {
- /* Code here */
- #error "ginputXPT2046: You must supply a definition for init_board for your board"
-}
-
-/**
- * @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 "ginputXPT2046: You must supply a definition for getpin_pressed for your board"
-}
-
-/**
- * @brief Aquire the bus ready for readings
- *
- * @notapi
- */
-static __inline void aquire_bus(void) {
- /* Code here */
- #error "ginputXPT2046: 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 "ginputXPT2046: You must supply a definition for release_bus for your board"
-}
-
-/**
- * @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) {
- /* Code here */
- #error "ginputXPT2046: You must supply a definition for read_value for your board"
-}
-
-#endif /* _GINPUT_LLD_MOUSE_BOARD_H */
-/** @} */
diff --git a/drivers/ginput/touch/XPT2046/ginput_lld_mouse_config.h b/drivers/ginput/touch/XPT2046/ginput_lld_mouse_config.h deleted file mode 100644 index 880c6a60..00000000 --- a/drivers/ginput/touch/XPT2046/ginput_lld_mouse_config.h +++ /dev/null @@ -1,41 +0,0 @@ -/*
- ChibiOS/GFX - Copyright (C) 2012
- Joel Bodenmann aka Tectu <joel@unormal.org>
-
- 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 <http://www.gnu.org/licenses/>.
-*/
-/**
- * @file drivers/ginput/touch/XPT2046/ginput_lld_mouse_config.h
- * @brief GINPUT LLD header file for mouse/touch driver.
- *
- * @addtogroup GINPUT_LLD_MOUSE
- * @{
- */
-#ifndef _LLD_GINPUT_MOUSE_CONFIG_H
-#define _LLD_GINPUT_MOUSE_CONFIG_H
-
-#define GINPUT_MOUSE_EVENT_TYPE GEVENT_TOUCH
-#define GINPUT_MOUSE_NEED_CALIBRATION TRUE
-#define GINPUT_MOUSE_LLD_CALIBRATION_LOADSAVE FALSE
-#define GINPUT_MOUSE_MAX_CALIBRATION_ERROR 5
-#define GINPUT_MOUSE_READ_CYCLES 4
-#define GINPUT_MOUSE_POLL_PERIOD 25
-#define GINPUT_MOUSE_MAX_CLICK_JITTER 10
-#define GINPUT_MOUSE_MAX_MOVE_JITTER 2
-#define GINPUT_MOUSE_CLICK_TIME 500
-
-#endif /* _LLD_GINPUT_MOUSE_CONFIG_H */
-/** @} */
diff --git a/drivers/ginput/touch/XPT2046/readme.txt b/drivers/ginput/touch/XPT2046/readme.txt deleted file mode 100644 index 22921c1a..00000000 --- a/drivers/ginput/touch/XPT2046/readme.txt +++ /dev/null @@ -1,9 +0,0 @@ -To use this driver:
-
-1. Add in your halconf.h:
- a) #define GFX_USE_GINPUT TRUE
- b) #define GINPUT_NEED_MOUSE TRUE
-
-2. To your makefile add the following lines:
- include $(GFXLIB)/drivers/ginput/touch/XPT2046/ginput_lld.mk
-
diff --git a/drivers/multiple/Win32/ginput_lld_mouse_config.h b/drivers/multiple/Win32/ginput_lld_mouse_config.h index 2e740af8..ceeedcb9 100644 --- a/drivers/multiple/Win32/ginput_lld_mouse_config.h +++ b/drivers/multiple/Win32/ginput_lld_mouse_config.h @@ -21,9 +21,12 @@ * @file drivers/multiple/Win32/ginput_lld_mouse_config.h
* @brief GINPUT LLD header file for mouse/touch driver.
*
- * @addtogroup GINPUT_LLD_MOUSE
+ * @defgroup Mouse Mouse
+ * @ingroup GINPUT
+ *
* @{
*/
+
#ifndef _LLD_GINPUT_MOUSE_CONFIG_H
#define _LLD_GINPUT_MOUSE_CONFIG_H
@@ -56,3 +59,4 @@ #endif /* _LLD_GINPUT_MOUSE_CONFIG_H */
/** @} */
+
diff --git a/drivers/multiple/Win32/ginput_lld_toggle_config.h b/drivers/multiple/Win32/ginput_lld_toggle_config.h index 58e47260..84ebaaa2 100644 --- a/drivers/multiple/Win32/ginput_lld_toggle_config.h +++ b/drivers/multiple/Win32/ginput_lld_toggle_config.h @@ -22,7 +22,9 @@ * @file drivers/multiple/Win32/ginput_lld_toggle_config.h
* @brief GINPUT Toggle Driver configuration header.
*
- * @addtogroup GINPUT_TOGGLE
+ * @defgroup Toggle Toggle
+ * @ingroup GINPUT
+ *
* @{
*/
@@ -49,3 +51,4 @@ #endif /* _GINPUT_LLD_TOGGLE_CONFIG_H */
/** @} */
+
diff --git a/drivers/touchscreen/ADS7843/readme.txt b/drivers/touchscreen/ADS7843/readme.txt deleted file mode 100644 index 85f40da5..00000000 --- a/drivers/touchscreen/ADS7843/readme.txt +++ /dev/null @@ -1,8 +0,0 @@ -To use this driver:
-
-1. Add in your halconf.h:
- a) #define GFX_USE_TOUCHSCREEN TRUE
-
-2. To your makefile add the following lines:
- include $(GFXLIB)/drivers/touchscreen/ADS7843/touchscreen_lld.mk
-
diff --git a/drivers/touchscreen/ADS7843/touchscreen_lld.c b/drivers/touchscreen/ADS7843/touchscreen_lld.c deleted file mode 100644 index 9b5d4aa0..00000000 --- a/drivers/touchscreen/ADS7843/touchscreen_lld.c +++ /dev/null @@ -1,241 +0,0 @@ -/*
- ChibiOS/GFX - Copyright (C) 2012
- Joel Bodenmann aka Tectu <joel@unormal.org>
-
- 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 <http://www.gnu.org/licenses/>.
-*/
-
-/**
- * @file drivers/touchscreen/ADS7843/touchscreen_lld.c
- * @brief Touchscreen Driver subsystem low level driver source.
- *
- * @addtogroup TOUCHSCREEN
- * @{
- */
-
-#include "ch.h"
-#include "hal.h"
-#include "touchscreen.h"
-
-#if GFX_USE_TOUCHSCREEN /*|| defined(__DOXYGEN__)*/
-
-/*===========================================================================*/
-/* Driver local definitions. */
-/*===========================================================================*/
-
-/*===========================================================================*/
-/* Driver exported variables. */
-/*===========================================================================*/
-
-/*===========================================================================*/
-/* Driver local variables. */
-/*===========================================================================*/
-#if !defined(__DOXYGEN__)
- /* Local copy of the current touchscreen driver */
- static const TouchscreenDriver *tsDriver;
-
- static uint16_t sampleBuf[7];
-#endif
-
-/*===========================================================================*/
-/* Driver local functions. */
-/*===========================================================================*/
-
-/*===========================================================================*/
-/* Driver interrupt handlers. */
-/*===========================================================================*/
-
-/*===========================================================================*/
-/* Driver exported functions. */
-/*===========================================================================*/
-
-/* ---- Required Routines ---- */
-
-/**
- * @brief Low level touchscreen driver initialization.
- *
- * @param[in] ts The touchscreen driver
- *
- * @notapi
- */
-void ts_lld_init(const TouchscreenDriver *ts) {
- tsDriver = ts;
-
- if(tsDriver->direct_init)
- spiStart(tsDriver->spip, tsDriver->spicfg);
-}
-
-
-/**
- * @brief Reads a conversion from the touchscreen
- *
- * @param[in] cmd The command bits to send to the touchscreen
- *
- * @return The read value 12-bit right-justified
- *
- * @note This function only reads data, it is assumed that the pins are
- * configured properly and the bus has been acquired beforehand
- *
- * @notapi
- */
-uint16_t ts_lld_read_value(uint8_t cmd) {
- static uint8_t txbuf[3] = {0};
- static uint8_t rxbuf[3] = {0};
- uint16_t ret;
-
- txbuf[0] = cmd;
-
- spiExchange(tsDriver->spip, 3, txbuf, rxbuf);
-
- ret = (rxbuf[1] << 5) | (rxbuf[2] >> 3);
-
- return ret;
-}
-
-/**
- * @brief 7-point median filtering code for touchscreen samples
- *
- * @note This is an internally used routine only.
- *
- * @notapi
- */
-static void ts_lld_filter(void) {
- uint16_t temp;
- int i,j;
-
- for(i = 0; i < 4; i++) {
- for(j = i; j < 7; j++) {
- if(sampleBuf[i] > sampleBuf[j]) {
- /* Swap the values */
- temp = sampleBuf[i];
- sampleBuf[i] = sampleBuf[j];
- sampleBuf[j] = temp;
- }
- }
- }
-}
-
-/**
- * @brief Reads out the X direction.
- *
- * @note The samples are median filtered for greater noise reduction
- *
- * @notapi
- */
-uint16_t ts_lld_read_x(void) {
- int i;
-
-#if defined(SPI_USE_MUTUAL_EXCLUSION)
- spiAcquireBus(tsDriver->spip);
-#endif
-
- TOUCHSCREEN_SPI_PROLOGUE();
- palClearPad(tsDriver->spicfg->ssport, tsDriver->spicfg->sspad);
-
- /* Discard the first conversion - very noisy and keep the ADC on hereafter
- * till we are done with the sampling. Note that PENIRQ is disabled.
- */
- ts_lld_read_value(0xD1);
-
- for(i = 0; i < 7; i++) {
- sampleBuf[i] = ts_lld_read_value(0xD1);
- }
-
- /* Switch on PENIRQ once again - perform a dummy read */
- ts_lld_read_value(0xD0);
-
- palSetPad(tsDriver->spicfg->ssport, tsDriver->spicfg->sspad);
- TOUCHSCREEN_SPI_EPILOGUE();
-
-#if defined(SPI_USE_MUTUAL_EXCLUSION)
- spiReleaseBus(tsDriver->spip);
-#endif
-
- /* Find the median - use selection sort */
- ts_lld_filter();
-
- return sampleBuf[3];
-}
-
-/*
- * @brief Reads out the Y direction.
- *
- * @notapi
- */
-uint16_t ts_lld_read_y(void) {
- int i;
-
-#if defined(SPI_USE_MUTUAL_EXCLUSION)
- spiAcquireBus(tsDriver->spip);
-#endif
-
- TOUCHSCREEN_SPI_PROLOGUE();
- palClearPad(tsDriver->spicfg->ssport, tsDriver->spicfg->sspad);
-
- /* Discard the first conversion - very noisy and keep the ADC on hereafter
- * till we are done with the sampling. Note that PENIRQ is disabled.
- */
- ts_lld_read_value(0x91);
-
- for(i = 0; i < 7; i++) {
- sampleBuf[i] = ts_lld_read_value(0x91);
- }
-
- /* Switch on PENIRQ once again - perform a dummy read */
- ts_lld_read_value(0x90);
-
- palSetPad(tsDriver->spicfg->ssport, tsDriver->spicfg->sspad);
- TOUCHSCREEN_SPI_EPILOGUE();
-
-#ifdef SPI_USE_MUTUAL_EXCLUSION
- spiReleaseBus(tsDriver->spip);
-#endif
-
- /* Find the median - use selection sort */
- ts_lld_filter();
-
- return sampleBuf[3];
-}
-
-/* ---- Optional Routines ---- */
-#if TOUCHSCREEN_HAS_PRESSED || defined(__DOXYGEN__)
- /*
- * @brief for checking if touchscreen is pressed or not.
- *
- * @return 1 if pressed / 0 if not pressed
- *
- * @notapi
- */
- uint8_t ts_lld_pressed(void) {
- return (!palReadPad(tsDriver->tsIRQPort, tsDriver->tsIRQPin));
- }
-#endif
-
-#if TOUCHSCREEN_HAS_PRESSURE || defined(__DOXYGEN__)
- /*
- * @brief Reads out the Z direction / pressure.
- *
- * @notapi
- */
- uint16_t ts_lld_read_z(void) {
- /* ToDo */
- return 42;
- }
-#endif
-
-#endif /* GFX_USE_TOUCHSCREEN */
-/** @} */
-
diff --git a/drivers/touchscreen/ADS7843/touchscreen_lld.mk b/drivers/touchscreen/ADS7843/touchscreen_lld.mk deleted file mode 100644 index c58f6647..00000000 --- a/drivers/touchscreen/ADS7843/touchscreen_lld.mk +++ /dev/null @@ -1,6 +0,0 @@ -# List the required driver.
-GFXSRC += $(GFXLIB)/drivers/touchscreen/ADS7843/touchscreen_lld.c
-
-# Required include directories
-GFXINC += $(GFXLIB)/drivers/touchscreen/ADS7843
-
diff --git a/drivers/touchscreen/ADS7843/touchscreen_lld_config.h b/drivers/touchscreen/ADS7843/touchscreen_lld_config.h deleted file mode 100644 index 056c8d7a..00000000 --- a/drivers/touchscreen/ADS7843/touchscreen_lld_config.h +++ /dev/null @@ -1,84 +0,0 @@ -/*
- ChibiOS/GFX - Copyright (C) 2012
- Joel Bodenmann aka Tectu <joel@unormal.org>
-
- 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 <http://www.gnu.org/licenses/>.
-*/
-
-/**
- * @file drivers/touchscreen/ADS7843/touchscreen_lld_config.h
- * @brief Touchscreen Driver subsystem low level driver.
- *
- * @addtogroup TOUCHSCREEN
- * @{
- */
-
-#ifndef TOUCHSCREEN_LLD_CONFIG_H
-#define TOUCHSCREEN_LLD_CONFIG_H
-
-#if GFX_USE_TOUCHSCREEN /*|| defined(__DOXYGEN__)*/
-
-/*===========================================================================*/
-/* Driver hardware support. */
-/*===========================================================================*/
-
-#define TOUCHSCREEN_HAS_PRESSED TRUE
-#define TOUCHSCREEN_HAS_PRESSURE FALSE
-
-struct TouchscreenDriver {
- /*
- * @brief Pointer to SPI driver.
- * @note SPI driver must be enabled in mcuconf.h and halconf.h
- */
- SPIDriver *spip;
-
- /*
- * @brief Pointer to the SPI configuration structure.
- * @note The lowest possible speed ~ 1-2MHz is to be used, otherwise
- * will result in a lot of noise
- */
- const SPIConfig *spicfg;
-
- /*
- * @brief Touchscreen controller TPIRQ pin GPIO port
- */
- ioportid_t tsIRQPort;
-
- /*
- * @brief Touchscreen controller TPIRQ GPIO pin
- * @note The interface is polled as of now, interrupt support is
- * to be implemented in the future.
- */
- ioportmask_t tsIRQPin;
-
- /*
- * @brief Initialize the SPI with the configuration struct given or not
- * If TRUE, spiStart is called by the init, otherwise not
- * @note This is provided in such a case when SPI port is being shared
- * across multiple peripherals, so not to disturb the SPI bus.
- * You can use TOUCHSCREEN_SPI_PROLOGUE() and TOUCHSCREEN_SPI_EPILOGUE()
- * macros to change the SPI configuration or speed before and
- * after using the touchpad. An example case would be sharing the
- * bus with a fast flash memory chip.
- */
- bool_t direct_init;
-};
-
-#endif /* GFX_USE_TOUCHSCREEN */
-
-#endif /* TOUCHSCREEN_LLD_CONFIG_H */
-/** @} */
-
diff --git a/drivers/touchscreen/MCU/readme.txt b/drivers/touchscreen/MCU/readme.txt deleted file mode 100644 index 105e7462..00000000 --- a/drivers/touchscreen/MCU/readme.txt +++ /dev/null @@ -1,8 +0,0 @@ -To use this driver:
-
-1. Add in your halconf.h:
- a) #define GFX_USE_TOUCHSCREEN TRUE
-
-2. To your makefile add the following lines:
- include $(GFXLIB)/drivers/touchscreen/MCU/touchscreen_lld.mk
-
diff --git a/drivers/touchscreen/MCU/touchscreen_lld.c b/drivers/touchscreen/MCU/touchscreen_lld.c deleted file mode 100644 index d34228a6..00000000 --- a/drivers/touchscreen/MCU/touchscreen_lld.c +++ /dev/null @@ -1,172 +0,0 @@ -/*
- ChibiOS/GFX - Copyright (C) 2012
- Joel Bodenmann aka Tectu <joel@unormal.org>
-
- 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 <http://www.gnu.org/licenses/>.
-*/
-
-/**
- * @file drivers/touchscreen/MCU/touchscreen_lld.c
- * @brief Touchscreen Driver subsystem low level driver source.
- *
- * @addtogroup TOUCHSCREEN
- * @{
- */
-
-#include "ch.h"
-#include "hal.h"
-#include "touchscreen.h"
-
-#if GFX_USE_TOUCHSCREEN /*|| defined(__DOXYGEN__)*/
-
-#define ADC_NUM_CHANNELS 2
-#define ADC_BUF_DEPTH 1
-
-/*===========================================================================*/
-/* Driver local variables. */
-/*===========================================================================*/
-
-static const TouchscreenDriver *ts;
-
-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 Low level Touchscreen driver initialization.
- *
- * @param[in] ts The touchscreen driver struct
- *
- * @notapi
- */
-void ts_lld_init(const TouchscreenDriver *ts_init) {
- ts = ts_init;
-
- adcStart(ts->adc_driver, NULL);
-}
-
-/**
- * @brief 7-point median filtering code for touchscreen samples
- *
- * @note This is an internally used routine only.
- *
- * @notapi
- */
-static void ts_lld_filter(void) {
-
- return 0;
-}
-
-/**
- * @brief Reads out the X direction.
- *
- * @note The samples are median filtered for greater noise reduction
- *
- * @notapi
- */
-uint16_t ts_lld_read_x(void) {
- 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 Reads out the Y direction.
- *
- * @notapi
- */
-uint16_t ts_lld_read_y(void) {
- 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);
-}
-
-/*
- * @brief Checks if touchscreen is pressed or not.
- *
- * @return 1 if pressed, 0 otherwise
- *
- * @notapi
- */
-uint8_t ts_lld_pressed(void) {
- 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);
-}
-
-#endif /* GFX_USE_TOUCHSCREEN */
-/** @} */
-
diff --git a/drivers/touchscreen/MCU/touchscreen_lld.mk b/drivers/touchscreen/MCU/touchscreen_lld.mk deleted file mode 100644 index 8d594c2c..00000000 --- a/drivers/touchscreen/MCU/touchscreen_lld.mk +++ /dev/null @@ -1,6 +0,0 @@ -# List the required driver.
-GFXSRC += $(GFXLIB)/drivers/touchscreen/MCU/touchscreen_lld.c
-
-# Required include directories
-GFXINC += $(GFXLIB)/drivers/touchscreen/MCU
-
diff --git a/drivers/touchscreen/MCU/touchscreen_lld_config.h b/drivers/touchscreen/MCU/touchscreen_lld_config.h deleted file mode 100644 index 800518ae..00000000 --- a/drivers/touchscreen/MCU/touchscreen_lld_config.h +++ /dev/null @@ -1,61 +0,0 @@ -/*
- ChibiOS/GFX - Copyright (C) 2012
- Joel Bodenmann aka Tectu <joel@unormal.org>
-
- 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 <http://www.gnu.org/licenses/>.
-*/
-
-/**
- * @file drivers/touchscreen/MCU/touchscreen_lld_config.h
- * @brief Touchscreen Driver subsystem low level driver.
- *
- * @addtogroup TOUCHSCREEN
- * @{
- */
-
-#ifndef TOUCHSCREEN_LLD_CONFIG_H
-#define TOUCHSCREEN_LLD_CONFIG_H
-
-#if GFX_USE_TOUCHSCREEN /*|| defined(__DOXYGEN__)*/
-
-/*===========================================================================*/
-/* Driver hardware support. */
-/*===========================================================================*/
-
-#define TOUCHSCREEN_HAS_PRESSED TRUE
-#define TOUCHSCREEN_HAS_PRESSURE FALSE
-
-/**
- * @brief The touchscreen driver struct
- * @details Pointer to this will be passed to tsInit()
- */
-struct TouchscreenDriver {
- ADCDriver *adc_driver;
- ioportid_t yd_port;
- ioportmask_t yd_pin;
- ioportid_t yu_port;
- ioportmask_t yu_pin;
- ioportid_t xl_port;
- ioportmask_t xl_pin;
- ioportid_t xr_port;
- ioportmask_t xr_pin;
-};
-
-#endif /* GFX_USE_TOUCHSCREEN */
-
-#endif /* TOUCHSCREEN_LLD_CONFIG_H */
-/** @} */
-
diff --git a/drivers/touchscreen/XPT2046/readme.txt b/drivers/touchscreen/XPT2046/readme.txt deleted file mode 100644 index a81caf67..00000000 --- a/drivers/touchscreen/XPT2046/readme.txt +++ /dev/null @@ -1,8 +0,0 @@ -To use this driver:
-
-1. Add in your halconf.h:
- a) #define GFX_USE_TOUCHSCREEN TRUE
-
-2. To your makefile add the following lines:
- include $(GFXLIB)/drivers/touchscreen/XPT2046/touchscreen_lld.mk
-
diff --git a/drivers/touchscreen/XPT2046/touchscreen_lld.c b/drivers/touchscreen/XPT2046/touchscreen_lld.c deleted file mode 100644 index 2d3689d4..00000000 --- a/drivers/touchscreen/XPT2046/touchscreen_lld.c +++ /dev/null @@ -1,241 +0,0 @@ -/*
- ChibiOS/GFX - Copyright (C) 2012
- Joel Bodenmann aka Tectu <joel@unormal.org>
-
- 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 <http://www.gnu.org/licenses/>.
-*/
-
-/**
- * @file drivers/touchscreen/XPT2046/touchscreen_lld.c
- * @brief Touchscreen Driver subsystem low level driver source.
- *
- * @addtogroup TOUCHSCREEN
- * @{
- */
-
-#include "ch.h"
-#include "hal.h"
-#include "touchscreen.h"
-
-#if GFX_USE_TOUCHSCREEN /*|| defined(__DOXYGEN__)*/
-
-/*===========================================================================*/
-/* Driver local definitions. */
-/*===========================================================================*/
-
-/*===========================================================================*/
-/* Driver exported variables. */
-/*===========================================================================*/
-
-/*===========================================================================*/
-/* Driver local variables. */
-/*===========================================================================*/
-#if !defined(__DOXYGEN__)
- /* Local copy of the current touchpad driver */
- static const TouchscreenDriver *tsDriver;
-
- static uint16_t sampleBuf[7];
-#endif
-
-/*===========================================================================*/
-/* Driver local functions. */
-/*===========================================================================*/
-
-/*===========================================================================*/
-/* Driver interrupt handlers. */
-/*===========================================================================*/
-
-/*===========================================================================*/
-/* Driver exported functions. */
-/*===========================================================================*/
-
-/* ---- Required Routines ---- */
-
-/**
- * @brief Low level Touchscreen driver initialization.
- *
- * @param[in] ts The touchscreen driver struct
- *
- * @notapi
- */
-void ts_lld_init(const TouchscreenDriver *ts) {
- tsDriver = ts;
-
- if(tsDriver->direct_init)
- spiStart(tsDriver->spip, tsDriver->spicfg);
-}
-
-
-/**
- * @brief Reads a conversion from the touchscreen
- *
- * @param[in] cmd The command bits to send to the touchscreen
- *
- * @return The read value 12-bit right-justified
- *
- * @note This function only reads data, it is assumed that the pins are
- * configured properly and the bus has been acquired beforehand
- *
- * @notapi
- */
-uint16_t ts_lld_read_value(uint8_t cmd) {
- static uint8_t txbuf[3] = {0};
- static uint8_t rxbuf[3] = {0};
- uint16_t ret;
-
- txbuf[0] = cmd;
-
- spiExchange(tsDriver->spip, 3, txbuf, rxbuf);
-
- ret = (rxbuf[1] << 5) | (rxbuf[2] >> 3);
-
- return ret;
-}
-
-/**
- * @brief 7-point median filtering code for touchscreen samples
- *
- * @note This is an internally used routine only.
- *
- * @notapi
- */
-static void ts_lld_filter(void) {
- uint16_t temp;
- int i,j;
-
- for(i = 0; i < 4; i++) {
- for(j = i; j < 7; j++) {
- if(sampleBuf[i] > sampleBuf[j]) {
- /* Swap the values */
- temp = sampleBuf[i];
- sampleBuf[i] = sampleBuf[j];
- sampleBuf[j] = temp;
- }
- }
- }
-}
-
-/**
- * @brief Reads out the X direction.
- *
- * @note The samples are median filtered for greater noise reduction
- *
- * @notapi
- */
-uint16_t ts_lld_read_x(void) {
- int i;
-
-#if defined(SPI_USE_MUTUAL_EXCLUSION)
- spiAcquireBus(tsDriver->spip);
-#endif
-
- TOUCHSCREEN_SPI_PROLOGUE();
- palClearPad(tsDriver->spicfg->ssport, tsDriver->spicfg->sspad);
-
- /* Discard the first conversion - very noisy and keep the ADC on hereafter
- * till we are done with the sampling. Note that PENIRQ is disabled.
- */
- ts_lld_read_value(0xD1);
-
- for(i = 0; i < 7; i++) {
- sampleBuf[i] = ts_lld_read_value(0xD1);
- }
-
- /* Switch on PENIRQ once again - perform a dummy read */
- ts_lld_read_value(0xD0);
-
- palSetPad(tsDriver->spicfg->ssport, tsDriver->spicfg->sspad);
- TOUCHSCREEN_SPI_EPILOGUE();
-
-#if defined(SPI_USE_MUTUAL_EXCLUSION)
- spiReleaseBus(tsDriver->spip);
-#endif
-
- /* Find the median - use selection sort */
- ts_lld_filter();
-
- return sampleBuf[3];
-}
-
-/*
- * @brief Reads out the Y direction.
- *
- * @notapi
- */
-uint16_t ts_lld_read_y(void) {
- int i;
-
-#if defined(SPI_USE_MUTUAL_EXCLUSION)
- spiAcquireBus(tsDriver->spip);
-#endif
-
- TOUCHSCREEN_SPI_PROLOGUE();
- palClearPad(tsDriver->spicfg->ssport, tsDriver->spicfg->sspad);
-
- /* Discard the first conversion - very noisy and keep the ADC on hereafter
- * till we are done with the sampling. Note that PENIRQ is disabled.
- */
- ts_lld_read_value(0x91);
-
- for(i = 0; i < 7; i++) {
- sampleBuf[i] = ts_lld_read_value(0x91);
- }
-
- /* Switch on PENIRQ once again - perform a dummy read */
- ts_lld_read_value(0x90);
-
- palSetPad(tsDriver->spicfg->ssport, tsDriver->spicfg->sspad);
- TOUCHSCREEN_SPI_EPILOGUE();
-
-#ifdef SPI_USE_MUTUAL_EXCLUSION
- spiReleaseBus(tsDriver->spip);
-#endif
-
- /* Find the median - use selection sort */
- ts_lld_filter();
-
- return sampleBuf[3];
-}
-
-/* ---- Optional Routines ---- */
-#if TOUCHSCREEN_HAS_PRESSED || defined(__DOXYGEN__)
- /*
- * @brief for checking if touchscreen is pressed or not.
- *
- * @return 1 if pressed / 0 if not pressed
- *
- * @notapi
- */
- uint8_t ts_lld_pressed(void) {
- return (!palReadPad(tsDriver->tsIRQPort, tsDriver->tsIRQPin));
- }
-#endif
-
-#if TOUCHSCREEN_HAS_PRESSURE || defined(__DOXYGEN__)
- /*
- * @brief Reads out the Z direction / pressure.
- *
- * @notapi
- */
- uint16_t ts_lld_read_z(void) {
- /* ToDo */
- return 42;
- }
-#endif
-
-#endif /* GFX_USE_TOUCHSCREEN */
-/** @} */
-
diff --git a/drivers/touchscreen/XPT2046/touchscreen_lld.mk b/drivers/touchscreen/XPT2046/touchscreen_lld.mk deleted file mode 100644 index 39d5caf9..00000000 --- a/drivers/touchscreen/XPT2046/touchscreen_lld.mk +++ /dev/null @@ -1,6 +0,0 @@ -# List the required driver.
-GFXSRC += $(GFXLIB)/drivers/touchscreen/XPT2046/touchscreen_lld.c
-
-# Required include directories
-GFXINC += $(GFXLIB)/drivers/touchscreen/XPT2046
-
diff --git a/drivers/touchscreen/XPT2046/touchscreen_lld_config.h b/drivers/touchscreen/XPT2046/touchscreen_lld_config.h deleted file mode 100644 index 3a030b5d..00000000 --- a/drivers/touchscreen/XPT2046/touchscreen_lld_config.h +++ /dev/null @@ -1,84 +0,0 @@ -/*
- ChibiOS/GFX - Copyright (C) 2012
- Joel Bodenmann aka Tectu <joel@unormal.org>
-
- 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 <http://www.gnu.org/licenses/>.
-*/
-
-/**
- * @file drivers/touchscreen/XPT2046/touchscreen_lld_config.h
- * @brief Touchscreen Driver subsystem low level driver.
- *
- * @addtogroup TOUCHSCREEN
- * @{
- */
-
-#ifndef TOUCHSCREEN_LLD_CONFIG_H
-#define TOUCHSCREEN_LLD_CONFIG_H
-
-#if GFX_USE_TOUCHSCREEN /*|| defined(__DOXYGEN__)*/
-
-/*===========================================================================*/
-/* Driver hardware support. */
-/*===========================================================================*/
-
-#define TOUCHSCREEN_HAS_PRESSED TRUE
-#define TOUCHSCREEN_HAS_PRESSURE TRUE
-
-struct TouchscreenDriver {
- /*
- * @brief Pointer to SPI driver.
- * @note SPI driver must be enabled in mcuconf.h and halconf.h
- */
- SPIDriver *spip;
-
- /*
- * @brief Pointer to the SPI configuration structure.
- * @note The lowest possible speed ~ 1-2MHz is to be used, otherwise
- * will result in a lot of noise
- */
- const SPIConfig *spicfg;
-
- /*
- * @brief Touchscreen controller TPIRQ pin GPIO port
- */
- ioportid_t tsIRQPort;
-
- /*
- * @brief Touchscreen controller TPIRQ GPIO pin
- * @note The interface is polled as of now, interrupt support is
- * to be implemented in the future.
- */
- ioportmask_t tsIRQPin;
-
- /*
- * @brief Initialize the SPI with the configuration struct given or not
- * If TRUE, spiStart is called by the init, otherwise not
- * @note This is provided in such a case when SPI port is being shared
- * across multiple peripherals, so not to disturb the SPI bus.
- * You can use TOUCHSCREEN_SPI_PROLOGUE() and TOUCHSCREEN_SPI_EPILOGUE()
- * macros to change the SPI configuration or speed before and
- * after using the touchpad. An example case would be sharing the
- * bus with a fast flash memory chip.
- */
- bool_t direct_init;
-};
-
-#endif /* GFX_USE_TOUCHSCREEN */
-
-#endif /* TOUCHSCREEN_LLD_CONFIG_H */
-/** @} */
-
|