fix retroVGA build and crs keys for Vic20/C64

MCUME_pico/CMakeLists.txt

@@ -8,14 +8,14 @@ include(pico_sdk_import.cmake)
 
 #set(TARGET testkeymax)
 #set(TARGET pico20)
-#set(TARGET pico64)
+set(TARGET pico64)
 #set(TARGET pico81)
 #set(TARGET picospeccy)
 #set(TARGET pico800)
 #set(TARGET pico5200)
 #set(TARGET picocolem)
 #set(TARGET picoo2em)
-set(TARGET picovcs)
+#set(TARGET picovcs)
 
 project(${TARGET} C CXX)
 

MCUME_pico/config/iopins.h

@@ -47,7 +47,7 @@
 #define I2C_SCL_IO      15? 
 #define I2C_SDA_IO      14?
 */
-#else
+#else /* end MCUME_REV1 */
 
 #if (defined(PICOMPUTER) && defined(USE_VGA) )
 
@@ -58,7 +58,7 @@
    CSYNC */
 #define VGA_COLORBASE   0
 #define VGA_SYNCBASE    8
-#else
+#else /* end PICOMPUTER && USE_VGA () */
 
 #ifdef PICOZX
 
@@ -70,7 +70,7 @@
 #define VGA_COLORBASE   0
 #define VGA_SYNCBASE    6
 
-#else
+#else /* PICOZX */
 // Speaker
 #define AUDIO_PIN       0
 // VGA
@@ -110,12 +110,13 @@
 #define TFT_CS          21
 #define TFT_BACKLIGHT   20
 
-#else
+#else /* end PICOMPUTERMAX */
 #define TFT_RST         21
 #define TFT_CS          255
 #define TFT_BACKLIGHT   20
 #endif
-#else
+
+#else /* end PICOMPUTER */
 // MCUME_REV2 (ILI)
 #define TFT_RST         21
 #define TFT_CS          17
@@ -158,8 +159,8 @@
 #define KROWIN4         17
 #define KROWIN5         18
 #define KROWIN6         19
+#else /* end USE_VGA (RETROVGA)*/
 
-#else
 // Keyboard matrix 
 //Cols (out)
 #define KCOLOUT1        1

MCUME_pico/display/emuapi.cpp

@@ -1334,6 +1334,7 @@ int keypressed = emu_ReadKeys();
 #ifdef USE_VGA    
     tft.begin(MODE_VGA_320x240);
 #else
+
 #ifdef PICOZX    
   // Force VGA if LEFT/RIGHT pressed
   if (keypressed & MASK_JOY2_UP)
@@ -1360,34 +1361,24 @@ int keypressed = emu_ReadKeys();
       tft.begin(MODE_TFT_320x240);    
     }     
   }
-#else
+#else /* end PICOZX */
   tft.begin(MODE_TFT_320x240);    
 #endif 
 
 #endif
 
+#ifndef USE_VGA    
 #ifdef PICOMPUTER
   // Flip screen if UP pressed
   if (keypressed & MASK_JOY2_UP)
   {
-#ifdef PICOMPUTERMAX
-#ifndef USE_VGA    
     tft.flipscreen(true);
-#endif
-#else
-    tft.flipscreen(true);
-#endif
   }
   else 
   {
-#ifdef PICOMPUTERMAX
-#ifndef USE_VGA    
     tft.flipscreen(false);
-#endif
-#else
-    tft.flipscreen(false);
-#endif
   }
+#endif
 #endif
 
   if (keypressed & MASK_JOY2_DOWN) {

MCUME_pico/pico20/emucfg.h

@@ -26,7 +26,7 @@ const unsigned short key_map1[] = {
   'Q','W','E','R','T','Y','U','I','O','P',
   'A','S','D','F','G','H','J','K','L',0x0D,
   0,'Z','X','C','V','B','N','M',0,' ',
-  145,157,29,17,157,29 //U L R D L R
+  0,0,0,0,157,29 // L R
   };  
 
 const unsigned short key_map2[] = {
@@ -34,7 +34,7 @@ const unsigned short key_map2[] = {
   0,0,0,'<','>',0,0,0,';','"',
   0,0,0,0,0,'^','-','+','=',0x0D,
   0,':',0,'?','\/','*',',','.',0,' ',
-  0,0,0,0,0,0
+  145,157,29,17,0,0 // U L R D
   };  
 
 const unsigned short key_map3[] = {
@@ -60,7 +60,7 @@ const unsigned short key_map1[] = {
   'Q','W','E','R','T','Y','U','I','O','P',157,
   0,'A','S','D','F','G','H','J','K','L',0x0D,
   0,'Z','X','C','V','B','N','M','.',' ',
-  145,157,29,17 //U L R D
+  0,0,0,0
   };  
 
 #define keylables_map2_0 (char *)"1234567890 "
@@ -70,7 +70,7 @@ const unsigned short key_map2[] = {
   '1','2','3','4','5','6','7','8','9','0',0,
   0, '!','@','#','$','%','+','&','*','-','\/',
   0, '(',')','?','\/','"','<','>',',',':',
-  0,0,0,0
+  145,157,29,17 //U L R D
   };  
 
 #define keylables_map3_0 (char *)"\x11\x12\x13\x14\x15\x16\x17\x18   "

MCUME_pico/pico64/emucfg.h

@@ -26,7 +26,7 @@ const unsigned short key_map1[] = {
   'Q','W','E','R','T','Y','U','I','O','P',
   'A','S','D','F','G','H','J','K','L',0x0D,
   0,'Z','X','C','V','B','N','M',0,' ',
-  145,157,29,17,157,29 //U L R D L R
+  0,0,0,0,157,29   // L R
   };  
 
 const unsigned short key_map2[] = {
@@ -34,7 +34,7 @@ const unsigned short key_map2[] = {
   0,0,0,'<','>',0,0,0,';','"',
   0,0,0,0,0,'^','-','+','=',0x0D,
   0,':',0,'?','\/','*',',','.',0,' ',
-  0,0,0,0,0,0
+  145,157,29,17,0,0 // U L R D
   };  
 
 const unsigned short key_map3[] = {
@@ -60,7 +60,7 @@ const unsigned short key_map1[] = {
   'Q','W','E','R','T','Y','U','I','O','P',157,
   0,'A','S','D','F','G','H','J','K','L',0x0D,
   0,'Z','X','C','V','B','N','M','.',' ',
-  145,157,29,17 //U L R D
+  0,0,0,0
   };  
 
 #define keylables_map2_0 (char *)"1234567890 "
@@ -70,7 +70,7 @@ const unsigned short key_map2[] = {
   '1','2','3','4','5','6','7','8','9','0',0,
   0, '!','@','#','$','%','+','&','*','-','\/',
   0, '(',')','?','\/','"','<','>',',',':',
-  0,0,0,0
+  145,157,29,17 //U L R D
   };  
 
 #define keylables_map3_0 (char *)"\x11\x12\x13\x14\x15\x16\x17\x18   "