4IFIR Wizard Update

4ifir Wizard source code/4Advanced/4ekate/config.ini

@@ -1,24 +1,69 @@
-[Default]
+-- Console will reboot after apply
+;[Default]
 ;catch_errors
-hex-by-swap-from-addr /payload.bin 00240000 0024FFFF 00019000
-hex-by-swap-from-addr /payload.bin 00440000 0044576E 00019000
-hex-by-swap-from-addr /payload.bin 00280000 00287239 00019000
-hex-by-swap-from-addr /payload.bin 00100000 00109C4B 00019000
-reboot
+hex-by-swap-from-addr /payload.bin 00240000 0024FFFF 00015000
+hex-by-swap-from-addr /payload.bin 00440000 0044576E 00015000
+hex-by-swap-from-addr /payload.bin 00280000 00287239 00015000
+hex-by-swap-from-addr /payload.bin 00100000 00109C4B 00015000
 
-[st1]
-;catch_errors
-hex-by-swap-from-addr /payload.bin 0024FFFF 00240000 00019000
-hex-by-swap-from-addr /payload.bin 00440000 0044576E 00019000
-hex-by-swap-from-addr /payload.bin 00280000 00287239 00019000
-hex-by-swap-from-addr /payload.bin 00100000 00109C4B 00019000
+hex-by-swap-from-addr /atmosphere/reboot_payload.bin 00240000 0024FFFF 00015000
+hex-by-swap-from-addr /atmosphere/reboot_payload.bin 00440000 0044576E 00015000
+hex-by-swap-from-addr /atmosphere/reboot_payload.bin 00280000 00287239 00015000
+hex-by-swap-from-addr /atmosphere/reboot_payload.bin 00100000 00109C4B 00015000
+
+hex-by-swap-from-addr /bootloader/update.bin 00240000 0024FFFF 00015000
+hex-by-swap-from-addr /bootloader/update.bin 00440000 0044576E 00015000
+hex-by-swap-from-addr /bootloader/update.bin 00280000 00287239 00015000
+hex-by-swap-from-addr /bootloader/update.bin 00100000 00109C4B 00015000
+
+hex-by-swap-from-addr /bootloader/payloads/fusee.bin 00240000 0024FFFF 00015000
+hex-by-swap-from-addr /bootloader/payloads/fusee.bin 00440000 0044576E 00015000
+hex-by-swap-from-addr /bootloader/payloads/fusee.bin 00280000 00287239 00015000
+hex-by-swap-from-addr /bootloader/payloads/fusee.bin 00100000 00109C4B 00015000
 reboot
 
-[st2]
+;[ST1]
 ;catch_errors
-hex-by-swap-from-addr /payload.bin 0024FFFF 00240000 00019000
-hex-by-swap-from-addr /payload.bin 0044576E 00440000 00019000
-hex-by-swap-from-addr /payload.bin 00287239 00280000 00019000
-hex-by-swap-from-addr /payload.bin 00109C4B 00100000 00019000
+hex-by-swap-from-addr /payload.bin 0024FFFF 00240000 00015000
+hex-by-swap-from-addr /payload.bin 00440000 0044576E 00015000
+hex-by-swap-from-addr /payload.bin 00280000 00287239 00015000
+hex-by-swap-from-addr /payload.bin 00100000 00109C4B 00015000
+
+hex-by-swap-from-addr /atmosphere/reboot_payload.bin 0024FFFF 00240000 00015000
+hex-by-swap-from-addr /atmosphere/reboot_payload.bin 00440000 0044576E 00015000
+hex-by-swap-from-addr /atmosphere/reboot_payload.bin 00280000 00287239 00015000
+hex-by-swap-from-addr /atmosphere/reboot_payload.bin 00100000 00109C4B 00015000
+
+hex-by-swap-from-addr /bootloader/update.bin 0024FFFF 00240000 00015000
+hex-by-swap-from-addr /bootloader/update.bin 00440000 0044576E 00015000
+hex-by-swap-from-addr /bootloader/update.bin 00280000 00287239 00015000
+hex-by-swap-from-addr /bootloader/update.bin 00100000 00109C4B 00015000
+
+hex-by-swap-from-addr /bootloader/payloads/fusee.bin 0024FFFF 00240000 00015000
+hex-by-swap-from-addr /bootloader/payloads/fusee.bin 00440000 0044576E 00015000
+hex-by-swap-from-addr /bootloader/payloads/fusee.bin 00280000 00287239 00015000
+hex-by-swap-from-addr /bootloader/payloads/fusee.bin 00100000 00109C4B 00015000
 reboot
 
+[ST2 | Apply]
+catch_errors
+hex-by-swap-from-addr /payload.bin 0024FFFF 00240000 00015000
+hex-by-swap-from-addr /payload.bin 0044576E 00440000 00015000
+hex-by-swap-from-addr /payload.bin 00287239 00280000 00015000
+hex-by-swap-from-addr /payload.bin 00109C4B 00100000 00015000
+
+hex-by-swap-from-addr /atmosphere/reboot_payload.bin 0024FFFF 00240000 00015000
+hex-by-swap-from-addr /atmosphere/reboot_payload.bin 0044576E 00440000 00015000
+hex-by-swap-from-addr /atmosphere/reboot_payload.bin 00287239 00280000 00015000
+hex-by-swap-from-addr /atmosphere/reboot_payload.bin 00109C4B 00100000 00015000
+
+hex-by-swap-from-addr /bootloader/update.bin 0024FFFF 00240000 00015000
+hex-by-swap-from-addr /bootloader/update.bin 0044576E 00440000 00015000
+hex-by-swap-from-addr /bootloader/update.bin 00287239 00280000 00015000
+hex-by-swap-from-addr /bootloader/update.bin 00109C4B 00100000 00015000
+
+hex-by-swap-from-addr /bootloader/payloads/fusee.bin 0024FFFF 00240000 00015000
+hex-by-swap-from-addr /bootloader/payloads/fusee.bin 0044576E 00440000 00015000
+hex-by-swap-from-addr /bootloader/payloads/fusee.bin 00287239 00280000 00015000
+hex-by-swap-from-addr /bootloader/payloads/fusee.bin 00109C4B 00100000 00015000
+reboot

4ifir Wizard source code/4Advanced/CPU/config.ini

@@ -1,48 +1,50 @@
-[*CPU Minimal Voltage]
+-- CPU Voltage Settings
+[*CPU vMin]
 catch_errors
-json_mark_cur_kip '/switch/.packages/4IFIR Wizard/4Advanced/CPU/json/cpuv.json' name 48
+json_mark_cur_kip '/switch/.packages/4IFIR Wizard/4Advanced/CPU/json/CPUvMin.json' name 48
 hex-by-cust-offset /atmosphere/kips/loader.kip 48 {json_mark_cur_kip(*,hex)}
 back
 
-[*CPU Maximum Voltage]
+[*CPU vMax]
 ; Mariko
 catch_errors
-json_mark_cur_kip '/switch/.packages/4IFIR Wizard/4Advanced/CPU/json/voltage_mariko.json' name 28
+json_mark_cur_kip '/switch/.packages/4IFIR Wizard/4Advanced/CPU/json/Mariko/CPUvMax.json' name 28
 hex-by-cust-offset /atmosphere/kips/loader.kip 28 {json_mark_cur_kip(*,hex)}
 back
 
-[*dCPUv]
+[*CPU vMax]
+; Erista
 catch_errors
-json_mark_cur_kip '/switch/.packages/4IFIR Wizard/4Advanced/CPU/json/dcpuv.json' name 12348
-hex-by-cust-offset /atmosphere/kips/loader.kip 12348 {json_mark_cur_kip(*,hex)}
+json_mark_cur_kip '/switch/.packages/4IFIR Wizard/4Advanced/CPU/json/Erista/CPUvMax.json' name 20
+hex-by-cust-offset /atmosphere/kips/loader.kip 20 {json_mark_cur_kip(*,hex)}
 back
 
-[*CPU Boost Clock]
+[*dCPUv]
 catch_errors
-json_mark_cur_kip '/switch/.packages/4IFIR Wizard/4Advanced/CPU/json/cpu boost.json' name 12
-hex-by-cust-offset /atmosphere/kips/loader.kip 12 {json_mark_cur_kip(*,hex)}
+json_mark_cur_kip '/switch/.packages/4IFIR Wizard/4Advanced/CPU/json/dCPUv.json' name 12348
+hex-by-cust-offset /atmosphere/kips/loader.kip 12348 {json_mark_cur_kip(*,hex)}
 back
 
-[*Low MHz Undervolt]
+-- CPU Undervolt Settings
+[*Low UV Mode]
 ; Mariko
 catch_errors
-json_mark_cur_kip '/switch/.packages/4IFIR Wizard/4Advanced/CPU/json/undervolt_low.json' name 40
+json_mark_cur_kip '/switch/.packages/4IFIR Wizard/4Advanced/CPU/json/Mariko/UVLow.json' name 40
 hex-by-cust-offset /atmosphere/kips/loader.kip 40 {json_mark_cur_kip(*,hex)}
 back
 
-[*High MHz Undervolt]
+[*High UV Mode]
 ; Mariko
 catch_errors
-json_mark_cur_kip '/switch/.packages/4IFIR Wizard/4Advanced/CPU/json/undervolt_high.json' name 12340
+json_mark_cur_kip '/switch/.packages/4IFIR Wizard/4Advanced/CPU/json/Mariko/UVHigh.json' name 12340
 hex-by-cust-offset /atmosphere/kips/loader.kip 12340 {json_mark_cur_kip(*,hex)}
 back
 
-
-[*CPU Voltage Limit]
-; Erista
+-- Other Settings
+[*CPU Boost Clock]
 catch_errors
-json_mark_cur_kip '/switch/.packages/4IFIR Wizard/4Advanced/CPU/json/voltage_erista.json' name 20
-hex-by-cust-offset /atmosphere/kips/loader.kip 20 {json_mark_cur_kip(*,hex)}
+json_mark_cur_kip '/switch/.packages/4IFIR Wizard/4Advanced/CPU/json/CPUBoost.json' name 12
+hex-by-cust-offset /atmosphere/kips/loader.kip 12 {json_mark_cur_kip(*,hex)}
 back
 
 [*Speed Shift]

4ifir Wizard source code/4Advanced/CPU/json/cpu boost.json → 4ifir Wizard source code/4Advanced/CPU/json/CPUBoost.json

@@ -1,82 +1,85 @@
-[
-    {
-        "name": "eBAMATIC",
-        "hex": "000000"
-    },
-    {
-        "name": "1400MHz",
-        "hex": "C05C15"
-    },
-    {
-        "name": "1428MHz - CPU-HI uv DEBUG",
-        "hex": "20CA15"
-    },
-    {
-        "name": "1500MHz",
-        "hex": "60E316"
-    },
-    {
-        "name": "1600MHz",
-        "hex": "006A18"
-    },
-    {
-        "name": "1700MHz",
-        "hex": "A0F019"
-    },
-    {
-        "name": "1785MHz - CPU-LOW uV DEBUG",
-        "hex": "A83C1B"
-    },
-    {
-        "name": "1800MHz",
-        "hex": "40771B"
-    },
-    {
-        "name": "1900MHz",
-        "hex": "E0FD1C"
-    },
-    {
-        "name": "2000MHz - E",
-        "hex": "80841E"
-    },
-    {
-        "name": "2100MHz",
-        "hex": "200B20"
-    },
-    {
-        "name": "2200MHz",
-        "hex": "C09121"
-    },
-    {
-        "name": "2300MHz",
-        "hex": "601823"
-    },
-    {
-        "name": "2400MHz",
-        "hex": "009F24"
-    },
-    {
-        "name": "2500MHz - D",
-        "hex": "A02526"
-    },
-    {
-        "name": "2600MHz",
-        "hex": "40AC27"
-    },
-    {
-        "name": "2700MHz",
-        "hex": "E03229"
-    },
-    {
-        "name": "2800MHz",
-        "hex": "80B92A"
-    },
-    {
-        "name": "2900MHz",
-        "hex": "20402C"
-    },
-    {
-        "name": "3000MHz - S",
-        "hex": "C0C62D"
-    }
+[
+    {
+        "name": "`CPU Boost Target Clock"
+    },
+    {
+        "name": "eBAMATIC - Default",
+        "hex": "000000"
+    },
+    {
+        "name": "1400 MHz",
+        "hex": "C05C15"
+    },
+    {
+        "name": "1428 MHz - CPU-HI uV DEBUG",
+        "hex": "20CA15"
+    },
+    {
+        "name": "1500 MHz",
+        "hex": "60E316"
+    },
+    {
+        "name": "1600 MHz",
+        "hex": "006A18"
+    },
+    {
+        "name": "1700 MHz",
+        "hex": "A0F019"
+    },
+    {
+        "name": "1785 MHz - CPU-LOW uV DEBUG",
+        "hex": "A83C1B"
+    },
+    {
+        "name": "1800 MHz",
+        "hex": "40771B"
+    },
+    {
+        "name": "1900 MHz",
+        "hex": "E0FD1C"
+    },
+    {
+        "name": "2000 MHz - E",
+        "hex": "80841E"
+    },
+    {
+        "name": "2100 MHz",
+        "hex": "200B20"
+    },
+    {
+        "name": "2200 MHz",
+        "hex": "C09121"
+    },
+    {
+        "name": "2300 MHz",
+        "hex": "601823"
+    },
+    {
+        "name": "2400 MHz",
+        "hex": "009F24"
+    },
+    {
+        "name": "2500 MHz - D",
+        "hex": "A02526"
+    },
+    {
+        "name": "2600 MHz",
+        "hex": "40AC27"
+    },
+    {
+        "name": "2700 MHz",
+        "hex": "E03229"
+    },
+    {
+        "name": "2800 MHz",
+        "hex": "80B92A"
+    },
+    {
+        "name": "2900 MHz",
+        "hex": "20402C"
+    },
+    {
+        "name": "3000 MHz - S",
+        "hex": "C0C62D"
+    }
 ]