Move Battery Status Struct to Battery Interface
Fix small compiler errors in new interfaces
This commit is contained in:
parent
e2138764ac
commit
c4547917c8
6 changed files with 18 additions and 18 deletions
|
@ -1,6 +1,17 @@
|
|||
#include "DisplayInterface.h"
|
||||
|
||||
class BatteryInterface {
|
||||
public:
|
||||
struct batteryStatus {
|
||||
/// @brief Percent of battery remaining (0-100]
|
||||
int percentage;
|
||||
/// @brief Voltage of battery in millivolts
|
||||
int voltage;
|
||||
/// @brief True - Battery is Charging
|
||||
/// False - Battery discharging
|
||||
bool isCharging;
|
||||
};
|
||||
|
||||
virtual void setup(DisplayInterface& display, int adc_pin, int charging_pin) = 0;
|
||||
virtual int getPercentage() = 0;
|
||||
virtual bool isCharging() = 0;
|
||||
|
|
|
@ -15,4 +15,4 @@ class DisplayInterface
|
|||
virtual void reset_settings_menu() = 0;
|
||||
virtual void update_battery(int percentage, bool isCharging, bool isConnected) = 0;
|
||||
virtual void turnOff() = 0;
|
||||
}
|
||||
};
|
|
@ -4,24 +4,16 @@
|
|||
#pragma once
|
||||
#include <lvgl.h>
|
||||
#include <string>
|
||||
#include "BatteryInterface.h"
|
||||
|
||||
class HardwareInterface {
|
||||
public:
|
||||
struct batteryStatus {
|
||||
/// @brief Percent of battery remaining (0-100]
|
||||
int percentage;
|
||||
/// @brief Voltage of battery in millivolts
|
||||
int voltage;
|
||||
/// @brief True - Battery is Charging
|
||||
/// False - Battery discharging
|
||||
bool isCharging;
|
||||
};
|
||||
|
||||
HardwareInterface() = default;
|
||||
|
||||
virtual void init() = 0;
|
||||
virtual void sendIR() = 0;
|
||||
virtual void MQTTPublish(const char *topic, const char *payload) = 0;
|
||||
virtual batteryStatus getBatteryPercentage() = 0;
|
||||
virtual BatteryInterface::batteryStatus getBatteryPercentage() = 0;
|
||||
virtual void debugPrint(std::string message) = 0;
|
||||
};
|
||||
|
|
|
@ -99,7 +99,7 @@ void HardwareRevX::MQTTPublish(const char *topic, const char *payload) {
|
|||
#endif
|
||||
}
|
||||
|
||||
HardwareInterface::batteryStatus HardwareRevX::getBatteryPercentage() {
|
||||
BatteryInterface::batteryStatus HardwareRevX::getBatteryPercentage() {
|
||||
return battery;
|
||||
}
|
||||
|
||||
|
|
|
@ -19,8 +19,8 @@ public:
|
|||
|
||||
virtual void init() override;
|
||||
|
||||
virtual batteryStatus getBatteryPercentage() {
|
||||
batteryStatus fakeStatus;
|
||||
virtual BatteryInterface::batteryStatus getBatteryPercentage() {
|
||||
BatteryInterface::batteryStatus fakeStatus;
|
||||
fakeStatus.isCharging = false;
|
||||
fakeStatus.percentage = 100;
|
||||
fakeStatus.voltage = 4200;
|
||||
|
|
|
@ -1,6 +1,3 @@
|
|||
#pragma once
|
||||
|
||||
#define IS_SIMULATOR true
|
||||
|
||||
#define SCREEN_WIDTH 240
|
||||
#define SCREEN_HEIGHT 360
|
||||
#define IS_SIMULATOR true
|
Loading…
Add table
Reference in a new issue