Added a way to force VGA mode in safe menu

Aurelio92 · May 22, 2021 · 22c9f7a · 22c9f7a
1 parent 4521e3a
commit 22c9f7a
Show file tree

Hide file tree

Showing 63 changed files with 11 additions and 2 deletions.
diff --git a/include/config.h b/include/config.h
diff --git a/include/debug.h b/include/debug.h
diff --git a/include/gc2wiimote.h b/include/gc2wiimote.h
diff --git a/include/genpad.h b/include/genpad.h
diff --git a/include/gpio.h b/include/gpio.h
diff --git a/include/gui/guielements.h b/include/gui/guielements.h
diff --git a/include/gui/guigamesview.h b/include/gui/guigamesview.h
diff --git a/include/gui/guihbview.h b/include/gui/guihbview.h
diff --git a/include/gui/guiluaelement.h b/include/gui/guiluaelement.h
diff --git a/include/gui/theme.h b/include/gui/theme.h
diff --git a/include/hiidra.h b/include/hiidra.h
diff --git a/include/i2c.h b/include/i2c.h
diff --git a/include/luasupport.h b/include/luasupport.h
diff --git a/include/main.h b/include/main.h
@@ -18,3 +18,4 @@ void lockSIMutex();
 void unlockSIMutex();
 Vector2 getScreenSize();
 bool isVGAEnabled();
+void setVGAEnabled(bool en);
diff --git a/include/nintendont.h b/include/nintendont.h
diff --git a/include/peripherals/ave.h b/include/peripherals/ave.h
diff --git a/include/peripherals/mx.h b/include/peripherals/mx.h
diff --git a/include/peripherals/pms2.h b/include/peripherals/pms2.h
diff --git a/include/peripherals/rvldd.h b/include/peripherals/rvldd.h
diff --git a/include/peripherals/uamp.h b/include/peripherals/uamp.h
diff --git a/include/safemenu.h b/include/safemenu.h
diff --git a/include/system.h b/include/system.h
diff --git a/include/systitles.h b/include/systitles.h
diff --git a/include/titles/titles.h b/include/titles/titles.h
diff --git a/include/utils.h b/include/utils.h
diff --git a/include/virtualsysconf.h b/include/virtualsysconf.h
diff --git a/source/config.cpp b/source/config.cpp
diff --git a/source/debug.c b/source/debug.c
diff --git a/source/genpad.cpp b/source/genpad.cpp
diff --git a/source/gui.cpp b/source/gui.cpp
diff --git a/source/gui/README.md b/source/gui/README.md
diff --git a/source/gui/guigamesview.cpp b/source/gui/guigamesview.cpp
diff --git a/source/gui/guihbview.cpp b/source/gui/guihbview.cpp
diff --git a/source/gui/guiluaelement.cpp b/source/gui/guiluaelement.cpp
diff --git a/source/i2c.c b/source/i2c.c
diff --git a/source/luasupport.cpp b/source/luasupport.cpp
diff --git a/source/luasupport/luaanimlib.cpp b/source/luasupport/luaanimlib.cpp
diff --git a/source/luasupport/luagcpluslib.cpp b/source/luasupport/luagcpluslib.cpp
diff --git a/source/luasupport/luagfxlib.cpp b/source/luasupport/luagfxlib.cpp
diff --git a/source/luasupport/luaguilib.cpp b/source/luasupport/luaguilib.cpp
diff --git a/source/luasupport/luapadlib.cpp b/source/luasupport/luapadlib.cpp
diff --git a/source/luasupport/luapms2lib.cpp b/source/luasupport/luapms2lib.cpp
diff --git a/source/luasupport/luasyslib.cpp b/source/luasupport/luasyslib.cpp
diff --git a/source/luasupport/luatimelib.cpp b/source/luasupport/luatimelib.cpp
diff --git a/source/luasupport/luauamplib.cpp b/source/luasupport/luauamplib.cpp
diff --git a/source/main.cpp b/source/main.cpp
@@ -33,8 +33,11 @@
 
 #include "textures.h"
 #include "textures_tpl.h"
+#include "opensans_ttf.h"
 #include "notosans_ttf.h"
 
+#include "testelement_lua.h"
+
 #define HUD_CONFIG_PATH "/rvloader/hud.conf"
 
 static Vector2 screenSize;
@@ -83,6 +86,10 @@ bool isVGAEnabled() {
     return VGAEnabled;
 }
 
+void setVGAEnabled(bool en) {
+    VGAEnabled = en;
+}
+
 void shutdownCB() {
     powerOff();
 }

diff --git a/source/peripherals/ave.cpp b/source/peripherals/ave.cpp
diff --git a/source/peripherals/mx.cpp b/source/peripherals/mx.cpp
diff --git a/source/peripherals/pms2.cpp b/source/peripherals/pms2.cpp
diff --git a/source/peripherals/rvldd.cpp b/source/peripherals/rvldd.cpp
diff --git a/source/peripherals/uamp.cpp b/source/peripherals/uamp.cpp
diff --git a/source/safemenu.cpp b/source/safemenu.cpp
@@ -72,12 +72,13 @@ void safeMenu() {
 
     //VIDEO_Init disables VGA, so we need to enable it again
     i2c_init();
-    if (isVGAEnabled()) {
+    if (isVGAEnabled() || (held & PAD_BUTTON_B)) {
+        setVGAEnabled(true);
         aveEnableVGA();
     }
     i2c_deinit();
 
-    printf("\x1b[2;0HPMv2 safe menu\n\nSelect your option:\n");
+    printf("\x1b[2;0HRVL safe menu\n\nSelect your option:\n");
     printf("> Boot priiloader\n");
     printf("- Reset GC+ sticks\n");
     printf("- Exit to System Menu\n");

diff --git a/source/system.cpp b/source/system.cpp
diff --git a/source/systitles.cpp b/source/systitles.cpp
diff --git a/source/theme.cpp b/source/theme.cpp
diff --git a/source/titles/chan.cpp b/source/titles/chan.cpp
diff --git a/source/titles/gc.cpp b/source/titles/gc.cpp
diff --git a/source/titles/hb.cpp b/source/titles/hb.cpp
diff --git a/source/titles/vc.cpp b/source/titles/vc.cpp
diff --git a/source/titles/wii.cpp b/source/titles/wii.cpp
diff --git a/source/titles/wiitdb.cpp b/source/titles/wiitdb.cpp
diff --git a/source/utils.cpp b/source/utils.cpp
diff --git a/source/virtualsysconf.cpp b/source/virtualsysconf.cpp