From f461b3b5b5d40db158e2c1378f8471a156a47450 Mon Sep 17 00:00:00 2001
From: Alex Taber <alexftaber@gmail.com>
Date: Sat, 2 Sep 2017 11:56:25 -0400
Subject: [PATCH] Remove GPIO error on reboot, change battery % indicator to
 battery graphics

---
 include/common.h   |   9 ++++++---
 romfs/battery1.png | Bin 0 -> 610 bytes
 romfs/battery2.png | Bin 0 -> 283 bytes
 romfs/battery3.png | Bin 0 -> 285 bytes
 romfs/battery4.png | Bin 0 -> 280 bytes
 romfs/battery5.png | Bin 0 -> 251 bytes
 romfs/charging.png | Bin 0 -> 800 bytes
 source/draw.c      |  30 ++++++++++++++----------------
 source/main.c      |  22 +++-------------------
 source/themes.c    |   7 +++++--
 10 files changed, 28 insertions(+), 40 deletions(-)
 create mode 100644 romfs/battery1.png
 create mode 100644 romfs/battery2.png
 create mode 100644 romfs/battery3.png
 create mode 100644 romfs/battery4.png
 create mode 100644 romfs/battery5.png
 create mode 100644 romfs/charging.png

diff --git a/include/common.h b/include/common.h
index da740ec..6e44c62 100644
--- a/include/common.h
+++ b/include/common.h
@@ -41,13 +41,16 @@
 
 static const int THEMES_PER_SCREEN = 4;
 
-Handle mcuhwc_handle;
-bool mcuhwc_on;
-
 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,
 };
 
diff --git a/romfs/battery1.png b/romfs/battery1.png
new file mode 100644
index 0000000000000000000000000000000000000000..b34ae4c9feab7f7b2f7e4f44f231066abd963dd6
GIT binary patch
literal 610
zcmV-o0-gPdP)<h;3K|Lk000e1NJLTq001Wd000vR1^@s66G#+}00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;Ryl{DkYibmoESS03B&m
zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00G8HL_t(Y$HkU0OCv!P
z$A9n5q9_RBA_yS?ZPY@)f}Ce-VeKcewDz;u91?7_w@_G3VJn&(f&|U(!6upAxnj>4
ztxjj|@~Ua(@tgVo-=8OZsAjVn0jI!sK2suZXXgk}QIaG}*4ja*)A?nL5g-EeQ(cMz
zd43*&xy8jGfKj{M{s~}=`C12Kh>nlZ^K%eE`h5n6hqzkJ8!+;JUWDA<!t^u%Wut*x
zUWR_(yR~}V7D2KMd3dNi=N#qM77T|$Jm&|eiY5s}e*~DFrCeW!sVOAS(Yw3%gYsWx
zRYk6^M{sUt2EDjIFE5c!2Uo9C9vpzR6M)Ne<o+JC5<t3L%*hED14V(|--oiCjI7e_
zBICvvdHcnU4P2w)1?Tm1^7I6Gj;qyh^*YSWp=W0xLb1L5WjTYum8+`^j*co>Rne;}
z)LL8|Q?9J|r<CtNjOU%US}+_^?CeyzR}>SBk`H05H#ZQ+Rn~ceg@Y5Rf;dgFySv_A
z3k&xe#&L{WTl1RGe<G{2T9licxcT{DP6-2-W$5E0#ok^JuZ<p@B*{{**UQp0wPO?f
w1NipWU7SN+UT_Nw!6XHcpqp@@4fwTw0~unjml4UOS^xk507*qoM6N<$f)G*$yZ`_I

literal 0
HcmV?d00001

diff --git a/romfs/battery2.png b/romfs/battery2.png
new file mode 100644
index 0000000000000000000000000000000000000000..42ee5f5f88a9ec675a41201aad9f4174cc4cf889
GIT binary patch
literal 283
zcmeAS@N?(olHy`uVBq!ia0vp^>Od^a!3H8dMEZafTavfC3&Vd9T(EcfWS|IVfk$L9
z0|U1(2s1Lwnj--eWH0gbb!C6Z$;7W?cs1?G6`+u8W=KSdbAE1aYF-JD%fR4Vl$uzQ
znxasiS(2gP?&%wlqL<1J6tDMmaSZV|{`Q(77n7lY+rxAZ<BnFRzDY(?%lXQx8)Q_E
zyq$jWMviKdI*$eave}Qc|1;-bjZ!XPUiU{Kbm^3)4uj`^eo04Xr-#<|7;Y0_a$sR%
z>)QL>`T(EtRNIM<Wu99cw>($a_d7Vo>!p&CyTdnY#_mqr>BVvOIuDn#-r@eRLH5sY
Se<25u8$Dh9T-G@yGywpgb6qh2

literal 0
HcmV?d00001

diff --git a/romfs/battery3.png b/romfs/battery3.png
new file mode 100644
index 0000000000000000000000000000000000000000..5d9b9e729bfab2eb7f0b4840b4287ed90a3f7a36
GIT binary patch
literal 285
zcmeAS@N?(olHy`uVBq!ia0vp^>Od^a!3H8dMEZafTavfC3&Vd9T(EcfWS|IVfk$L9
z0|U1(2s1Lwnj--eWH0gbb!C6Z$;7WC`QWmT9#BX&GbEzKIX^cyHLnE7WngeFN=+<D
zO;IS%EXh!C_w)@&(Mx3qiZ^<?IEHu}e|yc4i^)*L^<uV%a0*xJl+4Y|YYy19zl?F1
zCbVd;%l@+=M!g9i57s~Yy1a(nZq?SR1XjJ8i5(Myl%Dr=eCV#perxi)rq59BoFxOl
zg~*fY_vQ_}%d~2h4ojXZXfvMkkmvjI9TJZ%TMAeXZDZZB>PPX?DZkGN*JU2q%lP-d
V?4P5BXI6k*>FMg{vd$@?2>@U+WRCy<

literal 0
HcmV?d00001

diff --git a/romfs/battery4.png b/romfs/battery4.png
new file mode 100644
index 0000000000000000000000000000000000000000..87aa94ae7ec0b10f9426c6517e547a93f4b6246d
GIT binary patch
literal 280
zcmeAS@N?(olHy`uVBq!ia0vp^>Od^a!3H8dMEZafTavfC3&Vd9T(EcfWS|IVfk$L9
z0|U1(2s1Lwnj--eWH0gbb!C6Z$;7X1@K(X86(}T|84^+AoS&PUnpXnkGB7w7r6!i7
zrYMwWmSiZnd-?{X=%um)#cMoW978;gzrD7R^RR({+e7h%ZY<&(FG#&IaV!&iXVl;(
zxT$)vgt=dGOgr=a=InL9PW?Z)a?WN}wFiHHSHABw{PaFY^Xb*<|J$yGCG#|}@-S`M
zdQI{{L#Nj~kHW6tIgdn^TO7SBBJLzHx7h!HtT}_cV71=TEipO|eVOvu`Q*g^IBw7e
P`Iy1e)z4*}Q$iB}TAN(3

literal 0
HcmV?d00001

diff --git a/romfs/battery5.png b/romfs/battery5.png
new file mode 100644
index 0000000000000000000000000000000000000000..6eff85f7521eb26c1463559edc5ee221a1fd99ee
GIT binary patch
literal 251
zcmeAS@N?(olHy`uVBq!ia0vp^>Od^a!3H8dMEZafTavfC3&Vd9T(EcfWS|IVfk$L9
z0|U1(2s1Lwnj--eWH0gbb!C6Z$;7YCr21W$6(}T|84^+AoS&PUnpXnkGB7w7r6!i7
zrYMwWmSiZnd-?{X=%um)#p69)978;gzrAM2)f^z;dQtf2S$-Gsr^_y<`g$7ocJ!Jh
zy?1za$Rv2~C)+t)9c|`m=GT>yj&wc!kvL&N+xjKELg70OiLNVX)sA`ikH`FB=f3;g
l^F^xHegC&R;!rl*9X8*^{P(w?^1B6cgQu&X%Q~loCIH6~Q>6d^

literal 0
HcmV?d00001

diff --git a/romfs/charging.png b/romfs/charging.png
new file mode 100644
index 0000000000000000000000000000000000000000..fbaeb9026a30b8a4180b17798d1129ed69713c42
GIT binary patch
literal 800
zcmV+*1K<3KP)<h;3K|Lk000e1NJLTq001Wd000vR1^@s66G#+}00006VoOIv0QUg*
z0QZmuHP`?E010qNS#tmY3ljhU3ljkVnw%H_000McNliru;Ryl{HwMJ*ia`JX03B&m
zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00M+bL_t(Y$GuiPOjA)9
zJ>R|ewFO>LAQC}+piwkxf-az97nhPa2!kOyvgqg}lO|5OIIy^~7!7HH4EUG0Sv49V
zN-!oE39o_-NQ0&EY5U&&9BfUgKP`{Kx4h-M_nmvr`F;pR;W!QfAOISbkNn*Lz(wCb
zLOG5j3zAA6SZ8nnxRU=-1<904)*A?JO%GQ9+zLu2ie&rSL%D#6lHe)<h5(qJW{a6k
zAqY~4G&9=(QhxpG7n}f4D~MW%U;>balGe51=h3Oe7ppp`aJ;QKaUt3s%eY>g8OweE
zDxZvnnYruze6sI{>$L!oK|`6ZrWdTq#G)yP@Z_z1DE4AHJaYLA1q~T5V6bdY`vRw=
zs2_X%v9tHa=!u$;(F{N^Lu{!DN<#_(07{Cw>G@>j)}uEx(AyE#If*^3ZRYZ%CdYC7
zFjp&uh&-H_IhS$0Rsb@fq&YY?VSQLgnnaW@3SDQ0QiJ`c?5wL(44yr*yKy*N705Hm
zl?Dd@62PudKt({<4nTpFb^hjP_tSTCmJlTJiCVK>N`LnVaHXKnkFTD+b97JR5CFRr
zdwxA<N+}LM7@z6RxLzygm|Oh%tpT*E$?AsMs?_aEr|qn#Qv}TJZQA-0Kyss62`MS+
z?~l)P^jyE!xyp0ZL1`%QTT-ogxv%R$JaTYntjKdK<$&|;Ic7dN^=YXulXY8&gbW$d
zymB{gP1?Vz)%A30|Bm|j$Ux6fXcMcI0jv<wv-Z|)bA()<Go;nAuPIs;P*!!&z_GUG
z#KmZPEbIC2bAAir{}X};Qc{{3>zWYj0q1wNu4zK3BFX$-$N;=bt}p5zdmLe7*QT<i
e*vw6MP4N?=;Tzo0&<>yg0000<MNUMnLSTZ*LSL8w

literal 0
HcmV?d00001

diff --git a/source/draw.c b/source/draw.c
index 0d324fd..6d01b02 100644
--- a/source/draw.c
+++ b/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,16 +60,6 @@ void exit_screens(void)
     pp2d_exit();
 }
 
-static Result MCUHWC_GetBatteryLevel(u8 *out) // Code taken from daedreth's fork of lpp-3ds
-{
-    u32 *cmdbuf = getThreadCommandBuffer();
-    cmdbuf[0] = 0x50000;
-    svcSendSyncRequest(mcuhwc_handle);
-    *out = (u8) cmdbuf[2];
-    svcCloseHandle(mcuhwc_handle);
-    return cmdbuf[1];
-}
-
 static int theme_vertical_scroll = 0;
 static int splash_vertical_scroll = 0;
 
@@ -79,12 +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);
 
-    if (mcuhwc_on)
-    {
-        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);
diff --git a/source/main.c b/source/main.c
index 3854316..1f22316 100644
--- a/source/main.c
+++ b/source/main.c
@@ -33,12 +33,8 @@
 int init_services(void)
 {
     cfguInit();
+    ptmuInit();
     open_archives();
-    if (R_FAILED(srvGetServiceHandle(&mcuhwc_handle, "mcu::HWC")))
-    {
-        mcuhwc_on = false;
-        ptmuInit();
-    } else mcuhwc_on = true;
     return 0;
 }
 
@@ -46,8 +42,7 @@ int exit_services(void)
 {
     close_archives();
     cfguExit();
-    if (mcuhwc_on) svcCloseHandle(mcuhwc_handle);
-    else ptmuExit();
+    ptmuExit();
     return 0;
 }
 
@@ -93,14 +88,7 @@ int main(void)
         
         if (kDown & KEY_START)
         {
-            if(!envIsHomebrew()) 
-            {
-                srvPublishToSubscriber(0x202, 0);
-            } 
-            else 
-            {
-                break;
-            }
+            APT_HardwareResetAsync();
         }
         else if (kDown & KEY_L)
         {
@@ -243,8 +231,4 @@ int main(void)
             previously_selected = selected_theme;
         }
     }
-    
-    free(themes_list);
-    exit_services();
-    return 0;
 }
diff --git a/source/themes.c b/source/themes.c
index da00cf9..dcd489a 100644
--- a/source/themes.c
+++ b/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,9 @@ static void parse_smdh(Theme_s *theme, ssize_t textureID)
     if (!size)
     {
         free(info_buffer);
+        memcpy(theme->name, dir_name, 0x106);
+        utf8_to_utf16(theme->desc, (u8*)"No description", 0x106);
+        utf8_to_utf16(theme->author, (u8*)"Unknown author", 0x106);
         return;
     }
 
@@ -181,7 +184,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);