New config options

5 files changed, 216 insertions, 144 deletions

diff --git a/ConfigIni.cs b/ConfigIni.cs
index 12ad6258..62f7bcbe 100644
--- a/ConfigIni.cs
+++ b/ConfigIni.cs
@@ -49,6 +49,10 @@ namespace com.clusterrr.hakchi_gui
         public static bool FtpServer = false;

         public static bool TelnetServer = false;

         public static string Language = "";

+        public static bool UsbHostNes = false;

+        public static bool UsbHostFamicom = false;

+        public static bool UsbHostSnes = false;

+        public static bool UsbHostSuperFamicom = false;

 

         public static bool CustomFlashed

         {

@@ -400,6 +404,44 @@ namespace com.clusterrr.hakchi_gui
             }

         }

 

+        public static bool UsbHost

+        {

+            get

+            {

+                switch (ConsoleType)

+                {

+                    default:

+                    case MainForm.ConsoleType.NES:

+                        return UsbHostNes;

+                    case MainForm.ConsoleType.Famicom:

+                        return UsbHostFamicom;

+                    case MainForm.ConsoleType.SNES:

+                        return UsbHostSnes;

+                    case MainForm.ConsoleType.SuperFamicom:

+                        return UsbHostSuperFamicom;

+                }

+            }

+            set

+            {

+                switch (ConsoleType)

+                {

+                    default:

+                    case MainForm.ConsoleType.NES:

+                        UsbHostNes = value;

+                        break;

+                    case MainForm.ConsoleType.Famicom:

+                        UsbHostFamicom = value;

+                        break;

+                    case MainForm.ConsoleType.SNES:

+                        UsbHostSnes = value;

+                        break;

+                    case MainForm.ConsoleType.SuperFamicom:

+                        UsbHostSuperFamicom = value;

+                        break;

+                }

+            }

+        }

+

         public static void Load()

         {

             Debug.WriteLine("Loading config");

@@ -546,8 +588,17 @@ namespace com.clusterrr.hakchi_gui
                                 case "ftpserver":

                                     FtpServer = !value.ToLower().Equals("false");

                                     break;

-                                case "telnetserver":

-                                    TelnetServer = !value.ToLower().Equals("false");

+                                case "usbhostnes":

+                                    UsbHostNes = !value.ToLower().Equals("false");

+                                    break;

+                                case "usbhostfamicom":

+                                    UsbHostFamicom = !value.ToLower().Equals("false");

+                                    break;

+                                case "usbhostsnes":

+                                    UsbHostSnes = !value.ToLower().Equals("false");

+                                    break;

+                                case "usbhostsuperfamicom":

+                                    UsbHostSuperFamicom = !value.ToLower().Equals("false");

                                     break;

                             }

                             break;

@@ -589,6 +640,10 @@ namespace com.clusterrr.hakchi_gui
             configLines.Add(string.Format("AntiArmetLevel={0}", AntiArmetLevel));

             configLines.Add(string.Format("ConsoleType={0}", (byte)ConsoleType));

             configLines.Add(string.Format("FcStart={0}", FcStart));

+            configLines.Add(string.Format("UsbHostNes={0}", UsbHostNes));

+            configLines.Add(string.Format("UsbHostFamicom={0}", UsbHostFamicom));

+            configLines.Add(string.Format("UsbHostSuperFamicom={0}", UsbHostSuperFamicom));

+            configLines.Add(string.Format("UsbHostSnes={0}", UsbHostSnes));

             configLines.Add(string.Format("ExtraCommandLineArguments={0}", ExtraCommandLineArgumentsNes));

             configLines.Add(string.Format("ExtraCommandLineArgumentsSnes={0}", ExtraCommandLineArgumentsSnes));

             configLines.Add(string.Format("FoldersMode={0}", (byte)FoldersModeNes));

@@ -626,14 +681,13 @@ namespace com.clusterrr.hakchi_gui
             var config = new Dictionary<string, string>();

             config["clovercon_home_combination"] = ConfigIni.ResetHack ? string.Format("0x{0:X4}", ConfigIni.ResetCombination) : "0x7FFF";

             config["clovercon_autofire"] = ConfigIni.AutofireHack ? "1" : "0";

-            config["clovercon_autofire_xy"] = ConfigIni.AutofireXYHack && (ConfigIni.ConsoleType == MainForm.ConsoleType.NES || ConfigIni.ConsoleType == MainForm.ConsoleType.Famicom) ? "1" : "0";

+            config["clovercon_autofire_xy"] = ConfigIni.AutofireXYHack /*&& (ConfigIni.ConsoleType == MainForm.ConsoleType.NES || ConfigIni.ConsoleType == MainForm.ConsoleType.Famicom)*/ ? "1" : "0";

             config["clovercon_fc_start"] = ConfigIni.FcStart && (ConfigIni.ConsoleType == MainForm.ConsoleType.Famicom) ? "1" : "0";

             config["fontfix_enabled"] = ConfigIni.UseFont ? "y" : "n";

-            config["disable_armet"] = (ConfigIni.AntiArmetLevel > 0 && (ConfigIni.ConsoleType == MainForm.ConsoleType.NES || ConfigIni.ConsoleType == MainForm.ConsoleType.Famicom)) ? "y" : "n";

-            if ((ConfigIni.ConsoleType == MainForm.ConsoleType.NES || ConfigIni.ConsoleType == MainForm.ConsoleType.Famicom))

-                config["nes_extra_args"] = ConfigIni.ExtraCommandLineArguments;

-            if ((ConfigIni.ConsoleType == MainForm.ConsoleType.SNES || ConfigIni.ConsoleType == MainForm.ConsoleType.SuperFamicom))

-                config["snes_extra_args"] = ConfigIni.ExtraCommandLineArguments;

+            config["disable_armet"] = ConfigIni.AntiArmetLevel > 0 /*&& (ConfigIni.ConsoleType == MainForm.ConsoleType.NES || ConfigIni.ConsoleType == MainForm.ConsoleType.Famicom)*/ ? "y" : "n";

+            config["nes_extra_args"] = ExtraCommandLineArgumentsNes;

+            config["snes_extra_args"] = ExtraCommandLineArgumentsSnes;

+            config["usb_host"] = ConfigIni.UsbHost ? "y" : "n";

 

             ConsoleType = oldConsoleType;

             return config;

diff --git a/MainForm.Designer.cs b/MainForm.Designer.cs
index eb8c30fd..c652e1ba 100644
--- a/MainForm.Designer.cs
+++ b/MainForm.Designer.cs
@@ -90,6 +90,7 @@
             this.useExtendedFontToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();

             this.epilepsyProtectionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();

             this.globalCommandLineArgumentsexpertsOnluToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();

+            this.enableUSBHostToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();

             this.toolStripMenuItem5 = new System.Windows.Forms.ToolStripSeparator();

             this.saveSettingsToNESMiniNowToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();

             this.toolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();

@@ -142,6 +143,7 @@
             this.downloadBoxArtForSelectedGamesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();

             this.compressSelectedGamesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();

             this.decompressSelectedGamesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();

+            this.openSelectedGamesFolderInExplorerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();

             this.deleteSelectedGamesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();

             this.toolStripMenuItem12 = new System.Windows.Forms.ToolStripSeparator();

             this.createCustomCommandToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();

@@ -156,7 +158,6 @@
             this.listViewGames = new System.Windows.Forms.ListView();

             this.gameName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));

             this.exportFolderDialog = new System.Windows.Forms.FolderBrowserDialog();

-            this.openSelectedGamesFolderInExplorerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();

             this.menuStrip.SuspendLayout();

             this.groupBoxOptions.SuspendLayout();

             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxArt)).BeginInit();

@@ -374,6 +375,7 @@
             this.compressGamesToolStripMenuItem,

             this.useExtendedFontToolStripMenuItem,

             this.epilepsyProtectionToolStripMenuItem,

+            this.enableUSBHostToolStripMenuItem,

             this.globalCommandLineArgumentsexpertsOnluToolStripMenuItem,

             this.toolStripMenuItem5,

             this.saveSettingsToNESMiniNowToolStripMenuItem});

@@ -605,6 +607,13 @@
             resources.ApplyResources(this.globalCommandLineArgumentsexpertsOnluToolStripMenuItem, "globalCommandLineArgumentsexpertsOnluToolStripMenuItem");

             this.globalCommandLineArgumentsexpertsOnluToolStripMenuItem.Click += new System.EventHandler(this.globalCommandLineArgumentsexpertsOnluToolStripMenuItem_Click);

             // 

+            // enableUSBHostToolStripMenuItem

+            // 

+            this.enableUSBHostToolStripMenuItem.CheckOnClick = true;

+            this.enableUSBHostToolStripMenuItem.Name = "enableUSBHostToolStripMenuItem";

+            resources.ApplyResources(this.enableUSBHostToolStripMenuItem, "enableUSBHostToolStripMenuItem");

+            this.enableUSBHostToolStripMenuItem.Click += new System.EventHandler(this.enableUSBHostToolStripMenuItem_Click);

+            // 

             // toolStripMenuItem5

             // 

             this.toolStripMenuItem5.Name = "toolStripMenuItem5";

@@ -970,6 +979,12 @@
             resources.ApplyResources(this.decompressSelectedGamesToolStripMenuItem, "decompressSelectedGamesToolStripMenuItem");

             this.decompressSelectedGamesToolStripMenuItem.Click += new System.EventHandler(this.decompressSelectedGamesToolStripMenuItem_Click);

             // 

+            // openSelectedGamesFolderInExplorerToolStripMenuItem

+            // 

+            this.openSelectedGamesFolderInExplorerToolStripMenuItem.Name = "openSelectedGamesFolderInExplorerToolStripMenuItem";

+            resources.ApplyResources(this.openSelectedGamesFolderInExplorerToolStripMenuItem, "openSelectedGamesFolderInExplorerToolStripMenuItem");

+            this.openSelectedGamesFolderInExplorerToolStripMenuItem.Click += new System.EventHandler(this.openSelectedGamesFolderInExplorerToolStripMenuItem_Click);

+            // 

             // deleteSelectedGamesToolStripMenuItem

             // 

             this.deleteSelectedGamesToolStripMenuItem.Name = "deleteSelectedGamesToolStripMenuItem";

@@ -1061,12 +1076,6 @@
             this.exportFolderDialog.RootFolder = System.Environment.SpecialFolder.MyComputer;

             this.exportFolderDialog.ShowNewFolderButton = false;

             // 

-            // openSelectedGamesFolderInExplorerToolStripMenuItem

-            // 

-            this.openSelectedGamesFolderInExplorerToolStripMenuItem.Name = "openSelectedGamesFolderInExplorerToolStripMenuItem";

-            resources.ApplyResources(this.openSelectedGamesFolderInExplorerToolStripMenuItem, "openSelectedGamesFolderInExplorerToolStripMenuItem");

-            this.openSelectedGamesFolderInExplorerToolStripMenuItem.Click += new System.EventHandler(this.openSelectedGamesFolderInExplorerToolStripMenuItem_Click);

-            // 

             // MainForm

             // 

             this.AllowDrop = true;

@@ -1234,6 +1243,7 @@
         private System.Windows.Forms.ToolStripSeparator toolStripMenuItem12;

         private System.Windows.Forms.ToolStripMenuItem createCustomCommandToolStripMenuItem;

         private System.Windows.Forms.ToolStripMenuItem openSelectedGamesFolderInExplorerToolStripMenuItem;

+        private System.Windows.Forms.ToolStripMenuItem enableUSBHostToolStripMenuItem;

     }

 }

 

diff --git a/MainForm.cs b/MainForm.cs
index 307f586e..888b9304 100644
--- a/MainForm.cs
+++ b/MainForm.cs
@@ -159,6 +159,7 @@ namespace com.clusterrr.hakchi_gui
         {

             InitializeComponent();

             FormInitialize();

+

             Clovershell = new ClovershellConnection() { AutoReconnect = true, Enabled = true };

             Clovershell.OnConnected += Clovershell_OnConnected;

 

@@ -260,9 +261,10 @@ namespace com.clusterrr.hakchi_gui
         {

             try

             {

-                ConfigIni.CustomFlashed = true; // Just in case of new installation

                 WorkerForm.GetMemoryStats();

                 new Thread(RecalculateSelectedGamesThread).Start();

+                if (WorkerForm.GetRealConsoleType() == ConfigIni.ConsoleType)

+                    ConfigIni.CustomFlashed = true; // Just in case of new installation

             }

             catch (Exception ex)

             {

@@ -1237,6 +1239,11 @@ namespace com.clusterrr.hakchi_gui
         {

             ConfigIni.FcStart = upABStartOnSecondControllerToolStripMenuItem.Checked;

         }

+        

+        private void enableUSBHostToolStripMenuItem_Click(object sender, EventArgs e)

+        {

+            ConfigIni.UsbHost = enableUSBHostToolStripMenuItem.Checked;

+        }

 

         private void selectButtonCombinationToolStripMenuItem_Click(object sender, EventArgs e)

         {

@@ -1270,8 +1277,8 @@ namespace com.clusterrr.hakchi_gui
             famicomMiniToolStripMenuItem.Checked = ConfigIni.ConsoleType == ConsoleType.Famicom;

             sNESMiniToolStripMenuItem.Checked = ConfigIni.ConsoleType == ConsoleType.SNES;

             superFamicomMiniToolStripMenuItem.Checked = ConfigIni.ConsoleType == ConsoleType.SuperFamicom;

-            epilepsyProtectionToolStripMenuItem.Enabled = ConfigIni.ConsoleType == ConsoleType.NES || ConfigIni.ConsoleType == ConsoleType.Famicom;

-            useXYOnClassicControllerAsAutofireABToolStripMenuItem.Enabled = ConfigIni.ConsoleType == ConsoleType.NES || ConfigIni.ConsoleType == ConsoleType.Famicom;

+            //epilepsyProtectionToolStripMenuItem.Enabled = ConfigIni.ConsoleType == ConsoleType.NES || ConfigIni.ConsoleType == ConsoleType.Famicom;

+            //useXYOnClassicControllerAsAutofireABToolStripMenuItem.Enabled = ConfigIni.ConsoleType == ConsoleType.NES || ConfigIni.ConsoleType == ConsoleType.Famicom;

             upABStartOnSecondControllerToolStripMenuItem.Enabled = ConfigIni.ConsoleType == ConsoleType.Famicom;

 

             // Some settnigs

@@ -1282,6 +1289,7 @@ namespace com.clusterrr.hakchi_gui
             useXYOnClassicControllerAsAutofireABToolStripMenuItem.Checked = ConfigIni.AutofireXYHack && useXYOnClassicControllerAsAutofireABToolStripMenuItem.Enabled;

             upABStartOnSecondControllerToolStripMenuItem.Checked = ConfigIni.FcStart && upABStartOnSecondControllerToolStripMenuItem.Enabled;

             compressGamesToolStripMenuItem.Checked = ConfigIni.Compress;

+            enableUSBHostToolStripMenuItem.Checked = ConfigIni.UsbHost;

 

             // Folders mods

             disablePagefoldersToolStripMenuItem.Checked = (byte)ConfigIni.FoldersMode == 0;

diff --git a/MainForm.resx b/MainForm.resx
index 28600ddd..7751ace0 100644
--- a/MainForm.resx
+++ b/MainForm.resx
@@ -120,51 +120,17 @@
   <metadata name="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

     <value>315, 17</value>

   </metadata>

-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />

-  <data name="menuStrip.Location" type="System.Drawing.Point, System.Drawing">

-    <value>0, 0</value>

-  </data>

-  <data name="menuStrip.Size" type="System.Drawing.Size, System.Drawing">

-    <value>609, 24</value>

-  </data>

-  <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />

-  <data name="menuStrip.TabIndex" type="System.Int32, mscorlib">

-    <value>1</value>

-  </data>

-  <data name="&gt;&gt;menuStrip.Name" xml:space="preserve">

-    <value>menuStrip</value>

-  </data>

-  <data name="&gt;&gt;menuStrip.Type" xml:space="preserve">

-    <value>System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

-  </data>

-  <data name="&gt;&gt;menuStrip.Parent" xml:space="preserve">

-    <value>$this</value>

-  </data>

-  <data name="&gt;&gt;menuStrip.ZOrder" xml:space="preserve">

-    <value>5</value>

-  </data>

-  <data name="fileToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

-    <value>37, 20</value>

-  </data>

-  <data name="fileToolStripMenuItem.Text" xml:space="preserve">

-    <value>&amp;File</value>

-  </data>

   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />

   <data name="addMoreGamesToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">

     <value>Ctrl+O</value>

   </data>

+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />

   <data name="addMoreGamesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

     <value>208, 22</value>

   </data>

   <data name="addMoreGamesToolStripMenuItem.Text" xml:space="preserve">

     <value>Add more &amp;games</value>

   </data>

-  <data name="presetsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

-    <value>208, 22</value>

-  </data>

-  <data name="presetsToolStripMenuItem.Text" xml:space="preserve">

-    <value>Selection presets</value>

-  </data>

   <data name="toolStripMenuItem2.Size" type="System.Drawing.Size, System.Drawing">

     <value>139, 6</value>

   </data>

@@ -180,6 +146,12 @@
   <data name="deletePresetToolStripMenuItem.Text" xml:space="preserve">

     <value>Delete preset</value>

   </data>

+  <data name="presetsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

+    <value>208, 22</value>

+  </data>

+  <data name="presetsToolStripMenuItem.Text" xml:space="preserve">

+    <value>Selection presets</value>

+  </data>

   <data name="synchronizeToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">

     <value>F5</value>

   </data>

@@ -207,11 +179,11 @@
   <data name="exitToolStripMenuItem.Text" xml:space="preserve">

     <value>&amp;Exit</value>

   </data>

-  <data name="kernelToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

-    <value>52, 20</value>

+  <data name="fileToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

+    <value>37, 20</value>

   </data>

-  <data name="kernelToolStripMenuItem.Text" xml:space="preserve">

-    <value>&amp;Kernel</value>

+  <data name="fileToolStripMenuItem.Text" xml:space="preserve">

+    <value>&amp;File</value>

   </data>

   <data name="dumpKernelToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

     <value>276, 22</value>

@@ -261,6 +233,7 @@
   <data name="toolFlashTheWholeNANDStripMenuItem.Text" xml:space="preserve">

     <value>Flash the whole NAND (experts only!)</value>

   </data>

+  <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />

   <data name="toolFlashTheWholeNANDStripMenuItem.Visible" type="System.Boolean, mscorlib">

     <value>False</value>

   </data>

@@ -291,11 +264,11 @@
   <data name="uninstallToolStripMenuItem.Text" xml:space="preserve">

     <value>Uninstall</value>

   </data>

-  <data name="modulesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

-    <value>65, 20</value>

+  <data name="kernelToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

+    <value>52, 20</value>

   </data>

-  <data name="modulesToolStripMenuItem.Text" xml:space="preserve">

-    <value>&amp;Modules</value>

+  <data name="kernelToolStripMenuItem.Text" xml:space="preserve">

+    <value>&amp;Kernel</value>

   </data>

   <data name="installModulesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

     <value>197, 22</value>

@@ -309,11 +282,11 @@
   <data name="uninstallModulesToolStripMenuItem.Text" xml:space="preserve">

     <value>Uninstall extra modules</value>

   </data>

-  <data name="settingsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

-    <value>61, 20</value>

+  <data name="modulesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

+    <value>65, 20</value>

   </data>

-  <data name="settingsToolStripMenuItem.Text" xml:space="preserve">

-    <value>&amp;Settings</value>

+  <data name="modulesToolStripMenuItem.Text" xml:space="preserve">

+    <value>&amp;Modules</value>

   </data>

   <data name="languageToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

     <value>

@@ -341,12 +314,6 @@
   <data name="languageToolStripMenuItem.Text" xml:space="preserve">

     <value>Language</value>

   </data>

-  <data name="consoleTypeToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

-    <value>327, 22</value>

-  </data>

-  <data name="consoleTypeToolStripMenuItem.Text" xml:space="preserve">

-    <value>Console type</value>

-  </data>

   <data name="nESMiniToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

     <value>198, 22</value>

   </data>

@@ -371,11 +338,11 @@
   <data name="superFamicomMiniToolStripMenuItem.Text" xml:space="preserve">

     <value>Super Famicom (Japan)</value>

   </data>

-  <data name="pagesfoldersTypeToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

+  <data name="consoleTypeToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

     <value>327, 22</value>

   </data>

-  <data name="pagesfoldersTypeToolStripMenuItem.Text" xml:space="preserve">

-    <value>Pages/folders structure</value>

+  <data name="consoleTypeToolStripMenuItem.Text" xml:space="preserve">

+    <value>Console type</value>

   </data>

   <data name="disablePagefoldersToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

     <value>356, 22</value>

@@ -455,11 +422,11 @@
   <data name="customToolStripMenuItem.Text" xml:space="preserve">

     <value>Custom - show Folders Manager every time</value>

   </data>

-  <data name="cloverconHackToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

+  <data name="pagesfoldersTypeToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

     <value>327, 22</value>

   </data>

-  <data name="cloverconHackToolStripMenuItem.Text" xml:space="preserve">

-    <value>Controller hacks</value>

+  <data name="pagesfoldersTypeToolStripMenuItem.Text" xml:space="preserve">

+    <value>Pages/folders structure</value>

   </data>

   <data name="resetUsingCombinationOfButtonsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

     <value>308, 22</value>

@@ -491,6 +458,12 @@
   <data name="upABStartOnSecondControllerToolStripMenuItem.Text" xml:space="preserve">

     <value>"Up+A+B = Start" on 2nd controller</value>

   </data>

+  <data name="cloverconHackToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

+    <value>327, 22</value>

+  </data>

+  <data name="cloverconHackToolStripMenuItem.Text" xml:space="preserve">

+    <value>Controller hacks</value>

+  </data>

   <data name="compressGamesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

     <value>327, 22</value>

   </data>

@@ -509,6 +482,12 @@
   <data name="epilepsyProtectionToolStripMenuItem.Text" xml:space="preserve">

     <value>Disable epilepsy protection</value>

   </data>

+  <data name="enableUSBHostToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

+    <value>327, 22</value>

+  </data>

+  <data name="enableUSBHostToolStripMenuItem.Text" xml:space="preserve">

+    <value>Enable USB host</value>

+  </data>

   <data name="globalCommandLineArgumentsexpertsOnluToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

     <value>327, 22</value>

   </data>

@@ -527,11 +506,11 @@
   <data name="saveSettingsToNESMiniNowToolStripMenuItem.Text" xml:space="preserve">

     <value>Save settings to NES/SNES Mini now</value>

   </data>

-  <data name="toolsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

-    <value>47, 20</value>

+  <data name="settingsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

+    <value>61, 20</value>

   </data>

-  <data name="toolsToolStripMenuItem.Text" xml:space="preserve">

-    <value>&amp;Tools</value>

+  <data name="settingsToolStripMenuItem.Text" xml:space="preserve">

+    <value>&amp;Settings</value>

   </data>

   <data name="saveStateManagerToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

     <value>331, 22</value>

@@ -584,11 +563,11 @@
   <data name="takeScreenshotToolStripMenuItem.Text" xml:space="preserve">

     <value>Take screenshot</value>

   </data>

-  <data name="helpToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

-    <value>44, 20</value>

+  <data name="toolsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

+    <value>47, 20</value>

   </data>

-  <data name="helpToolStripMenuItem.Text" xml:space="preserve">

-    <value>&amp;Help</value>

+  <data name="toolsToolStripMenuItem.Text" xml:space="preserve">

+    <value>&amp;Tools</value>

   </data>

   <data name="gitHubPageWithActualReleasesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

     <value>246, 22</value>

@@ -614,6 +593,33 @@
   <data name="aboutToolStripMenuItem.Text" xml:space="preserve">

     <value>About...</value>

   </data>

+  <data name="helpToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

+    <value>44, 20</value>

+  </data>

+  <data name="helpToolStripMenuItem.Text" xml:space="preserve">

+    <value>&amp;Help</value>

+  </data>

+  <data name="menuStrip.Location" type="System.Drawing.Point, System.Drawing">

+    <value>0, 0</value>

+  </data>

+  <data name="menuStrip.Size" type="System.Drawing.Size, System.Drawing">

+    <value>609, 24</value>

+  </data>

+  <data name="menuStrip.TabIndex" type="System.Int32, mscorlib">

+    <value>1</value>

+  </data>

+  <data name="&gt;&gt;menuStrip.Name" xml:space="preserve">

+    <value>menuStrip</value>

+  </data>

+  <data name="&gt;&gt;menuStrip.Type" xml:space="preserve">

+    <value>System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

+  </data>

+  <data name="&gt;&gt;menuStrip.Parent" xml:space="preserve">

+    <value>$this</value>

+  </data>

+  <data name="&gt;&gt;menuStrip.ZOrder" xml:space="preserve">

+    <value>5</value>

+  </data>

   <data name="groupBoxOptions.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">

     <value>None</value>

   </data>

@@ -1265,27 +1271,6 @@
   <metadata name="statusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

     <value>407, 17</value>

   </metadata>

-  <data name="statusStrip.Location" type="System.Drawing.Point, System.Drawing">

-    <value>0, 614</value>

-  </data>

-  <data name="statusStrip.Size" type="System.Drawing.Size, System.Drawing">

-    <value>609, 22</value>

-  </data>

-  <data name="statusStrip.TabIndex" type="System.Int32, mscorlib">

-    <value>6</value>

-  </data>

-  <data name="&gt;&gt;statusStrip.Name" xml:space="preserve">

-    <value>statusStrip</value>

-  </data>

-  <data name="&gt;&gt;statusStrip.Type" xml:space="preserve">

-    <value>System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

-  </data>

-  <data name="&gt;&gt;statusStrip.Parent" xml:space="preserve">

-    <value>$this</value>

-  </data>

-  <data name="&gt;&gt;statusStrip.ZOrder" xml:space="preserve">

-    <value>2</value>

-  </data>

   <data name="toolStripStatusConnectionIcon.AutoSize" type="System.Boolean, mscorlib">

     <value>False</value>

   </data>

@@ -1307,6 +1292,27 @@
   <data name="toolStripProgressBar.Size" type="System.Drawing.Size, System.Drawing">

     <value>195, 16</value>

   </data>

+  <data name="statusStrip.Location" type="System.Drawing.Point, System.Drawing">

+    <value>0, 614</value>

+  </data>

+  <data name="statusStrip.Size" type="System.Drawing.Size, System.Drawing">

+    <value>609, 22</value>

+  </data>

+  <data name="statusStrip.TabIndex" type="System.Int32, mscorlib">

+    <value>6</value>

+  </data>

+  <data name="&gt;&gt;statusStrip.Name" xml:space="preserve">

+    <value>statusStrip</value>

+  </data>

+  <data name="&gt;&gt;statusStrip.Type" xml:space="preserve">

+    <value>System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

+  </data>

+  <data name="&gt;&gt;statusStrip.Parent" xml:space="preserve">

+    <value>$this</value>

+  </data>

+  <data name="&gt;&gt;statusStrip.ZOrder" xml:space="preserve">

+    <value>2</value>

+  </data>

   <metadata name="openFileDialogNes.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

     <value>500, 17</value>

   </metadata>

@@ -1406,6 +1412,18 @@
   <data name="groupBoxDefaultGames.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">

     <value>None</value>

   </data>

+  <data name="checkedListBoxDefaultGames.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">

+    <value>Top, Bottom, Left, Right</value>

+  </data>

+  <data name="checkedListBoxDefaultGames.Location" type="System.Drawing.Point, System.Drawing">

+    <value>5, 49</value>

+  </data>

+  <data name="checkedListBoxDefaultGames.Size" type="System.Drawing.Size, System.Drawing">

+    <value>282, 454</value>

+  </data>

+  <data name="checkedListBoxDefaultGames.TabIndex" type="System.Int32, mscorlib">

+    <value>3</value>

+  </data>

   <data name="&gt;&gt;checkedListBoxDefaultGames.Name" xml:space="preserve">

     <value>checkedListBoxDefaultGames</value>

   </data>

@@ -1445,30 +1463,6 @@
   <data name="&gt;&gt;groupBoxDefaultGames.ZOrder" xml:space="preserve">

     <value>7</value>

   </data>

-  <data name="checkedListBoxDefaultGames.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">

-    <value>Top, Bottom, Left, Right</value>

-  </data>

-  <data name="checkedListBoxDefaultGames.Location" type="System.Drawing.Point, System.Drawing">

-    <value>5, 49</value>

-  </data>

-  <data name="checkedListBoxDefaultGames.Size" type="System.Drawing.Size, System.Drawing">

-    <value>282, 454</value>

-  </data>

-  <data name="checkedListBoxDefaultGames.TabIndex" type="System.Int32, mscorlib">

-    <value>3</value>

-  </data>

-  <data name="&gt;&gt;checkedListBoxDefaultGames.Name" xml:space="preserve">

-    <value>checkedListBoxDefaultGames</value>

-  </data>

-  <data name="&gt;&gt;checkedListBoxDefaultGames.Type" xml:space="preserve">

-    <value>System.Windows.Forms.CheckedListBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

-  </data>

-  <data name="&gt;&gt;checkedListBoxDefaultGames.Parent" xml:space="preserve">

-    <value>groupBoxDefaultGames</value>

-  </data>

-  <data name="&gt;&gt;checkedListBoxDefaultGames.ZOrder" xml:space="preserve">

-    <value>0</value>

-  </data>

   <metadata name="timerCalculateGames.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

     <value>771, 17</value>

   </metadata>

@@ -1490,6 +1484,12 @@
   <data name="listViewGames.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">

     <value>None</value>

   </data>

+  <data name="gameName.Text" xml:space="preserve">

+    <value>Game name</value>

+  </data>

+  <data name="gameName.Width" type="System.Int32, mscorlib">

+    <value>253</value>

+  </data>

   <data name="listViewGames.Location" type="System.Drawing.Point, System.Drawing">

     <value>12, 57</value>

   </data>

@@ -1511,12 +1511,6 @@
   <data name="&gt;&gt;listViewGames.ZOrder" xml:space="preserve">

     <value>8</value>

   </data>

-  <data name="gameName.Text" xml:space="preserve">

-    <value>Game name</value>

-  </data>

-  <data name="gameName.Width" type="System.Int32, mscorlib">

-    <value>253</value>

-  </data>

   <metadata name="exportFolderDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

     <value>922, 17</value>

   </metadata>

@@ -3036,6 +3030,12 @@
   <data name="&gt;&gt;globalCommandLineArgumentsexpertsOnluToolStripMenuItem.Type" xml:space="preserve">

     <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

   </data>

+  <data name="&gt;&gt;enableUSBHostToolStripMenuItem.Name" xml:space="preserve">

+    <value>enableUSBHostToolStripMenuItem</value>

+  </data>

+  <data name="&gt;&gt;enableUSBHostToolStripMenuItem.Type" xml:space="preserve">

+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

+  </data>

   <data name="&gt;&gt;toolStripMenuItem5.Name" xml:space="preserve">

     <value>toolStripMenuItem5</value>

   </data>

@@ -3186,6 +3186,12 @@
   <data name="&gt;&gt;decompressSelectedGamesToolStripMenuItem.Type" xml:space="preserve">

     <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

   </data>

+  <data name="&gt;&gt;openSelectedGamesFolderInExplorerToolStripMenuItem.Name" xml:space="preserve">

+    <value>openSelectedGamesFolderInExplorerToolStripMenuItem</value>

+  </data>

+  <data name="&gt;&gt;openSelectedGamesFolderInExplorerToolStripMenuItem.Type" xml:space="preserve">

+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

+  </data>

   <data name="&gt;&gt;deleteSelectedGamesToolStripMenuItem.Name" xml:space="preserve">

     <value>deleteSelectedGamesToolStripMenuItem</value>

   </data>

@@ -3246,12 +3252,6 @@
   <data name="&gt;&gt;exportFolderDialog.Type" xml:space="preserve">

     <value>System.Windows.Forms.FolderBrowserDialog, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

   </data>

-  <data name="&gt;&gt;openSelectedGamesFolderInExplorerToolStripMenuItem.Name" xml:space="preserve">

-    <value>openSelectedGamesFolderInExplorerToolStripMenuItem</value>

-  </data>

-  <data name="&gt;&gt;openSelectedGamesFolderInExplorerToolStripMenuItem.Type" xml:space="preserve">

-    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

-  </data>

   <data name="&gt;&gt;$this.Name" xml:space="preserve">

     <value>MainForm</value>

   </data>

diff --git a/mods/mod_hakchi/hakchi/rootfs/etc/preinit.d/p0000_config b/mods/mod_hakchi/hakchi/rootfs/etc/preinit.d/p0000_config
index 00917bff..decf1877 100644
--- a/mods/mod_hakchi/hakchi/rootfs/etc/preinit.d/p0000_config
+++ b/mods/mod_hakchi/hakchi/rootfs/etc/preinit.d/p0000_config
@@ -1,6 +1,6 @@
 cfg_boot_stock='n'
-cfg_disable_armet='y'
+cfg_disable_armet='n'
 cfg_firmware='auto'
 cfg_nes_extra_args=''
 cfg_snes_extra_args=''
-cfg_usb_host='y'
+cfg_usb_host='n'