Skip to content

Commit b47cd64

Browse files
impeezaimpeeza
authored
Merge pull request #29 from borntohonk/master
refactor conds, patterns, and remove ssl patches, add new olsc patch
2 parents 8d4d183 + 203c1c0 commit b47cd64

3 files changed

Lines changed: 112 additions & 152 deletions

File tree

‎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.8
5+
export VERSION := 1.5.9
66

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

‎overlay/src/main.cpp‎

Lines changed: 47 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -99,65 +99,69 @@ class GuiToggle final : public tsl::Gui {
9999
auto list = new tsl::elm::List();
100100

101101
list->addItem(new tsl::elm::CategoryHeader("FS - 0100000000000000"));
102-
list->addItem(config_noacidsigchk1.create_list_item("noacidsigchk1"));
103-
list->addItem(config_noacidsigchk2.create_list_item("noacidsigchk2"));
104-
list->addItem(config_noncasigchk_old.create_list_item("noncasigchk_old"));
105-
list->addItem(config_noncasigchk_old2.create_list_item("noncasigchk_old2"));
106-
list->addItem(config_noncasigchk_new.create_list_item("noncasigchk_new"));
107-
list->addItem(config_nocntchk.create_list_item("nocntchk"));
108-
list->addItem(config_nocntchk2.create_list_item("nocntchk2"));
102+
list->addItem(config_noacidsigchk1.create_list_item("noacidsigchk_1.0.0-9.2.0"));
103+
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+"));
109109

110110
list->addItem(new tsl::elm::CategoryHeader("LDR - 0100000000000001"));
111-
list->addItem(config_noacidsigchk.create_list_item("noacidsigchk"));
111+
list->addItem(config_noacidsigchk3.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"));
115115

116116
list->addItem(new tsl::elm::CategoryHeader("ES - 0100000000000033"));
117-
list->addItem(config_es1.create_list_item("es1"));
118-
list->addItem(config_es2.create_list_item("es2"));
119-
list->addItem(config_es3.create_list_item("es3"));
120-
list->addItem(config_es4.create_list_item("es4"));
117+
list->addItem(config_es1.create_list_item("es_1.0.0-8.1.1"));
118+
list->addItem(config_es2.create_list_item("es_9.0.0-11.0.1"));
119+
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+"));
121+
122+
list->addItem(new tsl::elm::CategoryHeader("OLSC - 010000000000003E"));
123+
list->addItem(config_olsc1.create_list_item("olsc_6.0.0-14.1.2"));
124+
list->addItem(config_olsc2.create_list_item("olsc_15.0.0-18.1.0"));
125+
list->addItem(config_olsc3.create_list_item("olsc_19.0.0+"));
121126

122127
list->addItem(new tsl::elm::CategoryHeader("NIFM - 010000000000000F"));
123-
list->addItem(config_ctest.create_list_item("ctest"));
124-
list->addItem(config_ctest2.create_list_item("ctest2"));
125-
list->addItem(config_ctest3.create_list_item("ctest3"));
128+
list->addItem(config_ctest1.create_list_item("ctest_1.0.0-19.0.1"));
129+
list->addItem(config_ctest2.create_list_item("ctest_20.0.0+"));
126130

127131
list->addItem(new tsl::elm::CategoryHeader("NIM - 0100000000000025"));
128-
list->addItem(config_nim_old.create_list_item("nim_old"));
129-
list->addItem(config_nim_new.create_list_item("nim_new"));
130-
131-
list->addItem(new tsl::elm::CategoryHeader("Disable CA Verification - apply all"));
132-
list->addItem(config_ssl1.create_list_item("disablecaverification1"));
133-
list->addItem(config_ssl2.create_list_item("disablecaverification2"));
134-
list->addItem(config_ssl3.create_list_item("disablecaverification3"));
132+
list->addItem(config_nim1.create_list_item("blankcal0crashfix_17.0.0+"));
133+
list->addItem(config_nim_fw1.create_list_item("blockfirmwareupdates_1.0.0-5.1.0"));
134+
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+"));
135137

136138
frame->setContent(list);
137139
return frame;
138140
}
139141

140-
ConfigEntry config_noacidsigchk1{"fs", "noacidsigchk1", true};
141-
ConfigEntry config_noacidsigchk2{"fs", "noacidsigchk2", true};
142-
ConfigEntry config_noncasigchk_old{"fs", "noncasigchk_old", true};
143-
ConfigEntry config_noncasigchk_old2{"fs", "noncasigchk_old2", true};
144-
ConfigEntry config_noncasigchk_new{"fs", "noncasigchk_new", true};
145-
ConfigEntry config_nocntchk{"fs", "nocntchk", true};
146-
ConfigEntry config_nocntchk2{"fs", "nocntchk2", true};
147-
ConfigEntry config_noacidsigchk{"ldr", "noacidsigchk", true};
148-
ConfigEntry config_no_erpt{"erpt", "no_erpt", false};
149-
ConfigEntry config_es1{"es", "es1", true};
150-
ConfigEntry config_es2{"es", "es2", true};
151-
ConfigEntry config_es3{"es", "es3", true};
152-
ConfigEntry config_es4{"es", "es4", true};
153-
ConfigEntry config_ctest{"nifm", "ctest", true};
154-
ConfigEntry config_ctest2{"nifm", "ctest2", true};
155-
ConfigEntry config_ctest3{"nifm", "ctest3", true};
156-
ConfigEntry config_nim_old{"nim_old", "nim_old", true};
157-
ConfigEntry config_nim_new{"nim_new", "nim_new", true};
158-
ConfigEntry config_ssl1{"ssl", "disablecaverification1", false};
159-
ConfigEntry config_ssl2{"ssl", "disablecaverification2", false};
160-
ConfigEntry config_ssl3{"ssl", "disablecaverification3", false};
142+
ConfigEntry config_noacidsigchk1{"fs", "noacidsigchk_1.0.0-9.2.0", true};
143+
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};
150+
ConfigEntry config_no_erpt{"erpt", "no_erpt", true};
151+
ConfigEntry config_es1{"es", "es_1.0.0-8.1.1", true};
152+
ConfigEntry config_es2{"es", "es_9.0.0-11.0.1", true};
153+
ConfigEntry config_es3{"es", "es_12.0.0-18.1.0", true};
154+
ConfigEntry config_es4{"es", "es_19.0.0+", true};
155+
ConfigEntry config_olsc1{"olsc", "olsc_6.0.0-14.1.2", true};
156+
ConfigEntry config_olsc2{"olsc", "olsc_15.0.0-18.1.0", true};
157+
ConfigEntry config_olsc3{"olsc", "olsc_19.0.0+", true};
158+
ConfigEntry config_ctest1{"nifm", "ctest_1.0.0-19.0.1", true};
159+
ConfigEntry config_ctest2{"nifm", "ctest_20.0.0+", true};
160+
ConfigEntry config_nim1{"nim", "blankcal0crashfix_17.0.0+", true};
161+
ConfigEntry config_nim_fw1{"nim", "blockfirmwareupdates_1.0.0-5.1.0", true};
162+
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};
161165
};
162166

163167
class GuiLog final : public tsl::Gui {

0 commit comments

Comments
 (0)