Some key mapping.

nzeemin · Jan 7, 2023 · 885c260 · 885c260
1 parent 22ada61
commit 885c260
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/emulator/ScreenView.cpp b/emulator/ScreenView.cpp
@@ -267,14 +267,14 @@ void ScreenView_PrepareScreen()
 
 #define NOKEY 0x0000
 
-// ÀÐ2 = Ctrl;
-// Ins = ÂÑ;  Tab = ÒÀÁ;
-// ÐÓÑ = End, 0x23;  ËÀÒ = Home, 0x24;
+// ÀÐ2 = Esc; ÇÁ = Backspace
+// ÑÒÎÏ = Pause/Break
+// ÍÐ = LShift
 const uint16_t arrPcscan2VscanRus[256] =    // Device keys from PC keys, RUS
 {
     /*         0      1      2      3      4      5      6      7      8      9      a      b      c      d      e      f  */
-    /*0*/    NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY,
-    /*1*/    NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY,
+    /*0*/    NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, 0x503, NOKEY, NOKEY, NOKEY, NOKEY, 0x608, NOKEY, NOKEY,
+    /*1*/    NOKEY, NOKEY, NOKEY, 0x240, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY,
     /*2*/    NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY,
     /*3*/    0x720, 0x102, 0x104, 0x103, 0x008, 0x110, 0x105, 0x020, 0x006, 0x706, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY,
     /*4*/    NOKEY, 0106, 0111, 0123, 0127, 0125, 0101, 0120, 0122, 0133, 0117, 0114, 0104, 0120, 0124, 0135,
@@ -283,18 +283,19 @@ const uint16_t arrPcscan2VscanRus[256] =    // Device keys from PC keys, RUS
     /*7*/    NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY,
     /*8*/    NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY,
     /*9*/    NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY,
-    /*a*/    NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY,
+    /*a*/    0x440, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY,
     /*b*/    NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY,
     /*c*/    NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY,
     /*d*/    NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY,
     /*e*/    NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY,
     /*f*/    NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY,
 };
+// @ = '
 const uint16_t arrPcscan2VscanLat[256] =    // Device keys from PC keys, LAT
 {
     /*         0      1      2      3      4      5      6      7      8      9      a      b      c      d      e      f  */
-    /*0*/    NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY,
-    /*1*/    NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, 0x080, NOKEY, NOKEY, NOKEY, NOKEY,
+    /*0*/    NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, 0x503, NOKEY, NOKEY, NOKEY, NOKEY, 0x608, NOKEY, NOKEY,
+    /*1*/    NOKEY, NOKEY, NOKEY, 0x240, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, 0x080, NOKEY, NOKEY, NOKEY, NOKEY,
     /*2*/    0x408, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY,
     /*3*/    0x720, 0x102, 0x104, 0x103, 0x008, 0x110, 0x105, 0x020, 0x006, 0x706, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY,
     /*4*/    NOKEY, 0x303, 0x320, 0x202, 0x206, 0x108, 0x201, 0x205, 0x620, 0x308, 0x101, 0x203, 0x220, 0x403, 0x210, 0x305,
@@ -303,10 +304,10 @@ const uint16_t arrPcscan2VscanLat[256] =    // Device keys from PC keys, LAT
     /*7*/    NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY,
     /*8*/    NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY,
     /*9*/    NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY,
-    /*a*/    NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY,
-    /*b*/    NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY,
+    /*a*/    0x440, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY,
+    /*b*/    NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, 0x406, NOKEY, 0x505, NOKEY,
     /*c*/    NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY,
-    /*d*/    NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY,
+    /*d*/    NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, 0x306, NOKEY,
     /*e*/    NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY,
     /*f*/    NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY, NOKEY,
 };

diff --git a/emulator/Settings.cpp b/emulator/Settings.cpp
@@ -291,7 +291,7 @@ SETTINGS_GETSET_DWORD(RealSpeed, _T("RealSpeed"), WORD, 1);
 SETTINGS_GETSET_DWORD(Sound, _T("Sound"), BOOL, FALSE);
 SETTINGS_GETSET_DWORD(SoundVolume, _T("SoundVolume"), WORD, 0x3fff);
 
-SETTINGS_GETSET_DWORD(Keyboard, _T("Keyboard"), BOOL, TRUE);
+SETTINGS_GETSET_DWORD(Keyboard, _T("Keyboard"), BOOL, FALSE);
 
 
 //////////////////////////////////////////////////////////////////////

diff --git a/emulator/emubase/Board.cpp b/emulator/emubase/Board.cpp
@@ -67,7 +67,7 @@ CMotherboard::CMotherboard()
 
     SetConfiguration(0);  // Default configuration
 
-    m_pFloppyCtl->SetTrace(true);//DEBUG
+    //m_pFloppyCtl->SetTrace(true);//DEBUG
 
     Reset();
 }