diff options
Diffstat (limited to 'firmware/export')
-rw-r--r-- | firmware/export/button.h | 26 | ||||
-rw-r--r-- | firmware/export/config-cowond2.h | 2 | ||||
-rw-r--r-- | firmware/export/config-mrobe500.h | 2 | ||||
-rw-r--r-- | firmware/export/config-ondavx747.h | 2 |
4 files changed, 16 insertions, 16 deletions
diff --git a/firmware/export/button.h b/firmware/export/button.h index f47639b3c7..0b4c8fd2b0 100644 --- a/firmware/export/button.h +++ b/firmware/export/button.h | |||
@@ -60,30 +60,30 @@ void wheel_send_events(bool send); | |||
60 | int button_apply_acceleration(const unsigned int data); | 60 | int button_apply_acceleration(const unsigned int data); |
61 | #endif | 61 | #endif |
62 | 62 | ||
63 | #define BUTTON_NONE 0x00000000 | 63 | #define BUTTON_NONE 0x00000000 |
64 | 64 | ||
65 | /* Button modifiers */ | 65 | /* Button modifiers */ |
66 | #define BUTTON_REL 0x02000000 | 66 | #define BUTTON_REL 0x02000000 |
67 | #define BUTTON_REPEAT 0x04000000 | 67 | #define BUTTON_REPEAT 0x04000000 |
68 | #define BUTTON_TOUCHPAD 0x08000000 | 68 | #define BUTTON_TOUCHSCREEN 0x08000000 |
69 | 69 | ||
70 | #ifdef HAVE_TOUCHPAD | 70 | #ifdef HAVE_TOUCHSCREEN |
71 | #if !defined(BUTTON_TOPLEFT) || !defined(BUTTON_TOPMIDDLE) \ | 71 | #if !defined(BUTTON_TOPLEFT) || !defined(BUTTON_TOPMIDDLE) \ |
72 | || !defined(BUTTON_TOPRIGHT) || !defined(BUTTON_MIDLEFT) \ | 72 | || !defined(BUTTON_TOPRIGHT) || !defined(BUTTON_MIDLEFT) \ |
73 | || !defined(BUTTON_CENTER) || !defined(BUTTON_MIDRIGHT) \ | 73 | || !defined(BUTTON_CENTER) || !defined(BUTTON_MIDRIGHT) \ |
74 | || !defined(BUTTON_BOTTOMLEFT) || !defined(BUTTON_BOTTOMMIDDLE) \ | 74 | || !defined(BUTTON_BOTTOMLEFT) || !defined(BUTTON_BOTTOMMIDDLE) \ |
75 | || !defined(BUTTON_BOTTOMRIGHT) | 75 | || !defined(BUTTON_BOTTOMRIGHT) |
76 | #error Touchpad button mode BUTTON_* defines not set up correctly | 76 | #error Touchscreen button mode BUTTON_* defines not set up correctly |
77 | #endif | 77 | #endif |
78 | enum touchpad_mode { | 78 | enum touchscreen_mode { |
79 | TOUCHPAD_POINT = 0, /* touchpad returns pixel co-ords */ | 79 | TOUCHSCREEN_POINT = 0, /* touchscreen returns pixel co-ords */ |
80 | TOUCHPAD_BUTTON, /* touchpad returns BUTTON_* area codes | 80 | TOUCHSCREEN_BUTTON, /* touchscreen returns BUTTON_* area codes |
81 | actual pixel value will still be accessable | 81 | actual pixel value will still be accessable |
82 | from button_get_data */ | 82 | from button_get_data */ |
83 | }; | 83 | }; |
84 | /* maybe define the number of buttons in button-target.h ? */ | 84 | /* maybe define the number of buttons in button-target.h ? */ |
85 | void touchpad_set_mode(enum touchpad_mode mode); | 85 | void touchscreen_set_mode(enum touchscreen_mode mode); |
86 | enum touchpad_mode touchpad_get_mode(void); | 86 | enum touchscreen_mode touchscreen_get_mode(void); |
87 | #endif | 87 | #endif |
88 | 88 | ||
89 | #endif /* _BUTTON_H_ */ | 89 | #endif /* _BUTTON_H_ */ |
diff --git a/firmware/export/config-cowond2.h b/firmware/export/config-cowond2.h index 828dc076b7..841390b479 100644 --- a/firmware/export/config-cowond2.h +++ b/firmware/export/config-cowond2.h | |||
@@ -60,7 +60,7 @@ | |||
60 | 60 | ||
61 | /* define this to indicate your device's keypad */ | 61 | /* define this to indicate your device's keypad */ |
62 | #define CONFIG_KEYPAD COWOND2_PAD | 62 | #define CONFIG_KEYPAD COWOND2_PAD |
63 | #define HAVE_TOUCHPAD | 63 | #define HAVE_TOUCHSCREEN |
64 | #define HAVE_BUTTON_DATA | 64 | #define HAVE_BUTTON_DATA |
65 | 65 | ||
66 | /* define this if you have a real-time clock */ | 66 | /* define this if you have a real-time clock */ |
diff --git a/firmware/export/config-mrobe500.h b/firmware/export/config-mrobe500.h index d7e172b50f..285a53a014 100644 --- a/firmware/export/config-mrobe500.h +++ b/firmware/export/config-mrobe500.h | |||
@@ -86,7 +86,7 @@ | |||
86 | #define DEFAULT_REMOTE_CONTRAST_SETTING 7 | 86 | #define DEFAULT_REMOTE_CONTRAST_SETTING 7 |
87 | 87 | ||
88 | #define CONFIG_KEYPAD MROBE500_PAD | 88 | #define CONFIG_KEYPAD MROBE500_PAD |
89 | #define HAVE_TOUCHPAD | 89 | #define HAVE_TOUCHSCREEN |
90 | #define HAVE_BUTTON_DATA | 90 | #define HAVE_BUTTON_DATA |
91 | 91 | ||
92 | /* Define this if you do software codec */ | 92 | /* Define this if you do software codec */ |
diff --git a/firmware/export/config-ondavx747.h b/firmware/export/config-ondavx747.h index 1c2be01d93..ffb5e90a75 100644 --- a/firmware/export/config-ondavx747.h +++ b/firmware/export/config-ondavx747.h | |||
@@ -66,7 +66,7 @@ | |||
66 | 66 | ||
67 | #define CONFIG_KEYPAD ONDAVX747_PAD | 67 | #define CONFIG_KEYPAD ONDAVX747_PAD |
68 | #define HAS_BUTTON_HOLD | 68 | #define HAS_BUTTON_HOLD |
69 | #define HAVE_TOUCHPAD | 69 | #define HAVE_TOUCHSCREEN |
70 | #define HAVE_BUTTON_DATA | 70 | #define HAVE_BUTTON_DATA |
71 | 71 | ||
72 | /* Define this if you do software codec */ | 72 | /* Define this if you do software codec */ |