diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c index d2bd162175..9a29ebc4f8 100644 --- a/apps/plugins/rockblox.c +++ b/apps/plugins/rockblox.c @@ -424,15 +424,16 @@ #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD -#define ROCKBLOX_OFF BUTTON_POWER -#define ROCKBLOX_ROTATE_CCW BUTTON_HOME -#define ROCKBLOX_ROTATE_CCW2 BUTTON_VOL_DOWN -#define ROCKBLOX_ROTATE_CW BUTTON_VOL_UP -#define ROCKBLOX_DOWN BUTTON_OPTION -#define ROCKBLOX_LEFT BUTTON_PREV -#define ROCKBLOX_RIGHT BUTTON_NEXT -#define ROCKBLOX_DROP (BUTTON_PLAY|BUTTON_REL) -#define ROCKBLOX_RESTART (BUTTON_PLAY|BUTTON_REPEAT) +#define ROCKBLOX_OFF BUTTON_POWER +#define ROCKBLOX_ROTATE_CCW BUTTON_HOME +#define ROCKBLOX_ROTATE_CCW2 BUTTON_VOL_DOWN +#define ROCKBLOX_ROTATE_CW BUTTON_VOL_UP +#define ROCKBLOX_DOWN BUTTON_OPTION +#define ROCKBLOX_LEFT BUTTON_PREV +#define ROCKBLOX_RIGHT BUTTON_NEXT +#define ROCKBLOX_DROP (BUTTON_PLAY|BUTTON_REL) +#define ROCKBLOX_RESTART (BUTTON_PLAY|BUTTON_REPEAT) +#define ROCKBLOX_SCROLL_ENABLED 1 //Untested Probably needed #elif (CONFIG_KEYPAD == IHIFI_770_PAD) || (CONFIG_KEYPAD == IHIFI_800_PAD) @@ -465,6 +466,7 @@ #define ROCKBLOX_RIGHT BUTTON_RIGHT #define ROCKBLOX_DROP BUTTON_PLAY #define ROCKBLOX_RESTART BUTTON_BACK +#define ROCKBLOX_SCROLL_ENABLED 1 #elif CONFIG_KEYPAD == SHANLING_Q1_PAD /* use touchscreen */ @@ -858,7 +860,12 @@ static void new_block(void); #ifdef HAVE_SCROLLWHEEL int wheel_events = 0, last_wheel_event = 0; -bool wheel_enabled = false; +#ifdef ROCKBLOX_SCROLL_ENABLED + /* Bugfix M3K has a scrollpad that is also up down buttons */ + bool wheel_enabled = true; +#else + bool wheel_enabled = false; +#endif #endif static const short scoring[4] = { /* scoring for each number of lines */