xduoo_x3ii: Improvements in the meymappings!

 * PREV/NEXT now swapped so they do what is expected in most contexts
 * List and setting context retains prior behavior
 * Enable the ADC that reads the headset remote and map the keys.
 * As ADC-based remote "events" arrive as press/release pairs,
   delay the button release.

Change-Id: I22d4eac3bfe1573b50eca795cf377bdafdeb5336

1 files changed, 13 insertions, 2 deletions

diff --git a/firmware/target/hosted/xduoo/button-xduoo.c b/firmware/target/hosted/xduoo/button-xduoo.c
index f5b6c6be62..2daa7da16b 100644
--- a/firmware/target/hosted/xduoo/button-xduoo.c
+++ b/firmware/target/hosted/xduoo/button-xduoo.c
@@ -37,10 +37,10 @@ int button_map(int keycode)
             return BUTTON_OPTION;
 
         case KEY_UP:
-            return BUTTON_PREV;
+            return BUTTON_NEXT;
 
         case KEY_DOWN:
-            return BUTTON_NEXT;
+            return BUTTON_PREV;
 
         case KEY_ENTER:
             return BUTTON_PLAY;
@@ -54,6 +54,17 @@ int button_map(int keycode)
         case KEY_POWER:
             return BUTTON_POWER;
 
+#if defined(XDUOO_X3II) /* Headphone remote */
+        case KEY_NEXTSONG:
+            return (BUTTON_NEXT | BUTTON_DELAY_RELEASE);
+
+        case KEY_PLAYPAUSE:
+            return (BUTTON_PLAY | BUTTON_DELAY_RELEASE);
+
+        case KEY_PREVIOUSSONG:
+            return (BUTTON_PREV | BUTTON_DELAY_RELEASE);
+
+#endif
         default:
             return 0;
     }