mirror of
https://github.com/ByteWelder/Tactility.git
synced 2026-02-18 19:03:16 +00:00
- Refactored `TouchDevice`: it can now start/stop LVGL separately, and it has an optional `TouchDriver` interface - Refactored `DisplayDevice`: it can now start/stop LVGL separately, and it has an optional `DisplayDriver` interface - Updated all boards and drivers for above changes - LVGL can now be stopped and (re)started on the fly - Fixed issues with restarting Gui and Statusbar services - Refactored `Gui` service to be class and renamed `Gui` to `GuiService` - Fixed `Statusbar` service: forgot to deregister one of the icons - Updated `esp_lcd_st7701` to v1.1.3 - `lv_textarea_create()` now automatically registers the hardware keyboard hooks (by wrapping the function) - Fixed and updated `tactility.py` - Cleanup of a lot of code - `BootInitLvglBegin` and `BootInitLvglEnd` are replaced by `LvglStarted` and `LvglStopped`. - Introduced `tt::service::State` which is accessible via `tt::service::getState()` (and internally via `ServiceInstance`) - Started replacing `#define TAG` with `constexpr auto TAG = "..";`
111 lines
3.6 KiB
C++
111 lines
3.6 KiB
C++
#include "Core2Power.h"
|
|
#include <Tactility/TactilityCore.h>
|
|
#include "axp192/axp192.h"
|
|
|
|
constexpr auto TAG = "Core2Power";
|
|
|
|
extern axp192_t axpDevice;
|
|
|
|
bool Core2Power::supportsMetric(MetricType type) const {
|
|
switch (type) {
|
|
using enum MetricType;
|
|
case BatteryVoltage:
|
|
case ChargeLevel:
|
|
case IsCharging:
|
|
return true;
|
|
default:
|
|
return false;
|
|
}
|
|
|
|
return false; // Safety guard for when new enum values are introduced
|
|
}
|
|
|
|
bool Core2Power::getMetric(MetricType type, MetricData& data) {
|
|
switch (type) {
|
|
using enum MetricType;
|
|
case BatteryVoltage: {
|
|
float voltage;
|
|
if (axp192_read(&axpDevice, AXP192_BATTERY_VOLTAGE, &voltage) == ESP_OK) {
|
|
data.valueAsUint32 = (uint32_t)std::max((voltage * 1000.f), 0.0f);
|
|
return true;
|
|
} else {
|
|
return false;
|
|
}
|
|
}
|
|
case ChargeLevel: {
|
|
float vbat, charge_current;
|
|
if (
|
|
axp192_read(&axpDevice, AXP192_BATTERY_VOLTAGE, &vbat) == ESP_OK &&
|
|
axp192_read(&axpDevice, AXP192_CHARGE_CURRENT, &charge_current) == ESP_OK
|
|
) {
|
|
float max_voltage = 4.20f;
|
|
float min_voltage = 2.69f; // From M5Unified
|
|
float voltage_correction = (charge_current > 0.01f) ? -0.1f : 0.f; // Roughly 0.1V drop when ccharging
|
|
float corrected_voltage = vbat + voltage_correction;
|
|
if (corrected_voltage > 2.69f) {
|
|
float charge_factor = (corrected_voltage - min_voltage) / (max_voltage - min_voltage);
|
|
data.valueAsUint8 = (uint8_t)(charge_factor * 100.f);
|
|
} else {
|
|
data.valueAsUint8 = 0;
|
|
}
|
|
return true;
|
|
} else {
|
|
return false;
|
|
}
|
|
}
|
|
case IsCharging: {
|
|
float charge_current;
|
|
if (axp192_read(&axpDevice, AXP192_CHARGE_CURRENT, &charge_current) == ESP_OK) {
|
|
data.valueAsBool = charge_current > 0.001f;
|
|
return true;
|
|
} else {
|
|
return false;
|
|
}
|
|
}
|
|
case Current: {
|
|
float charge_current, discharge_current;
|
|
if (
|
|
axp192_read(&axpDevice, AXP192_CHARGE_CURRENT, &charge_current) == ESP_OK &&
|
|
axp192_read(&axpDevice, AXP192_DISCHARGE_CURRENT, &discharge_current) == ESP_OK
|
|
) {
|
|
if (charge_current > 0.0f) {
|
|
data.valueAsInt32 = (int32_t) (charge_current * 1000.0f);
|
|
} else {
|
|
data.valueAsInt32 = -(int32_t) (discharge_current * 1000.0f);
|
|
}
|
|
return true;
|
|
} else {
|
|
return false;
|
|
}
|
|
}
|
|
default:
|
|
return false;
|
|
}
|
|
}
|
|
|
|
bool Core2Power::isAllowedToCharge() const {
|
|
uint8_t buffer;
|
|
if (axp192_read(&axpDevice, AXP192_CHARGE_CONTROL_1, &buffer) == ESP_OK) {
|
|
return buffer & 0x80;
|
|
} else {
|
|
return false;
|
|
}
|
|
}
|
|
|
|
void Core2Power::setAllowedToCharge(bool canCharge) {
|
|
uint8_t buffer;
|
|
if (axp192_read(&axpDevice, AXP192_CHARGE_CONTROL_1, &buffer) == ESP_OK) {
|
|
buffer = (buffer & 0x7F) + (canCharge ? 0x80 : 0x00);
|
|
axp192_write(&axpDevice, AXP192_CHARGE_CONTROL_1, buffer);
|
|
}
|
|
}
|
|
|
|
static std::shared_ptr<PowerDevice> power;
|
|
|
|
std::shared_ptr<PowerDevice> createPower() {
|
|
if (power == nullptr) {
|
|
power = std::make_shared<Core2Power>();
|
|
}
|
|
return power;
|
|
}
|