summaryrefslogtreecommitdiffstats
path: root/firmware/target/arm/tcc780x
diff options
context:
space:
mode:
authorRob Purchase <shotofadds@rockbox.org>2009-10-15 20:13:29 +0000
committerRob Purchase <shotofadds@rockbox.org>2009-10-15 20:13:29 +0000
commitd29114c67187107dc558cc103d79f76af904f464 (patch)
treee1908562719adc3310940030199ff11023fd7d0f /firmware/target/arm/tcc780x
parent562e41bae5b76abd49eceebf8324a445a4b82450 (diff)
downloadrockbox-d29114c67187107dc558cc103d79f76af904f464.tar.gz
rockbox-d29114c67187107dc558cc103d79f76af904f464.zip
Touchscreen support for newer Cowon D2+ hardware revisions (using TSC200x touchscreen controller).
Flyspray: FS#10671 Author: Jonas Aaberg git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23194 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm/tcc780x')
-rw-r--r--firmware/target/arm/tcc780x/cowond2/button-cowond2.c139
-rw-r--r--firmware/target/arm/tcc780x/cowond2/button-target.h1
-rw-r--r--firmware/target/arm/tcc780x/cowond2/power-cowond2.c3
-rw-r--r--firmware/target/arm/tcc780x/cowond2/touchscreen-cowond2.c233
-rw-r--r--firmware/target/arm/tcc780x/cowond2/touchscreen-target.h30
5 files changed, 269 insertions, 137 deletions
diff --git a/firmware/target/arm/tcc780x/cowond2/button-cowond2.c b/firmware/target/arm/tcc780x/cowond2/button-cowond2.c
index 30d81fa059..df2ea1f307 100644
--- a/firmware/target/arm/tcc780x/cowond2/button-cowond2.c
+++ b/firmware/target/arm/tcc780x/cowond2/button-cowond2.c
@@ -23,94 +23,9 @@
#include "cpu.h"
#include "button.h"
#include "adc.h"
-#include "pcf50606.h"
#include "backlight.h"
-#include "touchscreen.h"
-#include "stdlib.h"
-
-#define NO_OF_TOUCH_DATA 5
-
-static bool touch_available = false;
-static short x[NO_OF_TOUCH_DATA], y[NO_OF_TOUCH_DATA];
-
-/* comparator for qsort */
-static int short_cmp(const void *a, const void *b)
-{
- return *(short*)a - *(short*)b;
-}
-
-void button_read_touch()
-{
- static long last_touch_interrupt = 0;
- static int touch_data_index = 0;
-
- /* don't read the coordinates when hold is enabled */
- if (button_hold()) return;
-
- /* put the touchscreen into idle mode */
- pcf50606_write(PCF5060X_ADCC1, 0);
-
- if (TIME_AFTER(current_tick, last_touch_interrupt + 1))
- {
- /* resets the index if the last touch could not be read 5 times */
- touch_data_index = 0;
- }
-
- /* here the touch coordinates are read 5 times */
- /* they will be sorted and the middle one will be used */
- pcf50606_read_adc(PCF5060X_ADC_TSC_XY,
- &x[touch_data_index], &y[touch_data_index]);
-
- touch_data_index++;
-
- if (touch_data_index > NO_OF_TOUCH_DATA - 1)
- {
- /* coordinates 5 times read */
- touch_available = true;
- touch_data_index = 0;
- }
- else
- {
- /* put the touchscreen back into the interrupt mode */
- pcf50606_write(PCF5060X_ADCC1, 1);
- }
- last_touch_interrupt = current_tick;
-}
-
-struct touch_calibration_point {
- short px_x; /* known pixel value */
- short px_y;
- short val_x; /* touchscreen value at the known pixel */
- short val_y;
-};
-
-static struct touch_calibration_point topleft, bottomright;
-
-static int touch_to_pixels(short val_x, short val_y)
-{
- short x,y;
-
- x=val_x;
- y=val_y;
-
- x = (x-topleft.val_x)*(bottomright.px_x - topleft.px_x)
- / (bottomright.val_x - topleft.val_x) + topleft.px_x;
-
- y = (y-topleft.val_y)*(bottomright.px_y - topleft.px_y)
- / (bottomright.val_y - topleft.val_y) + topleft.px_y;
-
- if (x < 0)
- x = 0;
- else if (x>=LCD_WIDTH)
- x=LCD_WIDTH-1;
-
- if (y < 0)
- y = 0;
- else if (y>=LCD_HEIGHT)
- y=LCD_HEIGHT-1;
-
- return (x<<16)|y;
-}
+#include "touchscreen-target.h"
+#include <stdlib.h>
void button_init_device(void)
{
@@ -120,18 +35,7 @@ void button_init_device(void)
/* Configure GPIOB 4 (button pressed) for input */
GPIOB_DIR &= ~0x10;
- touch_available = false;
-
- /* Arbitrary touchscreen calibration */
- topleft.px_x = 0;
- topleft.px_y = 0;
- topleft.val_x = 50;
- topleft.val_y = 50;
-
- bottomright.px_x = LCD_WIDTH;
- bottomright.px_y = LCD_HEIGHT;
- bottomright.val_x = 980;
- bottomright.val_y = 980;
+ touchscreen_init_device();
}
bool button_hold(void)
@@ -147,8 +51,6 @@ int button_read_device(int *data)
static bool hold_button = false;
bool hold_button_old;
- static bool touch_hold = false;
- static long last_touch = 0;
*data = old_data;
@@ -185,40 +87,7 @@ int button_read_device(int *data)
}
}
- if (touch_available || touch_hold)
- {
- short x_touch, y_touch;
- static short last_x = 0, last_y = 0;
-
- if (touch_hold)
- {
- /* get rid of very fast unintended double touches */
- x_touch = last_x;
- y_touch = last_y;
- }
- else
- {
- /* sort the 5 data taken and use the median value */
- qsort(x, NO_OF_TOUCH_DATA, sizeof(short), short_cmp);
- qsort(y, NO_OF_TOUCH_DATA, sizeof(short), short_cmp);
- x_touch = last_x = x[(NO_OF_TOUCH_DATA - 1)/2];
- y_touch = last_y = y[(NO_OF_TOUCH_DATA - 1)/2];
- last_touch = current_tick;
- touch_hold = true;
- touch_available = false;
- }
- old_data = *data = touch_to_pixels(x_touch, y_touch);
- btn |= touchscreen_to_pixels((*data&0xffff0000)>>16,
- (*data&0x0000ffff),
- data);
- }
-
- if (TIME_AFTER(current_tick, last_touch + 10))
- {
- /* put the touchscreen back into interrupt mode */
- touch_hold = false;
- pcf50606_write(PCF5060X_ADCC1, 1);
- }
+ btn |= touchscreen_read_device(data, &old_data);
if (!(GPIOA & 0x4))
btn |= BUTTON_POWER;
diff --git a/firmware/target/arm/tcc780x/cowond2/button-target.h b/firmware/target/arm/tcc780x/cowond2/button-target.h
index ce6e2884a9..7d3736fe67 100644
--- a/firmware/target/arm/tcc780x/cowond2/button-target.h
+++ b/firmware/target/arm/tcc780x/cowond2/button-target.h
@@ -30,7 +30,6 @@
bool button_hold(void);
void button_init_device(void);
int button_read_device(int *data);
-void button_read_touch(void);
/* Main unit's buttons */
#define BUTTON_POWER 0x00000001
diff --git a/firmware/target/arm/tcc780x/cowond2/power-cowond2.c b/firmware/target/arm/tcc780x/cowond2/power-cowond2.c
index d5f4ec9768..dfd692ecab 100644
--- a/firmware/target/arm/tcc780x/cowond2/power-cowond2.c
+++ b/firmware/target/arm/tcc780x/cowond2/power-cowond2.c
@@ -25,6 +25,7 @@
#include "pcf50606.h"
#include "pcf50635.h"
#include "button-target.h"
+#include "touchscreen-target.h"
#include "tuner.h"
#include "backlight-target.h"
#include "powermgmt.h"
@@ -101,7 +102,7 @@ void EXT3(void)
if (data[2] & 0x08)
{
/* Touchscreen event, do something about it */
- button_read_touch();
+ touchscreen_handle_device_irq();
}
}
#endif
diff --git a/firmware/target/arm/tcc780x/cowond2/touchscreen-cowond2.c b/firmware/target/arm/tcc780x/cowond2/touchscreen-cowond2.c
new file mode 100644
index 0000000000..d6483886ad
--- /dev/null
+++ b/firmware/target/arm/tcc780x/cowond2/touchscreen-cowond2.c
@@ -0,0 +1,233 @@
+/***************************************************************************
+ * __________ __ ___.
+ * Open \______ \ ____ ____ | | _\_ |__ _______ ___
+ * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
+ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
+ * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
+ * \/ \/ \/ \/ \/
+ * $Id$
+ *
+ * Copyright (C) 2009 by Rob Purchase, Carsten Schreiter, Jonas Aaberg
+ *
+ * This program 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 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
+#include "config.h"
+#include "button.h"
+#include "pcf50606.h"
+#include "touchscreen.h"
+#include "stdlib.h"
+#include "power-target.h"
+#include "tsc200x.h"
+
+#define NO_OF_TOUCH_DATA 5
+
+static bool touch_available = false;
+
+static short x[NO_OF_TOUCH_DATA], y[NO_OF_TOUCH_DATA];
+
+/* comparator for qsort */
+static int short_cmp(const void *a, const void *b)
+{
+ return *(short*)a - *(short*)b;
+}
+
+struct touch_calibration_point {
+ short px_x; /* known pixel value */
+ short px_y;
+ short val_x; /* touchscreen value at the known pixel */
+ short val_y;
+};
+
+static struct touch_calibration_point topleft, bottomright;
+
+static int touch_to_pixels(short val_x, short val_y)
+{
+ short x, y;
+
+ x = val_x;
+ y = val_y;
+
+ x = (x - topleft.val_x) * (bottomright.px_x - topleft.px_x)
+ / (bottomright.val_x - topleft.val_x) + topleft.px_x;
+
+ y = (y - topleft.val_y) * (bottomright.px_y - topleft.px_y)
+ / (bottomright.val_y - topleft.val_y) + topleft.px_y;
+
+ if (x < 0)
+ x = 0;
+ else if (x >= LCD_WIDTH)
+ x = LCD_WIDTH - 1;
+
+ if (y < 0)
+ y = 0;
+ else if (y >= LCD_HEIGHT)
+ y = LCD_HEIGHT - 1;
+
+ return (x << 16) | y;
+}
+
+static int touchscreen_read_pcf50606(int *data, int *old_data)
+{
+ int btn = BUTTON_NONE;
+ static bool touch_hold = false;
+ static long last_touch = 0;
+
+ if (touch_available || touch_hold)
+ {
+ short x_touch, y_touch;
+ static short last_x = 0, last_y = 0;
+
+ if (touch_hold)
+ {
+ /* get rid of very fast unintended double touches */
+ x_touch = last_x;
+ y_touch = last_y;
+ }
+ else
+ {
+ /* sort the 5 data taken and use the median value */
+ qsort(x, NO_OF_TOUCH_DATA, sizeof(short), short_cmp);
+ qsort(y, NO_OF_TOUCH_DATA, sizeof(short), short_cmp);
+
+ x_touch = last_x = x[(NO_OF_TOUCH_DATA - 1)/2];
+ y_touch = last_y = y[(NO_OF_TOUCH_DATA - 1)/2];
+
+ last_touch = current_tick;
+
+ touch_hold = true;
+ touch_available = false;
+ }
+
+ *old_data = *data = touch_to_pixels(x_touch, y_touch);
+
+ btn |= touchscreen_to_pixels((*data&0xffff0000) >> 16,
+ (*data&0x0000ffff),
+ data);
+ }
+
+ if (TIME_AFTER(current_tick, last_touch + 10))
+ {
+ /* put the touchscreen back into interrupt mode */
+ touch_hold = false;
+ pcf50606_write(PCF5060X_ADCC1, 1);
+ }
+
+ return btn;
+}
+
+static int touchscreen_read_tsc200x(int *data, int *old_data)
+{
+ int btn = BUTTON_NONE;
+ short x_touch, y_touch;
+
+ static long last_read = 0;
+ static int last_btn = BUTTON_NONE;
+
+ /* Don't read hw every check button round. I2C is slow
+ * and man is even slower. */
+ if (TIME_BEFORE(current_tick, last_read + 10))
+ {
+ *data = *old_data;
+ return last_btn;
+ }
+
+ if (tsc200x_is_pressed())
+ {
+ if (tsc200x_read_coords(&x_touch, &y_touch))
+ {
+ *old_data = *data = touch_to_pixels(x_touch, y_touch);
+
+ btn = touchscreen_to_pixels((*data & 0xffff0000) >> 16,
+ (*data & 0x0000ffff),
+ data);
+
+ last_btn = btn;
+ }
+ }
+
+ last_read = current_tick;
+
+ return btn;
+}
+
+void touchscreen_init_device(void)
+{
+ touch_available = false;
+
+ /* Arbitrary touchscreen calibration */
+ topleft.px_x = 0;
+ topleft.px_y = 0;
+
+ bottomright.px_x = LCD_WIDTH;
+ bottomright.px_y = LCD_HEIGHT;
+
+ topleft.val_x = 50;
+ topleft.val_y = 50;
+
+ bottomright.val_x = 980;
+ bottomright.val_y = 980;
+
+ if (get_pmu_type() != PCF50606)
+ {
+ tsc200x_init();
+ }
+}
+
+void touchscreen_handle_device_irq(void)
+{
+ static long last_touch_interrupt = 0;
+ static int touch_data_index = 0;
+
+ /* don't read the coordinates when hold is enabled */
+ if (button_hold()) return;
+
+ /* put the touchscreen into idle mode */
+ pcf50606_write(PCF5060X_ADCC1, 0);
+
+ if (TIME_AFTER(current_tick, last_touch_interrupt + 1))
+ {
+ /* resets the index if the last touch could not be read 5 times */
+ touch_data_index = 0;
+ }
+
+ /* here the touch coordinates are read 5 times */
+ /* they will be sorted and the middle one will be used */
+ pcf50606_read_adc(PCF5060X_ADC_TSC_XY,
+ &x[touch_data_index], &y[touch_data_index]);
+
+ touch_data_index++;
+
+ if (touch_data_index > NO_OF_TOUCH_DATA - 1)
+ {
+ /* coordinates 5 times read */
+ touch_available = true;
+ touch_data_index = 0;
+ }
+ else
+ {
+ /* put the touchscreen back into the interrupt mode */
+ pcf50606_write(PCF5060X_ADCC1, 1);
+ }
+ last_touch_interrupt = current_tick;
+}
+
+
+int touchscreen_read_device(int *data, int *old_data)
+{
+ int btn;
+
+ if (get_pmu_type() == PCF50606)
+ btn = touchscreen_read_pcf50606(data, old_data);
+ else
+ btn = touchscreen_read_tsc200x(data, old_data);
+
+ return btn;
+}
diff --git a/firmware/target/arm/tcc780x/cowond2/touchscreen-target.h b/firmware/target/arm/tcc780x/cowond2/touchscreen-target.h
new file mode 100644
index 0000000000..be18aed723
--- /dev/null
+++ b/firmware/target/arm/tcc780x/cowond2/touchscreen-target.h
@@ -0,0 +1,30 @@
+/***************************************************************************
+ * __________ __ ___.
+ * Open \______ \ ____ ____ | | _\_ |__ _______ ___
+ * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
+ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
+ * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
+ * \/ \/ \/ \/ \/
+ * $Id$
+ *
+ * Copyright (C) 2009 by Jonas Aaberg
+ *
+ * This program 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 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+#ifndef _TOUCHSCREEN_TARGET_H_
+#define _TOUCHSCREEN_TARGET_H_
+
+#include "config.h"
+
+void touchscreen_init_device(void);
+int touchscreen_read_device(int *data, int *old_data);
+void touchscreen_handle_device_irq(void);
+
+#endif