Update for HOS 14.0.0

Fixes issue #2
proferabg · Mar 26, 2022 · 932788d · 932788d
1 parent 7b8d70f
commit 932788d
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 50 deletions.
diff --git a/Makefile b/Makefile
@@ -17,7 +17,7 @@ endif
 
 APP_TITLE		:=	EdiZon
 APP_AUTHOR		:=	WerWolv & proferabg
-APP_VERSION		:=	v1.0.2b
+APP_VERSION		:=	v1.0.2c
 
 TARGET			:=	EdiZon
 OUTDIR			:=	out

diff --git a/include/cheat.hpp b/include/cheat.hpp
@@ -20,12 +20,11 @@
 #pragma once
 
 #include <edizon.h>
-//#include <helpers/dmntcht.h>
 #include <helpers/util.h>
+#include "dmntcht.h"
 #include "cheat_engine_types.hpp"
 #include "result.hpp"
 #include "results.hpp"
-#include "dmntcht.h"
 
 #include <string>
 #include <vector>

diff --git a/include/dmntcht.h b/include/dmntcht.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2020 Atmosphère-NX
+ * Copyright (c) Atmosphère-NX
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -15,8 +15,7 @@
  */
 
 #pragma once
-
-#include <edizon.h>
+#include <switch.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -65,7 +64,6 @@ Service* dmntchtGetServiceSession(void);
 
 Result dmntchtHasCheatProcess(bool *out);
 Result dmntchtGetCheatProcessEvent(Event *event);
-Result pmdmntAtmosphereGetProcessInfo(Handle* handle_out,  u64 pid);
 Result dmntchtGetCheatProcessMetadata(DmntCheatProcessMetadata *out_metadata);
 Result dmntchtForceOpenCheatProcess(void);
 Result dmntchtForceCloseCheatProcess(void);

diff --git a/include/service_guard.h b/include/service_guard.h
@@ -1,14 +1,15 @@
 #pragma once
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <switch/types.h>
 #include <switch/result.h>
 #include <switch/kernel/mutex.h>
 #include <switch/sf/service.h>
 #include <switch/services/sm.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 typedef struct ServiceGuard {
     Mutex mutex;
     u32 refCount;

diff --git a/source/dmntcht.c b/source/dmntcht.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2020 Atmosphère-NX
+ * Copyright (c) Atmosphère-NX
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -14,7 +14,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define NX_SERVICE_ASSUME_NON_DOMAIN
-
 #include "service_guard.h"
 #include "dmntcht.h"
 
@@ -30,7 +29,6 @@ void _dmntchtCleanup(void) {
     serviceClose(&g_dmntchtSrv);
 }
 
-
 Service* dmntchtGetServiceSession(void) {
     return &g_dmntchtSrv;
 }
@@ -55,37 +53,6 @@ Result dmntchtGetCheatProcessEvent(Event *event) {
 
     return rc;
 }
-typedef struct {
-    u64 keys_held;
-    u64 flags;
-} CfgOverrideStatus;
-
-Result pmdmntAtmosphereGetProcessInfo(Handle* handle_out,  u64 pid) { //NcmProgramLocation *loc_out, CfgOverrideStatus *status_out,
-    Handle tmp_handle;
-
-    struct {
-        NcmProgramLocation loc;
-        CfgOverrideStatus status;
-    } out;
-
-    Result rc = serviceDispatchInOut(pmdmntGetServiceSession(), 65000, pid, out,
-        .out_handle_attrs = { SfOutHandleAttr_HipcCopy },
-        .out_handles = &tmp_handle,
-    );
-
-    if (R_SUCCEEDED(rc)) {
-        if (handle_out) {
-            *handle_out = tmp_handle;
-        } else {
-            svcCloseHandle(tmp_handle);
-        }
-
-        // if (loc_out) *loc_out = out.loc;
-        // if (status_out) *status_out = out.status;
-    }
-
-    return rc;
-}
 
 Result dmntchtGetCheatProcessMetadata(DmntCheatProcessMetadata *out_metadata) {
     return serviceDispatchOut(&g_dmntchtSrv, 65002, *out_metadata);

diff --git a/source/main.cpp b/source/main.cpp
@@ -203,10 +203,17 @@ class GuiStats : public tsl::Gui {
             renderer->drawString("WiFi Signal:", false, 45, 360, 18, renderer->a(tsl::style::color::ColorText));
 
             s32 temparature = 0;
-            tsGetTemperatureMilliC(TsLocation_Internal, &temparature);
-            renderer->drawString(formatString("%.02f °C", temparature / 1000.0F).c_str(), false, 240, 160, 18, renderer->a(tsl::style::color::ColorHighlight));
-            tsGetTemperatureMilliC(TsLocation_External, &temparature);
-            renderer->drawString(formatString("%.02f °C", temparature / 1000.0F).c_str(), false, 240, 190, 18, renderer->a(tsl::style::color::ColorHighlight));
+            if(hosversionAtLeast(14,0,0)){
+                tsGetTemperature(TsLocation_Internal, &temparature);
+                renderer->drawString(formatString("%d °C", temparature).c_str(), false, 240, 160, 18, renderer->a(tsl::style::color::ColorHighlight));
+                tsGetTemperature(TsLocation_External, &temparature);
+                renderer->drawString(formatString("%d °C", temparature).c_str(), false, 240, 190, 18, renderer->a(tsl::style::color::ColorHighlight));
+            } else {
+                tsGetTemperatureMilliC(TsLocation_Internal, &temparature);
+                renderer->drawString(formatString("%.02f °C", temparature / 1000.0F).c_str(), false, 240, 160, 18, renderer->a(tsl::style::color::ColorHighlight));
+                tsGetTemperatureMilliC(TsLocation_External, &temparature);
+                renderer->drawString(formatString("%.02f °C", temparature / 1000.0F).c_str(), false, 240, 190, 18, renderer->a(tsl::style::color::ColorHighlight));
+            }
 
             u32 cpuClock = 0, gpuClock = 0, memClock = 0;
 
@@ -258,7 +265,7 @@ class GuiMain : public tsl::Gui {
         auto *rootFrame = new tsl::elm::HeaderOverlayFrame();
         rootFrame->setHeader(new tsl::elm::CustomDrawer([this](tsl::gfx::Renderer *renderer, s32 x, s32 y, s32 w, s32 h) {
             renderer->drawString("EdiZon", false, 20, 50, 30, renderer->a(tsl::style::color::ColorText));
-            renderer->drawString("v1.0.2b", false, 20, 70, 15, renderer->a(tsl::style::color::ColorDescription));
+            renderer->drawString("v1.0.2c", false, 20, 70, 15, renderer->a(tsl::style::color::ColorDescription));
 
             if (edz::cheat::CheatManager::getProcessID() != 0) {
                 renderer->drawString("Program ID:", false, 150, 40, 15, renderer->a(tsl::style::color::ColorText));