platform, keyboard improvements

diff --git a/pico/pico/memory.c b/pico/pico/memory.c
index bbe0c2b..a97df65 100644 (file)
--- a/pico/pico/memory.c
+++ b/pico/pico/memory.c
@@ -155,7 +155,7 @@ static u32 PicoRead8_pico_kb(u32 a)
       && PicoPicohw.kb.key_state != KEY_UP
       && PicoPicohw.kb.shift_state != SHIFT_UP_HELD_DOWN)
     ? key_shift
-    : PicoPicohw.kb.shift_state == SHIFT_UP ? PEVB_KBD_SHIFT : key;
+    : PicoPicohw.kb.shift_state == SHIFT_UP ? PEVB_KBD_LSHIFT : key;
   u32 key_code_7654 = (key_code & 0xf0) >> 4;
   u32 key_code_3210 = (key_code & 0x0f);
   switch(PicoPicohw.kb.i) {
@@ -217,7 +217,7 @@ static u32 PicoRead8_pico_kb(u32 a)
           if (PicoPicohw.kb.time_keydown > 350
                   // Modifier keys don't have typematic
                   && key_code != PEVB_KBD_CAPSLOCK
-                  && key_code != PEVB_KBD_SHIFT) {
+                  && key_code != PEVB_KBD_LSHIFT) {
             d |= 8; // Send key down a.k.a. make
            if (PicoPicohw.kb.key_state == KEY_DOWN)
               elprintf(EL_PICOHW, "PicoPicohw.kb.key_state: KEY DOWN\n");

diff --git a/pico/sms.c b/pico/sms.c
index 0608d78..3ecb35a 100644 (file)
--- a/pico/sms.c
+++ b/pico/sms.c
@@ -1,7 +1,7 @@
 /*
  * SMS emulation
  * (C) notaz, 2009-2010
- * (C) irixxxx, 2021-2024
+ * (C) irixxxx, 2021-2025
  *
  * This work is licensed under the terms of MAME license.
  * See COPYING file in the top-level directory.
@@ -219,7 +219,8 @@ static unsigned char kbd_map[] = {
   [PEVB_KBD_SOUND]     = 0x96, // graph
   [PEVB_KBD_CAPSLOCK]  = 0xa6, // ctrl
   [PEVB_KBD_FUNC]      = 0xb5, // func
-  [PEVB_KBD_SHIFT]     = 0xb6, // shift
+  [PEVB_KBD_LSHIFT]    = 0xb6, // shift (both keys on the same column)
+  [PEVB_KBD_RSHIFT]    = 0xb6,
 };
 
 static void kbd_update(void)
@@ -390,7 +391,7 @@ static void z80_sms_out(unsigned short a, unsigned char d)
       case 0xc0:
         // SG-1000 has a 8255 chip, mapped to 0xdc-0xdf
         if ((PicoIn.AHW & PAHW_SC) && (a & 0x2))
-          Pico.ms.io_sg = d; // 0xc2 = kbd/pad select
+          Pico.ms.io_sg = d; // 0xc2 = kbd/pad matrix column select
     }
   }
 }

diff --git a/platform/common/config_file.c b/platform/common/config_file.c
index 577f443..d34a9d3 100644 (file)
--- a/platform/common/config_file.c
+++ b/platform/common/config_file.c
@@ -68,6 +68,7 @@ static void keys_write(FILE *fn, int dev_id, const int *binds, const int *kbd_bi
 
                name = in_get_key_name(dev_id, k);
                if (strcmp(name, "#") == 0) name = "\\x23"; // replace comment sign
+               if (strcmp(name, "=") == 0) name = "\\x3d"; // replace assignment sign
 
                for (i = 0; me_ctrl_actions[i].name != NULL; i++) {
                        mask = me_ctrl_actions[i].mask;
@@ -107,6 +108,7 @@ static void keys_write(FILE *fn, int dev_id, const int *binds, const int *kbd_bi
        for (k = 0; k < key_count; k++) {
                const char *name = in_get_key_name(dev_id, k);
                if (strcmp(name, "#") == 0) name = "\\x23"; // replace comment sign
+               if (strcmp(name, "=") == 0) name = "\\x3d"; // replace assignment sign
                if (kbd_binds[k])
                        fprintf(fn, "bind %s = key%02x" NL, name, kbd_binds[k]);
        }

diff --git a/platform/common/emu.c b/platform/common/emu.c
index a7cae06..89d0c29 100644 (file)
--- a/platform/common/emu.c
+++ b/platform/common/emu.c
@@ -59,6 +59,12 @@ int pico_inp_mode;
 int flip_after_sync;\r
 int engineState = PGS_Menu;\r
 \r
+static int kbd_mode;\r
+\r
+static int pico_page;\r
+static int pico_w, pico_h;\r
+static u16 *pico_overlay;\r
+\r
 static short __attribute__((aligned(4))) sndBuffer[2*54000/50];\r
 \r
 /* tmp buff to reduce stack usage for plats with small stack */\r
@@ -1049,10 +1055,6 @@ void emu_reset_game(void)
        reset_timing = 1;\r
 }\r
 \r
-static int pico_page;\r
-static int pico_w, pico_h;\r
-static u16 *pico_overlay;\r
-\r
 static u16 *load_pico_overlay(int page, int w, int h)\r
 {\r
        static const char *pic_exts[] = { "png", "PNG" };\r
@@ -1129,13 +1131,12 @@ void run_events_pico(unsigned int events)
                PicoPicohw.page++;\r
                if (PicoPicohw.page > 7)\r
                        PicoPicohw.page = 7;\r
-        if (PicoPicohw.page == 7) {\r
-            // Used in games that require the Keyboard Pico peripheral\r
-            emu_status_msg("Test Page");\r
-        }\r
-        else {\r
-            emu_status_msg("Page %i", PicoPicohw.page);\r
-        }\r
+               if (PicoPicohw.page == 7) {\r
+                       // Used in games that require the Keyboard Pico peripheral\r
+                       emu_status_msg("Test Page");\r
+               } else {\r
+                       emu_status_msg("Page %i", PicoPicohw.page);\r
+               }\r
        }\r
        if (events & PEV_PICO_STORY) {\r
                if (pico_inp_mode == 1) {\r
@@ -1148,9 +1149,6 @@ void run_events_pico(unsigned int events)
        }\r
        if (events & PEV_PICO_PAD) {\r
                if (pico_inp_mode == 2) {\r
-                       pico_inp_mode = (PicoIn.opt & POPT_EN_PICO_KBD ? 3 : 0);\r
-                       emu_status_msg("Input: %s", pico_inp_mode ? "Keyboard" : "D-Pad");\r
-               } else if (pico_inp_mode == 3) {\r
                        pico_inp_mode = 0;\r
                        emu_status_msg("Input: D-Pad");\r
                } else {\r
@@ -1164,16 +1162,15 @@ void run_events_pico(unsigned int events)
                emu_status_msg("Pen %s", PicoPicohw.pen_pos[0] & 0x8000 ? "Up" : "Down");\r
        }\r
 \r
-       if (((currentConfig.EmuOpt & EOPT_PICO_PEN) &&\r
-                       (PicoIn.pad[0]&0x20) && pico_inp_mode && pico_overlay) ||\r
-           (!(PicoIn.opt & POPT_EN_PICO_KBD) && pico_inp_mode == 3)) {\r
+       if ((currentConfig.EmuOpt & EOPT_PICO_PEN) &&\r
+                       (PicoIn.pad[0]&0x20) && pico_inp_mode && pico_overlay) {\r
                pico_inp_mode = 0;\r
                emu_status_msg("Input: D-Pad");\r
        }\r
 \r
-       PicoPicohw.kb.active = pico_inp_mode == 3;\r
+       PicoPicohw.kb.active = (PicoIn.opt & POPT_EN_PICO_KBD ? kbd_mode : 0);\r
 \r
-       if (pico_inp_mode == 0 || pico_inp_mode == 3)\r
+       if (pico_inp_mode == 0)\r
                return;\r
 \r
        /* handle other input modes */\r
@@ -1266,10 +1263,6 @@ static void run_events_ui(unsigned int which)
                }\r
                plat_status_msg_busy_done();\r
        }\r
-       if (which & PEV_SWITCH_RND)\r
-       {\r
-               plat_video_toggle_renderer(1, 0);\r
-       }\r
        if (which & (PEV_SSLOT_PREV|PEV_SSLOT_NEXT))\r
        {\r
                if (which & PEV_SSLOT_PREV) {\r
@@ -1285,6 +1278,15 @@ static void run_events_ui(unsigned int which)
                emu_status_msg("SAVE SLOT %i [%s]", state_slot,\r
                        emu_check_save_file(state_slot, NULL) ? "USED" : "FREE");\r
        }\r
+       if (which & PEV_SWITCH_RND)\r
+       {\r
+               plat_video_toggle_renderer(1, 0);\r
+       }\r
+       if (which & PEV_SWITCH_KBD)\r
+       {\r
+               kbd_mode = !kbd_mode;\r
+               emu_status_msg("Keyboard %s", kbd_mode ? "on" : "off");\r
+       }\r
        if (which & PEV_RESET)\r
                emu_reset_game();\r
        if (which & PEV_MENU)\r
@@ -1300,19 +1302,6 @@ void emu_update_input(void)
        int events;\r
 \r
        in_update(actions);\r
-       in_update_kbd(actions_kbd);\r
-       PicoIn.kbd = 0;\r
-       for (int i = 0; i < IN_BIND_LAST; i++) {\r
-               if (actions_kbd[i]) {\r
-                       unsigned int action = actions_kbd[i];\r
-                       unsigned int key = (action & 0xff);\r
-                       if (key == PEVB_KBD_SHIFT || key == PEVB_KBD_CTRL || key == PEVB_KBD_FUNC) {\r
-                               PicoIn.kbd = (PicoIn.kbd & 0x00ff) | (action << 8);\r
-                       } else {\r
-                               PicoIn.kbd = (PicoIn.kbd & 0xff00) | action;\r
-                       }\r
-               }\r
-       }\r
 \r
        pl_actions[0] = actions[IN_BINDTYPE_PLAYER12];\r
        pl_actions[1] = actions[IN_BINDTYPE_PLAYER12] >> 16;\r
@@ -1321,20 +1310,23 @@ void emu_update_input(void)
 \r
        events = actions[IN_BINDTYPE_EMU] & PEV_MASK;\r
 \r
-       if (pico_inp_mode == 3) {\r
+       if (kbd_mode) {\r
+               int mask = (PicoIn.AHW & PAHW_PICO ? 0xf : 0x0);\r
+               in_update_kbd(actions_kbd);\r
+\r
                // FIXME: Only passthrough joystick input to avoid collisions\r
                // with PS/2 bindings. Ideally we should check if the device this\r
                // input originated from is the same as the device used for\r
                // PS/2 input, and passthrough if they are different devices.\r
-               PicoIn.pad[0] = pl_actions[0] & 0xf;\r
-               PicoIn.pad[1] = pl_actions[1] & 0xf;\r
-               PicoIn.pad[2] = pl_actions[2] & 0xf;\r
-               PicoIn.pad[3] = pl_actions[3] & 0xf;\r
+               PicoIn.pad[0] = pl_actions[0] & mask;\r
+               PicoIn.pad[1] = pl_actions[1] & mask;\r
+               PicoIn.pad[2] = pl_actions[2] & mask;\r
+               PicoIn.pad[3] = pl_actions[3] & mask;\r
 \r
                // Ignore events mapped to bindings that collide with PS/2 peripherals.\r
                // Note that calls to emu_set_fastforward() should be avoided as well,\r
                // since fast-forward activates even with parameter set_on = 0.\r
-               events &= ~PEV_MENU;\r
+               events &= PEV_SWITCH_KBD;\r
        } else {\r
                PicoIn.pad[0] = pl_actions[0] & 0xfff;\r
                PicoIn.pad[1] = pl_actions[1] & 0xfff;\r
@@ -1363,7 +1355,22 @@ void emu_update_input(void)
 \r
        events &= ~prev_events;\r
 \r
-       if (PicoIn.AHW == PAHW_PICO)\r
+       // update keyboard input, actions only updated if keyboard mode active\r
+       PicoIn.kbd = 0;\r
+       for (int i = 0; i < IN_BIND_LAST; i++) {\r
+               if (actions_kbd[i]) {\r
+                       unsigned int action = actions_kbd[i];\r
+                       unsigned int key = (action & 0xff);\r
+                       if (key == PEVB_KBD_LSHIFT || key == PEVB_KBD_RSHIFT ||\r
+                           key == PEVB_KBD_CTRL || key == PEVB_KBD_FUNC) {\r
+                               PicoIn.kbd = (PicoIn.kbd & 0x00ff) | (action << 8);\r
+                       } else {\r
+                               PicoIn.kbd = (PicoIn.kbd & 0xff00) | action;\r
+                       }\r
+               }\r
+       }\r
+\r
+       if (PicoIn.AHW & PAHW_PICO)\r
                run_events_pico(events);\r
        if (events)\r
                run_events_ui(events);\r

diff --git a/platform/common/input_pico.h b/platform/common/input_pico.h
index 0ecbee0..369a6fc 100644 (file)
--- a/platform/common/input_pico.h
+++ b/platform/common/input_pico.h
@@ -30,7 +30,8 @@
 #define PEVB_PICO_STORY 19
 #define PEVB_PICO_PAD   18
 #define PEVB_PICO_PENST 17
-#define PEVB_RESET      16
+#define PEVB_SWITCH_KBD 16
+#define PEVB_RESET      15
 
 #define PEV_VOL_DOWN    (1 << PEVB_VOL_DOWN)
 #define PEV_VOL_UP      (1 << PEVB_VOL_UP)
@@ -46,9 +47,10 @@
 #define PEV_PICO_STORY  (1 << PEVB_PICO_STORY)
 #define PEV_PICO_PAD    (1 << PEVB_PICO_PAD)
 #define PEV_PICO_PENST  (1 << PEVB_PICO_PENST)
+#define PEV_SWITCH_KBD  (1 << PEVB_SWITCH_KBD)
 #define PEV_RESET       (1 << PEVB_RESET)
 
-#define PEV_MASK 0x7fff0000
+#define PEV_MASK 0x7fff8000
 
 /* Keyboard Pico */
 
@@ -112,7 +114,7 @@
 
 // Orange buttons on left
 #define PEVB_KBD_CAPSLOCK 0x58
-#define PEVB_KBD_SHIFT 0x12 // left shift
+#define PEVB_KBD_LSHIFT 0x12 // left shift
 
 // Green buttons on right
 #define PEVB_KBD_BACKSPACE 0x66
@@ -129,6 +131,7 @@
 #define PEVB_KBD_ROMAJI 0x17
 
 // Other buttons for SC-3000
+#define PEVB_KBD_RSHIFT 0x59 // right shift
 #define PEVB_KBD_CTRL 0x14
 #define PEVB_KBD_FUNC 0x11
 #define PEVB_KBD_UP 0x75

diff --git a/platform/common/inputmap_kbd.c b/platform/common/inputmap_kbd.c
index eaefc2d..497a5df 100644 (file)
--- a/platform/common/inputmap_kbd.c
+++ b/platform/common/inputmap_kbd.c
@@ -32,6 +32,7 @@ const struct in_default_bind _in_sdl_defbinds[] = {
        { SDLK_F8,     IN_BINDTYPE_EMU, PEVB_PICO_STORY },
        { SDLK_F9,     IN_BINDTYPE_EMU, PEVB_PICO_PAD },
        { SDLK_F10,    IN_BINDTYPE_EMU, PEVB_PICO_PENST },
+       { SDLK_F12,    IN_BINDTYPE_EMU, PEVB_SWITCH_KBD },
        { SDLK_BACKSPACE, IN_BINDTYPE_EMU, PEVB_FF },
 
        { 0, 0, 0 }
@@ -103,7 +104,7 @@ const struct in_default_bind in_sdl_kbd_map[] = {
        // NB caps lock generates only a pulse on most keyboards, even if the
        // button is kept pressed. Using ctrl key for complete up/down handling.
        { SDLK_LCTRL, IN_BINDTYPE_KEYBOARD, PEVB_KBD_CAPSLOCK }, // Also switches english input
-       { SDLK_LSHIFT, IN_BINDTYPE_KEYBOARD, PEVB_KBD_SHIFT },
+       { SDLK_LSHIFT, IN_BINDTYPE_KEYBOARD, PEVB_KBD_LSHIFT },
 
        // Green buttons on right
        { SDLK_BACKSPACE, IN_BINDTYPE_KEYBOARD, PEVB_KBD_BACKSPACE },

diff --git a/platform/common/keyboard.c b/platform/common/keyboard.c
index 8cfd514..3b4a5f3 100644 (file)
--- a/platform/common/keyboard.c
+++ b/platform/common/keyboard.c
@@ -60,7 +60,7 @@ static struct key kbd_pico_row3[] = {
        { 0 },
 };
 static struct key kbd_pico_row4[] = {
-       {  0, "shift", "shift", PEVB_KBD_SHIFT },
+       {  0, "shift", "shift", PEVB_KBD_LSHIFT },
        {  7, "z", "Z",         PEVB_KBD_z },
        { 10, "x", "X",         PEVB_KBD_x },
        { 13, "c", "C",         PEVB_KBD_c },
@@ -76,9 +76,9 @@ static struct key kbd_pico_row4[] = {
        { 0 },
 };
 static struct key kbd_pico_row5[] = {
-       {  0, "muhenkan", "muhenkan",   PEVB_KBD_SOUND },
+       {  0, "muhenkan", "muhenkan",   PEVB_KBD_SOUND }, // Korean: sound
        { 13, "space", "space",         PEVB_KBD_SPACE },
-       { 22, "henkan", "henkan",       PEVB_KBD_HOME },
+       { 22, "henkan", "henkan",       PEVB_KBD_HOME }, // Korean: home
        { 29, "kana", "kana",           PEVB_KBD_CJK },
        { 34, "romaji", "romaji",       PEVB_KBD_ROMAJI },
        { 0 },
@@ -123,7 +123,7 @@ static struct key kbd_sc3000_row2[] = {
        { 0 },
 };
 static struct key kbd_sc3000_row3[] = {
-       {  0, "ctrl", "ctrl",   PEVB_KBD_CTRL },
+       {  0, "ctrl", "ctrl",   PEVB_KBD_CAPSLOCK },
        {  6, "a", "A",         PEVB_KBD_a },
        {  9, "s", "S",         PEVB_KBD_s },
        { 12, "d", "D",         PEVB_KBD_d },
@@ -142,7 +142,7 @@ static struct key kbd_sc3000_row3[] = {
        { 0 },
 };
 static struct key kbd_sc3000_row4[] = {
-       {  0, "shift", "shift", PEVB_KBD_SHIFT },
+       {  0, "shift", "shift", PEVB_KBD_LSHIFT },
        {  7, "z", "Z",         PEVB_KBD_z },
        { 10, "x", "X",         PEVB_KBD_x },
        { 13, "c", "C",         PEVB_KBD_c },
@@ -154,7 +154,7 @@ static struct key kbd_sc3000_row4[] = {
        { 31, ".", ">",         PEVB_KBD_PERIOD },
        { 34, "/", "?",         PEVB_KBD_SLASH },
        { 37, "pi", "pi",       PEVB_KBD_RO },
-       { 41, "shift", "shift", PEVB_KBD_SHIFT },
+       { 41, "shift", "shift", PEVB_KBD_RSHIFT },
        { 50, "v", "v",         PEVB_KBD_DOWN },
        { 0 },
 };

diff --git a/platform/common/menu_pico.c b/platform/common/menu_pico.c
index d5be800..ab639c5 100644 (file)
--- a/platform/common/menu_pico.c
+++ b/platform/common/menu_pico.c
@@ -375,6 +375,7 @@ me_bind_action emuctrl_actions[] =
        { "Pico Storyware ", PEV_PICO_STORY },
        { "Pico Pad       ", PEV_PICO_PAD },
        { "Pico Pen state ", PEV_PICO_PENST },
+       { "Switch Keyboard", PEV_SWITCH_KBD },
        { NULL,                0 }
 };
 
@@ -443,8 +444,8 @@ int key_config_kbd_loop(int id, int keys)
        int inp;
        int dev;
 
-       int w = 30 * me_mfont_w;
-       int x = g_menuscreen_w / 2 - w / 2;
+       int w = 20 * me_mfont_w / 2;
+       int x = g_menuscreen_w / 2;
 
        struct key *key;
        const int *binds;
@@ -454,7 +455,6 @@ int key_config_kbd_loop(int id, int keys)
        snprintf(ma2, sizeof(ma2), "%s", in_get_key_name(-1, -PBTN_MA2));
        snprintf(r, sizeof(r), "%s", in_get_key_name(-1, -PBTN_R));
        snprintf(l, sizeof(r), "%s", in_get_key_name(-1, -PBTN_L));
-       w = (strlen(mok)+strlen(ma2)) * me_mfont_w / 2;
 
        for (dev = 0; dev < IN_MAX_DEVS-1; dev++)
                if ((binds = in_get_dev_kbd_binds(dev))) break;
@@ -468,14 +468,16 @@ int key_config_kbd_loop(int id, int keys)
                for (bc--; bc >= 0 && binds[bc] != key->key; bc--) ;
 
                menu_draw_begin(1, 0);
-               text_out16(x, 2 * me_mfont_h, "-- %s Keyboard --", toggle ? "SC-3000" : "Pico");
+               text_out16(x - w, 2 * me_mfont_h, "Keyboard type: %s", toggle ? "SC-3000" : "Pico");
                kbd_draw(kbd, shift, (g_menuscreen_w - 320)/2, 4 * me_mfont_h, key);
-               text_out16(x - w, g_menuscreen_h - 7 * me_mfont_h, "currently bound to %s", in_get_key_name(-1, bc));
-               text_out16(x - w, g_menuscreen_h - 5 * me_mfont_h, "%s - bind, %s - clear", mok, ma2);
-               text_out16(x - w, g_menuscreen_h - 4 * me_mfont_h, "%s - toggle, %s - shift", r, l);
+               text_out16(x - 2*w, g_menuscreen_h - 7 * me_mfont_h, "currently bound to %s",
+                               bc >= 0 ? in_get_key_name(-1, bc) : "nothing");
+               if (!shift)
+                       text_out16(x - 2*w, g_menuscreen_h - 5 * me_mfont_h, "%s - bind, %s - clear", mok, ma2);
+               text_out16(x - 2*w, g_menuscreen_h - 4 * me_mfont_h, "%s - swap type, %s - shift view", r, l);
                menu_draw_end();
 
-               inp = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT|
+               inp = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT|PBTN_MA2|
                        PBTN_MOK|PBTN_MBACK|PBTN_MENU|PBTN_L|PBTN_R, NULL, 70);
                if (inp & (PBTN_MENU|PBTN_MBACK))
                        break;
@@ -508,6 +510,7 @@ int key_config_kbd_loop(int id, int keys)
 
                        while (in_menu_wait_any(NULL, 30) & PBTN_MOK)
                                ;
+                       if (shift) continue;
 
                        key = &kbd[keyy][keyx];
                        menu_draw_begin(1, 0);
@@ -520,9 +523,12 @@ int key_config_kbd_loop(int id, int keys)
                        for (is_down = 1; is_down; )
                                kc = in_update_keycode(&bind_dev_id, &is_down, NULL, -1);
 
-                       in_bind_kbd_key(bind_dev_id, bc, 0); /* ?? */
+                       in_bind_kbd_key(dev, bc, -1);
                        in_bind_kbd_key(bind_dev_id, kc, kbd[keyy][keyx].key);
                }
+               if (inp & PBTN_MA2) {
+                       in_bind_kbd_key(dev, bc, -1);
+               }
        }
 
        return 0;
@@ -1412,8 +1418,9 @@ static int main_menu_handler(int id, int keys)
 
 static const char *mgn_picopage(int id, int *offs)
 {
-       strcpy(static_buff, "   ");
-       sprintf(static_buff, "%i", PicoPicohw.page);
+       if (PicoPicohw.page != 7)
+               sprintf(static_buff, "%i", PicoPicohw.page);
+       else    sprintf(static_buff, "Test");
        return static_buff;
 }
 
@@ -1421,8 +1428,8 @@ static int mh_picopage(int id, int keys)
 {
        if (keys & (PBTN_LEFT|PBTN_RIGHT)) { // multi choice
                PicoPicohw.page += (keys & PBTN_LEFT) ? -1 : 1;
-               if (PicoPicohw.page < 0) PicoPicohw.page = 6;
-               else if (PicoPicohw.page > 6) PicoPicohw.page = 0;
+               if (PicoPicohw.page < 0) PicoPicohw.page = 7;
+               else if (PicoPicohw.page > 7) PicoPicohw.page = 0;
                return 0;
        }
        return 1;

diff --git a/platform/libpicofe b/platform/libpicofe
index 4acbd7f..d4428e4 160000 (submodule)
--- a/platform/libpicofe
+++ b/platform/libpicofe
@@ -1 +1 @@
-Subproject commit 4acbd7fec908288d3ba134c3ee17e05d3b3adddc
+Subproject commit d4428e4e21c79064dea669dfc6c93f1a1cb9c536