From 4eed01f458cfbe7fb533d61c26b2fd309c6c47d9 Mon Sep 17 00:00:00 2001
From: KazushiM <85604869+KazushiMe@users.noreply.github.com>
Date: Sun, 30 Oct 2022 01:46:02 +0800
Subject: [PATCH] Fixed SplConfigItem_HardwareType detection

---
 Source/sys-clk-OC/overlay/src/ui/gui/misc_gui.cpp | 15 ++++++++-------
 Source/sys-clk-OC/sysmodule/src/clocks.cpp        |  7 ++++---
 Source/sys-clk-OC/sysmodule/src/file_utils.h      |  2 +-
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/Source/sys-clk-OC/overlay/src/ui/gui/misc_gui.cpp b/Source/sys-clk-OC/overlay/src/ui/gui/misc_gui.cpp
index 0c51effd..ada9d2ac 100644
--- a/Source/sys-clk-OC/overlay/src/ui/gui/misc_gui.cpp
+++ b/Source/sys-clk-OC/overlay/src/ui/gui/misc_gui.cpp
@@ -24,15 +24,16 @@ MiscGui::MiscGui()
     splExit();
 
     switch (hardware_type) {
-        case 1: //Icosa
-        case 2: //Copper
-            this->isMariko = false;
+        case 0: // Icosa
+        case 1: // Copper
+        case 4: // Calcio
+            isMariko = false;
             break;
-        // case 3: // Iowa
-        // case 4: // Hoag
-        // case 5: // Aula
         default:
-            this->isMariko = true;
+        // case 2: // Hoag
+        // case 3: // Iowa
+        // case 5: // Aula
+            isMariko = true;
             break;
     }
 }
diff --git a/Source/sys-clk-OC/sysmodule/src/clocks.cpp b/Source/sys-clk-OC/sysmodule/src/clocks.cpp
index ed7e32b8..b3f4d866 100644
--- a/Source/sys-clk-OC/sysmodule/src/clocks.cpp
+++ b/Source/sys-clk-OC/sysmodule/src/clocks.cpp
@@ -85,12 +85,13 @@ void Clocks::Initialize()
     splExit();
 
     switch (hardware_type) {
-        case 1: //Icosa
-        case 2: //Copper
+        case 0: // Icosa
+        case 1: // Copper
+        case 4: // Calcio
             isMariko = false;
             break;
+        case 2: // Hoag
         case 3: // Iowa
-        case 4: // Hoag
         case 5: // Aula
             isMariko = true;
             break;
diff --git a/Source/sys-clk-OC/sysmodule/src/file_utils.h b/Source/sys-clk-OC/sysmodule/src/file_utils.h
index 5306a03e..401217d0 100644
--- a/Source/sys-clk-OC/sysmodule/src/file_utils.h
+++ b/Source/sys-clk-OC/sysmodule/src/file_utils.h
@@ -17,7 +17,7 @@
 #include <cstdarg>
 #include <sysclk.h>
 
-#define FILE_CONFIG_DIR "/config/sys-clk/"
+#define FILE_CONFIG_DIR "/config/sys-clk"
 #define FILE_FLAG_CHECK_INTERVAL_NS 5000000000ULL
 #define FILE_CONTEXT_CSV_PATH FILE_CONFIG_DIR "/context.csv"
 #define FILE_LOG_FLAG_PATH FILE_CONFIG_DIR "/log.flag"