diff --git a/README.md b/README.md index 7258286..6304be4 100644 --- a/README.md +++ b/README.md @@ -84,8 +84,7 @@ * Other: * [FPSLocker Patches](https://github.com/masagrator/FPSLocker-Warehouse) - Патчи для FPSLocker, что бы не качать отдельно патч для каждой игры через оверлей. * [DVR Patches](https://github.com/exelix11/dvr-patches) - Патчи SysDVR, работают и без системного модуля, активируя фоновую запись в играх, где это изначально запрещено. - * [TriPlayer](https://github.com/DefenderOfHyrule/TriPlayer) - Хоумбрю-музыкальный плеер, который работает через системный модуль, и может сворачиваться, работая в фоне. - * [sys-ftpd](https://github.com/tomvita/sys-ftpd-light) - FTP сервер, работающий на фоне. + * [sys-ftpd](https://github.com/cathery/sys-ftpd) - FTP сервер, работающий на фоне. diff --git a/README_ENG.md b/README_ENG.md index b9a12ce..429ea16 100644 --- a/README_ENG.md +++ b/README_ENG.md @@ -81,8 +81,7 @@ * Other: * [FPSLocker Patches](https://github.com/masagrator/FPSLocker-Warehouse) - Patches for FPSLocker, so you don't have to download a separate patch for each game through the overlay. * [DVR Patches](https://github.com/exelix11/dvr-patches) - SysDVR patches, work without the system module, activating background recording in games where it is initially prohibited. - * [TriPlayer](https://github.com/DefenderOfHyrule/TriPlayer) - A homebrew music player that runs through the system module, and can minimize while running in the background. - * [sys-ftpd](https://github.com/tomvita/sys-ftpd-light) - FTP server running in background. + * [sys-ftpd](https://github.com/cathery/sys-ftpd) - FTP server running in background. diff --git a/Ultra.zip b/Ultra.zip new file mode 100644 index 0000000..d6e2d37 Binary files /dev/null and b/Ultra.zip differ diff --git a/atmosphere/contents/0000000000534C56/exefs.nsp b/atmosphere/contents/0000000000534C56/exefs.nsp index b475dde..2027329 100644 Binary files a/atmosphere/contents/0000000000534C56/exefs.nsp and b/atmosphere/contents/0000000000534C56/exefs.nsp differ diff --git a/atmosphere/contents/00FF0000636C6BFF/exefs.nsp b/atmosphere/contents/00FF0000636C6BFF/exefs.nsp index 477f939..0294e6a 100644 Binary files a/atmosphere/contents/00FF0000636C6BFF/exefs.nsp and b/atmosphere/contents/00FF0000636C6BFF/exefs.nsp differ diff --git a/atmosphere/contents/690000000000000D/exefs.nsp b/atmosphere/contents/690000000000000D/exefs.nsp index b36f676..82b9b1b 100644 Binary files a/atmosphere/contents/690000000000000D/exefs.nsp and b/atmosphere/contents/690000000000000D/exefs.nsp differ diff --git a/atmosphere/package3 b/atmosphere/package3 index 4ab9cc7..179258e 100644 Binary files a/atmosphere/package3 and b/atmosphere/package3 differ diff --git a/config/sys-clk/config.ini b/config/sys-clk/config.ini index ecd9eef..a797b85 100644 --- a/config/sys-clk/config.ini +++ b/config/sys-clk/config.ini @@ -1,3 +1,3 @@ [values] uncapped_clocks=1 -auto_cpu_boost=1 +reversenx_sync=1 diff --git a/config/sys-con/config.ini b/config/sys-con/config.ini index 1739525..624d9c9 100644 --- a/config/sys-con/config.ini +++ b/config/sys-con/config.ini @@ -6,9 +6,16 @@ [global] polling_frequency_ms=1 -;log_level Trace=0, Debug=1, Info=2, Warning=3, Error=4 +; thread_priority (0-63) +; Lower number means higher priority +; 44 is the usual priority of the main thread +; 59 is a special priority on cores 0..2 that enables preemptive multithreading +; 63 is a special priority on core 3 that enables preemptive multithreading +polling_thread_priority=48 + +;log_level Trace=0, Debug=1, Performance=2, Info=3, Warning=4, Error=5 ;Important note, if you set the log level to Debug or Trace, the polling_frequency_ms will be automatically increase otherwise it will generate too many logs -log_level=2 +log_level=3 ;Discovery mode: ;0: Discover All Generic HID + XBOX Controllers (Cause issue with official USB switch controllers) @@ -87,8 +94,8 @@ dpad_left=34 dpad_right=35 capture=0 home=0 -simulate_home= -simulate_capture= +simulate_capture=minus+dpad_up +simulate_home=minus+dpad_down ; *************************************** ; Profiles @@ -270,7 +277,6 @@ ZL=7 ZR=8 minus=9 plus=10 -simulate_home= [0810-0001]; Dual PSX controller adapter B=3 @@ -285,7 +291,6 @@ minus=9 plus=10 lstick_click=11 rstick_click=12 -simulate_home=minus+plus rstick_left=-Rz rstick_right=+Rz rstick_up=+Z @@ -308,7 +313,6 @@ rstick_left=-Rz rstick_right=+Rz rstick_up=+Z rstick_down=-Z -simulate_home=minus+plus [046d-c294]; Logitech Driving Force GT (Wheel) B=1 @@ -352,7 +356,6 @@ minus=9 plus=10 lstick_click=11 rstick_click=12 -simulate_home=minus+plus [07b5-0213] ;Activbb X6-34U Controller / Thrustmaster Firestorm Digital3 B=3 @@ -363,7 +366,6 @@ L=6 R=8 minus=5 plus=7 -simulate_home=minus+plus [0f0d-00c1] ;Hori battlepad (switch mode) b=2 @@ -474,7 +476,6 @@ zl=6 zr=8 minus=9 plus=10 -simulate_home=minus+plus rstick_left=-Rz rstick_right=+Rz rstick_up=+Slider @@ -530,8 +531,35 @@ zl=5 zr=6 minus=9 plus=10 -simulate_home=plus+R -simulate_capture=minus+L + +[20bc-503d] ;BEITONG +b=2 +a=1 +y=5 +x=4 +l=7 +r=8 +zl=9 +zr=10 +minus=11 +plus=12 +home=16 +lstick_click=14 +rstick_click=15 +rstick_left=-Z +rstick_right=Z +rstick_up=Rz +rstick_down=-Rz + +[0583-2060] ;Buffalo snes usb +b=2 +a=1 +x=3 +y=4 +l=5 +r=6 +minus=7 +plus=8 ; *************************************** ; N64 / GC adapter @@ -581,7 +609,6 @@ rstick_left=+Rz rstick_right=-Rz rstick_up=+Z rstick_down=-Z -simulate_home=zl+plus [20d6-a710] ;Hyperkin N64 Adapter (Switch mode) b=2 @@ -594,7 +621,6 @@ rstick_left=-Z rstick_right=Z rstick_up=Rz rstick_down=-Rz -simulate_home=zl+plus ; *************************************** ; Switch controllers diff --git a/games/Homebrew.Menu.nsp b/games/Homebrew.Menu.nsp index 438101b..f7b9d0f 100644 Binary files a/games/Homebrew.Menu.nsp and b/games/Homebrew.Menu.nsp differ diff --git a/switch/.overlays/FPSLocker.ovl b/switch/.overlays/FPSLocker.ovl index 3566a1a..4c38b8f 100644 Binary files a/switch/.overlays/FPSLocker.ovl and b/switch/.overlays/FPSLocker.ovl differ diff --git a/switch/.overlays/Ultra.ovl b/switch/.overlays/Ultra.ovl index acc0608..7fa6562 100644 Binary files a/switch/.overlays/Ultra.ovl and b/switch/.overlays/Ultra.ovl differ diff --git a/switch/.packages/boot_package.ini b/switch/.packages/boot_package.ini index 3f0ddf8..97b1ea5 100644 --- a/switch/.packages/boot_package.ini +++ b/switch/.packages/boot_package.ini @@ -9,6 +9,7 @@ del '/atmosphere/flags/' del '/atmosphere/hbl_html/' del '/atmosphere/hosts/domains.txt' del '/atmosphere/kips/.bak/*.kip' +del '/atmosphere/splash.png del '/atmosphere/exefs_patches/logo_sloth/' del '/atmosphere/exefs_patches/es_patches/' @@ -26,6 +27,9 @@ del '/atmosphere/fatal_reports/' del '/bootloader/ini/fullstock.ini' del '/bootloader/ini/sys_cfw.ini' del '/bootloader/ini/sys_sm.ini' +del '/bootloader/ini/!kefir_updater.ini' +del '/bootloader/ini/atmostock.ini' +del '/bootloader/ini/kefir_updater.ini' del '/bootloader/res/atmosphere.bmp' del '/bootloader/res/icon_payload.bmp' del '/bootloader/res/icon_switch.bmp' @@ -68,7 +72,6 @@ del '/switch/.overlays/4IFIR.ovl' del '/switch/.overlays/InfoNX-ovl.ovl' del '/switch/.overlays/Ultra-Status-Monitor.ovl' del '/switch/.overlays/sys-clk-overlay.ovl' -del '/switch/.overlays/sys-patch-overlay.ovl' del '/switch/.packages/Ultra Cleaner/' diff --git a/switch/DBI/dbi.config b/switch/DBI/dbi.config index e2f831d..511c5ac 100644 --- a/switch/DBI/dbi.config +++ b/switch/DBI/dbi.config @@ -20,15 +20,12 @@ HighlightUpdates=true RotateScreen=false ; Rotate joycons RotateJoycon=false -; Underclock CPU in menues to reduce battery usage -OptimizeClockSpeed=true ; URL with title versions in format |[rightsId|] ;VersionsURL=https://raw.githubusercontent.com/16BitWonder/nx-versions/master/versions.txt VersionsURL=https://raw.githubusercontent.com/blawar/titledb/master/versions.txt ;VersionsURL=sdmc:/versions.txt ; URL with titledb json TitleDB=https://raw.githubusercontent.com/blawar/titledb/master/US.en.json - ;Browse saves FS in Read-only mode ROSaveFS=false ; Show "Update all items from here..." in context menu of file browsers @@ -49,6 +46,14 @@ FoolproofSaveDelete=true TimeShow=true ; Show time with seconds TimeShowSeconds=true +; Run Application list from file browser by pressing L +BrowseAppsFromFiles=false +; Validate SSL certificates on network connections +ValidateSSL=false +; UpdateURL +DBIUpdateURL=https://github.com/Ultra-NX/Ultra-Resources/releases/download/Homebrews/DBI.RU.zip +; Dump generated forwarders to configured dump location +DumpForwarders=false [Filtering] ; Apply filebrowser filter to directories @@ -97,8 +102,6 @@ CalculateLFSSize=true [Install] ; Check NCA hash during install CheckHash=true -; Use chunked network transfer (good in bad environments) -ChunkedTransfer=false ; Allow NSZ/XCZ install in applet mode EnableNSZ=true ; Create LFS folder in /atmosphere/contents after installation @@ -114,10 +117,10 @@ PatchVideoRec=false ; MTP options [MTP] -; Log all files, if disabled transfer shows only for files >= 2M -LogAllFiles=true ; Show or not NSP that includes base game, latest update and all DLC in single multi-title file ShowCombinedNSP=true +; Add [Base] and [Update] suffix to filename +AddBaseUpdate=false ; Show or not virtual "Mods & cheats" folder that redirects to sdmc:/atmosphere/contents/TITLEID ShowMAC=true ; Use TitleID for "Mods & cheats" folder @@ -134,6 +137,8 @@ SingleURB=false BufferSize=512 ; MTP transmission timeout in ms NewBufferTimeout=2500 +; Send Object_Removed event for files copied to Install storages +AutoremoveInstalled=true ; FTP options [FTP] @@ -149,9 +154,13 @@ MinPassivePort=40000 MaxPassivePort=40100 ; send current directory as type=cdir CDIR=false +; Force UTF8 usage +ForceUtf8=true ;HTTP options [HTTP] +; Use parallel downloading +UseParallelDownloading=true ; Access port Port=1234 @@ -184,6 +193,7 @@ Hidden=false notUltraNX=ApacheHTTP|https://tinfoil.ultranx.ru/dbi/ ;NSP Indexer=URLList|http://192.168.1.47/nspindexer/index.php?DBI ;Home server=ApacheHTTP|http://192.168.1.47/Nintendo/Switch/ +;WebDAV test=WebDAV|http://user:password@192.168.1.47/webdav/ ;Test FTP=FTP|ftp://192.168.1.24:2121/ ;Test SFTP=SFTP|sftp://user:password@192.168.1.24/ ;Test SFTP=SFTP|sftp://remote_user@192.168.1.47/ @@ -194,12 +204,12 @@ notUltraNX=ApacheHTTP|https://tinfoil.ultranx.ru/dbi/ [Local sources] ; = ;Homebrew=sdmc:/switch -DBILogs=sdmc:/switch/DBI/logs +;DBILogs=sdmc:/switch/DBI/logs [MTP custom storages] ; = ;Homebrew=sdmc:/switch -DBILogs=sdmc:/switch/DBI/logs +;DBILogs=sdmc:/switch/DBI/logs ; Override for display name ; =