Merge branch 'master' of github.com:3dsfug/Anemone3DS

* fix readme

* fix?

* fix?

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

Makefile

@@ -167,9 +167,9 @@ MAKEROM		?=	makerom
 
 MAKEROM_ARGS		:=	-elf "$(OUTPUT).elf" -rsf "$(RSF_PATH)" -banner "$(BUILD)/banner.bnr" -icon "$(BUILD)/icon.icn" -DAPP_TITLE="$(APP_TITLE)" -DAPP_PRODUCT_CODE="$(PRODUCT_CODE)" -DAPP_UNIQUE_ID="$(UNIQUE_ID)"
 
-ifneq ($(strip $(ROMFS)),)
-	MAKEROM_ARGS	+=	 -romfs "$(BUILD)/romfs.bin"
-endif
+#ifneq ($(strip $(ROMFS)),)
+#	MAKEROM_ARGS	+=	 -romfs "$(BUILD)/romfs.bin"
+#endif
 ifneq ($(strip $(LOGO)),)
 	MAKEROM_ARGS	+=	 -logo "$(LOGO)"
 endif
@@ -178,7 +178,7 @@ ifeq ($(strip $(ROMFS)),)
 $(OUTPUT).cia: $(OUTPUT).elf $(BUILD)/banner.bnr $(BUILD)/icon.icn
 	$(MAKEROM) -f cia -o "$@" -target t -exefslogo $(MAKEROM_ARGS)
 else
-$(OUTPUT).cia: $(OUTPUT).elf $(BUILD)/romfs.bin $(BUILD)/banner.bnr $(BUILD)/icon.icn
+$(OUTPUT).cia: $(OUTPUT).elf $(BUILD)/banner.bnr $(BUILD)/icon.icn
 	$(MAKEROM) -f cia -o "$@" -target t -exefslogo $(MAKEROM_ARGS)
 endif
 
@@ -204,11 +204,6 @@ $(BUILD)/icon.icn	:	$(APP_ICON)
 	$(BANNERTOOL) makesmdh -s "$(APP_TITLE)" -l "$(APP_DESCRIPTION)" -p "$(APP_AUTHOR)" -i "$(APP_ICON)" -f "$(ICON_FLAGS)" -o "$@"
 
 
-3DSTOOL		?= 3dstool
-
-$(BUILD)/romfs.bin	:	$(ROMFS)
-	$(3DSTOOL) -ctf romfs "$@" --romfs-dir "$(ROMFS)"
-
 #---------------------------------------------------------------------------------
 else
 

README.md

@@ -1,27 +1,30 @@
-# Anemone3DS
-A Theme Manager for the Nintendo3DS, written in C
+![# Anemone3DS](https://github.com/astronautlevel2/Anemone3DS/blob/master/meta/banner.png)
+
+A Theme and Splashscreen Manager for the Nintendo3DS, written in C
 
 # Dependencies
-This depends on zlib. Get it from portlibs.
+ * zlib, which can be retrieved from the [3ds_portlibs](https://github.com/devkitPro/3ds_portlibs)
+ * [makerom](https://github.com/profi200/Project_CTR) and [bannertool](https://github.com/Steveice10/buildtools), which can be retrieved from [SteveIce10's](https://github.com/Steveice10) buildtools repo. These must be added to your PATH.
+ * [pp2d](https://github.com/BernardoGiordano/pp2d), which is included in the repo if you do a git clone --recursive.
 
 # License
 This project is licensed under the GNU GPLv3. See LICENSE.md for details. Additional terms 7b and 7c apply to this project.
 
 # Credits
-
 The following people contributed to Anemone3DS in some way. Without these people, Anemone3DS wouldn't exist, or wouldn't be as good as it is:
- * Daedreth, who wrote the initial implementation of theme application code and SMDH parsing
- * LiquidFenrir, who refactored a lot of my messy GUI code and wrote the image preview from zip code, as well as the icon code
- * Sono, who wrote the BCSTM playback code
- * Kenn (mattkenster) for designing the GUI, a number of sprites used in the application, and drawing the banner and icon.
+ * [Daedreth](https://github.com/daedreth), who wrote the initial implementation of theme application code and SMDH parsing.
+ * [LiquidFenrir](https://github.com/LiquidFenrir), who refactored a lot of my messy GUI code and wrote the image preview from zip code, as well as the icon code.
+ * [Sono](https://github.com/MarcuzD), who wrote the BCSTM playback code.
+ * [Kenn (mattkenster)](https://github.com/mattkenster), for designing the GUI, a number of sprites used in the application, and drawing the banner and icon.
 
 Special thanks go to these people who, while not directly contributing, helped immensely:
- * Rinnegatamante, whose code served as reference on theme installation.
- * BernardoGiordano for making pp2d, and being super responsive to feature requests and just general help
- * yellows8 for his home menu extdump tool, which was invaluable in debugging.
- * the folks on #dev of Nintendo Homebrew, who helped with unicode shenanigans (especially Stary2001, Fenrir, and DanielKO).
+ * [Rinnegatamante](https://github.com/Rinnegatamante), whose code served as reference on theme installation.
+ * [BernardoGiordano](https://github.com/BernardoGiordano) for making pp2d, and being super responsive to feature requests and just general help
+ * [yellows8](https://github.com/yellows8) for his home menu extdump tool, which was invaluable in debugging.
+ * the folks on #dev of Nintendo Homebrew, who helped with unicode shenanigans (especially [Stary2001](https://github.com/Stary2001), [Fenrir](https://github.com/FenrirWolf), and DanielKO).
  * the maintainers for all used libraries, including ctrulib, zlib, citro3d, pp2d and minizip.
  * all the people who helped keep me going and motivated me to work. This includes, but is definitely not limited to:
-   * The members of the Nintendo Homebrew Discord
-   * The members of the Secret Shack Service Discord
-   * The members of the ThemePlaza Discord
+ 
+   + The members of the [Nintendo Homebrew Discord](https://discord.gg/C29hYvh)
+   + The members of the __Secret Shack Service Discord__
+   + The members of the [ThemePlaza Discord](https://discord.gg/2hUQwXz)

include/common.h

@@ -35,9 +35,11 @@
 
 #define THEMES_PATH 	"/Themes/"
 #define SPLASHES_PATH	"/Splashes/"
-#define SINGLE_INSTALL	0
-#define SHUFFLE_INSTALL	1
+
+#define SINGLE_INSTALL 	0
+#define SHUFFLE_INSTALL 1
 #define BGM_INSTALL		2
+#define UNINSTALL		3
 
 static const int THEMES_PER_SCREEN = 4;
 
@@ -45,6 +47,12 @@ enum TextureID {
     TEXTURE_FONT_RESERVED = 0, //used by pp2d for the font
     TEXTURE_ARROW,
     TEXTURE_SHUFFLE,
+    TEXTURE_BATTERY_1,
+    TEXTURE_BATTERY_2,
+    TEXTURE_BATTERY_3,
+    TEXTURE_BATTERY_4,
+    TEXTURE_BATTERY_5,
+    TEXTURE_BATTERY_CHARGE,
     TEXTURE_PREVIEW,
 };
 

include/draw.h

@@ -35,7 +35,7 @@ void exit_screens(void);
 
 void draw_theme_install(int install_type);
 void draw_theme_interface(Theme_s * themes_list, int theme_count, int selected_theme, bool preview_mode);
-void draw_splash_install(void);
+void draw_splash_install(int install_type);
 void draw_splash_interface(Splash_s *splashes_list, int splash_count, int selected_splash, bool preview_mode);
 
 #endif

include/splashes.h

@@ -37,5 +37,5 @@ typedef struct{
 
 Result get_splashes(Splash_s** splashes_list, int *splash_count);
 void splash_install(Splash_s splash_to_install);
-
+void splash_delete();
 #endif

meta/app.rsf

@@ -3,7 +3,7 @@ BasicInfo:
   CompanyCode             : "00"
   ProductCode             : "CTR-P-ANEM"
   ContentType             : Application
-  Logo                    : Nintendo # Nintendo / Licensed / Distributed / iQue / iQueForSystem
+  Logo                    : Homebrew # Nintendo / Licensed / Distributed / iQue / iQueForSystem
 
 TitleInfo:
   UniqueId                : 0xAFEN
@@ -33,6 +33,9 @@ SystemControlInfo:
   RemasterVersion: 7
   StackSize: 0x40000
   
+RomFs:
+    RootPath            : romfs
+  
 # DO NOT EDIT BELOW HERE OR PROGRAMS WILL NOT LAUNCH (most likely)
 
 AccessControlInfo:

source/draw.c

@@ -47,6 +47,12 @@ void init_screens(void)
     
     pp2d_load_texture_png(TEXTURE_ARROW, "romfs:/arrow.png");
     pp2d_load_texture_png(TEXTURE_SHUFFLE, "romfs:/shuffle.png");
+    pp2d_load_texture_png(TEXTURE_BATTERY_1, "romfs:/battery1.png");
+    pp2d_load_texture_png(TEXTURE_BATTERY_2, "romfs:/battery2.png");
+    pp2d_load_texture_png(TEXTURE_BATTERY_3, "romfs:/battery3.png");
+    pp2d_load_texture_png(TEXTURE_BATTERY_4, "romfs:/battery4.png");
+    pp2d_load_texture_png(TEXTURE_BATTERY_5, "romfs:/battery5.png");
+    pp2d_load_texture_png(TEXTURE_BATTERY_CHARGE, "romfs:/charging.png");
 }
 
 void exit_screens(void)
@@ -54,21 +60,6 @@ void exit_screens(void)
     pp2d_exit();
 }
 
-static Result MCUHWC_GetBatteryLevel(u8 *out) // Code taken from daedreth's fork of lpp-3ds
-{
-    #define TRY(expr) if(R_FAILED(res = (expr))) { svcCloseHandle(mcuhwcHandle); return res; }
-    Result res;
-    Handle mcuhwcHandle;
-    TRY(srvGetServiceHandle(&mcuhwcHandle, "mcu::HWC"));
-    u32 *cmdbuf = getThreadCommandBuffer();
-    cmdbuf[0] = 0x50000;
-    TRY(svcSendSyncRequest(mcuhwcHandle));
-    *out = (u8) cmdbuf[2];
-    svcCloseHandle(mcuhwcHandle);
-    return cmdbuf[1];
-    #undef TRY
-}
-
 static int theme_vertical_scroll = 0;
 static int splash_vertical_scroll = 0;
 
@@ -84,9 +75,14 @@ void draw_base_interface(void)
     pp2d_draw_text(28, 2, 0.6, 0.6, COLOR_WHITE, (tm.tm_sec % 2 == 1) ? ":" : " ");
     pp2d_draw_textf(34, 2, 0.6, 0.6, COLOR_WHITE, "%.2i", tm.tm_min);
 
-    u8 battery_val = 0;
-    MCUHWC_GetBatteryLevel(&battery_val);
-    pp2d_draw_textf(350, 2, 0.6, 0.6, COLOR_WHITE, "%i%%", battery_val);
+    u8 battery_charging;
+    PTMU_GetBatteryChargeState(&battery_charging);
+    u8 battery_status;
+    PTMU_GetBatteryLevel(&battery_status);
+    pp2d_draw_texture(2 + battery_status, 357, 2);
+    
+    if (battery_charging)
+        pp2d_draw_texture(TEXTURE_BATTERY_CHARGE, 357, 2);
 
     pp2d_draw_on(GFX_BOTTOM);
     pp2d_draw_rectangle(0, 0, 320, 24, COLOR_ACCENT);
@@ -213,10 +209,20 @@ void draw_theme_interface(Theme_s * themes_list, int theme_count, int selected_t
     pp2d_end_draw();
 }
 
-void draw_splash_install(void)
+void draw_splash_install(int install_type)
 {
     draw_base_interface();
-    pp2d_draw_textf(20, 30, 0.7, 0.7, COLOR_WHITE, "Installing a splash...");
+    switch (install_type)
+    {
+        case SINGLE_INSTALL:
+            pp2d_draw_textf(20, 30, 0.7, 0.7, COLOR_WHITE, "Installing a splash...");
+            break;
+        case UNINSTALL:
+            pp2d_draw_textf(20, 30, 0.7, 0.7, COLOR_WHITE, "Uninstalling a splash...");
+            break;
+        default: 
+            break;
+    }
     pp2d_end_draw();
 }
 
@@ -239,8 +245,8 @@ void draw_splash_interface(Splash_s *splashes_list, int splash_count, int select
         draw_base_interface();
         pp2d_draw_text_center(GFX_TOP, 4, 0.5, 0.5, COLOR_WHITE, "Splash mode");
 
-        pp2d_draw_wtext_center(GFX_TOP, 210, 0.7, 0.7, COLOR_WHITE, L"\uE000 Install Splash    \uE004 Switch to Themes");
-
+        pp2d_draw_wtext_center(GFX_TOP, 180, 0.7, 0.7, COLOR_WHITE, L"\uE000 Install Splash    \uE004 Switch to Themes");
+		pp2d_draw_wtext_center(GFX_TOP, 210, 0.7, 0.7, COLOR_WHITE, L"\uE002 Delete current Splash");
         pp2d_draw_on(GFX_BOTTOM);
         for (int i = 0; i < splash_count; i++) {
             if (splash_count <= THEMES_PER_SCREEN)

source/main.c

@@ -28,12 +28,13 @@
 #include "themes.h"
 #include "splashes.h"
 #include "draw.h"
+#include "common.h"
 
 int init_services(void)
 {
     cfguInit();
+    ptmuInit();
     open_archives();
-    ptmSysmInit();
     return 0;
 }
 
@@ -41,6 +42,7 @@ int exit_services(void)
 {
     close_archives();
     cfguExit();
+    ptmuExit();
     return 0;
 }
 
@@ -49,7 +51,6 @@ int main(void)
     init_services();
     init_screens();
     
-    
     int theme_count = 0;
     Theme_s * themes_list = NULL;
     Result res = get_themes(&themes_list, &theme_count);
@@ -86,10 +87,7 @@ int main(void)
         
         if (kDown & KEY_START)
         {
-            exit_screens();
-            exit_services();
-            PTMSYSM_RebootAsync(0);
-            ptmSysmExit();
+            APT_HardwareResetAsync();
         }
         else if (kDown & KEY_L)
         {
@@ -125,14 +123,19 @@ int main(void)
         // Actions
         else if (kDown & KEY_X)
         {
-            draw_theme_install(BGM_INSTALL);
-            bgm_install(*current_theme);
+            if (splash_mode) {
+                draw_splash_install(UNINSTALL);
+                splash_delete();
+            } else {
+                draw_theme_install(BGM_INSTALL);
+                bgm_install(*current_theme);
+            }
         }
         else if (kDown & KEY_A)
         {
             if (splash_mode)
             {
-                draw_splash_install();
+                draw_splash_install(SINGLE_INSTALL);
                 splash_install(*current_splash);
                 svcSleepThread(5e8);
             } else {
@@ -232,8 +235,4 @@ int main(void)
             previously_selected = selected_theme;
         }
     }
-    
-    free(themes_list);
-        
-    return 0;
 }

source/splashes.c

@@ -86,7 +86,11 @@ Result get_splashes(Splash_s** splashes_list, int *splash_count)
 
     return res;
 }
-
+void splash_delete() 
+{
+    remove("/luma/splash.bin");
+    remove("/luma/splashbottom.bin");
+}
 void splash_install(Splash_s splash_to_install)
 {
     char *screen_buf;

source/themes.c

@@ -87,7 +87,7 @@ void load_theme_preview(Theme_s *theme)
     free(preview_buffer);
 }
 
-static void parse_smdh(Theme_s *theme, ssize_t textureID)
+static void parse_smdh(Theme_s *theme, ssize_t textureID, u16 *dir_name)
 {
     char *info_buffer = NULL;
     u64 size = 0;
@@ -105,6 +105,12 @@ static void parse_smdh(Theme_s *theme, ssize_t textureID)
     if (!size)
     {
         free(info_buffer);
+        memset(theme->name, 0, 0x80);
+        memset(theme->desc, 0, 0x100);
+        memset(theme->author, 0, 0x80);
+        memcpy(theme->name, dir_name, 0x80);
+        utf8_to_utf16(theme->desc, (u8*)"No description", 0x100);
+        utf8_to_utf16(theme->author, (u8*)"Unknown author", 0x80);
         return;
     }
 
@@ -181,7 +187,7 @@ Result get_themes(Theme_s **themes_list, int *theme_count)
         current_theme->is_zip = !strcmp(entry.shortExt, "ZIP");
         
         ssize_t iconID = TEXTURE_PREVIEW + *theme_count;
-        parse_smdh(current_theme, iconID);
+        parse_smdh(current_theme, iconID, entry.name);
     }
     
     FSDIR_Close(dir_handle);