From b0b20ea496e0539dc88eb24b5f643f1647c9d000 Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Sun, 31 Dec 2023 10:59:43 +0100 Subject: [PATCH] fixing cppcheck --- src/PowerManagement/power_management.cpp | 4 +- src/PowerManagement/power_management.h | 58 +++++++++++------------- src/TaskBeacon.h | 2 +- 3 files changed, 29 insertions(+), 35 deletions(-) diff --git a/src/PowerManagement/power_management.cpp b/src/PowerManagement/power_management.cpp index 06af01f..6689686 100644 --- a/src/PowerManagement/power_management.cpp +++ b/src/PowerManagement/power_management.cpp @@ -96,9 +96,9 @@ double AXP192::getBatteryVoltage() { // cppcheck-suppress unusedFunction double AXP192::getBatteryChargeDischargeCurrent() { if (isCharging()) { - return ((XPowersAXP192 *)_pmu)->getBatteryChargeCurrent(); + return static_cast(_pmu)->getBatteryChargeCurrent(); } - return -1.0 * ((XPowersAXP192 *)_pmu)->getBattDischargeCurrent(); + return -1.0 * static_cast(_pmu)->getBattDischargeCurrent(); } bool AXP192::isBatteryConnect() { diff --git a/src/PowerManagement/power_management.h b/src/PowerManagement/power_management.h index 45ff6ea..98625bb 100644 --- a/src/PowerManagement/power_management.h +++ b/src/PowerManagement/power_management.h @@ -38,56 +38,50 @@ class AXP192 : public PowerManagement { public: AXP192(); - bool begin(TwoWire &port); + bool begin(TwoWire &port) override; - void activateLoRa(); - void deactivateLoRa(); + void activateLoRa() override; + void deactivateLoRa() override; - void activateGPS(); - void deactivateGPS(); + void activateGPS() override; + void deactivateGPS() override; - void activateOLED(); - void deactivateOLED(); + void activateOLED() override; + void deactivateOLED() override; - void enableChgLed(); - void disableChgLed(); + void activateMeasurement() override; + void deactivateMeasurement() override; - void activateMeasurement(); - void deactivateMeasurement(); + double getBatteryVoltage() override; + double getBatteryChargeDischargeCurrent() override; - double getBatteryVoltage(); - double getBatteryChargeDischargeCurrent(); - - bool isBatteryConnect(); - bool isCharging(); + bool isBatteryConnect() override; + bool isCharging() override; }; class AXP2101 : public PowerManagement { public: AXP2101(); - bool begin(TwoWire &port); + bool begin(TwoWire &port) override; - void activateLoRa(); - void deactivateLoRa(); + void activateLoRa() override; + void deactivateLoRa() override; - void activateGPS(); - void deactivateGPS(); + void activateGPS() override; + void deactivateGPS() override; - void activateOLED(); - void deactivateOLED(); + void activateOLED() override; + void deactivateOLED() override; - void enableChgLed(); - void disableChgLed(); + void activateMeasurement() override; + void deactivateMeasurement() override; - void activateMeasurement(); - void deactivateMeasurement(); + double getBatteryVoltage() override; + double getBatteryChargeDischargeCurrent() override; - double getBatteryVoltage(); - double getBatteryChargeDischargeCurrent(); - - bool isBatteryConnect(); - bool isCharging(); + bool isBatteryConnect() override; + bool isCharging() override; }; #endif diff --git a/src/TaskBeacon.h b/src/TaskBeacon.h index 0a8c565..39af9b2 100644 --- a/src/TaskBeacon.h +++ b/src/TaskBeacon.h @@ -31,7 +31,7 @@ private: static uint _instances; static OneButton _userButton; static bool _send_update; - static void pushButton(); + static void pushButton(); // cppcheck-suppress unusedPrivateFunction }; #endif