1 files changed, 27 insertions, 6 deletions

diff --git a/apps/plugins/sudoku/sudoku.h b/apps/plugins/sudoku/sudoku.h
index 3fc8dbe0e0..2cd9198af9 100644
--- a/apps/plugins/sudoku/sudoku.h
+++ b/apps/plugins/sudoku/sudoku.h
@@ -172,18 +172,39 @@
 
 #elif (CONFIG_KEYPAD == COWOND2_PAD)
 #define SUDOKU_BUTTON_QUIT BUTTON_POWER
-#define SUDOKU_BUTTON_UP BUTTON_UP
-#define SUDOKU_BUTTON_DOWN BUTTON_DOWN
-#define SUDOKU_BUTTON_LEFT BUTTON_LEFT
-#define SUDOKU_BUTTON_RIGHT BUTTON_RIGHT
-#define SUDOKU_BUTTON_TOGGLE BUTTON_PLUS
 #define SUDOKU_BUTTON_MENU BUTTON_MENU
-#define SUDOKU_BUTTON_POSSIBLE BUTTON_MINUS
 
 #else
 #error No keymap defined!
 #endif
 
+#ifdef HAVE_TOUCHPAD
+#ifndef SUDOKU_BUTTON_QUIT
+#define SUDOKU_BUTTON_QUIT     BUTTON_TOPLEFT
+#endif
+#ifndef SUDOKU_BUTTON_UP
+#define SUDOKU_BUTTON_UP       BUTTON_TOPMIDDLE
+#endif
+#ifndef SUDOKU_BUTTON_DOWN
+#define SUDOKU_BUTTON_DOWN     BUTTON_BOTTOMMIDDLE
+#endif
+#ifndef SUDOKU_BUTTON_LEFT
+#define SUDOKU_BUTTON_LEFT     BUTTON_MIDLEFT
+#endif
+#ifndef SUDOKU_BUTTON_RIGHT
+#define SUDOKU_BUTTON_RIGHT    BUTTON_MIDRIGHT
+#endif
+#ifndef SUDOKU_BUTTON_TOGGLE
+#define SUDOKU_BUTTON_TOGGLE   BUTTON_CENTER
+#endif
+#ifndef SUDOKU_BUTTON_MENU
+#define SUDOKU_BUTTON_MENU     BUTTON_TOPRIGHT
+#endif
+#ifndef SUDOKU_BUTTON_POSSIBLE
+#define SUDOKU_BUTTON_POSSIBLE BUTTON_BOTTOMLEFT
+#endif
+#endif
+
 struct sudoku_state_t {
   char filename[MAX_PATH];  /* Filename */
   char startboard[9][9];    /* The initial state of the game */