4 files changed, 12 insertions, 6 deletions

diff --git a/firmware/drivers/synaptics-mep.c b/firmware/drivers/synaptics-mep.c
index 48139534f2..01845bfe0c 100644
--- a/firmware/drivers/synaptics-mep.c
+++ b/firmware/drivers/synaptics-mep.c
@@ -561,6 +561,8 @@ int touchpad_read_device(char *data, int len)
 /* for HDD6330 an absolute packet will follow for sensor nr 0 which we ignore */
 #if defined(PHILIPS_HDD6330)
                 if ((data[3]>>6) == 0) syn_read(tmp, 4);
+                // relay tap gesture packet
+                if (tmp[1]==0x02) { data[1]=0x02; data[2]=0x00; data[3]=0x00; }
 #endif
                 logf(" pos %d", val);
                 logf(" z %d", data[3]);
diff --git a/firmware/target/arm/debug-target.h b/firmware/target/arm/debug-target.h
index 28f95327ad..b7a1f7e5cb 100644
--- a/firmware/target/arm/debug-target.h
+++ b/firmware/target/arm/debug-target.h
@@ -30,16 +30,14 @@
 #   define DEBUG_CANCEL  BUTTON_MENU
 
 #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \
-      (CONFIG_KEYPAD == SANSA_C200_PAD)
+      (CONFIG_KEYPAD == SANSA_C200_PAD) || \
+      (CONFIG_KEYPAD == PHILIPS_HDD6330_PAD)
 #   define DEBUG_CANCEL  BUTTON_LEFT
 
 #elif (CONFIG_KEYPAD == PHILIPS_SA9200_PAD) || \
       (CONFIG_KEYPAD == PHILIPS_HDD1630_PAD)
 #   define DEBUG_CANCEL  BUTTON_POWER
 
-#elif (CONFIG_KEYPAD == PHILIPS_HDD6330_PAD)
-#   define DEBUG_CANCEL  BUTTON_PREV
-
 #elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD)
 #   define DEBUG_CANCEL  BUTTON_PLAY
 
diff --git a/firmware/target/arm/philips/hdd6330/button-hdd6330.c b/firmware/target/arm/philips/hdd6330/button-hdd6330.c
index fc171c72ba..4e40de57ab 100644
--- a/firmware/target/arm/philips/hdd6330/button-hdd6330.c
+++ b/firmware/target/arm/philips/hdd6330/button-hdd6330.c
@@ -26,7 +26,7 @@
 #include "synaptics-mep.h"
 
 /*#define LOGF_ENABLE*/
-#include "logf.h"
+/*#include "logf.h"*/
 
 static int int_btn = BUTTON_NONE;
 #ifndef BOOTLOADER
@@ -78,6 +78,10 @@ void button_int(void)
         if (data[1] & 0x8)
             int_btn |= BUTTON_VIEW;
     }
+    else if ((data[1] & MEP_GESTURE) && (data[3] >> 6) == 0) /* index = 0 */
+    {
+        int_btn |= BUTTON_TAP;
+    }
     else if ((data[0] == MEP_ABSOLUTE_HEADER))
     {
         if (data[1] & MEP_FINGER)
diff --git a/firmware/target/arm/philips/hdd6330/button-target.h b/firmware/target/arm/philips/hdd6330/button-target.h
index 492a5014e5..8d4ed5ef5f 100644
--- a/firmware/target/arm/philips/hdd6330/button-target.h
+++ b/firmware/target/arm/philips/hdd6330/button-target.h
@@ -29,6 +29,7 @@
 #define MEP_BUTTON_ID       0x9
 #define MEP_ABSOLUTE_HEADER 0x0b
 #define MEP_FINGER          0x01
+#define MEP_GESTURE         0x02
 
 #define HAS_BUTTON_HOLD
 
@@ -53,7 +54,8 @@ void button_int(void);
 #define BUTTON_NEXT         0x00000200
 #define BUTTON_PREV         0x00000400
 #define BUTTON_PLAY         0x00000800
-#define BUTTON_MAIN         0x00000fff
+#define BUTTON_TAP          0x00001000
+#define BUTTON_MAIN         0x00001fff
 
 /* No Remote control */
 #define BUTTON_REMOTE 0