2 files changed, 145 insertions, 23 deletions

diff --git a/apps/debug_menu.c b/apps/debug_menu.c
index 59344f6f71..55c371dc25 100644
--- a/apps/debug_menu.c
+++ b/apps/debug_menu.c
@@ -2396,6 +2396,54 @@ static bool usb_reconnect(void)
 }
 #endif
 
+#if CONFIG_USBOTG == USBOTG_ISP1583
+extern int dbg_usb_num_items(void);
+extern char* dbg_usb_item(int selected_item, void *data, char *buffer, size_t buffer_len);
+
+static int isp1583_action_callback(int action, struct gui_synclist *lists)
+{
+    (void)lists;
+    if (action == ACTION_NONE)
+        action = ACTION_REDRAW;
+    return action;
+}
+
+static bool dbg_isp1583(void)
+{
+    struct simplelist_info isp1583;
+    simplelist_info_init(&isp1583, "ISP1583", dbg_usb_num_items(), NULL);
+    isp1583.timeout = HZ/100; 
+    isp1583.hide_selection = true;
+    isp1583.get_name = dbg_usb_item;
+    isp1583.action_callback = isp1583_action_callback;
+    return simplelist_show_list(&isp1583);
+}
+#endif
+
+#ifdef CREATIVE_ZVM
+extern int pic_dbg_num_items(void);
+extern char* pic_dbg_item(int selected_item, void *data, char *buffer, size_t buffer_len);
+
+static int pic_action_callback(int action, struct gui_synclist *lists)
+{
+    (void)lists;
+    if (action == ACTION_NONE)
+        action = ACTION_REDRAW;
+    return action;
+}
+
+static bool dbg_pic(void)
+{
+    struct simplelist_info pic;
+    simplelist_info_init(&pic, "PIC", pic_dbg_num_items(), NULL);
+    pic.timeout = HZ/100; 
+    pic.hide_selection = true;
+    pic.get_name = pic_dbg_item;
+    pic.action_callback = pic_action_callback;
+    return simplelist_show_list(&pic);
+}
+#endif
+
 
 /****** The menu *********/
 struct the_menu_item {
@@ -2472,6 +2520,12 @@ static const struct the_menu_item menuitems[] = {
 #if defined(HAVE_EEPROM) && !defined(HAVE_EEPROM_SETTINGS)
         { "Write back EEPROM", dbg_write_eeprom },
 #endif
+#if CONFIG_USBOTG == USBOTG_ISP1583
+        { "View ISP1583 info", dbg_isp1583 },
+#endif
+#ifdef CREATIVE_ZVM
+        { "View PIC info", dbg_pic },
+#endif
 #ifdef ROCKBOX_HAS_LOGF
         {"logf", logfdisplay },
         {"logfdump", logfdump },
diff --git a/apps/keymaps/keymap-creativezvm.c b/apps/keymaps/keymap-creativezvm.c
index 221830e15e..4944e0baef 100644
--- a/apps/keymaps/keymap-creativezvm.c
+++ b/apps/keymaps/keymap-creativezvm.c
@@ -43,31 +43,57 @@ CONTEXT_CUSTOM|CONTEXT_SETTINGS = the direction keys for the eq/col picker scree
 

 */

 

-#define BUTTON_VOL_UP   BUTTON_NONE

-#define BUTTON_VOL_DOWN BUTTON_NONE

-

 static const struct button_mapping button_context_standard[]  = {

     { ACTION_STD_PREV,          BUTTON_UP|BUTTON_REL,                  BUTTON_NONE },

     { ACTION_STD_PREVREPEAT,    BUTTON_UP|BUTTON_REPEAT,               BUTTON_NONE },

     { ACTION_STD_NEXT,          BUTTON_DOWN|BUTTON_REL,                BUTTON_NONE },

     { ACTION_STD_NEXTREPEAT,    BUTTON_DOWN|BUTTON_REPEAT,             BUTTON_NONE },

 

-    { ACTION_STD_CANCEL,        BUTTON_LEFT,                BUTTON_NONE },

-    { ACTION_STD_CANCEL,        BUTTON_POWER,               BUTTON_NONE },

+    { ACTION_STD_CANCEL,        BUTTON_LEFT,                           BUTTON_NONE },

+    { ACTION_STD_CANCEL,        BUTTON_POWER,                          BUTTON_NONE },

 

-    { ACTION_STD_CONTEXT,       BUTTON_SELECT|BUTTON_REPEAT,BUTTON_SELECT },

+    { ACTION_STD_CONTEXT,       BUTTON_SELECT|BUTTON_REPEAT,           BUTTON_SELECT },

 

-    { ACTION_STD_QUICKSCREEN,   BUTTON_MENU|BUTTON_REPEAT,  BUTTON_MENU },

-    { ACTION_STD_MENU,          BUTTON_MENU|BUTTON_REL,     BUTTON_MENU },

+    { ACTION_STD_QUICKSCREEN,   BUTTON_MENU|BUTTON_REPEAT,             BUTTON_MENU },

+    { ACTION_STD_MENU,          BUTTON_MENU|BUTTON_REL,                BUTTON_MENU },

 

-    { ACTION_STD_OK,            BUTTON_SELECT|BUTTON_REL,   BUTTON_SELECT },

-    { ACTION_STD_OK,            BUTTON_RIGHT,               BUTTON_NONE },

+    { ACTION_STD_OK,            BUTTON_SELECT|BUTTON_REL,              BUTTON_SELECT },

+    { ACTION_STD_OK,            BUTTON_RIGHT,                          BUTTON_NONE },

 

     LAST_ITEM_IN_LIST

 }; /* button_context_standard */

 

 

 static const struct button_mapping button_context_wps[]  = {

+    { ACTION_WPS_PLAY,          BUTTON_PLAY|BUTTON_REL,         BUTTON_PLAY },

+    { ACTION_WPS_STOP,          BUTTON_PLAY|BUTTON_REPEAT,      BUTTON_NONE },

+

+    { ACTION_WPS_SKIPNEXT,      BUTTON_RIGHT|BUTTON_REL,        BUTTON_RIGHT },

+    { ACTION_WPS_SKIPPREV,      BUTTON_LEFT|BUTTON_REL,         BUTTON_LEFT },

+

+    { ACTION_WPS_SEEKBACK,      BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_NONE },

+    { ACTION_WPS_SEEKFWD,       BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_NONE },

+    { ACTION_WPS_STOPSEEK,      BUTTON_LEFT|BUTTON_REL,         BUTTON_LEFT|BUTTON_REPEAT },

+    { ACTION_WPS_STOPSEEK,      BUTTON_RIGHT|BUTTON_REL,        BUTTON_RIGHT|BUTTON_REPEAT },

+

+    //{ ACTION_WPS_ABSETB_NEXTDIR,BUTTON_RIGHT,                   BUTTON_CUSTOM },

+    //{ ACTION_WPS_ABSETA_PREVDIR,BUTTON_LEFT,                    BUTTON_CUSTOM },

+    //{ ACTION_WPS_ABRESET,       BUTTON_CUSTOM|BUTTON_REPEAT,    BUTTON_NONE   },

+

+    { ACTION_WPS_VOLDOWN,       BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_NONE },

+    { ACTION_WPS_VOLDOWN,       BUTTON_DOWN,                    BUTTON_NONE },

+    { ACTION_WPS_VOLUP,         BUTTON_UP|BUTTON_REPEAT,        BUTTON_NONE },

+    { ACTION_WPS_VOLUP,         BUTTON_UP,                      BUTTON_NONE },

+

+    { ACTION_WPS_PITCHSCREEN,   BUTTON_BACK|BUTTON_REPEAT,      BUTTON_BACK },

+

+    { ACTION_WPS_QUICKSCREEN,   BUTTON_MENU|BUTTON_REPEAT,      BUTTON_MENU },

+    { ACTION_WPS_MENU,          BUTTON_MENU|BUTTON_REL,         BUTTON_MENU },

+    { ACTION_WPS_MENU,          BUTTON_POWER,                   BUTTON_NONE },

+    { ACTION_WPS_CONTEXT,       BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_SELECT },

+

+    { ACTION_WPS_ID3SCREEN,     BUTTON_BACK|BUTTON_REL,         BUTTON_NONE },

+    { ACTION_WPS_BROWSE,        BUTTON_SELECT|BUTTON_REL,       BUTTON_BACK },

     LAST_ITEM_IN_LIST

 }; /* button_context_wps */

 

@@ -76,14 +102,23 @@ static const struct button_mapping button_context_list[]  = {
 }; /* button_context_list */

 

 static const struct button_mapping button_context_tree[]  = {

+    { ACTION_TREE_WPS,    BUTTON_PLAY|BUTTON_REL,         BUTTON_PLAY },

+    { ACTION_TREE_STOP,   BUTTON_POWER,                   BUTTON_NONE },

+    { ACTION_TREE_STOP,   BUTTON_POWER|BUTTON_REL,        BUTTON_POWER },

+    { ACTION_TREE_STOP,   BUTTON_POWER|BUTTON_REPEAT,     BUTTON_NONE },

     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST)

 }; /* button_context_tree */

 

-static const struct button_mapping button_context_listtree_scroll_with_combo[]  = {

-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),

-};

-

 static const struct button_mapping button_context_listtree_scroll_without_combo[]  = {

+    { ACTION_NONE,              BUTTON_LEFT,                BUTTON_NONE },

+    { ACTION_STD_CANCEL,        BUTTON_LEFT|BUTTON_REL,     BUTTON_LEFT },

+    { ACTION_TREE_ROOT_INIT,    BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_LEFT },

+    { ACTION_TREE_PGLEFT,       BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE },

+    { ACTION_TREE_PGLEFT,       BUTTON_LEFT|BUTTON_REL,     BUTTON_LEFT|BUTTON_REPEAT },

+    { ACTION_NONE,              BUTTON_RIGHT,               BUTTON_NONE },

+    { ACTION_STD_OK,            BUTTON_RIGHT|BUTTON_REL,    BUTTON_RIGHT },

+    { ACTION_TREE_PGRIGHT,      BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },

+    { ACTION_TREE_PGRIGHT,      BUTTON_RIGHT|BUTTON_REL,    BUTTON_RIGHT|BUTTON_REPEAT },

     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),

 };

 

@@ -96,30 +131,41 @@ static const struct button_mapping button_context_settings[]  = {
     { ACTION_STD_PREVREPEAT,        BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_LEFT },

     { ACTION_STD_NEXT,              BUTTON_RIGHT,                   BUTTON_NONE },

     { ACTION_STD_NEXTREPEAT,        BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_RIGHT },

-    { ACTION_SETTINGS_RESET,        BUTTON_PLAY,                      BUTTON_NONE },

-

+    { ACTION_SETTINGS_RESET,        BUTTON_PLAY,                    BUTTON_NONE },

     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)

 }; /* button_context_settings */

 

 static const struct button_mapping button_context_settings_right_is_inc[]  = {

-

+    { ACTION_SETTINGS_INC,          BUTTON_RIGHT,               BUTTON_NONE },

+    { ACTION_SETTINGS_INCREPEAT,    BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },

+    { ACTION_SETTINGS_DEC,          BUTTON_LEFT,                BUTTON_NONE },

+    { ACTION_SETTINGS_DECREPEAT,    BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE },

+    { ACTION_STD_PREV,              BUTTON_UP,                  BUTTON_NONE },

+    { ACTION_STD_PREVREPEAT,        BUTTON_UP|BUTTON_REPEAT,    BUTTON_NONE },

+    { ACTION_STD_NEXT,              BUTTON_DOWN,                BUTTON_NONE },

+    { ACTION_STD_NEXTREPEAT,        BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_NONE },

+    { ACTION_SETTINGS_RESET,        BUTTON_BACK,                BUTTON_NONE },

     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)

 }; /* button_context_settingsgraphical */

 

 static const struct button_mapping button_context_yesno[]  = {

+    { ACTION_YESNO_ACCEPT,          BUTTON_SELECT,                  BUTTON_NONE },

     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)

 }; /* button_context_settings_yesno */

 

 static const struct button_mapping button_context_colorchooser[]  = {

+    { ACTION_STD_OK,            BUTTON_BACK|BUTTON_REL,   BUTTON_NONE },

     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),

 }; /* button_context_colorchooser */

 

 static const struct button_mapping button_context_eq[]  = {

+    { ACTION_STD_OK,            BUTTON_SELECT|BUTTON_REL,   BUTTON_NONE },

     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),

 }; /* button_context_eq */

 

 /** Bookmark Screen **/

 static const struct button_mapping button_context_bmark[]  = {

+    { ACTION_BMS_DELETE,       BUTTON_BACK, BUTTON_NONE },

     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),

 }; /* button_context_bmark */

 

@@ -128,7 +174,15 @@ static const struct button_mapping button_context_time[]  = {
 }; /* button_context_time */

 

 static const struct button_mapping button_context_quickscreen[]  = {

-

+    { ACTION_QS_DOWNINV,    BUTTON_UP,                      BUTTON_NONE },

+    { ACTION_QS_DOWNINV,    BUTTON_UP|BUTTON_REPEAT,        BUTTON_NONE },

+    { ACTION_QS_DOWN,       BUTTON_DOWN,                    BUTTON_NONE },

+    { ACTION_QS_DOWN,       BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_NONE },

+    { ACTION_QS_LEFT,       BUTTON_LEFT,                    BUTTON_NONE },

+    { ACTION_QS_LEFT,       BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_NONE },

+    { ACTION_QS_RIGHT,      BUTTON_RIGHT,                   BUTTON_NONE },

+    { ACTION_QS_RIGHT,      BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_NONE },

+    { ACTION_STD_CANCEL,    BUTTON_MENU,                    BUTTON_NONE },

     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)

 }; /* button_context_quickscreen */

 

@@ -138,7 +192,24 @@ static const struct button_mapping button_context_pitchscreen[]  = {
 }; /* button_context_pitchcreen */

 

 static const struct button_mapping button_context_keyboard[]  = {

-

+    { ACTION_KBD_LEFT,         BUTTON_LEFT,                             BUTTON_NONE },

+    { ACTION_KBD_LEFT,         BUTTON_LEFT|BUTTON_REPEAT,               BUTTON_NONE },

+    { ACTION_KBD_RIGHT,        BUTTON_RIGHT,                            BUTTON_NONE },

+    { ACTION_KBD_RIGHT,        BUTTON_RIGHT|BUTTON_REPEAT,              BUTTON_NONE },

+    { ACTION_KBD_CURSOR_LEFT,  BUTTON_CUSTOM,                           BUTTON_NONE },

+    { ACTION_KBD_CURSOR_LEFT,  BUTTON_CUSTOM|BUTTON_REPEAT,             BUTTON_NONE },

+    { ACTION_KBD_CURSOR_RIGHT, BUTTON_PLAY,                             BUTTON_NONE },

+    { ACTION_KBD_CURSOR_RIGHT, BUTTON_PLAY|BUTTON_REPEAT,               BUTTON_NONE },

+    { ACTION_KBD_SELECT,       BUTTON_SELECT,                           BUTTON_NONE },

+    { ACTION_KBD_PAGE_FLIP,    BUTTON_BACK|BUTTON_MENU,                 BUTTON_NONE },

+    { ACTION_KBD_DONE,         BUTTON_PLAY|BUTTON_REL,                  BUTTON_PLAY },

+    { ACTION_KBD_ABORT,        BUTTON_BACK|BUTTON_REL,                  BUTTON_BACK },

+    { ACTION_KBD_BACKSPACE,    BUTTON_MENU,                             BUTTON_NONE },

+    { ACTION_KBD_BACKSPACE,    BUTTON_MENU|BUTTON_REPEAT,               BUTTON_NONE },

+    { ACTION_KBD_UP,           BUTTON_UP,                               BUTTON_NONE },

+    { ACTION_KBD_UP,           BUTTON_UP|BUTTON_REPEAT,                 BUTTON_NONE },

+    { ACTION_KBD_DOWN,         BUTTON_DOWN,                             BUTTON_NONE },

+    { ACTION_KBD_DOWN,         BUTTON_DOWN|BUTTON_REPEAT,               BUTTON_NONE },

     LAST_ITEM_IN_LIST

 }; /* button_context_keyboard */

 

@@ -154,10 +225,7 @@ const struct button_mapping* get_context_mapping(int context)
             return button_context_list;

         case CONTEXT_MAINMENU:

         case CONTEXT_TREE:

-            if (global_settings.hold_lr_for_scroll_in_list)

-                return button_context_listtree_scroll_without_combo;

-            else

-                return button_context_listtree_scroll_with_combo;

+            return button_context_listtree_scroll_without_combo;

         case CONTEXT_CUSTOM|CONTEXT_TREE:

             return button_context_tree;

         case CONTEXT_SETTINGS: