Support .wuhb and change packaging structure

.gitignore

@@ -7,4 +7,5 @@
 *_syms.h
 *.elf
 *.rpx
+*.wuhb
 *.zip

Makefile

@@ -98,9 +98,8 @@ all: $(BUILD)
 dist: all
 	mkdir -p dist/wiiu/apps/Bloopair_pair_menu/
 	cp pair_menu/Bloopair_pair_menu.rpx dist/wiiu/apps/Bloopair_pair_menu/
-
-	mkdir -p dist/wiiu/environments/tiramisu/modules/setup/
-	cp 30_bloopair.rpx dist/wiiu/environments/tiramisu/modules/setup/
+	cp pair_menu/Bloopair_pair_menu.wuhb dist/wiiu/apps/Bloopair_pair_menu/
+	cp 30_bloopair.rpx dist/
 
 $(BUILD): $(CURDIR)/source/ios_kernel/ios_kernel.bin.h
 	@[ -d $@ ] || mkdir -p $@

README.md

@@ -20,10 +20,13 @@ To pair a DualShock 3 to the console, see the [Pairing a DualShock 3](#pairing-a
 - Sony DualSense Controller
 
 ## Installation
-- Download the latest .zip from the [releases page](https://github.com/GaryOderNichts/Bloopair/releases)
-- Extract it to the root of your SD Card
+- Download and extract the latest .zip from the [releases page](https://github.com/GaryOderNichts/Bloopair/releases).
+- Copy the `30_bloopair.rpx` from the .zip file to the `modules/setup/` folder of your target environment on the SD Card.  
+  This would be `wiiu/environments/tiramisu/modules/setup/` for Tiramisu.
+- Copy the `wiiu` folder from the .zip and copy it to the root of your SD Card.  
+  If you're using aroma you can delete the `Bloopair_pair_menu.rpx` in the `wiiu/apps` folder and use the .wuhb instead.
 
-Make sure you're using Tiramisu. Follow https://wiiu.hacks.guide/#/ to setup Tiramisu.  
+Make sure you're using Tiramisu or Aroma. Follow https://wiiu.hacks.guide/#/ to setup Tiramisu.  
 More info about Tiramisu here: https://maschell.github.io/homebrew/2021/12/31/tiramisu.html
 
 ## Usage
@@ -34,11 +37,11 @@ If a controller had been paired in the past, simply turn it on again and it shou
 
 ## Pairing a DualShock 3
 The DualShock 3 needs to be paired using a USB cable. After the initial pairing it can be used like any other wireless Bluetooth controller.  
-- Open the Bloopair pairing app from the Homebrew Launcher. You should now be in the USB pairing menu.
+- Open the Bloopair pairing app from the Wii U menu or Homebrew Launcher. You should now be in the USB pairing menu.
 - Connect the DualShock 3 using a USB cable to the front or back ports of the console.
 - The screen will say "Paired!" once the controller has been successfully paired.  
 You can now remove the USB cable from the controller. Press the PS button once back on the Wii U menu to connect it to the console.
-- Press the HOME button to exit to the HBL
+- Press the HOME button to exit.
 
 The DualShock 3 is now ready to use with the console.
 

dist/wiiu/apps/Bloopair_pair_menu/meta.xml

@@ -2,8 +2,8 @@
 <app version="1">
   <name>Bloopair Pairing Menu</name>
   <coder>GaryOderNichts</coder>
-  <version>v0.5.2</version>
-  <release_date>20220405120000</release_date>
+  <version>v0.5.3</version>
+  <release_date>20220905120000</release_date>
   <short_description>DS3 Pairing Menu for Bloopair</short_description> 
   <long_description>
 Pairs DualShock 3 controllers using USB to the console.

pair_menu/Makefile

@@ -8,6 +8,15 @@ endif
 
 TOPDIR ?= $(CURDIR)
 
+#-------------------------------------------------------------------------------
+# APP_NAME sets the long name of the application
+# APP_SHORTNAME sets the short name of the application
+# APP_AUTHOR sets the author of the application
+#-------------------------------------------------------------------------------
+APP_NAME		:=	DS3 Pairing Menu for Bloopair
+APP_SHORTNAME	:=	Bloopair Pairing Menu
+APP_AUTHOR		:=	GaryOderNichts
+
 include $(DEVKITPRO)/wut/share/wut_rules
 
 #-------------------------------------------------------------------------------
@@ -16,12 +25,20 @@ include $(DEVKITPRO)/wut/share/wut_rules
 # 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
+# CONTENT is the path to the bundled folder that will be mounted as /vol/content/
+# ICON is the game icon, leave blank to use default rule
+# TV_SPLASH is the image displayed during bootup on the TV, leave blank to use default rule
+# DRC_SPLASH is the image displayed during bootup on the DRC, leave blank to use default rule
 #-------------------------------------------------------------------------------
 TARGET		:=	Bloopair_pair_menu
 BUILD		:=	build
 SOURCES		:=	. ../common
 DATA		:=	data
 INCLUDES	:=	../common
+CONTENT		:=	
+ICON		:=	icon.png
+TV_SPLASH	:=	
+DRC_SPLASH	:=	
 
 #-------------------------------------------------------------------------------
 # options for code generation
@@ -90,6 +107,34 @@ export INCLUDE	:=	$(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
 
 export LIBPATHS	:=	$(foreach dir,$(LIBDIRS),-L$(dir)/lib)
 
+ifneq (,$(strip $(CONTENT)))
+	export APP_CONTENT := $(TOPDIR)/$(CONTENT)
+endif
+
+ifneq (,$(strip $(ICON)))
+	export APP_ICON := $(TOPDIR)/$(ICON)
+else ifneq (,$(wildcard $(TOPDIR)/$(TARGET).png))
+	export APP_ICON := $(TOPDIR)/$(TARGET).png
+else ifneq (,$(wildcard $(TOPDIR)/icon.png))
+	export APP_ICON := $(TOPDIR)/icon.png
+endif
+
+ifneq (,$(strip $(TV_SPLASH)))
+	export APP_TV_SPLASH := $(TOPDIR)/$(TV_SPLASH)
+else ifneq (,$(wildcard $(TOPDIR)/tv-splash.png))
+	export APP_TV_SPLASH := $(TOPDIR)/tv-splash.png
+else ifneq (,$(wildcard $(TOPDIR)/splash.png))
+	export APP_TV_SPLASH := $(TOPDIR)/splash.png
+endif
+
+ifneq (,$(strip $(DRC_SPLASH)))
+	export APP_DRC_SPLASH := $(TOPDIR)/$(DRC_SPLASH)
+else ifneq (,$(wildcard $(TOPDIR)/drc-splash.png))
+	export APP_DRC_SPLASH := $(TOPDIR)/drc-splash.png
+else ifneq (,$(wildcard $(TOPDIR)/splash.png))
+	export APP_DRC_SPLASH := $(TOPDIR)/splash.png
+endif
+
 .PHONY: $(BUILD) clean all
 
 #-------------------------------------------------------------------------------
@@ -102,7 +147,7 @@ $(BUILD):
 #-------------------------------------------------------------------------------
 clean:
 	@echo clean ...
-	@rm -fr $(BUILD) $(TARGET).rpx $(TARGET).elf
+	@rm -fr $(BUILD) $(TARGET).wuhb $(TARGET).rpx $(TARGET).elf
 
 #-------------------------------------------------------------------------------
 else
@@ -113,8 +158,9 @@ DEPENDS	:=	$(OFILES:.o=.d)
 #-------------------------------------------------------------------------------
 # main targets
 #-------------------------------------------------------------------------------
-all	:	$(OUTPUT).rpx
+all	:	$(OUTPUT).wuhb
 
+$(OUTPUT).wuhb	:	$(OUTPUT).rpx
 $(OUTPUT).rpx	:	$(OUTPUT).elf
 $(OUTPUT).elf	:	$(OFILES)
 

pair_menu/main.cpp

@@ -142,7 +142,9 @@ int main()
     }
 
 main_loop: ;
-    while (WHBProcIsRunning());
+    while (WHBProcIsRunning()) {
+        WHBLogConsoleDraw();
+    }
 
     HIDDelClient(&client);
     HIDTeardown();