From 47db59640b274616c5d6b225c032579912ab6ab0 Mon Sep 17 00:00:00 2001 From: snedmore Date: Fri, 12 Dec 2025 19:10:27 +0000 Subject: [PATCH] updates --- .gitignore | 1 + demo.py | 7 ++++--- inachip.py | 4 +++- powermon.py | 3 ++- powertest.py | 2 +- 5 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 .gitignore mode change 100644 => 100755 demo.py mode change 100644 => 100755 powertest.py diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c18dd8d --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +__pycache__/ diff --git a/demo.py b/demo.py old mode 100644 new mode 100755 index 535027f..bb80c44 --- a/demo.py +++ b/demo.py @@ -8,10 +8,11 @@ sensors = [ ] solarmon = pm.PowerMon(sensors) -powerData = None +powerData = [] while True: - data = solarmon.getData() + powerData = solarmon.getData() + print("\033c", end="") print("Raspberry Pi Power Consumption:") print(f"Vbus:\t\t{powerData[0].voltage} V") print(f"Current:\t{powerData[0].current} A") @@ -21,4 +22,4 @@ while True: print(f"Vbus:\t\t{powerData[1].voltage} V") print(f"Current:\t{powerData[1].current} A") print(f"Power:\t\t{powerData[1].power} W") - sleep(1) \ No newline at end of file + sleep(1) diff --git a/inachip.py b/inachip.py index d8a37ff..ba46501 100644 --- a/inachip.py +++ b/inachip.py @@ -43,6 +43,8 @@ class INA226: self.data.voltage = float(self.__readRegWord(VOLTAGE_REG_ADDR)) * VOLTAGE_LSB self.data.power = float(self.__readRegWord(POWER_REG_ADDR)) * CURRENT_LSB * 25.0 self.data.current = float(self.__readRegWord(CURRENT_REG_ADDR)) * CURRENT_LSB + if (self.data.current > 20.96): + self.data.current = 0.0 return self.data - \ No newline at end of file + diff --git a/powermon.py b/powermon.py index 1bcacec..4c052cf 100644 --- a/powermon.py +++ b/powermon.py @@ -17,7 +17,8 @@ class PowerMon: ina = INA226(self.bus, sensors[i][0], sensors[i][1]) self.chipObjs.append(ina) except Exception as e: - raise Exception("Initiating sensors failed: " + e) + e.add_note("Initiating sensors failed") + raise def getData(self) -> list[PowerData]: results = [] diff --git a/powertest.py b/powertest.py old mode 100644 new mode 100755 index 44c6da6..ba7ba22 --- a/powertest.py +++ b/powertest.py @@ -49,7 +49,7 @@ with SMBus(1) as bus: print(f"Current:\t{powerData.current} A") print(f"Power:\t\t{powerData.power} W") #print(f"PowerC:\t\t{powerData.powerCorrected} W") - #print(bus.read_word_data(ADDRESS, 0x00)) + #print(hex(readReg(bus, 0x05))) print() sleep(1)