diff --git a/Source/Configurator/Configurator.spec b/Source/Configurator/Configurator.spec new file mode 100644 index 00000000..a7b3e0b7 --- /dev/null +++ b/Source/Configurator/Configurator.spec @@ -0,0 +1,46 @@ +# -*- mode: python ; coding: utf-8 -*- +from PyInstaller.utils.hooks import collect_all + +datas = [('C:/Users/sould/Documents/GitHub/Switch-OC-Mansion/Source/Configurator/assets', 'assets')] +binaries = [] +hiddenimports = [] +tmp_ret = collect_all('psutil') +datas += tmp_ret[0]; binaries += tmp_ret[1]; hiddenimports += tmp_ret[2] + + +a = Analysis( + ['C:/Users/sould/Documents/GitHub/Switch-OC-Mansion/Source/Configurator/src/main.py'], + pathex=[], + binaries=binaries, + datas=datas, + hiddenimports=hiddenimports, + hookspath=[], + hooksconfig={}, + runtime_hooks=[], + excludes=[], + noarchive=False, + optimize=0, +) +pyz = PYZ(a.pure) + +exe = EXE( + pyz, + a.scripts, + a.binaries, + a.datas, + [], + name='Configurator', + debug=False, + bootloader_ignore_signals=False, + strip=False, + upx=True, + upx_exclude=[], + runtime_tmpdir=None, + console=False, + disable_windowed_traceback=False, + argv_emulation=False, + target_arch=None, + codesign_identity=None, + entitlements_file=None, + icon=['C:\\Users\\sould\\Documents\\GitHub\\Switch-OC-Mansion\\Source\\Configurator\\assets\\icon.ico'], +) diff --git a/Source/Configurator/build.bat b/Source/Configurator/build.bat index e2a9a084..a237ce84 100644 --- a/Source/Configurator/build.bat +++ b/Source/Configurator/build.bat @@ -1,3 +1,2 @@ -python -m PyInstaller --onefile --add-data "assets;assets" --icon=assets/icon.ico --noconsole src/main.py +python -m PyInstaller --onefile --add-data "assets;assets" --icon=assets/icon.ico --noconsole src/main.py --hidden-import=pillow --hidden-import=psutil --hidden-import=dearpygui --hidden-import=numpy --hidden-import=pathlib move "dist\main.exe" "dist\hocconfig.exe" -del src/__pycache__ \ No newline at end of file diff --git a/Source/Configurator/deps.bat b/Source/Configurator/deps.bat index c1ea927a..8273bf6c 100644 --- a/Source/Configurator/deps.bat +++ b/Source/Configurator/deps.bat @@ -1,5 +1,5 @@ pip install pyinstaller -pip install dearpygui +pip install dearpygui==2.0.0 pip install numpy pip install psutil pip install pil diff --git a/Source/Configurator/dist/hocconfig.exe b/Source/Configurator/dist/hocconfig.exe index 209dcad8..262289a4 100644 Binary files a/Source/Configurator/dist/hocconfig.exe and b/Source/Configurator/dist/hocconfig.exe differ diff --git a/Source/Configurator/main.spec b/Source/Configurator/main.spec index f962168c..e53d3bf0 100644 --- a/Source/Configurator/main.spec +++ b/Source/Configurator/main.spec @@ -6,7 +6,7 @@ a = Analysis( pathex=[], binaries=[], datas=[('assets', 'assets')], - hiddenimports=[], + hiddenimports=['pillow', 'psutil', 'dearpygui', 'numpy', 'pathlib'], hookspath=[], hooksconfig={}, runtime_hooks=[], diff --git a/Source/Configurator/src/__pycache__/about.cpython-313.pyc b/Source/Configurator/src/__pycache__/about.cpython-313.pyc deleted file mode 100644 index ac5d05af..00000000 Binary files a/Source/Configurator/src/__pycache__/about.cpython-313.pyc and /dev/null differ diff --git a/Source/Configurator/src/__pycache__/common.cpython-313.pyc b/Source/Configurator/src/__pycache__/common.cpython-313.pyc deleted file mode 100644 index 8be13386..00000000 Binary files a/Source/Configurator/src/__pycache__/common.cpython-313.pyc and /dev/null differ diff --git a/Source/Configurator/src/__pycache__/cpu.cpython-313.pyc b/Source/Configurator/src/__pycache__/cpu.cpython-313.pyc deleted file mode 100644 index 827cfa2b..00000000 Binary files a/Source/Configurator/src/__pycache__/cpu.cpython-313.pyc and /dev/null differ diff --git a/Source/Configurator/src/__pycache__/defaults.cpython-313.pyc b/Source/Configurator/src/__pycache__/defaults.cpython-313.pyc deleted file mode 100644 index cd57214d..00000000 Binary files a/Source/Configurator/src/__pycache__/defaults.cpython-313.pyc and /dev/null differ diff --git a/Source/Configurator/src/__pycache__/gpu.cpython-313.pyc b/Source/Configurator/src/__pycache__/gpu.cpython-313.pyc deleted file mode 100644 index f7db3360..00000000 Binary files a/Source/Configurator/src/__pycache__/gpu.cpython-313.pyc and /dev/null differ diff --git a/Source/Configurator/src/__pycache__/ini.cpython-313.pyc b/Source/Configurator/src/__pycache__/ini.cpython-313.pyc deleted file mode 100644 index f5e683b3..00000000 Binary files a/Source/Configurator/src/__pycache__/ini.cpython-313.pyc and /dev/null differ diff --git a/Source/Configurator/src/__pycache__/installer.cpython-313.pyc b/Source/Configurator/src/__pycache__/installer.cpython-313.pyc deleted file mode 100644 index c380467a..00000000 Binary files a/Source/Configurator/src/__pycache__/installer.cpython-313.pyc and /dev/null differ diff --git a/Source/Configurator/src/__pycache__/kip.cpython-313.pyc b/Source/Configurator/src/__pycache__/kip.cpython-313.pyc deleted file mode 100644 index 75478c89..00000000 Binary files a/Source/Configurator/src/__pycache__/kip.cpython-313.pyc and /dev/null differ diff --git a/Source/Configurator/src/__pycache__/license.cpython-313.pyc b/Source/Configurator/src/__pycache__/license.cpython-313.pyc deleted file mode 100644 index bccbf4d7..00000000 Binary files a/Source/Configurator/src/__pycache__/license.cpython-313.pyc and /dev/null differ diff --git a/Source/Configurator/src/__pycache__/misc.cpython-313.pyc b/Source/Configurator/src/__pycache__/misc.cpython-313.pyc deleted file mode 100644 index be0a4ea8..00000000 Binary files a/Source/Configurator/src/__pycache__/misc.cpython-313.pyc and /dev/null differ diff --git a/Source/Configurator/src/__pycache__/preset.cpython-313.pyc b/Source/Configurator/src/__pycache__/preset.cpython-313.pyc deleted file mode 100644 index 0e5e3110..00000000 Binary files a/Source/Configurator/src/__pycache__/preset.cpython-313.pyc and /dev/null differ diff --git a/Source/Configurator/src/__pycache__/ram.cpython-313.pyc b/Source/Configurator/src/__pycache__/ram.cpython-313.pyc deleted file mode 100644 index 392df4ba..00000000 Binary files a/Source/Configurator/src/__pycache__/ram.cpython-313.pyc and /dev/null differ diff --git a/Source/Configurator/src/__pycache__/settings.cpython-313.pyc b/Source/Configurator/src/__pycache__/settings.cpython-313.pyc deleted file mode 100644 index 2214b6ce..00000000 Binary files a/Source/Configurator/src/__pycache__/settings.cpython-313.pyc and /dev/null differ diff --git a/Source/Configurator/src/main.py b/Source/Configurator/src/main.py index d52fa841..63479a54 100644 --- a/Source/Configurator/src/main.py +++ b/Source/Configurator/src/main.py @@ -30,6 +30,7 @@ import common as c import sys import os import webbrowser +import ctypes import kip as k import gpu @@ -43,10 +44,10 @@ import misc true = True false = False -if getattr(sys, 'frozen', False): - assets_path = os.path.join(sys._MEIPASS, 'assets/') -else: - assets_path = os.path.join(os.path.dirname(__file__), '../assets/') +# if getattr(sys, 'frozen', False): +assets_path = os.path.join(sys._MEIPASS, 'assets/') +# else: + # assets_path = os.path.join(os.path.dirname(__file__), '../assets/') cooler_image_path = assets_path + "coolerhd.png" # coolerHD Emoji from OC server cooler_image = Image.open(cooler_image_path).convert("RGBA") diff --git a/dist/README.md b/dist/README.md index 6b3d0fa2..ee6238a5 100644 --- a/dist/README.md +++ b/dist/README.md @@ -46,11 +46,12 @@ Git clone Atmosphere, and move the cloned folder into build/
Insert Source/stratosphere folder into build/
Run build.sh -To build the configurator, clone it's repo (souldbminersmwc/ocs2-configurator)
-Run build.bat or cd into folder and run "python -m PyInstaller --onefile --add-data "assets;assets" --icon=assets/icon.ico --noconsole src/main.py"
+To build the configurator, cd into Source/Configurator
+Run build.bat or run "python -m PyInstaller --onefile --add-data "assets;assets" --icon=assets/icon.ico --noconsole src/main.py"
## Credits +Lightos for RAM timings
meha for Switch-Oc-Suite
sys-clk team for sys-clk
b0rd2death for Ultrahand sys-clk fork
diff --git a/dist/atmosphere/contents/00FF0000636C6BFF/exefs.nsp b/dist/atmosphere/contents/00FF0000636C6BFF/exefs.nsp index bd268e32..e9fa29bf 100644 Binary files a/dist/atmosphere/contents/00FF0000636C6BFF/exefs.nsp and b/dist/atmosphere/contents/00FF0000636C6BFF/exefs.nsp differ diff --git a/dist/atmosphere/kips/hoc.kip b/dist/atmosphere/kips/hoc.kip index f19aee2e..c7955fb4 100644 Binary files a/dist/atmosphere/kips/hoc.kip and b/dist/atmosphere/kips/hoc.kip differ diff --git a/dist/switch/.overlays/sys-clk-overlay.ovl b/dist/switch/.overlays/sys-clk-overlay.ovl index a0ddfcd3..f87960d0 100644 Binary files a/dist/switch/.overlays/sys-clk-overlay.ovl and b/dist/switch/.overlays/sys-clk-overlay.ovl differ diff --git a/dist/switch/sys-clk-manager.nro b/dist/switch/sys-clk-manager.nro index 7e8c64e4..9a8914f6 100644 Binary files a/dist/switch/sys-clk-manager.nro and b/dist/switch/sys-clk-manager.nro differ