summaryrefslogtreecommitdiffstats
path: root/firmware
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2008-04-15 10:35:11 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2008-04-15 10:35:11 +0000
commit5b5a626bb6ba54ccdcd90741cea5f9cbd0f79553 (patch)
tree0bf60b83aad534757330162ad4f683f142955ccb /firmware
parent50851794a6bdd585ce70ecb430b1f798fb90936b (diff)
downloadrockbox-5b5a626bb6ba54ccdcd90741cea5f9cbd0f79553.tar.gz
rockbox-5b5a626bb6ba54ccdcd90741cea5f9cbd0f79553.tar.bz2
rockbox-5b5a626bb6ba54ccdcd90741cea5f9cbd0f79553.zip
Setup the touchpads to have two modes - stylus and button - and set them in button mode by default.
in button mode the touchpad is split into a 3x3 grid for 9 seperate buttons which can be used by the action system like real buttons. Unify the keymap file for the touchpads in button mode. the target keymap file only needs to worry about real buttons. (As these ports mature each screen will need to be fixed seperatly to be able to use stylus mode (the lists can already but don't change mode just yet.) git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17114 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r--firmware/export/button.h19
-rw-r--r--firmware/export/config-cowond2.h1
-rw-r--r--firmware/target/arm/tcc780x/cowond2/button-target.h23
-rw-r--r--firmware/target/arm/tms320dm320/mrobe-500/button-mr500.c32
-rw-r--r--firmware/target/arm/tms320dm320/mrobe-500/button-target.h20
5 files changed, 85 insertions, 10 deletions
diff --git a/firmware/export/button.h b/firmware/export/button.h
index 95da7adc42..6decf6ec69 100644
--- a/firmware/export/button.h
+++ b/firmware/export/button.h
@@ -64,4 +64,23 @@ int button_apply_acceleration(const unsigned int data);
#define BUTTON_REPEAT 0x04000000
#define BUTTON_TOUCHPAD 0x08000000
+#ifdef HAVE_TOUCHPAD
+#if !defined(BUTTON_TOPLEFT) || !defined(BUTTON_TOPMIDDLE) \
+ || !defined(BUTTON_TOPRIGHT) || !defined(BUTTON_MIDLEFT) \
+ || !defined(BUTTON_CENTER) || !defined(BUTTON_MIDRIGHT) \
+ || !defined(BUTTON_BOTTOMLEFT) || !defined(BUTTON_BOTTOMMIDDLE) \
+ || !defined(BUTTON_BOTTOMRIGHT)
+#error Touchpad button mode BUTTON_* defines not set up correctly
+#endif
+enum touchpad_mode {
+ TOUCHPAD_POINT = 0, /* touchpad returns pixel co-ords */
+ TOUCHPAD_BUTTON, /* touchpad returns BUTTON_* area codes
+ actual pixel value will still be accessable
+ from button_get_data */
+};
+/* maybe define the number of buttons in button-target.h ? */
+void touchpad_set_mode(enum touchpad_mode mode);
+enum touchpad_mode touchpad_get_mode(void);
+#endif
+
#endif /* _BUTTON_H_ */
diff --git a/firmware/export/config-cowond2.h b/firmware/export/config-cowond2.h
index 9380de57ef..d3b23b225d 100644
--- a/firmware/export/config-cowond2.h
+++ b/firmware/export/config-cowond2.h
@@ -56,6 +56,7 @@
/* define this to indicate your device's keypad */
#define CONFIG_KEYPAD COWOND2_PAD
+#define HAVE_TOUCHPAD
/* define this if you have a real-time clock */
//#define CONFIG_RTC RTC_TCC780X
diff --git a/firmware/target/arm/tcc780x/cowond2/button-target.h b/firmware/target/arm/tcc780x/cowond2/button-target.h
index 3ccf70cffd..573ab03a11 100644
--- a/firmware/target/arm/tcc780x/cowond2/button-target.h
+++ b/firmware/target/arm/tcc780x/cowond2/button-target.h
@@ -35,14 +35,25 @@ int button_read_device(void);
#define BUTTON_MINUS 0x00000004
#define BUTTON_MENU 0x00000008
+/* compatibility hacks
+ not mapped to the touchpad button areas because
+ the touchpad is not always in that mode */
+#define BUTTON_LEFT BUTTON_MINUS
+#define BUTTON_RIGHT BUTTON_PLUS
+
/* Faked buttons based on touchscreen quadrants (not yet read) */
-#define BUTTON_UP 0x00000020
-#define BUTTON_DOWN 0x00000040
-#define BUTTON_LEFT 0x00000080
-#define BUTTON_RIGHT 0x00000100
-#define BUTTON_SELECT 0x00000200
+/* Touchpad Screen Area Buttons */
+#define BUTTON_TOPLEFT 0x00000010
+#define BUTTON_TOPMIDDLE 0x00000020
+#define BUTTON_TOPRIGHT 0x00000040
+#define BUTTON_MIDLEFT 0x00000080
+#define BUTTON_CENTER 0x00000100
+#define BUTTON_MIDRIGHT 0x00000200
+#define BUTTON_BOTTOMLEFT 0x00000400
+#define BUTTON_BOTTOMMIDDLE 0x00000800
+#define BUTTON_BOTTOMRIGHT 0x00001000
-#define BUTTON_MAIN 0x3FF
+#define BUTTON_MAIN 0x1FFF
/* No remote */
#define BUTTON_REMOTE 0
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/button-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/button-mr500.c
index 0eb1c07e74..d1fd2eb702 100644
--- a/firmware/target/arm/tms320dm320/mrobe-500/button-mr500.c
+++ b/firmware/target/arm/tms320dm320/mrobe-500/button-mr500.c
@@ -40,6 +40,22 @@
static short last_x, last_y, last_z1, last_z2; /* for the touch screen */
static bool touch_available = false;
+static enum touchpad_mode current_mode = TOUCHPAD_POINT;
+static int touchpad_buttons[3][3] = {
+ {BUTTON_TOPLEFT, BUTTON_TOPMIDDLE, BUTTON_TOPRIGHT},
+ {BUTTON_MIDLEFT, BUTTON_CENTER, BUTTON_MIDRIGHT},
+ {BUTTON_BOTTOMLEFT, BUTTON_BOTTOMMIDDLE, BUTTON_BOTTOMRIGHT},
+};
+
+void touchpad_set_mode(enum touchpad_mode mode)
+{
+ current_mode = mode;
+}
+enum touchpad_mode touchpad_get_mode(void)
+{
+ return current_mode;
+}
+
static struct touch_calibration_point topleft, bottomright;
/* Jd's tests.. These will hopefully work for everyone so we dont have to
@@ -165,7 +181,19 @@ int button_read_device(int *data)
last_x = x;
last_y = y;
*data = touch_to_pixels(x, y);
- r_button |= BUTTON_TOUCHPAD;
+ switch (current_mode)
+ {
+ case TOUCHPAD_POINT:
+ r_button |= BUTTON_TOUCHPAD;
+ break;
+ case TOUCHPAD_BUTTON:
+ {
+ int px_x = ((*data&0xffff0000)>>16), px_y = ((*data&0x0000ffff));
+ r_button |= touchpad_buttons[px_y/(LCD_HEIGHT/3)][px_x/(LCD_WIDTH/3)];
+ oldbutton = r_button;
+ break;
+ }
+ }
}
last_touch = current_tick;
touch_available = false;
@@ -219,6 +247,6 @@ void GIO14(void)
read_battery_inputs();
break;
}
- touch_available = true;
+ //touch_available = true;
IO_INTC_IRQ2 = (1<<3); /* IRQ_GIO14 == 35 */
}
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/button-target.h b/firmware/target/arm/tms320dm320/mrobe-500/button-target.h
index 1f17f3f3c8..ae23346814 100644
--- a/firmware/target/arm/tms320dm320/mrobe-500/button-target.h
+++ b/firmware/target/arm/tms320dm320/mrobe-500/button-target.h
@@ -53,14 +53,30 @@ void use_calibration(bool enable);
#define BUTTON_TOUCH 0x00000200
-/* compatibility hacks */
+/* Touchpad Screen Area Buttons */
+#define BUTTON_TOPLEFT 0x00004000
+#define BUTTON_TOPMIDDLE 0x00008000
+#define BUTTON_TOPRIGHT 0x00010000
+#define BUTTON_MIDLEFT 0x00020000
+#define BUTTON_CENTER 0x00040000
+#define BUTTON_MIDRIGHT 0x00080000
+#define BUTTON_BOTTOMLEFT 0x00100000
+#define BUTTON_BOTTOMMIDDLE 0x00200000
+#define BUTTON_BOTTOMRIGHT 0x00400000
+
+/* compatibility hacks
+ not mapped to the touchpad button areas because
+ the touchpad is not always in that mode */
#define BUTTON_LEFT BUTTON_RC_REW
#define BUTTON_RIGHT BUTTON_RC_FF
#define POWEROFF_BUTTON BUTTON_POWER
#define POWEROFF_COUNT 10
-#define BUTTON_MAIN BUTTON_POWER
+#define BUTTON_MAIN (BUTTON_POWER| \
+ BUTTON_TOPLEFT|BUTTON_TOPMIDDLE|BUTTON_TOPRIGHT \
+ BUTTON_MIDLEFT|BUTTON_CENTER|BUTTON_MIDRIGHT \
+ BUTTON_BOTTOMLEFT|BUTTON_BOTTOMMIDDLE|BUTTON_BOTTOMRIGHT)
#define BUTTON_REMOTE (BUTTON_RC_HEART|BUTTON_RC_MODE| \
BUTTON_RC_VOL_DOWN|BUTTON_RC_VOL_UP| \