1
0
mirror of https://github.com/mist-devel/mist-firmware.git synced 2026-01-13 15:17:43 +00:00

8bit osd tests

This commit is contained in:
harbaum 2014-06-13 09:56:11 +00:00
parent 0ef7822128
commit fa0caa4483
5 changed files with 45 additions and 6 deletions

View File

@ -332,7 +332,8 @@ const unsigned short usb2ps2[] = {
0x01, // 42: F9
0x09, // 43: F10
0x78, // 44: F11
0x07, // 45: F12
OSD_LOC, // 45: F12 (OSD)
// 0x07, // 45: F12
EXT | 0x7c, // 46: Print Screen
NUM_LOCK_TOGGLE, // 47: Scroll Lock
0x77, // 48: Pause (special key handled inside user_io)

5
main.c
View File

@ -197,6 +197,11 @@ int main(void)
HandleFpga();
HandleUI();
}
// 8 bit cores can also have a ui
if(user_io_core_type() == CORE_TYPE_8BIT) {
HandleUI();
}
}
return 0;
}

34
menu.c
View File

@ -295,15 +295,43 @@ void HandleUI(void)
{
if(user_io_core_type() == CORE_TYPE_MINIMIG)
menustate = MENU_MAIN1;
else
else if(user_io_core_type() == CORE_TYPE_MIST)
menustate = MENU_MIST_MAIN1;
menusub = 0;
else
menustate = MENU_DUMMY_MAIN1;
menusub = 0;
OsdClear();
OsdEnable(DISABLE_KEYBOARD);
}
break;
/******************************************************************/
/* dummy main menu */
/******************************************************************/
case MENU_DUMMY_MAIN1 :
menumask=0;
OsdSetTitle("Menu", 0);
OsdWrite(0, "", 0,0);
OsdWrite(1, " Dummy menu test", 0,0);
OsdWrite(2, "", 0,0);
OsdWrite(3, "", 0,0);
OsdWrite(4, "", 0,0);
OsdWrite(5, "", 0,0);
OsdWrite(6, "", 0,0);
OsdWrite(7, "", 0,0);
menustate = MENU_DUMMY_MAIN2;
parentstate=MENU_DUMMY_MAIN1;
break;
case MENU_DUMMY_MAIN2 :
// menu key closes menu
if (menu)
menustate = MENU_NONE1;
break;
/******************************************************************/
/* mist main menu */
/******************************************************************/

4
menu.h
View File

@ -84,6 +84,10 @@ enum MENU
MENU_MIST_VIDEO2,
MENU_MIST_VIDEO_ADJUST1,
MENU_MIST_VIDEO_ADJUST2,
// Dummy menu entries
MENU_DUMMY_MAIN1,
MENU_DUMMY_MAIN2,
};
// UI strings, used by boot messages

5
osd.c
View File

@ -660,8 +660,9 @@ unsigned char OsdGetCtrl(void)
DisableOsd();
}
// mist/atari core uses local queue
if(user_io_core_type() == CORE_TYPE_MIST)
// mist/atari and 8bit cores use local queue
if((user_io_core_type() == CORE_TYPE_MIST) ||
(user_io_core_type() == CORE_TYPE_8BIT))
c1 = OsdKeyGet();
// add front menu button