Merge remote-tracking branch 'Masa/master'

Author: redraz

Makefile

@@ -38,7 +38,7 @@ include $(DEVKITPRO)/libnx/switch_rules
 #   NACP building is skipped as well.
 #---------------------------------------------------------------------------------
 APP_TITLE	:=	Status Monitor
-APP_VERSION	:=	1.1.3U+
+APP_VERSION	:=	1.1.4U
 TARGET		:=	$(notdir $(CURDIR))
 BUILD		:=	build
 SOURCES		:=	source

include/i2c.h

@@ -1,14 +1,6 @@
-/*
-Functions taken from Switch-OC-Suite source code made by KazushiMe
-Original repository link (Deleted, last checked 15.04.2023): https://github.com/KazushiMe/Switch-OC-Suite
-*/
+#pragma once
 
-#include "max17050.h"
-
-constexpr float max17050SenseResistor = MAX17050_BOARD_SNS_RESISTOR_UOHM / 1000; // in uOhm
-constexpr float max17050CGain = 1.99993;
-
-Result I2cReadRegHandler(u8 reg, I2cDevice dev, u16 *out)
+Result I2cReadRegHandler16(u8 reg, I2cDevice dev, u16 *out)
 {
 	struct readReg {
         u8 send;
@@ -46,16 +38,40 @@ Result I2cReadRegHandler(u8 reg, I2cDevice dev, u16 *out)
 	return 0;
 }
 
-Result Max17050ReadReg(u8 reg, u16 *out)
+Result I2cReadRegHandler8(u8 reg, I2cDevice dev, u8 *out)
 {
-	u16 data = 0;
-	Result res = I2cReadRegHandler(reg, I2cDevice_Max17050, &data);
+	struct readReg {
+        u8 send;
+        u8 sendLength;
+        u8 sendData;
+        u8 receive;
+        u8 receiveLength;
+    };
+
+	I2cSession _session;
+
+	Result res = i2cOpenSession(&_session, dev);
+	if (res)
+		return res;
+
+	u8 val;
 
-	if (R_FAILED(res))
+    struct readReg readRegister = {
+        .send = 0 | (I2cTransactionOption_Start << 6),
+        .sendLength = sizeof(reg),
+        .sendData = reg,
+        .receive = 1 | (I2cTransactionOption_All << 6),
+        .receiveLength = sizeof(val),
+    };
+
+	res = i2csessionExecuteCommandList(&_session, &val, sizeof(val), &readRegister, sizeof(readRegister));
+	if (res)
 	{
+		i2csessionClose(&_session);
 		return res;
 	}
 
-	*out = data;
-	return res;
-}
+	*out = val;
+	i2csessionClose(&_session);
+	return 0;
+}

include/max17050.h

@@ -20,12 +20,15 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+/*
+ * Modified by: MasaGratoR
+ */
 
 #ifndef __MAX17050_H_
 #define __MAX17050_H_
 
 //#include <utils/types.h>
-
+#include "i2c.h"
 
 /* Board default values */
 #define MAX17050_BOARD_CGAIN 2 /* Actual: 1.99993 */
@@ -44,6 +47,9 @@
 
 #define MAX17050_WAIT_NS 1175800000
 
+constexpr float max17050SenseResistor = MAX17050_BOARD_SNS_RESISTOR_UOHM / 1000; // in uOhm
+constexpr float max17050CGain = 1.99993;
+
 
 enum MAX17050_reg {
 	MAX17050_STATUS		= 0x00,
@@ -142,4 +148,18 @@ int max17050_get_property(enum MAX17050_reg reg, int *value);
 int max17050_fix_configuration();
 u32 max17050_get_cached_batt_volt();
 */
-#endif /* __MAX17050_H_ */
+#endif /* __MAX17050_H_ */
+
+Result Max17050ReadReg(u8 reg, u16 *out)
+{
+	u16 data = 0;
+	Result res = I2cReadRegHandler16(reg, I2cDevice_Max17050, &data);
+
+	if (R_FAILED(res))
+	{
+		return res;
+	}
+
+	*out = data;
+	return res;
+}

include/tmp451.h

@@ -0,0 +1,103 @@
+/*
+ * SOC/PCB Temperature driver for Nintendo Switch's TI TMP451
+ *
+ * Copyright (c) 2018 CTCaer
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * Modified by: MasaGratoR
+ */
+
+#ifndef __TMP451_H_
+#define __TMP451_H_
+
+//#include <utils/types.h>
+#include "i2c.h"
+
+//#define TMP451_I2C_ADDR 0x4C
+
+#define TMP451_PCB_TEMP_REG    0x00
+#define TMP451_SOC_TEMP_REG    0x01
+
+/*
+#define TMP451_CONFIG_REG      0x09
+#define TMP451_CNV_RATE_REG    0x0A
+*/
+
+#define TMP451_SOC_TEMP_DEC_REG 0x10
+#define TMP451_PCB_TEMP_DEC_REG 0x15
+
+/*
+#define TMP451_SOC_TMP_OFH_REG 0x11
+#define TMP451_SOC_TMP_OFL_REG 0x12
+*/
+
+// If input is false, the return value is packed. MSByte is the integer in oC
+// and the LSByte is the decimal point truncated to 2 decimal places.
+// Otherwise it's an integer oC.
+/*
+u16 tmp451_get_soc_temp(bool integer);
+u16 tmp451_get_pcb_temp(bool integer);
+void tmp451_init();
+void tmp451_end();
+*/
+
+Result Tmp451ReadReg(u8 reg, u8 *out)
+{
+	u8 data = 0;
+	Result res = I2cReadRegHandler8(reg, I2cDevice_Tmp451, &data);
+
+	if (R_FAILED(res))
+	{
+		return res;
+	}
+
+	*out = data;
+	return res;
+}
+
+Result Tmp451GetSocTemp(float* temperature) {
+    u8 integer = 0;
+    u8 decimals = 0;
+
+    Result rc = Tmp451ReadReg(TMP451_SOC_TEMP_REG, &integer);
+    if (R_FAILED(rc))
+        return rc;
+    rc = Tmp451ReadReg(TMP451_SOC_TEMP_DEC_REG, &decimals);
+    if (R_FAILED(rc))
+        return rc;
+    
+    decimals = ((u16)(decimals >> 4) * 625) / 100;
+    *temperature = (float)(integer) + ((float)(decimals) / 100);
+    return rc;
+}
+
+Result Tmp451GetPcbTemp(float* temperature) {
+    u8 integer = 0;
+    u8 decimals = 0;
+
+    Result rc = Tmp451ReadReg(TMP451_PCB_TEMP_REG, &integer);
+    if (R_FAILED(rc))
+        return rc;
+    rc = Tmp451ReadReg(TMP451_PCB_TEMP_DEC_REG, &decimals);
+    if (R_FAILED(rc))
+        return rc;
+    
+    decimals = ((u16)(decimals >> 4) * 625) / 100;
+    *temperature = (float)(integer) + ((float)(decimals) / 100);
+    return rc;
+}
+
+#endif /* __TMP451_H_ */