Compare commits

...

3 Commits

Author SHA1 Message Date
Maschell
aed781e88d Fix exiting when running some payloads (like the nand dumper) 2024-05-07 19:11:21 +02:00
Maschell
88d25a79c3 Fix Makefile to be compatible with CLion 2024-04-26 10:33:05 +02:00
Maschell
a6bc48e987 Fix checking button combo 2024-04-26 10:33:05 +02:00
3 changed files with 13 additions and 7 deletions

View File

@ -1,3 +1,3 @@
FROM ghcr.io/wiiu-env/devkitppc:20240423
FROM ghcr.io/wiiu-env/devkitppc:20240505
WORKDIR project

View File

@ -127,7 +127,7 @@ export OUTPUT := $(CURDIR)/$(TARGET)
#---------------------------------------------------------------------------------
$(BUILD):
@[ -d $@ ] || mkdir -p $@
@$(shell [ ! -d $(BUILD) ] && mkdir -p $(BUILD))
@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile

View File

@ -57,11 +57,16 @@ extern "C" uint32_t start_wrapper(int argc, char **argv) {
DEBUG_FUNCTION_LINE_VERBOSE("Hello from payload.elf multiloader");
VPADReadError err;
VPADStatus vpad_data;
VPADRead(VPAD_CHAN_0, &vpad_data, 1, &err);
uint32_t btn = vpad_data.hold | vpad_data.trigger;
VPADStatus vpadStatus{};
VPADReadError vpadError = VPAD_READ_UNINITIALIZED;
int btn = 0;
do {
if (VPADRead(VPAD_CHAN_0, &vpadStatus, 1, &vpadError) > 0 && vpadError == VPAD_READ_SUCCESS) {
btn = vpadStatus.trigger | vpadStatus.hold;
} else {
OSSleepTicks(OSMillisecondsToTicks(1));
}
} while (vpadError == VPAD_READ_NO_SAMPLES);
std::map<std::string, std::string> payloads = get_all_payloads("wiiu/payloads");
@ -118,6 +123,7 @@ extern "C" int _start(int argc, char **argv) {
if (entryPoint != 0) {
res = ((int (*)(int, char **)) entryPoint)(argc, argv);
}
_Exit(0);
return res;
}