- add applet

- fix ums with autoboot enabled - add default reboot
HookedBehemoth · Sep 7, 2020 · acaa81b · acaa81b
1 parent a901470
commit acaa81b
Show file tree

Hide file tree

Showing 10 changed files with 381 additions and 9 deletions.
diff --git a/Makefile.applet b/Makefile.applet
@@ -0,0 +1,203 @@
+#---------------------------------------------------------------------------------
+.SUFFIXES:
+#---------------------------------------------------------------------------------
+
+ifeq ($(strip $(DEVKITPRO)),)
+$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>/devkitpro")
+endif
+
+TOPDIR ?= $(CURDIR)
+include $(DEVKITPRO)/libnx/switch_rules
+
+#---------------------------------------------------------------------------------
+# TARGET is the name of the output
+# BUILD is the directory where object files & intermediate files will be placed
+# SOURCES is a list of directories containing source code
+# DATA is a list of directories containing data files
+# INCLUDES is a list of directories containing header files
+# ROMFS is the directory containing data to be added to RomFS, relative to the Makefile (Optional)
+#
+# NO_ICON: if set to anything, do not use icon.
+# NO_NACP: if set to anything, no .nacp file is generated.
+# APP_TITLE is the name of the app stored in the .nacp file (Optional)
+# APP_AUTHOR is the author of the app stored in the .nacp file (Optional)
+# APP_VERSION is the version of the app stored in the .nacp file (Optional)
+# APP_TITLEID is the titleID of the app stored in the .nacp file (Optional)
+# ICON is the filename of the icon (.jpg), relative to the project folder.
+#   If not set, it attempts to use one of the following (in this order):
+#     - <Project name>.jpg
+#     - icon.jpg
+#     - <libnx folder>/default_icon.jpg
+#
+# CONFIG_JSON is the filename of the NPDM config file (.json), relative to the project folder.
+#   If not set, it attempts to use one of the following (in this order):
+#     - <Project name>.json
+#     - config.json
+#   If a JSON file is provided or autodetected, an ExeFS PFS0 (.nsp) is built instead
+#   of a homebrew executable (.nro). This is intended to be used for sysmodules.
+#   NACP building is skipped as well.
+#---------------------------------------------------------------------------------
+APP_TITLE	:=	Studious Pancake
+APP_VERSION :=	0.1.0
+
+TARGET		:=	applet/$(notdir $(CURDIR))
+BUILD		:=	build.nro
+SOURCES		:=	common applet
+INCLUDES	:=	common
+
+#---------------------------------------------------------------------------------
+# options for code generation
+#---------------------------------------------------------------------------------
+ARCH	:=	-march=armv8-a+crc+crypto -mtune=cortex-a57 -mtp=soft -fPIE
+
+CFLAGS	:=	-g -Wall -Werror -O2 -ffunction-sections \
+			$(ARCH) $(DEFINES)
+
+CFLAGS	+=	$(INCLUDE) -D__SWITCH__
+
+CXXFLAGS	:= $(CFLAGS) -fno-rtti -fno-exceptions -std=c++20
+
+ASFLAGS	:=	-g $(ARCH)
+LDFLAGS	=	-specs=$(DEVKITPRO)/libnx/switch.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
+
+LIBS	:= -lnx
+
+#---------------------------------------------------------------------------------
+# list of directories containing libraries, this must be the top level containing
+# include and lib
+#---------------------------------------------------------------------------------
+LIBDIRS	:= $(PORTLIBS) $(LIBNX)
+
+
+#---------------------------------------------------------------------------------
+# no real need to edit anything past this point unless you need to add additional
+# rules for different file extensions
+#---------------------------------------------------------------------------------
+ifneq ($(BUILD),$(notdir $(CURDIR)))
+#---------------------------------------------------------------------------------
+
+export OUTPUT	:=	$(CURDIR)/$(TARGET)
+export TOPDIR	:=	$(CURDIR)
+
+export VPATH	:=	$(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \
+			$(foreach dir,$(DATA),$(CURDIR)/$(dir))
+
+export DEPSDIR	:=	$(CURDIR)/$(BUILD)
+
+CFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
+CPPFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
+SFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
+BINFILES	:=	$(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*)))
+
+#---------------------------------------------------------------------------------
+# use CXX for linking C++ projects, CC for standard C
+#---------------------------------------------------------------------------------
+ifeq ($(strip $(CPPFILES)),)
+#---------------------------------------------------------------------------------
+	export LD	:=	$(CC)
+#---------------------------------------------------------------------------------
+else
+#---------------------------------------------------------------------------------
+	export LD	:=	$(CXX)
+#---------------------------------------------------------------------------------
+endif
+#---------------------------------------------------------------------------------
+
+export OFILES_BIN	:=	$(addsuffix .o,$(BINFILES))
+export OFILES_SRC	:=	$(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o)
+export OFILES 	:=	$(OFILES_BIN) $(OFILES_SRC)
+export HFILES_BIN	:=	$(addsuffix .h,$(subst .,_,$(BINFILES)))
+
+export INCLUDE	:=	$(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
+			$(foreach dir,$(LIBDIRS),-I$(dir)/include) \
+			-I$(CURDIR)/$(BUILD)
+
+export LIBPATHS	:=	$(foreach dir,$(LIBDIRS),-L$(dir)/lib)
+
+ifeq ($(strip $(CONFIG_JSON)),)
+	jsons := $(wildcard *.json)
+	ifneq (,$(findstring $(TARGET).json,$(jsons)))
+		export APP_JSON := $(TOPDIR)/$(TARGET).json
+	else
+		ifneq (,$(findstring config.json,$(jsons)))
+			export APP_JSON := $(TOPDIR)/config.json
+		endif
+	endif
+else
+	export APP_JSON := $(TOPDIR)/$(CONFIG_JSON)
+endif
+
+ifeq ($(strip $(ICON)),)
+	icons := $(wildcard *.jpg)
+	ifneq (,$(findstring $(TARGET).jpg,$(icons)))
+		export APP_ICON := $(TOPDIR)/$(TARGET).jpg
+	else
+		ifneq (,$(findstring icon.jpg,$(icons)))
+			export APP_ICON := $(TOPDIR)/icon.jpg
+		endif
+	endif
+else
+	export APP_ICON := $(TOPDIR)/$(ICON)
+endif
+
+ifeq ($(strip $(NO_ICON)),)
+	export NROFLAGS += --icon=$(APP_ICON)
+endif
+
+ifeq ($(strip $(NO_NACP)),)
+	export NROFLAGS += --nacp=$(CURDIR)/$(TARGET).nacp
+endif
+
+ifneq ($(APP_TITLEID),)
+	export NACPFLAGS += --titleid=$(APP_TITLEID)
+endif
+
+ifneq ($(ROMFS),)
+	export NROFLAGS += --romfsdir=$(CURDIR)/$(ROMFS)
+endif
+
+.PHONY: $(BUILD) clean all
+
+#---------------------------------------------------------------------------------
+all: $(BUILD)
+
+$(BUILD):
+	@[ -d $@ ] || mkdir -p $@
+	@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile.applet
+
+#---------------------------------------------------------------------------------
+clean:
+	@echo clean ...
+	@rm -fr $(BUILD) $(TARGET).nro $(TARGET).nacp $(TARGET).elf
+
+
+#---------------------------------------------------------------------------------
+else
+.PHONY:	all
+
+DEPENDS	:=	$(OFILES:.o=.d)
+
+#---------------------------------------------------------------------------------
+# main targets
+#---------------------------------------------------------------------------------
+all	:	$(OUTPUT).nro
+
+$(OUTPUT).nro	:	$(OUTPUT).elf $(OUTPUT).nacp
+
+$(OUTPUT).elf	:	$(OFILES)
+
+$(OFILES_SRC)	: $(HFILES_BIN)
+
+#---------------------------------------------------------------------------------
+# you need a rule like this for each extension you use as binary data
+#---------------------------------------------------------------------------------
+%.bin.o	%_bin.h :	%.bin
+#---------------------------------------------------------------------------------
+	@echo $(notdir $<)
+	@$(bin2o)
+
+-include $(DEPENDS)
+
+#---------------------------------------------------------------------------------------
+endif
+#---------------------------------------------------------------------------------------
diff --git a/Makefile → Makefile.overlay b/Makefile → Makefile.overlay
@@ -40,11 +40,10 @@ include $(DEVKITPRO)/libnx/switch_rules
 APP_TITLE	:=	Studious Pancake
 APP_VERSION :=	0.1.0
 
-TARGET		:=	$(notdir $(CURDIR))
-BUILD		:=	build
-SOURCES		:=	source
-DATA		:=	data
-INCLUDES	:=	include libs/tesla/include
+TARGET		:=	overlay/$(notdir $(CURDIR))
+BUILD		:=	build.ovl
+SOURCES		:=	common overlay
+INCLUDES	:=	common libs/tesla/include
 
 NO_ICON		:=  1
 
@@ -53,7 +52,7 @@ NO_ICON		:=  1
 #---------------------------------------------------------------------------------
 ARCH	:=	-march=armv8-a+crc+crypto -mtune=cortex-a57 -mtp=soft -fPIE
 
-CFLAGS	:=	-g -Wall -O2 -ffunction-sections \
+CFLAGS	:=	-g -Wall -Werror -O2 -ffunction-sections \
 			$(ARCH) $(DEFINES)
 
 CFLAGS	+=	$(INCLUDE) -D__SWITCH__
@@ -167,7 +166,7 @@ all: $(BUILD)
 
 $(BUILD):
 	@[ -d $@ ] || mkdir -p $@
-	@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
+	@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile.overlay
 
 #---------------------------------------------------------------------------------
 clean:

diff --git a/applet/main.cpp b/applet/main.cpp
@@ -0,0 +1,137 @@
+#include "hekate.hpp"
+
+#include <cstdio>
+#include <cstdlib>
+#include <switch.h>
+#include <vector>
+
+namespace {
+
+    typedef void (*TuiCallback)(void *user);
+
+    struct TuiItem {
+        std::string text;
+        TuiCallback cb;
+        void *user;
+        bool selectable;
+    };
+
+    void ConfigCallback(void *user) {
+        auto config = reinterpret_cast<Hekate::BootConfig *>(user);
+
+        Hekate::RebootToConfig(*config);
+    }
+
+    void UmsCallback(void *user) {
+        Hekate::RebootToUMS(Hekate::UmsTarget_Sd);
+
+        (void)user;
+    }
+
+}
+
+extern "C" void userAppInit(void) {
+    splInitialize();
+}
+
+extern "C" void userAppExit(void) {
+    splExit();
+}
+
+int main(int argc, char **argv) {
+    auto config_list = Hekate::LoadBootConfigList();
+    std::vector<TuiItem> items;
+
+    items.reserve(config_list.size() + 3);
+
+    items.emplace_back("Configs", nullptr, nullptr, false);
+    for (auto &entry : config_list)
+        items.emplace_back(entry.name, ConfigCallback, &entry, true);
+
+    items.emplace_back("Miscellaneous", nullptr, nullptr, false);
+    items.emplace_back("Reboot to UMS", UmsCallback, nullptr, true);
+
+    std::size_t index = 0;
+
+    for (auto &item : items) {
+        if (item.selectable)
+            break;
+
+        index++;
+    }
+
+    PrintConsole *console = consoleInit(nullptr);
+
+    while (appletMainLoop()) {
+        {
+            u64 kDown = 0;
+
+            hidScanInput();
+
+            for (int controller = 0; controller < 10; controller++)
+                kDown |= hidKeysDown(static_cast<HidControllerID>(controller));
+
+            if ((kDown & (KEY_PLUS | KEY_B | KEY_L)))
+                break;
+
+            if ((kDown & KEY_A)) {
+                auto &item = items[index];
+
+                if (item.selectable && item.cb)
+                    item.cb(item.user);
+
+                break;
+            }
+
+            if ((kDown & KEY_MINUS)) {
+                Hekate::RebootDefault();
+            }
+
+            if ((kDown & KEY_DOWN) && (index + 1) < items.size()) {
+                for (std::size_t i = index; i < items.size(); i++) {
+                    if (!items[i + 1].selectable)
+                        continue;
+
+                    index = i + 1;
+                    break;
+                }
+            }
+
+            if ((kDown & KEY_UP) && index > 0) {
+                for (std::size_t i = index; i > 0; i--) {
+                    if (!items[i - 1].selectable)
+                        continue;
+
+                    index = i - 1;
+                    break;
+                }
+            }
+        }
+
+        consoleClear();
+
+        printf("Studious Pancake\n----------------\n");
+
+        for (std::size_t i = 0; i < items.size(); i++) {
+            auto &item    = items[i];
+            bool selected = (i == index);
+
+            if (!item.selectable)
+                console->flags |= CONSOLE_COLOR_FAINT;
+
+            printf("%c %s\n", selected ? '>' : ' ', item.text.c_str());
+
+            if (!item.selectable)
+                console->flags &= ~CONSOLE_COLOR_FAINT;
+        }
+
+        consoleUpdate(nullptr);
+    }
+
+    consoleExit(nullptr);
+
+    (void)argc;
+    (void)argv;
+
+    return EXIT_SUCCESS;
+}