diff --git a/Source/rewrite-hoc-clk/sysmodule/src/board/board_power.cpp b/Source/rewrite-hoc-clk/sysmodule/src/board/board_power.cpp deleted file mode 100644 index a0701043..00000000 --- a/Source/rewrite-hoc-clk/sysmodule/src/board/board_power.cpp +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors - * - * 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 . - * - */ - -/* -------------------------------------------------------------------------- - * "THE BEER-WARE LICENSE" (Revision 42): - * , , - * wrote this file. As long as you retain this notice you can do whatever you - * want with this stuff. If you meet any of us some day, and you think this - * stuff is worth it, you can buy us a beer in return. - The sys-clk authors - * -------------------------------------------------------------------------- - */ - -#include -#include -#include - -namespace board { - - u32 GetPowerMw(SysClkPowerSensor sensor) { - switch (sensor) { - case SysClkPowerSensor_Now: - return max17050PowerNow(); - case SysClkPowerSensor_Avg: - return max17050PowerAvg(); - default: - ASSERT_ENUM_VALID(SysClkPowerSensor, sensor); - } - - return 0; - } - -} diff --git a/Source/rewrite-hoc-clk/sysmodule/src/board/board_power.hpp b/Source/rewrite-hoc-clk/sysmodule/src/board/board_power.hpp deleted file mode 100644 index 2d0f2616..00000000 --- a/Source/rewrite-hoc-clk/sysmodule/src/board/board_power.hpp +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors - * - * 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 . - * - */ - -/* -------------------------------------------------------------------------- - * "THE BEER-WARE LICENSE" (Revision 42): - * , , - * wrote this file. As long as you retain this notice you can do whatever you - * want with this stuff. If you meet any of us some day, and you think this - * stuff is worth it, you can buy us a beer in return. - The sys-clk authors - * -------------------------------------------------------------------------- - */ - -#pragma once -#include -#include - -namespace board { - - u32 GetPowerMw(SysClkPowerSensor sensor) - -} diff --git a/Source/rewrite-hoc-clk/sysmodule/src/board/board_temp.cpp b/Source/rewrite-hoc-clk/sysmodule/src/board/board_sensor.cpp similarity index 86% rename from Source/rewrite-hoc-clk/sysmodule/src/board/board_temp.cpp rename to Source/rewrite-hoc-clk/sysmodule/src/board/board_sensor.cpp index d102241a..955a1b38 100644 --- a/Source/rewrite-hoc-clk/sysmodule/src/board/board_temp.cpp +++ b/Source/rewrite-hoc-clk/sysmodule/src/board/board_sensor.cpp @@ -58,4 +58,17 @@ namespace board { return std::max(0, millis); } + u32 GetPowerMw(SysClkPowerSensor sensor) { + switch (sensor) { + case SysClkPowerSensor_Now: + return max17050PowerNow(); + case SysClkPowerSensor_Avg: + return max17050PowerAvg(); + default: + ASSERT_ENUM_VALID(SysClkPowerSensor, sensor); + } + + return 0; + } + } diff --git a/Source/rewrite-hoc-clk/sysmodule/src/board/board_temp.hpp b/Source/rewrite-hoc-clk/sysmodule/src/board/board_sensor.hpp similarity index 96% rename from Source/rewrite-hoc-clk/sysmodule/src/board/board_temp.hpp rename to Source/rewrite-hoc-clk/sysmodule/src/board/board_sensor.hpp index 71b02d3d..03415b96 100644 --- a/Source/rewrite-hoc-clk/sysmodule/src/board/board_temp.hpp +++ b/Source/rewrite-hoc-clk/sysmodule/src/board/board_sensor.hpp @@ -31,5 +31,6 @@ namespace board { u32 GetTemperatureMilli(SysClkThermalSensor sensor); + u32 GetPowerMw(SysClkPowerSensor sensor) }