From 655060eb4799c3f5a79a036deb694f9e8ea23d46 Mon Sep 17 00:00:00 2001
From: D3fau4 <19638408+D3fau4@users.noreply.github.com>
Date: Fri, 11 Dec 2020 11:39:53 +0100
Subject: [PATCH] 1.1.2 small fix

---
 NightFall/Makefile            |  2 +-
 NightFall/include/spl/spl.hpp |  2 +-
 NightFall/source/main.cpp     | 12 ++++++++----
 NightFall/source/spl/spl.cpp  | 20 ++++++++++++++------
 4 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/NightFall/Makefile b/NightFall/Makefile
index cca93ab..5e547d8 100644
--- a/NightFall/Makefile
+++ b/NightFall/Makefile
@@ -40,7 +40,7 @@ include $(DEVKITPRO)/libnx/switch_rules
 TARGET				:=	$(notdir $(CURDIR))
 APP_TITLE 			:= 	NightFall
 APP_AUTHOR 			:= 	D3fau4
-APP_VERSION 		:= 	1.1.1
+APP_VERSION 		:= 	1.1.2
 ICON				:=  resources/icon/NightFall.jpg
 BUILD				:=	build
 SOURCES				:=	source source/amssu source/sm source/spl source/hid source/FS source/net source/psm source/UI
diff --git a/NightFall/include/spl/spl.hpp b/NightFall/include/spl/spl.hpp
index 58b7175..54dc58f 100644
--- a/NightFall/include/spl/spl.hpp
+++ b/NightFall/include/spl/spl.hpp
@@ -22,6 +22,6 @@ SOFTWARE.*/
 
 namespace spl {
     char *GetHardwareType(void);
-    bool HasRCMbug(void);
+    bool HasRCMbugPatched(void);
     bool HasEmummc(void);
 }
\ No newline at end of file
diff --git a/NightFall/source/main.cpp b/NightFall/source/main.cpp
index bef001a..5749572 100644
--- a/NightFall/source/main.cpp
+++ b/NightFall/source/main.cpp
@@ -141,9 +141,9 @@ void CheckJson()
 void CheckHardware()
 {
 	/*Check if is Ipatched/Mariko */
-	if (spl::GetHardwareType() == "Mariko" || spl::HasRCMbug())
+	if (spl::GetHardwareType() == "Iowa" || spl::GetHardwareType() == "Hoag" || spl::GetHardwareType() == "Calcio" || spl::HasRCMbugPatched())
 	{
-		brls::Logger::error("The software was closed because only works in non-patched/mariko");
+		brls::Logger::error("Mariko or patched unit detected");
 		is_patched = true;
 	}
 	else
@@ -154,6 +154,7 @@ void CheckHardware()
 	{
 		brls::Logger::debug("Have Emummc");
 		HasEmummc = true;
+		is_patched = false;
 	}
 	else
 	{
@@ -250,12 +251,15 @@ int main(int argc, char *argv[])
 		onlineupdate = false;
 	}
 
+	brls::Logger::debug(j["Firmwver"].get<std::string>());
+	brls::Logger::debug(ver.display_version);
+
 	brls::ListItem *UpdateOnlineItem = new brls::ListItem("main/tabs/Firmware/update/title"_i18n.c_str(), firmwarever);
 	UpdateOnlineItem->getClickEvent()->subscribe([](brls::View *view) {
 		//download
 		brls::StagedAppletFrame *stagedFrame = new brls::StagedAppletFrame();
 		stagedFrame->setTitle("main/tabs/Firmware/update/title"_i18n.c_str());
-		if (onlineupdate == true && is_patched == false && HasEmummc == true && psm::GetBatteryState() > 15)
+		if (onlineupdate == true && is_patched == false && psm::GetBatteryState() >= 15)
 		{
 			Network::Net net = Network::Net();
 			std::string download = Conf["URL"].get<std::string>() + j["intfw"].get<std::string>();
@@ -272,7 +276,7 @@ int main(int argc, char *argv[])
 			{
 				stagedFrame->addStage(new UpToDate(stagedFrame, "main/tabs/Firmware/update/update_lowbattery"_i18n.c_str()));
 			}
-			if (is_patched == false)
+			else if (is_patched == false)
 			{
 				stagedFrame->addStage(new UpToDate(stagedFrame, "main/tabs/Firmware/update/update_uptodate"_i18n.c_str()));
 			}
diff --git a/NightFall/source/spl/spl.cpp b/NightFall/source/spl/spl.cpp
index a61bc29..d931eaa 100644
--- a/NightFall/source/spl/spl.cpp
+++ b/NightFall/source/spl/spl.cpp
@@ -32,10 +32,11 @@ namespace spl
         Result ret = 0;
         u64 hardware_type = 4;
         char *hardware[] = {
-            "Icosa",
-            "Copper",
-            "Hoag",
-            "Mariko",
+            "Icosa",  // Erista normal
+            "Copper", // Erista prototype
+            "Hoag",   // Mariko lite
+            "Iowa",   // Mariko retail
+            "Calcio", // Mariko prototype
             "Unknown"};
 
         if (R_FAILED(ret = splGetConfig(SplConfigItem_HardwareType, &hardware_type)))
@@ -43,11 +44,10 @@ namespace spl
             return hardware[4];
         }
         else
-
             return hardware[hardware_type];
     }
 
-    bool HasRCMbug(void)
+    bool HasRCMbugPatched(void)
     {
         Result ret = 0;
         u64 has_rcm_bug_patch;
@@ -55,6 +55,10 @@ namespace spl
         {
             return has_rcm_bug_patch;
         }
+        else
+        {
+            return has_rcm_bug_patch;
+        }
     }
 
     bool HasEmummc(void)
@@ -66,5 +70,9 @@ namespace spl
         {
             return IsEmummc;
         }
+        else
+        {
+            return IsEmummc;
+        }
     }
 } // namespace spl
\ No newline at end of file