Skip to content

Commit

Permalink
Merge branch 'eos'
Browse files Browse the repository at this point in the history
  • Loading branch information
CatcherITGF committed Jan 18, 2024
2 parents 05f225f + 0d6cbb8 commit 3bbd0bf
Show file tree
Hide file tree
Showing 78 changed files with 290 additions and 317 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ jobs:
- name: "Compile AIO"
working-directory: ./Sources/AIO
run: zip -qqrX ../../AIO.zip ./
- name: "Compile OC-Suite Wizard"
- name: "Compile EOS Wizard"
working-directory: ./Sources/NXVenom
run: zip -qqrX "../../OC-Suite Wizard.zip" "./switch/.packages/OC-Suite Wizard" ./switch/.overlays/ovlmenu.ovl
run: zip -qqrX "../../EOS Wizard.zip" "./switch/.packages/EOS Wizard" ./switch/.overlays/ovlmenu.ovl
- uses: stefanzweifel/git-auto-commit-action@v5
with:
commit_message: "Build: Compile Bundle"
Expand Down
Binary file modified Sources/NXVenom/atmosphere/contents/010000000000DA7A/exefs.nsp
Binary file not shown.
Binary file modified Sources/NXVenom/atmosphere/kips/loader.kip
Binary file not shown.
90 changes: 45 additions & 45 deletions Sources/NXVenom/config/status-monitor/config.ini
Original file line number Diff line number Diff line change
@@ -1,57 +1,57 @@
[status-monitor]
key_combo = ZL+ZR+DDOWN
battery_avg_iir_filter=true
battery_time_left_refreshrate=60
battery_avg_iir_filter = true
battery_time_left_refreshrate = 60

[full]
refresh_rate=1
layer_width_align=left
refresh_rate = 1
layer_width_align = left

[mini]
refresh_rate=1
layer_width_align=left
layer_height_align=top
handheld_font_size=15
docked_font_size=15
real_freqs=false
real_volts=true
show=CPU+GPU+RAM+TEMP+DRAW+FAN+FPS
replace_MB_with_RAM_load=true
background_color=#1117
cat_color=#CDEF
text_color=#FFFF
refresh_rate = 1
layer_width_align = left
layer_height_align = top
handheld_font_size = 15
docked_font_size = 15
real_freqs = false
real_volts = true
show = CPU+GPU+RAM+TEMP+DRAW+FAN+FPS
replace_MB_with_RAM_load = true
background_color = #1117
cat_color = #CDEF
text_color = #FFFF

[micro]
refresh_rate=1
layer_height_align=top
handheld_font_size=14
docked_font_size=14
text_align=left
real_freqs=false
real_volts=true
show=FPS+CPU+GPU+RAM+BRD+PWR+BAT
replace_GB_with_RAM_load=true
background_color=#1117
cat_color=#BDFF
text_color=#FFFF
refresh_rate = 1
layer_height_align = top
handheld_font_size = 14
docked_font_size = 14
text_align = left
real_freqs = false
real_volts = true
show = FPS+CPU+GPU+RAM+BRD+PWR+BAT
replace_GB_with_RAM_load = true
background_color = #1117
cat_color = #BDFF
text_color = #FFFF

[fps-counter]
layer_width_align=left
layer_height_align=top
handheld_font_size=28
docked_font_size=28
text_color=#0F0F
background_color=#1117
layer_width_align = left
layer_height_align = top
handheld_font_size = 28
docked_font_size = 28
text_color = #0F0F
background_color = #1117

[fps-graph]
layer_width_align=left
layer_height_align=top
max_fps_text_color=#FFFF
min_fps_text_color=#FFFF
background_color=#1117
fps_counter_color=#4444
border_color=#F77F
dashed_line_color=#8888
main_line_color=#FFFF
rounded_line_color=#F0FF
perfect_line_color=#0C0F
layer_width_align = left
layer_height_align = top
max_fps_text_color = #FFFF
min_fps_text_color = #FFFF
background_color = #1117
fps_counter_color = #4444
border_color = #F77F
dashed_line_color = #8888
main_line_color = #FFFF
rounded_line_color = #F0FF
perfect_line_color = #0C0F
2 changes: 1 addition & 1 deletion Sources/NXVenom/config/uberhand/packages.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[OC-SuiteWizardd]
[EOSWizardd]
priority = 2

[SoftwareInstallerr]
Expand Down
14 changes: 14 additions & 0 deletions Sources/NXVenom/switch/.packages/EOS Wizard/Backup/config.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
[Create Backup]
backup

[*Manage Backups]
; Mariko
catch_errors
source '/atmosphere/kips/.bak/*'
kip_info {source} '/switch/.packages/EOS Wizard/Backup/json/curconf_mariko.json' '/switch/.packages/EOS Wizard/Backup/json/curconf_mariko2.json' name

[*Manage Backups]
; Erista
catch_errors
source '/atmosphere/kips/.bak/*'
kip_info {source} '/switch/.packages/EOS Wizard/Backup/json/curconf_erista.json' name
Original file line number Diff line number Diff line change
@@ -1,57 +1,57 @@
[*Undervolt Level]
; Mariko
json_mark_cur_kip '/switch/.packages/OC-Suite Wizard/Configure/CPU/json/marikoCpuUV.json' name 12
json_mark_cur_kip '/switch/.packages/EOS Wizard/Configure/CPU/json/marikoCpuUV.json' name 12
hex-by-cust-offset-dec /atmosphere/kips/loader.kip 12 {json_mark_cur_kip(*,dec)}
back

[*Min Volt]
; Mariko
catch_errors
json_mark_cur_kip '/switch/.packages/OC-Suite Wizard/Configure/CPU/json/marikoCpuMinVolt.json' name 24
json_mark_cur_kip '/switch/.packages/EOS Wizard/Configure/CPU/json/marikoCpuMinVolt.json' name 24
hex-by-cust-offset-dec /atmosphere/kips/loader.kip 24 {json_mark_cur_kip(*,dec)}
{json_mark_cur_kip(*,comm)} /atmosphere/kips/loader.kip 24 {json_mark_cur_kip(*,hex)}
back

[*Min Volt]
; Erista
catch_errors
json_mark_cur_kip '/switch/.packages/OC-Suite Wizard/Configure/CPU/json/eristaCpuMinVolt.json' name 16
json_mark_cur_kip '/switch/.packages/EOS Wizard/Configure/CPU/json/eristaCpuMinVolt.json' name 16
hex-by-cust-offset-dec /atmosphere/kips/loader.kip 16 {json_mark_cur_kip(*,dec)}
{json_mark_cur_kip(*,comm)} /atmosphere/kips/loader.kip 16 {json_mark_cur_kip(*,hex)}
back

[*High Min Volt]
; Mariko
catch_errors
json_mark_cur_kip '/switch/.packages/OC-Suite Wizard/Configure/CPU/json/marikoCpuHighMinVolt.json' name 28
json_mark_cur_kip '/switch/.packages/EOS Wizard/Configure/CPU/json/marikoCpuHighMinVolt.json' name 28
hex-by-cust-offset-dec /atmosphere/kips/loader.kip 28 {json_mark_cur_kip(*,dec)}
{json_mark_cur_kip(*,comm)} /atmosphere/kips/loader.kip 28 {json_mark_cur_kip(*,hex)}
back

[*Max Volt]
; Mariko
catch_errors
json_mark_cur_kip '/switch/.packages/OC-Suite Wizard/Configure/CPU/json/marikoCpuMaxVolt.json' name 32
json_mark_cur_kip '/switch/.packages/EOS Wizard/Configure/CPU/json/marikoCpuMaxVolt.json' name 32
hex-by-cust-offset-dec /atmosphere/kips/loader.kip 32 {json_mark_cur_kip(*,dec)}
back

[*Max Volt]
; Erista
catch_errors
json_mark_cur_kip '/switch/.packages/OC-Suite Wizard/Configure/CPU/json/eristaCpuMaxVolt.json' name 20
json_mark_cur_kip '/switch/.packages/EOS Wizard/Configure/CPU/json/eristaCpuMaxVolt.json' name 20
hex-by-cust-offset-dec /atmosphere/kips/loader.kip 20 {json_mark_cur_kip(*,dec)}
back

[*Boost Clock]
; Mariko
catch_errors
json_mark_cur_kip '/switch/.packages/OC-Suite Wizard/Configure/CPU/json/marikoCpuBoostClock.json' name 8
json_mark_cur_kip '/switch/.packages/EOS Wizard/Configure/CPU/json/marikoCpuBoostClock.json' name 8
hex-by-cust-offset-dec /atmosphere/kips/loader.kip 8 {json_mark_cur_kip(*,dec)}
back

[*Boost Clock]
; Erista
catch_errors
json_mark_cur_kip '/switch/.packages/OC-Suite Wizard/Configure/CPU/json/eristaCpuBoostClock.json' name 8
json_mark_cur_kip '/switch/.packages/EOS Wizard/Configure/CPU/json/eristaCpuBoostClock.json' name 8
hex-by-cust-offset-dec /atmosphere/kips/loader.kip 8 {json_mark_cur_kip(*,dec)}
back
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,11 @@
"dec": "1"
},
{
"name": "2 - SLT",
"name": "2 - OCT",
"dec": "2"
},
{
"name": "3 - OCT",
"name": "3 - HiOCT",
"dec": "3"
},
{
"name": "4 - HiOCT",
"dec": "4"
}
]
Original file line number Diff line number Diff line change
@@ -1,44 +1,44 @@
[*Undervolt Level]
; Mariko
catch_errors
json_mark_cur_kip '/switch/.packages/OC-Suite Wizard/Configure/GPU/json/marikoGpuUV.json' name 36
json_mark_cur_kip '/switch/.packages/EOS Wizard/Configure/GPU/json/marikoGpuUV.json' name 36
hex-by-cust-offset-dec /atmosphere/kips/loader.kip 36 {json_mark_cur_kip(*,dec)}
back

[*Volt Offset]
catch_errors
json_mark_cur_kip '/switch/.packages/OC-Suite Wizard/Configure/GPU/json/commonGpuVoltOffset.json' name 40
json_mark_cur_kip '/switch/.packages/EOS Wizard/Configure/GPU/json/commonGpuVoltOffset.json' name 40
hex-by-cust-offset-dec /atmosphere/kips/loader.kip 40 {json_mark_cur_kip(*,dec)}
back

[*Min Volt]
; Mariko
catch_errors
json_mark_cur_kip '/switch/.packages/OC-Suite Wizard/Configure/GPU/json/marikoGpuVmin.json' name 48
json_mark_cur_kip '/switch/.packages/EOS Wizard/Configure/GPU/json/marikoGpuVmin.json' name 48
hex-by-cust-offset-dec /atmosphere/kips/loader.kip 48 {json_mark_cur_kip(*,dec)}
{json_mark_cur_kip(*,comm)} /atmosphere/kips/loader.kip 48 {json_mark_cur_kip(*,hex)}
back

[*Min Volt]
; Erista
catch_errors
json_mark_cur_kip '/switch/.packages/OC-Suite Wizard/Configure/GPU/json/eristaGpuVmin.json' name 44
json_mark_cur_kip '/switch/.packages/EOS Wizard/Configure/GPU/json/eristaGpuVmin.json' name 44
hex-by-cust-offset-dec /atmosphere/kips/loader.kip 44 {json_mark_cur_kip(*,dec)}
{json_mark_cur_kip(*,comm)} /atmosphere/kips/loader.kip 44 {json_mark_cur_kip(*,hex)}
back

[*Max Volt]
; Mariko
catch_errors
json_mark_cur_kip '/switch/.packages/OC-Suite Wizard/Configure/GPU/json/marikoGpuMaxVolt.json' name 52
json_mark_cur_kip '/switch/.packages/EOS Wizard/Configure/GPU/json/marikoGpuMaxVolt.json' name 52
hex-by-cust-offset-dec /atmosphere/kips/loader.kip 52 {json_mark_cur_kip(*,dec)}
back

-- Custom Volt Table ; Mariko

[*76 - 614 MHz]
; Mariko
json_mark_cur_kip '/switch/.packages/OC-Suite Wizard/Configure/GPU/json/marikoGpuVoltTable.json' name 108
json_mark_cur_kip '/switch/.packages/EOS Wizard/Configure/GPU/json/marikoGpuVoltTable.json' name 108
hex-by-cust-offset-dec /atmosphere/kips/loader.kip 108 {json_mark_cur_kip(*,dec)}
hex-by-cust-offset-dec /atmosphere/kips/loader.kip 112 {json_mark_cur_kip(*,dec)}
hex-by-cust-offset-dec /atmosphere/kips/loader.kip 116 {json_mark_cur_kip(*,dec)}
Expand All @@ -51,54 +51,54 @@ back

[*691 MHz]
; Mariko
json_mark_cur_kip '/switch/.packages/OC-Suite Wizard/Configure/GPU/json/marikoGpuVoltTable.json' name 140
json_mark_cur_kip '/switch/.packages/EOS Wizard/Configure/GPU/json/marikoGpuVoltTable.json' name 140
hex-by-cust-offset-dec /atmosphere/kips/loader.kip 140 {json_mark_cur_kip(*,dec)}
back

[*768 MHz]
; Mariko
json_mark_cur_kip '/switch/.packages/OC-Suite Wizard/Configure/GPU/json/marikoGpuVoltTable.json' name 144
json_mark_cur_kip '/switch/.packages/EOS Wizard/Configure/GPU/json/marikoGpuVoltTable.json' name 144
hex-by-cust-offset-dec /atmosphere/kips/loader.kip 144 {json_mark_cur_kip(*,dec)}
back

[*844 MHz]
; Mariko
json_mark_cur_kip '/switch/.packages/OC-Suite Wizard/Configure/GPU/json/marikoGpuVoltTable.json' name 148
json_mark_cur_kip '/switch/.packages/EOS Wizard/Configure/GPU/json/marikoGpuVoltTable.json' name 148
hex-by-cust-offset-dec /atmosphere/kips/loader.kip 148 {json_mark_cur_kip(*,dec)}
back

[*921 MHz]
; Mariko
json_mark_cur_kip '/switch/.packages/OC-Suite Wizard/Configure/GPU/json/marikoGpuVoltTable.json' name 152
json_mark_cur_kip '/switch/.packages/EOS Wizard/Configure/GPU/json/marikoGpuVoltTable.json' name 152
hex-by-cust-offset-dec /atmosphere/kips/loader.kip 152 {json_mark_cur_kip(*,dec)}
back

[*998 MHz]
; Mariko
json_mark_cur_kip '/switch/.packages/OC-Suite Wizard/Configure/GPU/json/marikoGpuVoltTable.json' name 156
json_mark_cur_kip '/switch/.packages/EOS Wizard/Configure/GPU/json/marikoGpuVoltTable.json' name 156
hex-by-cust-offset-dec /atmosphere/kips/loader.kip 156 {json_mark_cur_kip(*,dec)}
back

[*1075 MHz]
; Mariko
json_mark_cur_kip '/switch/.packages/OC-Suite Wizard/Configure/GPU/json/marikoGpuVoltTable.json' name 160
json_mark_cur_kip '/switch/.packages/EOS Wizard/Configure/GPU/json/marikoGpuVoltTable.json' name 160
hex-by-cust-offset-dec /atmosphere/kips/loader.kip 160 {json_mark_cur_kip(*,dec)}
back

[*1152 MHz]
; Mariko
json_mark_cur_kip '/switch/.packages/OC-Suite Wizard/Configure/GPU/json/marikoGpuVoltTable.json' name 164
json_mark_cur_kip '/switch/.packages/EOS Wizard/Configure/GPU/json/marikoGpuVoltTable.json' name 164
hex-by-cust-offset-dec /atmosphere/kips/loader.kip 164 {json_mark_cur_kip(*,dec)}
back

[*1228 MHz]
; Mariko
json_mark_cur_kip '/switch/.packages/OC-Suite Wizard/Configure/GPU/json/marikoGpuVoltTable.json' name 168
json_mark_cur_kip '/switch/.packages/EOS Wizard/Configure/GPU/json/marikoGpuVoltTable.json' name 168
hex-by-cust-offset-dec /atmosphere/kips/loader.kip 168 {json_mark_cur_kip(*,dec)}
back

[*1267 MHz]
; Mariko
json_mark_cur_kip '/switch/.packages/OC-Suite Wizard/Configure/GPU/json/marikoGpuVoltTable.json' name 172
json_mark_cur_kip '/switch/.packages/EOS Wizard/Configure/GPU/json/marikoGpuVoltTable.json' name 172
hex-by-cust-offset-dec /atmosphere/kips/loader.kip 172 {json_mark_cur_kip(*,dec)}
back
Loading

0 comments on commit 3bbd0bf

Please sign in to comment.