4 files changed, 24 insertions, 24 deletions

diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c
index f934052746..25cdd3d96b 100644
--- a/firmware/drivers/button.c
+++ b/firmware/drivers/button.c
@@ -267,7 +267,6 @@ void button_set_flip(bool flip)
     }
 }
 
-
 /*
  * Get button pressed from hardware
  */
@@ -376,12 +375,12 @@ static int button_read(void)
     if(adc_read(2) < 0x180)
         btn |= BUTTON_RIGHT;
     if(adc_read(3) < 0x180)
-        btn |= BUTTON_PLAY | BUTTON_UP;
+        btn |= BUTTON_PLAY;
 
     if ( !(porta & 0x20) )
         btn |= BUTTON_ON;
     if ( !(porta & 0x800) )
-        btn |= BUTTON_STOP | BUTTON_DOWN;
+        btn |= BUTTON_STOP;
 
     return btn;
 }
@@ -488,7 +487,7 @@ static int button_read(void)
     if(adc_read(ADC_BUTTON_OPTION) > 0x200) /* active high */
         btn |= BUTTON_MENU;
     if(adc_read(ADC_BUTTON_ONOFF) < 0x120) /* active low */
-        btn |= BUTTON_ON;
+        btn |= BUTTON_OFF;
 
     /* Check the 4 direction keys, hard-coded analog limits for now */
     if (data >= 0x2EF)
@@ -496,9 +495,9 @@ static int button_read(void)
     else if (data >= 0x246)
         btn |= BUTTON_RIGHT;
     else if (data >= 0x19D)
-        btn |= BUTTON_PLAY | BUTTON_UP;
+        btn |= BUTTON_UP;
     else if (data >= 0x0A1)
-        btn |= BUTTON_STOP | BUTTON_DOWN;
+        btn |= BUTTON_DOWN;
 
     return btn;
 }
diff --git a/firmware/drivers/serial.c b/firmware/drivers/serial.c
index 11dadc6f19..e1e0eb82e9 100644
--- a/firmware/drivers/serial.c
+++ b/firmware/drivers/serial.c
@@ -85,7 +85,7 @@ int remote_control_rx(void)
         }
         else
         {
-#ifndef HAVE_NEO_KEYPAD /* This needs to be fixed for Neo */
+#if !defined(HAVE_NEO_KEYPAD) && !defined(HAVE_ONDIO_KEYPAD)
             switch (btn)
             {
                 case STOP:
diff --git a/firmware/export/button.h b/firmware/export/button.h
index 7f4998f48d..7ec484440f 100644
--- a/firmware/export/button.h
+++ b/firmware/export/button.h
@@ -37,7 +37,7 @@ void button_set_flip(bool flip); /* turn 180 degrees */
 #define BUTTON_NONE             0x0000
 
 #ifdef HAVE_NEO_KEYPAD
-
+/* neo button codes */
 #define BUTTON_UP               0x0080
 #define BUTTON_DOWN             0x0010
 #define BUTTON_LEFT             0x0001
@@ -80,9 +80,6 @@ void button_set_flip(bool flip); /* turn 180 degrees */
 #else
 
 /* Shared button codes */
-#define BUTTON_ON               0x0001
-#define BUTTON_UP               0x0010
-#define BUTTON_DOWN             0x0020
 #define BUTTON_LEFT             0x0040
 #define BUTTON_RIGHT            0x0080
 
@@ -94,38 +91,42 @@ void button_set_flip(bool flip); /* turn 180 degrees */
 /* remote control buttons */
 #define BUTTON_RC_VOL_UP        (0x0008 | BUTTON_REMOTE)
 #define BUTTON_RC_VOL_DOWN      (0x0800 | BUTTON_REMOTE)
-#define BUTTON_RC_PLAY          (BUTTON_UP | BUTTON_REMOTE)
-#define BUTTON_RC_STOP          (BUTTON_DOWN | BUTTON_REMOTE)
 #define BUTTON_RC_LEFT          (BUTTON_LEFT | BUTTON_REMOTE)
 #define BUTTON_RC_RIGHT         (BUTTON_RIGHT| BUTTON_REMOTE)
 
 #ifdef HAVE_RECORDER_KEYPAD
 
 /* Recorder specific button codes */
+#define BUTTON_ON               0x0001
 #define BUTTON_OFF              0x0002
 #define BUTTON_PLAY             0x0004
+#define BUTTON_UP               0x0010
+#define BUTTON_DOWN             0x0020
 #define BUTTON_F1               0x0100
 #define BUTTON_F2               0x0200
 #define BUTTON_F3               0x0400
 
+#define BUTTON_RC_PLAY          (BUTTON_PLAY | BUTTON_REMOTE)
+#define BUTTON_RC_STOP          (BUTTON_OFF | BUTTON_REMOTE)
+
 #elif defined(HAVE_PLAYER_KEYPAD)
 
 /* Jukebox 6000 and Studio specific button codes */
+#define BUTTON_ON               0x0001
 #define BUTTON_MENU             0x0002
-#define BUTTON_PLAY             BUTTON_UP
-#define BUTTON_STOP             BUTTON_DOWN
+#define BUTTON_PLAY             0x0010
+#define BUTTON_STOP             0x0020
+
+#define BUTTON_RC_PLAY          (BUTTON_PLAY | BUTTON_REMOTE)
+#define BUTTON_RC_STOP          (BUTTON_STOP | BUTTON_REMOTE)
 
 #elif defined HAVE_ONDIO_KEYPAD
 
 /* Ondio specific button codes */
-#define BUTTON_MENU             0x0002
-#define BUTTON_PLAY             BUTTON_UP
-#define BUTTON_STOP             BUTTON_DOWN
-/* ON is also interpreted as OFF, let's see if that helps a bit */
-#define BUTTON_OFF      BUTTON_ON
-#define BUTTON_F1               0x0100 /* unreacheable */
-#define BUTTON_F2               0x0200 /* unreacheable */
-#define BUTTON_F3               0x0400 /* unreacheable */
+#define BUTTON_OFF              0x0002
+#define BUTTON_UP               0x0010
+#define BUTTON_DOWN             0x0020
+#define BUTTON_MENU             0x0100
 
 #endif /* HAVE_RECORDER/PLAYER/ONDIO_KEYPAD */
 
diff --git a/firmware/usb.c b/firmware/usb.c
index 566f9c43d2..6c14b75f19 100644
--- a/firmware/usb.c
+++ b/firmware/usb.c
@@ -135,7 +135,7 @@ static void usb_slave_mode(bool on)
             lcd_puts(0, 0, str);
             lcd_puts(0, 1, "Press ON to debug");
             lcd_update();
-            while(button_get(true) != BUTTON_ON) {};
+            while(!(button_get(true) & BUTTON_REL)) {};
             dbg_ports();
             panicf("ata: %d",rc);
         }