Thu 15 Aug 2019 15:32:42 EDT - PC Engine / Turbo Grafx

Author: 32teeth

.DS_Store

@@ -87,11 +87,10 @@
     {"Delete Save",5, 15},
     {"Exit Game",6, 20}
   };
-  STATES WITHOUTSAVE[4] = {
+  STATES WITHOUTSAVE[3] = {
     {"Resume Game",0, 0},
     {"Restart Game",1, 10},
-    {"Save Game",3, 25},
-    {"Exit Game",6, 20}                      
+    {"Exit Game",6, 20}
   }; 
   STATES STATE; 
 
@@ -438,7 +437,7 @@
       buffer = (uint16_t *)malloc(size);    
       if (!buffer) abort();   
       OPTION = 0;                 
-      OPTIONS = SAVED ? 6 : 4;
+      OPTIONS = SAVED ? 6 : 3;
       hud_theme();
       GUI = THEMES[USER];
       STATE = OPTIONS == 6 ? WITHSAVE[OPTION] : WITHOUTSAVE[OPTION];     

Components/odroid-go-pcengine-huexpress/odroid-go-common/components/odroid/odroid_hud.c

@@ -396,7 +396,8 @@ NOINLINE void app_init(void)
         abort();
     }
 
-    char *rom_file = odroid_ui_choose_file("/sd/roms/pce", "pce");
+    //char *rom_file = odroid_ui_choose_file("/sd/roms/pce", "pce");
+    char* rom_file = odroid_settings_RomFilePath_get();
     if (!rom_file)
     {
         printf("No file selected!\n");

Components/odroid-go-pcengine-huexpress/pcengine-go/main/main.c

@@ -26,4 +26,18 @@ menu "Retro ESP32 Configuration"
         bool "START + SELECT as MENU button"
 
     endchoice
+
+    choice IN_GAME_MENU
+        prompt "In Game Menu"
+        default IN_GAME_MENU_NO
+        help
+            Use Retro ESP32 - In Game Menu
+
+    config IN_GAME_MENU_YES
+        bool "YES"
+
+    config IN_GAME_MENU_NO
+        bool "NO"
+
+    endchoice    
 endmenu    

Components/prosystem-odroid-go/components/odroid/Kconfig.projbuild

@@ -1447,6 +1447,27 @@ void odroid_display_show_hourglass()
 
 SemaphoreHandle_t gb_mutex = NULL;
 
+void odroid_display_lock()
+{
+    if (!gb_mutex)
+    {
+        gb_mutex = xSemaphoreCreateMutex();
+        if (!gb_mutex) abort();
+    }
+
+    if (xSemaphoreTake(gb_mutex, 1000 / portTICK_RATE_MS) != pdTRUE)
+    {
+        abort();
+    }
+}
+
+void odroid_display_unlock()
+{
+    if (!gb_mutex) abort();
+
+    xSemaphoreGive(gb_mutex);
+}
+
 void odroid_display_lock_gb_display()
 {
     if (!gb_mutex)

Components/prosystem-odroid-go/components/odroid/odroid_display.c

@@ -28,6 +28,8 @@ void display_tasktonotify_set(int value);
 int is_backlight_initialized();
 void odroid_display_show_splash();
 void odroid_display_drain_spi();
+void odroid_display_lock();
+void odroid_display_unlock();
 void odroid_display_lock_gb_display();
 void odroid_display_unlock_gb_display();
 void odroid_display_show_sderr(int errNum);

Components/prosystem-odroid-go/components/odroid/odroid_display.h

@@ -54,8 +54,8 @@
   #define WHITE 65535
   #define BLACK 0     
   int OPTION = 0;
-  extern int ACTION = 0;
   int OPTIONS = 3;
+  extern int ACTION = 0;
   int8_t USER;
   int8_t DELETE_SAVE;
   int x, y, w, h, i, size;
@@ -87,10 +87,9 @@
     {"Delete Save",5, 15},
     {"Exit Game",6, 20}
   };
-  STATES WITHOUTSAVE[4] = {
+  STATES WITHOUTSAVE[3] = {
     {"Resume Game",0, 0},
     {"Restart Game",1, 10},
-    {"Save Game",3, 25},
     {"Exit Game",6, 20}                      
   }; 
   STATES STATE; 
@@ -321,7 +320,7 @@
 
 //{#pragma region Mask
   void hud_mask(int x, int y, int w, int h){
-    for (int i = 0; i < w * h; i++) buffer[i] = GUI.bg;
+    for (i = 0; i < w * h; i++) buffer[i] = GUI.bg;
     ili9341_write_frame_rectangleLE(x, y, w, h, buffer);
   }
 
@@ -438,11 +437,12 @@
       buffer = (uint16_t *)malloc(size);    
       if (!buffer) abort();   
       OPTION = 0;                 
-      OPTIONS = SAVED ? 6 : 4;
+      OPTIONS = SAVED ? 6 : 3;
       hud_theme();
       GUI = THEMES[USER];
       STATE = OPTIONS == 6 ? WITHSAVE[OPTION] : WITHOUTSAVE[OPTION];     
       INIT = true;
+      hud_debug("HUD - INIT");
     }                     
   }
 
@@ -451,13 +451,17 @@
     buffer = realloc(buffer, size);                      
     free(buffer);
     INIT = false;
+    hud_debug("HUD - DEINIT");
   }
 //}#pragma endregion Init  
 
 //{#pragma region Menu
   void hud_menu(void) {
     hud_init();                         
     hud_debug("HUD - MENU");
+    //hud_background();
+    //hud_logo();
+    usleep(200000);
     hud_background();
     hud_logo();
     hud_options();
@@ -488,7 +492,8 @@
         BUTTON A
       */
       if (gamepad.values[ODROID_INPUT_B]) {
-        ACTION = 0;
+        STATE.action = 0;
+        ili9341_clear(0);
         debounce(ODROID_INPUT_B);
         return 0;
       }      
@@ -504,7 +509,7 @@
             return 0;
           break;
           case 1: // "Restart Game"
-            odroid_settings_StartAction_set(1);
+            //odroid_settings_StartAction_set(1);
             forceConsoleReset = true;
             esp_restart();          
           break;