Merge develop into main (#167)
- WiFi Connect app is now hidden by default, but accessible at the bottom of the WiFi Manage app when WiFi is turned on. - WiFi service now turns on WiFi when calling connect() and WiFi is not on. - Removed `blocking` option for `service::loader::startApp()`. This feature was unused and complex. - Various apps: Moved private headers into Private/ folder. - Various apps: created start() function for easy starting. - Added documentation to all TactilityC APIs - Refactored various `enum` into `class enum` - Refactor M5Stack `initBoot()` (but VBus is still 0V for some reason)
This commit is contained in:
committed by
GitHub
parent
3ca0f8cf97
commit
3ea02d912f
@@ -175,7 +175,7 @@ void CoreS3Display::setGammaCurve(uint8_t index) {
|
||||
void CoreS3Display::setBacklightDuty(uint8_t backlightDuty) {
|
||||
const uint8_t voltage = 20 + ((8 * backlightDuty) / 255); // [0b00000, 0b11100] - under 20 is too dark
|
||||
// TODO: Refactor to use Axp2102 class with https://github.com/m5stack/M5Unified/blob/b8cfec7fed046242da7f7b8024a4e92004a51ff7/src/utility/AXP2101_Class.cpp#L42
|
||||
if (!tt::hal::i2c::masterWrite(I2C_NUM_0, AXP2101_ADDRESS, 0x99, &voltage, 1, 1000)) {
|
||||
if (!tt::hal::i2c::masterWriteRegister(I2C_NUM_0, AXP2101_ADDRESS, 0x99, &voltage, 1, 1000)) { // Sets DLD01
|
||||
TT_LOG_E(TAG, "Failed to set display backlight voltage");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,11 +5,11 @@
|
||||
|
||||
bool CoreS3Power::supportsMetric(MetricType type) const {
|
||||
switch (type) {
|
||||
case BATTERY_VOLTAGE:
|
||||
case IS_CHARGING:
|
||||
case CHARGE_LEVEL:
|
||||
case MetricType::BatteryVoltage:
|
||||
case MetricType::IsCharging:
|
||||
case MetricType::ChargeLevel:
|
||||
return true;
|
||||
case CURRENT:
|
||||
case MetricType::Current:
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -18,7 +18,7 @@ bool CoreS3Power::supportsMetric(MetricType type) const {
|
||||
|
||||
bool CoreS3Power::getMetric(Power::MetricType type, Power::MetricData& data) {
|
||||
switch (type) {
|
||||
case BATTERY_VOLTAGE: {
|
||||
case MetricType::BatteryVoltage: {
|
||||
float milliVolt;
|
||||
if (axpDevice.getBatteryVoltage(milliVolt)) {
|
||||
data.valueAsUint32 = (uint32_t)milliVolt;
|
||||
@@ -27,7 +27,7 @@ bool CoreS3Power::getMetric(Power::MetricType type, Power::MetricData& data) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
case CHARGE_LEVEL: {
|
||||
case MetricType::ChargeLevel: {
|
||||
float vbatMillis;
|
||||
if (axpDevice.getBatteryVoltage(vbatMillis)) {
|
||||
float vbat = vbatMillis / 1000.f;
|
||||
@@ -44,7 +44,7 @@ bool CoreS3Power::getMetric(Power::MetricType type, Power::MetricData& data) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
case IS_CHARGING: {
|
||||
case MetricType::IsCharging: {
|
||||
Axp2101::ChargeStatus status;
|
||||
if (axpDevice.getChargeStatus(status)) {
|
||||
data.valueAsBool = (status == Axp2101::CHARGE_STATUS_CHARGING);
|
||||
@@ -53,7 +53,7 @@ bool CoreS3Power::getMetric(Power::MetricType type, Power::MetricData& data) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
case CURRENT:
|
||||
case MetricType::Current:
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ std::shared_ptr<SdCard> createSdCard() {
|
||||
GPIO_NUM_NC,
|
||||
GPIO_NUM_NC,
|
||||
GPIO_NUM_NC,
|
||||
SdCard::MountBehaviourAtBoot,
|
||||
SdCard::MountBehaviour::AtBoot,
|
||||
tt::lvgl::getLvglSyncLockable(),
|
||||
{
|
||||
CORES3_LCD_PIN_CS
|
||||
|
||||
Reference in New Issue
Block a user