Skip to content

version 1.6.0 - mostly refactor #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
borntohonk wants to merge 1 commit into
base: master
Choose a base branch
from
+287 −143
Open

version 1.6.0 - mostly refactor #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions .github/workflows/build-jobs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,24 +20,40 @@ jobs:

- name: Build sys-patch
run: |
make -C sys-patch -j$(nproc) dist && \
LIBNX_VER=$(dkp-pacman -Q libnx | cut -d' ' -f2 | cut -d- -f1)
echo "Detected libnx version: $LIBNX_VER"
if [ "$LIBNX_VER" = "4.11.0" ]; then
EXTRA_FLAGS="-DUSE_DEBUG_EVENT=1"
else
EXTRA_FLAGS=""
fi
make -C sys-patch -j$(nproc) dist EXTRA_FLAGS="$EXTRA_FLAGS" && \
VERSION=$(grep 'export VERSION := ' sys-patch/Makefile | cut -c 19-)
TAGVERSION=$(curl -s https://api.github.com/repos/$GITHUB_REPOSITORY/releases/latest | grep "tag_name" | head -1 | cut -d '"' -f 4)
echo "VERSION=${VERSION}" >> $GITHUB_ENV
echo "TAGVERSION=${TAGVERSION}" >> $GITHUB_ENV
mv sys-patch/sys-patch.zip sys-patch/sys-patch-v$VERSION.zip
SHA256=$(sha256sum sys-patch/sys-patch-v$VERSION.zip)
echo "SHA256=${SHA256}" >> $GITHUB_ENV
- name: Upload artifact
uses: actions/upload-artifact@v4
with:
include-hidden-files: true
overwrite: true
name: sys-patch-${{ env.VERSION }}
name: sys-patch-v${{ env.VERSION }}
path: sys-patch/out/

- name: Fetch git cli and upload release
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
echo "sys-patch/sys-patch-v${{ env.VERSION }}.zip"
echo "${{ env.SHA256 }}"
if [ ${{ env.TAGVERSION }} = v${{ env.VERSION }} ];
then echo "Tag version and makefile version are same, don't publish release, only artifact uploaded."
else
Expand All @@ -47,6 +63,6 @@ jobs:
chmod +x gh*/bin/gh && \
cp gh*/bin/gh /bin/gh && \
rm gh*.tar.gz && \
rm -rf gh*
gh release create v${{ env.VERSION }} sys-patch/sys-patch.zip --title "Sys-patch version ${{ env.VERSION }}" --repo github.com/$GITHUB_REPOSITORY
rm -rf gh* && \
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
fi
1 change: 0 additions & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
[submodule "overlay/libtesla"]
path = overlay/libtesla
url = https://github.com/WerWolv/libtesla
branch = master
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ MAKEFILES := sysmod overlay
TARGETS := $(foreach dir,$(MAKEFILES),$(CURDIR)/$(dir))

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

ifneq ($(strip $(shell git symbolic-ref --short HEAD 2>/dev/null)),)
export GIT_BRANCH := $(shell git symbolic-ref --short HEAD)
Expand Down
2 changes: 1 addition & 1 deletion overlay/libtesla
Open in desktop
Submodule libtesla updated 1 files
+7 −27 include/tesla.hpp
44 changes: 24 additions & 20 deletions overlay/src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,14 +101,14 @@ class GuiToggle final : public tsl::Gui {
list->addItem(new tsl::elm::CategoryHeader("FS - 0100000000000000"));
list->addItem(config_noacidsigchk1.create_list_item("noacidsigchk_1.0.0-9.2.0"));
list->addItem(config_noacidsigchk2.create_list_item("noacidsigchk_1.0.0-9.2.0"));
list->addItem(config_noncasigchk1.create_list_item("noncasigchk_10.0.0-16.1.0"));
list->addItem(config_noncasigchk2.create_list_item("noncasigchk_17.0.0+"));
list->addItem(config_nocntchk1.create_list_item("nocntchk_10.0.0-18.1.0"));
list->addItem(config_nocntchk2.create_list_item("nocntchk_19.0.0-20.5.0"));
list->addItem(config_nocntchk3.create_list_item("nocntchk_21.0.0+"));
list->addItem(config_noncasigchk1.create_list_item("noncasigchk_1.0.0-3.0.2"));
list->addItem(config_noncasigchk2.create_list_item("noncasigchk_4.0.0-16.1.0"));
list->addItem(config_noncasigchk3.create_list_item("noncasigchk_17.0.0+"));
list->addItem(config_nocntchk1.create_list_item("nocntchk_1.0.0-18.1.0"));
list->addItem(config_nocntchk2.create_list_item("nocntchk_19.0.0+"));

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

list->addItem(new tsl::elm::CategoryHeader("ERPT - 010000000000002B"));
list->addItem(config_no_erpt.create_list_item("no_erpt"));
Expand Down Expand Up @@ -141,12 +141,12 @@ class GuiToggle final : public tsl::Gui {

ConfigEntry config_noacidsigchk1{"fs", "noacidsigchk_1.0.0-9.2.0", true};
ConfigEntry config_noacidsigchk2{"fs", "noacidsigchk_1.0.0-9.2.0", true};
ConfigEntry config_noncasigchk1{"fs", "noncasigchk_10.0.0-16.1.0", true};
ConfigEntry config_noncasigchk2{"fs", "noncasigchk_17.0.0+", true};
ConfigEntry config_nocntchk1{"fs", "nocntchk_10.0.0-18.1.0", true};
ConfigEntry config_nocntchk2{"fs", "nocntchk_19.0.0-20.5.0", true};
ConfigEntry config_nocntchk3{"fs", "nocntchk_21.0.0+", true};
ConfigEntry config_noacidsigchk3{"ldr", "noacidsigchk_10.0.0+", true};
ConfigEntry config_noncasigchk1{"fs", "noncasigchk_1.0.0-3.0.2", true};
ConfigEntry config_noncasigchk2{"fs", "noncasigchk_4.0.0-16.1.0", true};
ConfigEntry config_noncasigchk3{"fs", "noncasigchk_17.0.0+", true};
ConfigEntry config_nocntchk1{"fs", "nocntchk_1.0.0-18.1.0", true};
ConfigEntry config_nocntchk2{"fs", "nocntchk_19.0.0+", true};
ConfigEntry config_noacidsigchk4{"ldr", "noacidsigchk_10.0.0+", true};
ConfigEntry config_no_erpt{"erpt", "no_erpt", true};
ConfigEntry config_es1{"es", "es_1.0.0-8.1.1", true};
ConfigEntry config_es2{"es", "es_9.0.0-11.0.1", true};
Expand Down Expand Up @@ -198,17 +198,21 @@ class GuiLog final : public tsl::Gui {
#undef F

if (value.starts_with("Patched")) {
if (value.ends_with("(sys-patch)")) {
user->list->addItem(new tsl::elm::ListItem(Key, "Patched", colour_syspatch));
} else {
user->list->addItem(new tsl::elm::ListItem(Key, "Patched", colour_file));
}
auto *item = new tsl::elm::ListItem(Key);
item->setValue("Patched", true);
user->list->addItem(item);
} else if (value.starts_with("Unpatched") || value.starts_with("Disabled")) {
user->list->addItem(new tsl::elm::ListItem(Key, Value, colour_unpatched));
auto *item = new tsl::elm::ListItem(Key);
item->setValue(Value, true);
user->list->addItem(item);
} else if (user->last_section == "stats") {
user->list->addItem(new tsl::elm::ListItem(Key, Value, tsl::style::color::ColorDescription));
auto *item = new tsl::elm::ListItem(Key);
item->setValue(Value, true);
user->list->addItem(item);
} else {
user->list->addItem(new tsl::elm::ListItem(Key, Value, tsl::style::color::ColorText));
auto *item = new tsl::elm::ListItem(Key);
item->setValue(Value, true);
user->list->addItem(item);
}

return 1;
Expand Down
1 change: 1 addition & 0 deletions sysmod/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ CFLAGS := -g -Wall -O2 -ffunction-sections \
CFLAGS += $(INCLUDE) -D__SWITCH__

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

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