restructure

3 files changed, 0 insertions, 273 deletions

diff --git a/touchpad/touchpad.c b/touchpad/touchpad.c
deleted file mode 100644
index 1ef54190..00000000
--- a/touchpad/touchpad.c
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
-    ChibiOS/RT - Copyright (C) 2012
-                 Joel Bodenmann aka Tectu <joel@unormal.org>
-
-    This file is part of ChibiOS-LCD-Driver.
-
-    ChibiOS-LCD-Driver 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-LCD-Driver 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/>.
-*/
-
-#include "touchpad.h"
-#include "glcd.h"
-
-volatile static struct cal cal = {
-	1, 1, 0, 0
-};
-
-static const SPIConfig spicfg = {
-	NULL,
-	TP_CS_PORT,
-	TP_CS,
-	SPI_CR1_SPE | SPI_CR1_BR_2 | SPI_CR1_BR_1 | SPI_CR1_BR_0,
-};
-
-void tpInit(SPIDriver *spip) {
-	spiStart(spip, &spicfg);	
-}
-
-uint8_t tpIRQ(void) {
-	return (!palReadPad(TP_IRQ_PORT, TP_IRQ));
-}
-
-static uint16_t tpReadRealX(void) {
-	uint32_t results = 0;
-	uint16_t i, x;
-
-	for(i=0; i<CONVERSIONS; i++) {
-		lld_tpReadX();	
-		results += lld_tpReadX();
-	}
-
-	x = (((SCREEN_WIDTH-1) * (results/CONVERSIONS)) / 2048);
-
-	return x;
-}
-
-static uint16_t tpReadRealY(void) {
-	uint32_t results = 0;
-	uint16_t i, y;
-
-	for(i=0; i<CONVERSIONS; i++) {
-		lld_tpReadY();
-		results += lld_tpReadY();
-	}
-
-	y = (((SCREEN_HEIGHT-1) * (results/CONVERSIONS)) / 2048);
-
-	return y;
-}
-
-uint16_t tpReadX(void) {
-	uint16_t x, y;
-
-	x = cal.xm * tpReadRealX() + cal.xn;
-	y = cal.ym * tpReadRealY() + cal.yn;
-
-	switch(lcdGetOrientation()) {
-		case portrait:
-			return x;
-		case landscape:
-			return SCREEN_HEIGHT - y;
-		case portraitInv:
-			return SCREEN_WIDTH - x;
-		case landscapeInv:
-			return y;
-	}
-
-	return x;
-}
-
-uint16_t tpReadY(void) {
-	uint16_t x, y;
-
-	x = cal.xm * tpReadRealX() + cal.xn;
-	y = cal.ym * tpReadRealY() + cal.yn;
-
-	switch(lcdGetOrientation()) {
-		case portrait:
-			return y;
-		case landscape:
-			return x;
-		case portraitInv:
-			return SCREEN_HEIGHT - y;
-		case landscapeInv:
-			return SCREEN_WIDTH - x;
-	}
-
-	return y;
-}
-
-uint16_t tpReadZ(void) {
-	return lld_tpReadZ();
-}
-
-static void tpDrawCross(uint16_t x, uint16_t y) {
-	lcdDrawLine(x-15, y, x-2, y, 0xffff);
-	lcdDrawLine(x+2, y, x+15, y, 0xffff);
-	lcdDrawLine(x, y-15, x, y-2, 0xffff);
-	lcdDrawLine(x, y+2, x, y+15, 0xffff);
-  
-	lcdDrawLine(x-15, y+15, x-7, y+15, RGB565CONVERT(184,158,131));
-	lcdDrawLine(x-15, y+7, x-15, y+15, RGB565CONVERT(184,158,131));
-
-	lcdDrawLine(x-15, y-15, x-7, y-15, RGB565CONVERT(184,158,131));
-	lcdDrawLine(x-15, y-7, x-15, y-15, RGB565CONVERT(184,158,131));
-
-	lcdDrawLine(x+7, y+15, x+15, y+15, RGB565CONVERT(184,158,131));
-	lcdDrawLine(x+15, y+7, x+15, y+15, RGB565CONVERT(184,158,131));
-
-	lcdDrawLine(x+7, y-15, x+15, y-15, RGB565CONVERT(184,158,131));
-	lcdDrawLine(x+15, y-15, x+15, y-7, RGB565CONVERT(184,158,131));    
-}
-
-void tpCalibrate(void) {
-	uint16_t cross[2][2] = {{40,40}, {200, 280}};
-	uint16_t points[2][2];
-	uint8_t i;
-
-	lcdSetOrientation(portrait);
-	lcdClear(Red);
-	/* Abhishek: need to specify a font to use here, should probably make sure it exists somehow */
-	lcdDrawString(40, 10, "Touchpad Calibration", font_Larger, White, Red, solid);
-
-	for(i = 0; i < 2; i++) {
-		tpDrawCross(cross[i][0], cross[i][1]);
-		while(!tpIRQ());
-		points[i][0] = tpReadRealX();
-		points[i][1] = tpReadRealY();
-		while(tpIRQ());
-		lcdFillArea(cross[i][0]-15, cross[i][1]-15, cross[i][0]+16, cross[i][1]+16, Red);
-	}
-
-	cal.xm = ((float)cross[1][0] - (float)cross[0][0]) / ((float)points[1][0] - (float)points[0][0]);
-	cal.ym = ((float)cross[1][1] - (float)cross[0][1]) / ((float)points[1][1] - (float)points[0][1]);
-
-	cal.xn = (float)cross[0][0] - cal.xm * (float)points[0][0];
-	cal.yn = (float)cross[0][1] - cal.ym * (float)points[0][1];
-
-	lcdSetWindow(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT);
-}
-
diff --git a/touchpad/touchpad.h b/touchpad/touchpad.h
deleted file mode 100644
index e62f4bba..00000000
--- a/touchpad/touchpad.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
-    ChibiOS/RT - Copyright (C) 2012
-                 Joel Bodenmann aka Tectu <joel@unormal.org>
-
-    This file is part of ChibiOS-LCD-Driver.
-
-    ChibiOS-LCD-Driver 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-LCD-Driver 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/>.
-*/
-
-#ifndef TOUCHPAD_H
-#define TOUCHPAD_H
-
-#include "ch.h"
-#include "hal.h"
-#include "glcd.h"
-#include "glcdconf.h"
-#include "ads7843_lld.h"
-#include "xpt2046_lld.h"
-
-#define CONVERSIONS 3
-
-#define TP_CS_HIGH		palSetPad(TP_CS_PORT, TP_CS)
-#define TP_CS_LOW		palClearPad(TP_CS_PORT, TP_CS)
-
-struct cal {
-	float xm;
-	float ym;
-	float xn;
-	float yn;
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/*
- * Description: initializes touchpad (SPI)
- *
- * param: SPI driver
- *
- * return: none
- */
-void tpInit(SPIDriver *spip);
-
-/*
- * Description: reads out PEN_IRQ from touchpad controller
- *
- * param: none
- *
- * return: 1 = touchpad pressed / 0 = touchpad not pressed
- */
-uint8_t tpIRQ(void);
-
-/*
- * Description: reads-out X coordinate, calibrated
- *
- * param: none
- *
- * return: X coordinate, relative to screen zero-point
- */
-uint16_t tpReadX(void);
-
-/*
- * Description: reads-out Y coordinate, calibrated
- *
- * param: none
- *
- * return: Y coordinate, relative to screen zero-point
- */
-uint16_t tpReadY(void);
-
-/*
- * Description: reads-out Z value / pressure
- *				only available when controller supports, returns
- *				zero otherwise.
- *
- * param:		none
- *
- * return:		pressure on the touchpad
- */
-uint16_t tpReadZ(void);
-
-/*
- * Description: calibration routine
- *
- * param: none
- *
- * return: none
- */
-void tpCalibrate(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
diff --git a/touchpad/touchpad.mk b/touchpad/touchpad.mk
deleted file mode 100644
index de27ae0d..00000000
--- a/touchpad/touchpad.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-LCD_TOUCHPAD_SRC =		$(LCDLIB)/touchpad/touchpad.c 
-
-LCD_TOUCHPAD_INC =		$(LCDLIB)/touchpad