Skip to content

Commit 0f8a044

Browse files
borntohonkborntohonk
authored
version 1.6.0 - mostly refactor - 22.0.0 es fix
2 parents f407d0d + 215e747 commit 0f8a044

8 files changed

Lines changed: 94 additions & 65 deletions

File tree

‎.github/workflows/build-jobs.yaml‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,24 +20,34 @@ jobs:
2020

2121
- name: Build sys-patch
2222
run: |
23+
24+
LIBNX_VER=$(dkp-pacman -Q libnx | cut -d' ' -f2 | cut -d- -f1)
25+
echo "Detected libnx version: $LIBNX_VER"
26+
2327
make -C sys-patch -j$(nproc) dist && \
28+
2429
VERSION=$(grep 'export VERSION := ' sys-patch/Makefile | cut -c 19-)
2530
TAGVERSION=$(curl -s https://api.github.com/repos/$GITHUB_REPOSITORY/releases/latest | grep "tag_name" | head -1 | cut -d '"' -f 4)
2631
echo "VERSION=${VERSION}" >> $GITHUB_ENV
2732
echo "TAGVERSION=${TAGVERSION}" >> $GITHUB_ENV
33+
mv sys-patch/sys-patch.zip sys-patch/sys-patch-v$VERSION.zip
34+
SHA256=$(sha256sum sys-patch/sys-patch-v$VERSION.zip)
35+
echo "SHA256=${SHA256}" >> $GITHUB_ENV
2836
2937
- name: Upload artifact
3038
uses: actions/upload-artifact@v4
3139
with:
3240
include-hidden-files: true
3341
overwrite: true
34-
name: sys-patch-${{ env.VERSION }}
42+
name: sys-patch-v${{ env.VERSION }}
3543
path: sys-patch/out/
3644

3745
- name: Fetch git cli and upload release
3846
env:
3947
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4048
run: |
49+
echo "sys-patch/sys-patch-v${{ env.VERSION }}.zip"
50+
echo "${{ env.SHA256 }}"
4151
if [ ${{ env.TAGVERSION }} = v${{ env.VERSION }} ];
4252
then echo "Tag version and makefile version are same, don't publish release, only artifact uploaded."
4353
else
@@ -47,6 +57,6 @@ jobs:
4757
chmod +x gh*/bin/gh && \
4858
cp gh*/bin/gh /bin/gh && \
4959
rm gh*.tar.gz && \
50-
rm -rf gh*
51-
gh release create v${{ env.VERSION }} sys-patch/sys-patch.zip --title "Sys-patch version ${{ env.VERSION }}" --repo github.com/$GITHUB_REPOSITORY
60+
rm -rf gh* && \
61+
gh release create v${{ env.VERSION }} sys-patch/sys-patch-v${{ env.VERSION }}.zip --title "Sys-patch version v${{ env.VERSION }}" --repo github.com/$GITHUB_REPOSITORY
5262
fi

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ firmware
1111
*.nacp
1212
*.ovl
1313
*.nca
14+
*.lst
1415
out
1516
ignoreme
1617
.vscode/settings.json

‎.gitmodules‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
[submodule "overlay/libtesla"]
22
path = overlay/libtesla
33
url = https://github.com/WerWolv/libtesla
4-
branch = master

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ MAKEFILES := sysmod overlay
22
TARGETS := $(foreach dir,$(MAKEFILES),$(CURDIR)/$(dir))
33

44
# the below was taken from atmosphere + switch-examples makefile
5-
export VERSION := 1.5.9
5+
export VERSION := 1.6.0
66

77
ifneq ($(strip $(shell git symbolic-ref --short HEAD 2>/dev/null)),)
88
export GIT_BRANCH := $(shell git symbolic-ref --short HEAD)

‎overlay/libtesla‎

‎overlay/src/main.cpp‎

Lines changed: 34 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -101,14 +101,14 @@ class GuiToggle final : public tsl::Gui {
101101
list->addItem(new tsl::elm::CategoryHeader("FS - 0100000000000000"));
102102
list->addItem(config_noacidsigchk1.create_list_item("noacidsigchk_1.0.0-9.2.0"));
103103
list->addItem(config_noacidsigchk2.create_list_item("noacidsigchk_1.0.0-9.2.0"));
104-
list->addItem(config_noncasigchk1.create_list_item("noncasigchk_10.0.0-16.1.0"));
105-
list->addItem(config_noncasigchk2.create_list_item("noncasigchk_17.0.0+"));
106-
list->addItem(config_nocntchk1.create_list_item("nocntchk_10.0.0-18.1.0"));
107-
list->addItem(config_nocntchk2.create_list_item("nocntchk_19.0.0-20.5.0"));
108-
list->addItem(config_nocntchk3.create_list_item("nocntchk_21.0.0+"));
104+
list->addItem(config_noncasigchk1.create_list_item("noncasigchk_1.0.0-3.0.2"));
105+
list->addItem(config_noncasigchk2.create_list_item("noncasigchk_4.0.0-16.1.0"));
106+
list->addItem(config_noncasigchk3.create_list_item("noncasigchk_17.0.0+"));
107+
list->addItem(config_nocntchk1.create_list_item("nocntchk_1.0.0-18.1.0"));
108+
list->addItem(config_nocntchk2.create_list_item("nocntchk_19.0.0+"));
109109

110110
list->addItem(new tsl::elm::CategoryHeader("LDR - 0100000000000001"));
111-
list->addItem(config_noacidsigchk3.create_list_item("noacidsigchk_10.0.0+"));
111+
list->addItem(config_noacidsigchk4.create_list_item("noacidsigchk_10.0.0+"));
112112

113113
list->addItem(new tsl::elm::CategoryHeader("ERPT - 010000000000002B"));
114114
list->addItem(config_no_erpt.create_list_item("no_erpt"));
@@ -117,7 +117,8 @@ class GuiToggle final : public tsl::Gui {
117117
list->addItem(config_es1.create_list_item("es_1.0.0-8.1.1"));
118118
list->addItem(config_es2.create_list_item("es_9.0.0-11.0.1"));
119119
list->addItem(config_es3.create_list_item("es_12.0.0-18.1.0"));
120-
list->addItem(config_es4.create_list_item("es_19.0.0+"));
120+
list->addItem(config_es4.create_list_item("es_19.0.0-21.2.0"));
121+
list->addItem(config_es5.create_list_item("es_22.0.0+"));
121122

122123
list->addItem(new tsl::elm::CategoryHeader("OLSC - 010000000000003E"));
123124
list->addItem(config_olsc1.create_list_item("olsc_6.0.0-14.1.2"));
@@ -132,26 +133,28 @@ class GuiToggle final : public tsl::Gui {
132133
list->addItem(config_nim1.create_list_item("blankcal0crashfix_17.0.0+"));
133134
list->addItem(config_nim_fw1.create_list_item("blockfirmwareupdates_1.0.0-5.1.0"));
134135
list->addItem(config_nim_fw2.create_list_item("blockfirmwareupdates_6.0.0-6.2.0"));
135-
list->addItem(config_nim_fw3.create_list_item("blockfirmwareupdates_7.0.0-11.0.1"));
136-
list->addItem(config_nim_fw4.create_list_item("blockfirmwareupdates_12.0.0+"));
136+
list->addItem(config_nim_fw3.create_list_item("blockfirmwareupdates_7.0.0-10.2.0"));
137+
list->addItem(config_nim_fw4.create_list_item("blockfirmwareupdates_11.0.0-11.0.1"));
138+
list->addItem(config_nim_fw5.create_list_item("blockfirmwareupdates_12.0.0+"));
137139

138140
frame->setContent(list);
139141
return frame;
140142
}
141143

142144
ConfigEntry config_noacidsigchk1{"fs", "noacidsigchk_1.0.0-9.2.0", true};
143145
ConfigEntry config_noacidsigchk2{"fs", "noacidsigchk_1.0.0-9.2.0", true};
144-
ConfigEntry config_noncasigchk1{"fs", "noncasigchk_10.0.0-16.1.0", true};
145-
ConfigEntry config_noncasigchk2{"fs", "noncasigchk_17.0.0+", true};
146-
ConfigEntry config_nocntchk1{"fs", "nocntchk_10.0.0-18.1.0", true};
147-
ConfigEntry config_nocntchk2{"fs", "nocntchk_19.0.0-20.5.0", true};
148-
ConfigEntry config_nocntchk3{"fs", "nocntchk_21.0.0+", true};
149-
ConfigEntry config_noacidsigchk3{"ldr", "noacidsigchk_10.0.0+", true};
146+
ConfigEntry config_noncasigchk1{"fs", "noncasigchk_1.0.0-3.0.2", true};
147+
ConfigEntry config_noncasigchk2{"fs", "noncasigchk_4.0.0-16.1.0", true};
148+
ConfigEntry config_noncasigchk3{"fs", "noncasigchk_17.0.0+", true};
149+
ConfigEntry config_nocntchk1{"fs", "nocntchk_1.0.0-18.1.0", true};
150+
ConfigEntry config_nocntchk2{"fs", "nocntchk_19.0.0+", true};
151+
ConfigEntry config_noacidsigchk4{"ldr", "noacidsigchk_10.0.0+", true};
150152
ConfigEntry config_no_erpt{"erpt", "no_erpt", true};
151153
ConfigEntry config_es1{"es", "es_1.0.0-8.1.1", true};
152154
ConfigEntry config_es2{"es", "es_9.0.0-11.0.1", true};
153155
ConfigEntry config_es3{"es", "es_12.0.0-18.1.0", true};
154-
ConfigEntry config_es4{"es", "es_19.0.0+", true};
156+
ConfigEntry config_es4{"es", "es_19.0.0-21.2.0", true};
157+
ConfigEntry config_es5{"es", "es_22.0.0+", true};
155158
ConfigEntry config_olsc1{"olsc", "olsc_6.0.0-14.1.2", true};
156159
ConfigEntry config_olsc2{"olsc", "olsc_15.0.0-18.1.0", true};
157160
ConfigEntry config_olsc3{"olsc", "olsc_19.0.0+", true};
@@ -160,8 +163,9 @@ class GuiToggle final : public tsl::Gui {
160163
ConfigEntry config_nim1{"nim", "blankcal0crashfix_17.0.0+", true};
161164
ConfigEntry config_nim_fw1{"nim", "blockfirmwareupdates_1.0.0-5.1.0", true};
162165
ConfigEntry config_nim_fw2{"nim", "blockfirmwareupdates_6.0.0-6.2.0", true};
163-
ConfigEntry config_nim_fw3{"nim", "blockfirmwareupdates_7.0.0-11.0.1", true};
164-
ConfigEntry config_nim_fw4{"nim", "blockfirmwareupdates_12.0.0+", true};
166+
ConfigEntry config_nim_fw3{"nim", "blockfirmwareupdates_7.0.0-10.2.0", true};
167+
ConfigEntry config_nim_fw4{"nim", "blockfirmwareupdates_11.0.0-11.0.1", true};
168+
ConfigEntry config_nim_fw5{"nim", "blockfirmwareupdates_12.0.0+", true};
165169
};
166170

167171
class GuiLog final : public tsl::Gui {
@@ -198,17 +202,21 @@ class GuiLog final : public tsl::Gui {
198202
#undef F
199203

200204
if (value.starts_with("Patched")) {
201-
if (value.ends_with("(sys-patch)")) {
202-
user->list->addItem(new tsl::elm::ListItem(Key, "Patched", colour_syspatch));
203-
} else {
204-
user->list->addItem(new tsl::elm::ListItem(Key, "Patched", colour_file));
205-
}
205+
auto *item = new tsl::elm::ListItem(Key);
206+
item->setValue("Patched", true);
207+
user->list->addItem(item);
206208
} else if (value.starts_with("Unpatched") || value.starts_with("Disabled")) {
207-
user->list->addItem(new tsl::elm::ListItem(Key, Value, colour_unpatched));
209+
auto *item = new tsl::elm::ListItem(Key);
210+
item->setValue(Value, true);
211+
user->list->addItem(item);
208212
} else if (user->last_section == "stats") {
209-
user->list->addItem(new tsl::elm::ListItem(Key, Value, tsl::style::color::ColorDescription));
213+
auto *item = new tsl::elm::ListItem(Key);
214+
item->setValue(Value, true);
215+
user->list->addItem(item);
210216
} else {
211-
user->list->addItem(new tsl::elm::ListItem(Key, Value, tsl::style::color::ColorText));
217+
auto *item = new tsl::elm::ListItem(Key);
218+
item->setValue(Value, true);
219+
user->list->addItem(item);
212220
}
213221

214222
return 1;

‎sysmod/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ CFLAGS := -g -Wall -O2 -ffunction-sections \
5656
CFLAGS += $(INCLUDE) -D__SWITCH__
5757

5858
CXXFLAGS := $(CFLAGS) -std=c++23 -fno-rtti -fno-exceptions
59+
CXXFLAGS += $(EXTRA_FLAGS)
5960

6061
ASFLAGS := -g $(ARCH)
6162
LDFLAGS = -specs=$(DEVKITPRO)/libnx/switch.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)

0 commit comments

Comments
 (0)