Agptek Rocker: Initial commit

Change-Id: I26b51106c7b1c36a603fba6d521e917d79b5a95b

7 files changed, 265 insertions, 3 deletions

diff --git a/apps/SOURCES b/apps/SOURCES
index 666bf69f60..de633880f6 100644
--- a/apps/SOURCES
+++ b/apps/SOURCES
@@ -315,4 +315,6 @@ keymaps/keymap-ihifi.c
 keymaps/keymap-ypr1.c
 #elif CONFIG_KEYPAD == DX50_PAD
 keymaps/keymap-dx50.c
+#elif CONFIG_KEYPAD == AGPTEK_ROCKER_PAD
+keymaps/keymap-agptekrocker.c
 #endif
diff --git a/apps/bitmaps/native/SOURCES b/apps/bitmaps/native/SOURCES
index dbd0f577ed..ea726d4c07 100644
--- a/apps/bitmaps/native/SOURCES
+++ b/apps/bitmaps/native/SOURCES
@@ -13,7 +13,7 @@ rockboxlogo.112x30x1.bmp
 rockboxlogo.96x30x16.bmp
 #elif (LCD_WIDTH == 128) && (LCD_DEPTH == 2)
 rockboxlogo.128x42x2.bmp
-#elif (LCD_WIDTH == 128) && (LCD_DEPTH == 16)
+#elif (LCD_WIDTH == 128) && (LCD_DEPTH >= 16)
 rockboxlogo.128x40x16.bmp
 #elif (LCD_WIDTH == 132) && (LCD_DEPTH >= 16)
 rockboxlogo.132x40x16.bmp
@@ -40,9 +40,15 @@ rockboxlogo.640x198x16.bmp
 #endif
 
 /* The Sony NWZ linux bootloader needs icons to display a menu */
-#if defined(BOOTLOADER) && defined(SONY_NWZ_LINUX)
+#if defined(BOOTLOADER) 
+#if defined(SONY_NWZ_LINUX)
 rockboxicon.130x130x16.bmp
 toolsicon.130x130x16.bmp
+#elif defined(AGPTEK_ROCKER)
+hibyicon.70x70x16.bmp
+rockboxicon.70x70x16.bmp
+toolsicon.70x70x16.bmp
+#endif
 #endif
 
 #ifndef BOOTLOADER  /* We don't need these for the bootloader */
diff --git a/apps/bitmaps/native/hibyicon.70x70x16.bmp b/apps/bitmaps/native/hibyicon.70x70x16.bmp
new file mode 100644
index 0000000000..640623421f
--- /dev/null
+++ b/apps/bitmaps/native/hibyicon.70x70x16.bmp
diff --git a/apps/bitmaps/native/rockboxicon.70x70x16.bmp b/apps/bitmaps/native/rockboxicon.70x70x16.bmp
new file mode 100644
index 0000000000..20f6709530
--- /dev/null
+++ b/apps/bitmaps/native/rockboxicon.70x70x16.bmp
diff --git a/apps/bitmaps/native/toolsicon.70x70x16.bmp b/apps/bitmaps/native/toolsicon.70x70x16.bmp
new file mode 100644
index 0000000000..aa0deb9ad4
--- /dev/null
+++ b/apps/bitmaps/native/toolsicon.70x70x16.bmp
diff --git a/apps/keymaps/keymap-agptekrocker.c b/apps/keymaps/keymap-agptekrocker.c
new file mode 100644
index 0000000000..1b4c784dd4
--- /dev/null
+++ b/apps/keymaps/keymap-agptekrocker.c
@@ -0,0 +1,254 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ *
+ * Copyright (C) 2017 Marcin Bukat
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
+#include "config.h"
+#include "action.h"
+#include "button.h"
+#include "settings.h"
+
+/* {Action Code,    Button code,    Prereq button code } */
+
+/* 
+ * The format of the list is as follows
+ * { Action Code,   Button code,    Prereq button code } 
+ * if there's no need to check the previous button's value, use BUTTON_NONE
+ * Insert LAST_ITEM_IN_LIST at the end of each mapping 
+ */
+static const struct button_mapping button_context_standard[]  = {
+    { 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_STD_OK,          BUTTON_SELECT|BUTTON_REL,          BUTTON_SELECT },
+    { ACTION_STD_OK,          BUTTON_RIGHT,                      BUTTON_NONE },
+
+    { ACTION_STD_CANCEL,      BUTTON_LEFT,                       BUTTON_NONE },
+
+    { ACTION_STD_CONTEXT,     BUTTON_SELECT|BUTTON_REPEAT,       BUTTON_SELECT },
+
+    { ACTION_STD_MENU,        BUTTON_POWER,            BUTTON_NONE },
+
+//    ACTION_STD_QUICKSCREEN,
+//    ACTION_STD_KEYLOCK
+//    ACTION_STD_REC
+//    ACTION_STD_HOTKEY
+
+//    { ACTION_STD_QUICKSCREEN, BUTTON_SELECT|BUTTON_REPEAT,         BUTTON_SELECT },
+
+    LAST_ITEM_IN_LIST
+}; /* button_context_standard */
+
+
+static const struct button_mapping button_context_wps[]  = {
+//    { ACTION_WPS_BROWSE,        BUTTON_UP|BUTTON_REPEAT,  BUTTON_UP },
+    { ACTION_WPS_PLAY,     BUTTON_SELECT|BUTTON_REL,        BUTTON_SELECT },
+    { 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_SKIPNEXT, BUTTON_RIGHT|BUTTON_REL,    BUTTON_RIGHT },
+    { ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL,    BUTTON_LEFT },
+    { ACTION_WPS_STOP,     BUTTON_SELECT|BUTTON_REPEAT,     BUTTON_SELECT },
+    { ACTION_WPS_VOLDOWN,   BUTTON_VOLDOWN,                  BUTTON_NONE },
+    { ACTION_WPS_VOLDOWN,   BUTTON_VOLDOWN|BUTTON_REPEAT,    BUTTON_NONE },
+    { ACTION_WPS_VOLUP,     BUTTON_VOLUP,                   BUTTON_NONE },
+    { ACTION_WPS_VOLUP,     BUTTON_VOLUP|BUTTON_REPEAT,     BUTTON_NONE },
+//    ACTION_WPS_PITCHSCREEN  optional
+//    ACTION_WPS_ID3SCREEN    optional
+    { ACTION_WPS_CONTEXT,       BUTTON_DOWN|BUTTON_REL,       BUTTON_DOWN },
+    { ACTION_WPS_QUICKSCREEN,   BUTTON_DOWN|BUTTON_REPEAT,    BUTTON_DOWN }, // optional
+    { ACTION_WPS_MENU,          BUTTON_UP|BUTTON_REL,      BUTTON_UP }, /*this should be the same as ACTION_STD_MENU */
+//    ACTION_WPS_VIEW_PLAYLIST
+//    ACTION_WPS_LIST_BOOKMARKS,/* optional */
+//    ACTION_WPS_CREATE_BOOKMARK,/* optional */
+
+    { ACTION_STD_KEYLOCK,       BUTTON_POWER,      BUTTON_NONE },
+
+    LAST_ITEM_IN_LIST
+}; /* button_context_wps */
+
+static const struct button_mapping button_context_settings[] = {
+    { ACTION_SETTINGS_INC,      BUTTON_VOLUP,                BUTTON_NONE },
+    { ACTION_SETTINGS_INCREPEAT,BUTTON_VOLUP|BUTTON_REPEAT,  BUTTON_NONE },
+//    ACTION_SETTINGS_INCBIGSTEP
+    { ACTION_SETTINGS_DEC,      BUTTON_VOLDOWN,               BUTTON_NONE },
+    { ACTION_SETTINGS_DECREPEAT,BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_NONE },
+//    ACTION_SETTINGS_DECBIGSTEP
+    { ACTION_SETTINGS_RESET,    BUTTON_SELECT|BUTTON_REPEAT,     BUTTON_SELECT },
+//    ACTION_SETTINGS_SET, /* Used by touchscreen targets */
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
+}; /* button_context_settings */
+
+static const struct button_mapping button_context_list[]  = {
+//    ACTION_LISTTREE_PGUP,/* optional */
+//    ACTION_LISTTREE_PGDOWN,/* optional */
+
+#ifdef HAVE_VOLUME_IN_LIST
+    { ACTION_LIST_VOLUP,                BUTTON_VOL_UP,                     BUTTON_NONE },
+    { ACTION_LIST_VOLUP,                BUTTON_VOL_UP|BUTTON_REPEAT,       BUTTON_NONE },
+    { ACTION_LIST_VOLDOWN,              BUTTON_VOL_DOWN,                   BUTTON_NONE },
+    { ACTION_LIST_VOLDOWN,              BUTTON_VOL_DOWN|BUTTON_REPEAT,     BUTTON_NONE },
+#endif
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+}; /* button_context_list */
+
+static const struct button_mapping button_context_tree[]  = {
+//    ACTION_TREE_ROOT_INIT,
+//    ACTION_TREE_PGLEFT,/* optional */
+//    ACTION_TREE_PGRIGHT,/* optional */
+//    ACTION_TREE_STOP,
+//    ACTION_TREE_WPS,
+//    ACTION_TREE_HOTKEY,
+
+    { ACTION_TREE_WPS,    BUTTON_UP|BUTTON_REL,         BUTTON_UP },
+//    { ACTION_TREE_STOP,   BUTTON_POWER|BUTTON_REL,      BUTTON_POWER },
+//    { ACTION_TREE_HOTKEY, BUTTON_REC|BUTTON_REL,        BUTTON_REC },
+    
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
+}; /* button_context_tree */
+
+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_quickscreen[]  = {
+    { ACTION_QS_TOP,     BUTTON_UP|BUTTON_REL,          BUTTON_NONE },
+    { ACTION_QS_TOP,     BUTTON_UP|BUTTON_REPEAT,       BUTTON_NONE },
+    { ACTION_QS_DOWN,    BUTTON_DOWN|BUTTON_REL,        BUTTON_NONE },
+    { ACTION_QS_DOWN,    BUTTON_DOWN|BUTTON_REPEAT,     BUTTON_NONE },
+    { ACTION_QS_LEFT,    BUTTON_LEFT|BUTTON_REL,        BUTTON_NONE },
+    { ACTION_QS_LEFT,    BUTTON_LEFT|BUTTON_REPEAT,     BUTTON_NONE },
+    { ACTION_QS_RIGHT,   BUTTON_RIGHT|BUTTON_REL,       BUTTON_NONE },
+    { ACTION_QS_RIGHT,   BUTTON_RIGHT|BUTTON_REPEAT,    BUTTON_NONE },
+    
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
+}; /* button_context_quickscreen */
+
+static const struct button_mapping button_context_settings_time[] = {
+    { 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 },
+
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)
+}; /* button_context_settings_time */
+
+static const struct button_mapping button_context_pitchscreen[]  = {
+    { ACTION_PS_INC_SMALL,      BUTTON_VOLUP,                BUTTON_NONE },
+    { ACTION_PS_INC_BIG,        BUTTON_VOLUP|BUTTON_REPEAT,  BUTTON_NONE },
+    { ACTION_PS_DEC_SMALL,      BUTTON_VOLDOWN,               BUTTON_NONE },
+    { ACTION_PS_DEC_BIG,        BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_PS_NUDGE_LEFT,     BUTTON_LEFT,               BUTTON_NONE },
+    { ACTION_PS_NUDGE_LEFTOFF,  BUTTON_LEFT|BUTTON_REL,    BUTTON_NONE },
+    { ACTION_PS_NUDGE_RIGHT,    BUTTON_RIGHT,              BUTTON_NONE },
+    { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RIGHT|BUTTON_REL,   BUTTON_NONE },
+//    { ACTION_PS_TOGGLE_MODE,    BUTTON_REC,                BUTTON_NONE },
+    { ACTION_PS_RESET,          BUTTON_SELECT,             BUTTON_NONE },
+    { ACTION_PS_EXIT,           BUTTON_POWER,              BUTTON_NONE },
+    { ACTION_PS_EXIT,           BUTTON_UP,                 BUTTON_NONE },
+    { ACTION_PS_SLOWER,         BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_PS_FASTER,         BUTTON_RIGHT|BUTTON_REPEAT,BUTTON_NONE },
+    
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
+}; /* button_context_pitchscreen */
+
+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_POWER|BUTTON_LEFT,                BUTTON_NONE },
+    { ACTION_KBD_CURSOR_LEFT,  BUTTON_POWER|BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE },
+    { ACTION_KBD_CURSOR_RIGHT, BUTTON_POWER|BUTTON_RIGHT,               BUTTON_NONE },
+    { ACTION_KBD_CURSOR_RIGHT, BUTTON_POWER|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
+    
+    { ACTION_KBD_UP,           BUTTON_VOLDOWN,                 BUTTON_NONE },
+    { ACTION_KBD_UP,           BUTTON_VOLDOWN|BUTTON_REPEAT,   BUTTON_NONE },
+    { ACTION_KBD_DOWN,         BUTTON_VOLUP,               BUTTON_NONE },
+    { ACTION_KBD_DOWN,         BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_KBD_PAGE_FLIP,    BUTTON_POWER|BUTTON_SELECT,         BUTTON_POWER },
+    { ACTION_KBD_BACKSPACE,    BUTTON_DOWN,                      BUTTON_NONE },
+    { ACTION_KBD_BACKSPACE,    BUTTON_DOWN|BUTTON_REPEAT,        BUTTON_NONE },
+    { ACTION_KBD_SELECT,       BUTTON_SELECT,                    BUTTON_NONE },
+    { ACTION_KBD_DONE,         BUTTON_UP,                        BUTTON_NONE },
+    { ACTION_KBD_ABORT,        BUTTON_POWER,                     BUTTON_NONE },
+    { ACTION_KBD_MORSE_INPUT,  BUTTON_POWER|BUTTON_REL,            BUTTON_POWER },
+    { ACTION_KBD_MORSE_SELECT, BUTTON_SELECT|BUTTON_REL,         BUTTON_NONE },
+
+    LAST_ITEM_IN_LIST
+}; /* button_context_keyboard */
+
+static const struct button_mapping button_context_bmark[]  = {
+    { ACTION_BMS_DELETE,       BUTTON_LEFT,        BUTTON_NONE },
+
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
+}; /* button_context_bmark */
+
+/* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */
+const struct button_mapping* get_context_mapping(int context)
+{
+    switch (context)
+    {
+        case CONTEXT_STD:
+            return button_context_standard;
+            
+        case CONTEXT_WPS:
+            return button_context_wps;
+
+        case CONTEXT_LIST:
+            return button_context_list;
+
+        case CONTEXT_CUSTOM|CONTEXT_TREE:
+            return button_context_tree;
+
+        case CONTEXT_SETTINGS:
+        case CONTEXT_SETTINGS_EQ:
+            return button_context_settings;
+
+        case CONTEXT_SETTINGS_TIME:
+            return button_context_settings_time;
+
+        case CONTEXT_YESNOSCREEN:
+            return button_context_yesno;
+
+        case CONTEXT_BOOKMARKSCREEN:
+            return button_context_bmark;
+
+        case CONTEXT_QUICKSCREEN:
+            return button_context_quickscreen;
+
+        case CONTEXT_PITCHSCREEN:
+            return button_context_pitchscreen;
+
+        case CONTEXT_KEYBOARD:
+        case CONTEXT_MORSE_INPUT:
+            return button_context_keyboard;
+
+        default:
+            return button_context_standard;
+    } 
+    return button_context_standard;
+}
diff --git a/apps/recorder/bmp.c b/apps/recorder/bmp.c
index 8d49fd7582..b11c41b424 100644
--- a/apps/recorder/bmp.c
+++ b/apps/recorder/bmp.c
@@ -670,7 +670,7 @@ int read_bmp_fd(int fd,
     /* Check if this fits the buffer */
     if (totalsize > maxsize) {
         DEBUGF("read_bmp_fd: Bitmap too large for buffer: "
-               "%d bytes.\n", totalsize);
+               "%d bytes (%d max).\n", totalsize, maxsize);
         return -6;
     }