1 files changed, 18 insertions, 12 deletions

diff --git a/firmware/target/arm/olympus/mrobe-100/button-target.h b/firmware/target/arm/olympus/mrobe-100/button-target.h
index 900211ebe4..93d42d62fb 100644
--- a/firmware/target/arm/olympus/mrobe-100/button-target.h
+++ b/firmware/target/arm/olympus/mrobe-100/button-target.h
@@ -29,22 +29,14 @@
 #define MEP_BUTTON_ID       0x09
 #define MEP_ABSOLUTE_HEADER 0x0b
 
-#define HAS_BUTTON_HOLD
-
 bool button_hold(void);
 void button_init_device(void);
-int button_read_device(void);
+int  button_read_device(void);
 
 #ifndef BOOTLOADER
 void button_int(void);
 #endif
 
-#define POWEROFF_BUTTON     BUTTON_POWER
-#define POWEROFF_COUNT      10
-
-/* FIXME: Until the buttons are figured out, we use the button definitions
-   for the H10 keypad & remote. THESE ARE NOT CORRECT! */
-
 /* Main unit's buttons */
 #define BUTTON_PLAY         0x00000001
 #define BUTTON_MENU         0x00000002
@@ -61,18 +53,32 @@ void button_int(void);
                             |BUTTON_RIGHT|BUTTON_SELECT|BUTTON_UP|BUTTON_SLIDE_UP\
                             |BUTTON_DOWN|BUTTON_SLIDE_DOWN|BUTTON_POWER)
 
+#define HAS_BUTTON_HOLD
+
+#define POWEROFF_BUTTON     BUTTON_POWER
+#define POWEROFF_COUNT      10
+
+#ifdef HAVE_REMOTE_LCD
+void headphones_int(void);
+bool remote_button_hold(void);
+
 /* Remote control's buttons */
 #define BUTTON_RC_PLAY      0x00010000
 #define BUTTON_RC_REW       0x00020000
 #define BUTTON_RC_FF        0x00040000
-#define BUTTON_RC_DISPLAY   0x00080000
-#define BUTTON_RC_FAV       0x00100000
+#define BUTTON_RC_DOWN      0x00080000
+#define BUTTON_RC_HEART     0x00100000
 #define BUTTON_RC_MODE      0x00200000
 #define BUTTON_RC_VOL_UP    0x00400000
 #define BUTTON_RC_VOL_DOWN  0x00800000
 #define BUTTON_REMOTE       (BUTTON_RC_PLAY|BUTTON_RC_REW|BUTTON_RC_FF\
-                            |BUTTON_RC_DISPLAY|BUTTON_RC_FAV|BUTTON_RC_MODE\
+                            |BUTTON_RC_DOWN|BUTTON_RC_HEART|BUTTON_RC_MODE\
                             |BUTTON_RC_VOL_UP|BUTTON_RC_VOL_DOWN)
+
+#define HAS_REMOTE_BUTTON_HOLD
 #define RC_POWEROFF_BUTTON  BUTTON_RC_PLAY
+#else
+#define BUTTON_REMOTE 0
+#endif /* HAVE_REMOTE_LCD */
 
 #endif /* _BUTTON_TARGET_H_ */