diff --git a/esp32_marauder/AXP2101_Class.cpp b/esp32_marauder/AXP2101_Class.cpp deleted file mode 100644 index 0710d00..0000000 --- a/esp32_marauder/AXP2101_Class.cpp +++ /dev/null @@ -1,584 +0,0 @@ -// Copyright (c) M5Stack. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -#include "AXP2101_Class.hpp" - -#if __has_include() -#include -#endif - -#include - -#define IS_BIT_SET(val,mask) (((val)&(mask)) == (mask)) - -namespace m5 -{ -/* - DCDC1 : 1.5-3.4V， 2000mA - DCDC2 : 0.5-1.2V，1.22-1.54V, 2000mA - DCDC3 : 0.5-1.2V，1.22-1.54V, 1.6-3.4V, 2000mA - DCDC4 : 0.5-1.2V, 1.22-1.84V, 1500mA - DCDC5 : 1.2V , 1.4-3.7V, 1000mA - - RTCLDO1/2 : 1.8V/2.5V/3V/3.3V, 30mA - - ALDO1~4 : 0.5-3.5V, 100mV/step 300mA -*/ - bool AXP2101_Class::begin(void) - { - std::uint8_t val; - _init = readRegister(0x03, &val, 1); - if (_init) - { - _init = (val == 0x4A); -#if defined (ESP_LOGV) - // ESP_LOGV("AXP2101", "reg03h:%02x : init:%d", val, _init); -#endif - } - return _init; - } - - // 0=ALDO1 ~ 3=ALDO4 / 4=BLDO1 / 5=BLDO2 - void AXP2101_Class::_set_LDO(std::uint8_t num, int voltage) - { - if (num > 5) return; - std::uint8_t reg_volt = num + 0x92; - voltage -= 500; - /// convert voltage to value - std::uint_fast8_t val = (voltage < 0) ? 0 : std::min(voltage / 100, 0x1E); - writeRegister8(reg_volt, val); - - std::uint_fast8_t reg90bit = 1 << num; - if (voltage < 0) - { - bitOff(0x90, reg90bit); - } - else - { - bitOn(0x90, reg90bit); - } - } - - void AXP2101_Class::_set_DLDO(std::uint8_t num, int voltage) - { - if (num > 1) return; - - std::uint8_t reg_volt = num + 0x99; - voltage -= 500; - /// convert voltage to value - std::uint_fast8_t val = (voltage < 0) ? 0 : std::min(voltage / (num ? 50 : 100), num ? 0x13 : 0x1C); - writeRegister8(reg_volt, val); - - uint8_t reg = 0x90 + num; - uint8_t bit = num ? 0x01 : 0x80; - if (voltage < 0) - { - bitOff(reg, bit); - } - else - { - bitOn(reg, bit); - } - } - - bool AXP2101_Class::_get_LDOEn(std::uint8_t num) - { - bool res = false; - if (num <= 5) { - std::uint_fast8_t reg90bit = 1 << num; - res = readRegister8(0x90) & reg90bit; - } - return res; - } - - void AXP2101_Class::setBatteryCharge(bool enable) - { - std::uint8_t val = 0; - if (readRegister(0x18, &val, 1)) - { - writeRegister8(0x18, (val & 0xFD) | (enable << 1)); - } - } - - void AXP2101_Class::setPreChargeCurrent(std::uint16_t max_mA) - { - static constexpr std::uint8_t table[] = { 0, 25, 50, 75, 100, 125, 150, 175, 200, 255 }; - if (max_mA > 200) { max_mA = 200; } - - size_t i = 0; - while (table[i] <= max_mA) { ++i; } - i -= 1; - writeRegister8(0x61, i); - } - - void AXP2101_Class::setChargeCurrent(std::uint16_t max_mA) - { - max_mA /= 5; - if (max_mA > 1000/5) { max_mA = 1000/5; } - static constexpr std::uint8_t table[] = { 125 / 5, 150 / 5, 175 / 5, 200 / 5, 300 / 5, 400 / 5, 500 / 5, 600 / 5, 700 / 5, 800 / 5, 900 / 5, 1000 / 5, 255 }; - - size_t i = 0; - while (table[i] <= max_mA) { ++i; } - i += 4; - writeRegister8(0x62, i); - } - - void AXP2101_Class::setChargeVoltage(std::uint16_t max_mV) - { - max_mV = (max_mV / 10) - 400; - if (max_mV > 460 - 400) { max_mV = 460 - 400; } - static constexpr std::uint8_t table[] = - { 410 - 400 /// 4100mV - , 420 - 400 /// 4200mV - , 435 - 400 /// 4350mV - , 440 - 400 /// 4400mV - , 460 - 400 /// 4600mV - , 255 - }; - size_t i = 0; - while (table[i] <= max_mV) { ++i; } - - if (++i >= 0b110) { i = 0; } - writeRegister8(0x64, i); - } - - std::int8_t AXP2101_Class::getBatteryLevel(void) - { - std::int8_t res = readRegister8(0xA4); - return res; - } - - /// @return -1:discharge / 0:standby / 1:charge - int AXP2101_Class::getChargeStatus(void) - { - uint32_t val = (readRegister8(0x01) >> 5) & 0b11; - // 0b01:charge / 0b10:dischage / 0b00:stanby - return (val == 1) ? 1 : ((val == 2) ? -1 : 0); - } - - bool AXP2101_Class::isCharging(void) - { - return (readRegister8(0x01) & 0b01100000) == 0b00100000; - } - - void AXP2101_Class::powerOff(void) - { - bitOn(0x10, 0x01); - } - - //enable all ADC channel control or set default values - void AXP2101_Class::setAdcState(bool enable) - { - writeRegister8(0x30, enable == true ? 0b111111 : 0b11); - } - - void AXP2101_Class::setAdcRate( std::uint8_t rate ) - { - } - - void AXP2101_Class::setBACKUP(bool enable) - { -/* - static constexpr std::uint8_t add = 0x35; - static constexpr std::uint8_t bit = 1 << 7; - if (enable) - { // Enable - bitOn(add, bit); - } - else - { // Disable - bitOff(add, bit); - } -//*/ - } - - bool AXP2101_Class::isACIN(void) - { -return false; - } - bool AXP2101_Class::isVBUS(void) - { // VBUS good indication - return readRegister8(0x00) & 0x20; - } - - bool AXP2101_Class::getBatState(void) - { // Battery present state - return readRegister8(0x00) & 0x08; - } - - std::uint8_t AXP2101_Class::getPekPress(void) - { - std::uint8_t val = readRegister8(0x49) & 0x0C; - if (val) { writeRegister8(0x49, val); } - return val >> 2; - } - - float AXP2101_Class::getACINVoltage(void) - { -return 0; - } - - float AXP2101_Class::getACINCurrent(void) - { -return 0; - } - - float AXP2101_Class::getVBUSVoltage(void) - { - if (isVBUS() == false) { return 0.0f; } - - float vBus = readRegister14(0x38); - if (vBus >= 16375) { return 0.0f; } - - return vBus / 1000.0f; - } - - float AXP2101_Class::getVBUSCurrent(void) - { -return 0; - } - - float AXP2101_Class::getTSVoltage(void) - { - float volt = readRegister14(0x36); - if (volt >= 16375) { return 0.0f; } - - return volt / 2000.0f; - } - - float AXP2101_Class::getInternalTemperature(void) - { - return 22 + ((7274 - readRegister16(0x3C)) / 20); - } - - float AXP2101_Class::getBatteryPower(void) - { -return 0; - } - - float AXP2101_Class::getBatteryVoltage(void) - { - return readRegister14(0x34) / 1000.0f; - } - - float AXP2101_Class::getBatteryChargeCurrent(void) - { -return 0; - } - - float AXP2101_Class::getBatteryDischargeCurrent(void) - { -return 0; - } - - float AXP2101_Class::getAPSVoltage(void) - { -return 0; - } - - bool AXP2101_Class::enableIRQ(std::uint64_t registerEn) - { - return setIRQEnRegister(registerEn, true); - } - - bool AXP2101_Class::disableIRQ(std::uint64_t registerEn) - { - return setIRQEnRegister(registerEn, false); - } - - bool AXP2101_Class::setIRQEnRegister(std::uint64_t registerEn, bool enable) - { - int res = 0; - uint8_t data = 0, value = 0; - if (registerEn & 0x0000FF) - { - value = registerEn & 0xFF; - data = readRegister8(AXP2101_IRQEN0); - intRegister[0] = enable ? (data | value) : (data & (~value)); - res |= writeRegister8(AXP2101_IRQEN0, intRegister[0]); - } - if (registerEn & 0x00FF00) - { - value = registerEn >> 8; - data = readRegister8(AXP2101_IRQEN1); - intRegister[1] = enable ? (data | value) : (data & (~value)); - res |= writeRegister8(AXP2101_IRQEN1, intRegister[1]); - } - if (registerEn & 0xFF0000) - { - value = registerEn >> 16; - data = readRegister8(AXP2101_IRQEN2); - intRegister[2] = enable ? (data | value) : (data & (~value)); - res |= writeRegister8(AXP2101_IRQEN2, intRegister[2]); - } - return res == 0; - } - - std::uint64_t AXP2101_Class::getIRQStatuses(void) - { - statusRegister[0] = readRegister8(AXP2101_IRQSTAT0); - statusRegister[1] = readRegister8(AXP2101_IRQSTAT1); - statusRegister[2] = readRegister8(AXP2101_IRQSTAT2); - return (uint32_t)(statusRegister[0] << 16) | (uint32_t)(statusRegister[1] << 8) | (uint32_t)(statusRegister[2]); - } - - void AXP2101_Class::clearIRQStatuses() - { - for (int i = 0; i < AXP2101_IRQSTAT_CNT; i++) - { - writeRegister8(AXP2101_IRQSTAT0 + i, 0xFF); - statusRegister[i] = 0; - } - } - - bool AXP2101_Class::isDropWarningLevel2Irq(void) - { - uint8_t mask = AXP2101_IRQ_WARNING_LEVEL2; - if (intRegister[0] & mask) - { - return IS_BIT_SET(statusRegister[0], mask); - } - return false; - } - - bool AXP2101_Class::isDropWarningLevel1Irq(void) - { - uint8_t mask = AXP2101_IRQ_WARNING_LEVEL1; - if (intRegister[0] & mask) - { - return IS_BIT_SET(statusRegister[0], mask); - } - return false; - } - - bool AXP2101_Class::isGaugeWdtTimeoutIrq() - { - uint8_t mask = AXP2101_IRQ_GAUGE_WDT_TIMEOUT; - if (intRegister[0] & mask) - { - return IS_BIT_SET(statusRegister[0], mask); - } - return false; - } - - bool AXP2101_Class::isBatChargerOverTemperatureIrq(void) - { - uint8_t mask = AXP2101_IRQ_BAT_CHG_OVER_TEMP; - if (intRegister[0] & mask) - { - return IS_BIT_SET(statusRegister[0], mask); - } - return false; - } - - bool AXP2101_Class::isBatChargerUnderTemperatureIrq(void) - { - uint8_t mask = AXP2101_IRQ_BAT_CHG_UNDER_TEMP; - if (intRegister[0] & mask) - { - return IS_BIT_SET(statusRegister[0], mask); - } - return false; - } - - bool AXP2101_Class::isBatWorkOverTemperatureIrq(void) - { - uint8_t mask = AXP2101_IRQ_BAT_OVER_TEMP; - if (intRegister[0] & mask) - { - return IS_BIT_SET(statusRegister[0], mask); - } - return false; - } - - bool AXP2101_Class::isBatWorkUnderTemperatureIrq(void) - { - uint8_t mask = AXP2101_IRQ_BAT_UNDER_TEMP; - if (intRegister[0] & mask) - { - return IS_BIT_SET(statusRegister[0], mask); - } - return false; - } - - bool AXP2101_Class::isVbusInsertIrq(void) - { - uint8_t mask = AXP2101_IRQ_VBUS_INSERT >> 8; - if (intRegister[1] & mask) - { - return IS_BIT_SET(statusRegister[1], mask); - } - return false; - } - - bool AXP2101_Class::isVbusRemoveIrq(void) - { - uint8_t mask = AXP2101_IRQ_VBUS_REMOVE >> 8; - if (intRegister[1] & mask) - { - return IS_BIT_SET(statusRegister[1], mask); - } - return false; - } - - bool AXP2101_Class::isBatInsertIrq(void) - { - uint8_t mask = AXP2101_IRQ_BAT_INSERT >> 8; - if (intRegister[1] & mask) - { - return IS_BIT_SET(statusRegister[1], mask); - } - return false; - } - - bool AXP2101_Class::isBatRemoveIrq(void) - { - uint8_t mask = AXP2101_IRQ_BAT_REMOVE >> 8; - if (intRegister[1] & mask) - { - return IS_BIT_SET(statusRegister[1], mask); - } - return false; - } - - bool AXP2101_Class::isPekeyShortPressIrq(void) - { - uint8_t mask = AXP2101_IRQ_PKEY_SHORT_PRESS >> 8; - if (intRegister[1] & mask) - { - return IS_BIT_SET(statusRegister[1], mask); - } - return false; - - } - - bool AXP2101_Class::isPekeyLongPressIrq(void) - { - uint8_t mask = AXP2101_IRQ_PKEY_LONG_PRESS >> 8; - if (intRegister[1] & mask) - { - return IS_BIT_SET(statusRegister[1], mask); - } - return false; - } - - bool AXP2101_Class::isPekeyNegativeIrq(void) - { - uint8_t mask = AXP2101_IRQ_PKEY_NEGATIVE_EDGE >> 8; - if (intRegister[1] & mask) - { - return IS_BIT_SET(statusRegister[1], mask); - } - return false; - } - - bool AXP2101_Class::isPekeyPositiveIrq(void) - { - uint8_t mask = AXP2101_IRQ_PKEY_POSITIVE_EDGE >> 8; - if (intRegister[1] & mask) - { - return IS_BIT_SET(statusRegister[1], mask); - } - return false; - } - - bool AXP2101_Class::isWdtExpireIrq(void) - { - uint8_t mask = AXP2101_IRQ_WDT_EXPIRE >> 16; - if (intRegister[2] & mask) - { - return IS_BIT_SET(statusRegister[2], mask); - } - return false; - } - - bool AXP2101_Class::isLdoOverCurrentIrq(void) - { - uint8_t mask = AXP2101_IRQ_LDO_OVER_CURR >> 16; - if (intRegister[2] & mask) - { - return IS_BIT_SET(statusRegister[2], mask); - } - return false; - } - - bool AXP2101_Class::isBatfetOverCurrentIrq(void) - { - uint8_t mask = AXP2101_IRQ_BATFET_OVER_CURR >> 16; - if (intRegister[2] & mask) - { - return IS_BIT_SET(statusRegister[2], mask); - } - return false; - } - - bool AXP2101_Class::isBatChagerDoneIrq(void) - { - uint8_t mask = AXP2101_IRQ_BAT_CHG_DONE >> 16; - if (intRegister[2] & mask) - { - return IS_BIT_SET(statusRegister[2], mask); - } - return false; - } - - bool AXP2101_Class::isBatChagerStartIrq(void) - { - uint8_t mask = AXP2101_IRQ_BAT_CHG_START >> 16; - if (intRegister[2] & mask) - { - return IS_BIT_SET(statusRegister[2], mask); - } - return false; - } - - bool AXP2101_Class::isBatDieOverTemperatureIrq(void) - { - uint8_t mask = AXP2101_IRQ_DIE_OVER_TEMP >> 16; - if (intRegister[2] & mask) - { - return IS_BIT_SET(statusRegister[2], mask); - } - return false; - } - - bool AXP2101_Class::isChagerOverTimeoutIrq(void) - { - uint8_t mask = AXP2101_IRQ_CHAGER_TIMER >> 16; - if (intRegister[2] & mask) - { - return IS_BIT_SET(statusRegister[2], mask); - } - return false; - } - - bool AXP2101_Class::isBatOverVoltageIrq(void) - { - uint8_t mask = AXP2101_IRQ_BAT_OVER_VOLTAGE >> 16; - if (intRegister[2] & mask) - { - return IS_BIT_SET(statusRegister[2], mask); - } - return false; - } - - std::size_t AXP2101_Class::readRegister12(std::uint8_t addr) - { - std::uint8_t buf[2] = {0}; - readRegister(addr, buf, 2); - return (buf[0] & 0x0F) << 8 | buf[1]; - } - std::size_t AXP2101_Class::readRegister14(std::uint8_t addr) - { - std::uint8_t buf[2] = {0}; - readRegister(addr, buf, 2); - return (buf[0] & 0x3F) << 8 | buf[1]; - } - std::size_t AXP2101_Class::readRegister16(std::uint8_t addr) - { - std::uint8_t buf[2] = {0}; - readRegister(addr, buf, 2); - return buf[0] << 8 | buf[1]; - } - -} diff --git a/esp32_marauder/AXP2101_Class.h b/esp32_marauder/AXP2101_Class.h deleted file mode 100644 index be09f14..0000000 --- a/esp32_marauder/AXP2101_Class.h +++ /dev/null @@ -1,188 +0,0 @@ -// Copyright (c) M5Stack. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -#ifndef __M5_AXP2101_CLASS_H__ -#define __M5_AXP2101_CLASS_H__ - -#include "../I2C_Class.hpp" - -//IRQ ENABLE REGISTER -#define AXP2101_IRQEN0 0x40 -#define AXP2101_IRQEN1 0x41 -#define AXP2101_IRQEN2 0x42 - -//IRQ STATUS REGISTER -#define AXP2101_IRQSTAT0 0x48 -#define AXP2101_IRQSTAT1 0x49 -#define AXP2101_IRQSTAT2 0x4A -#define AXP2101_IRQSTAT_CNT 3 - - -namespace m5 -{ - typedef enum { - AXP2101_IRQ_BAT_UNDER_TEMP = 1 << 0, // Battery Under Temperature in Work mode IRQ(bwut_irq) - AXP2101_IRQ_BAT_OVER_TEMP = 1 << 1, // Battery Over Temperature in Work mode IRQ(bwot_irq) - AXP2101_IRQ_BAT_CHG_UNDER_TEMP = 1 << 2, // Battery Under Temperature in Charge mode IRQ(bcut_irq) - AXP2101_IRQ_BAT_CHG_OVER_TEMP = 1 << 3, // Battery Over Temperature in Charge mode IRQ(bcot_irq) - AXP2101_IRQ_GAUGE_NEW_SOC = 1 << 4, // Gauge New SOC IRQ(lowsoc_irq) - AXP2101_IRQ_GAUGE_WDT_TIMEOUT = 1 << 5, // Gauge Watchdog Timeout IRQ(gwdt_irq) - AXP2101_IRQ_WARNING_LEVEL1 = 1 << 6, // SOC drop to Warning Level1 IRQ(socwl1_irq) - AXP2101_IRQ_WARNING_LEVEL2 = 1 << 7, // SOC drop to Warning Level2 IRQ(socwl2_irq) - - // IRQ2 REG 41H - AXP2101_IRQ_PKEY_POSITIVE_EDGE = 1 << 8, // POWERON Positive Edge IRQ(ponpe_irq_en) - AXP2101_IRQ_PKEY_NEGATIVE_EDGE = 1 << 9, // POWERON Negative Edge IRQ(ponne_irq_en) - AXP2101_IRQ_PKEY_LONG_PRESS = 1 << 10, // POWERON Long PRESS IRQ(ponlp_irq) - AXP2101_IRQ_PKEY_SHORT_PRESS = 1 << 11, // POWERON Short PRESS IRQ(ponsp_irq_en) - AXP2101_IRQ_BAT_REMOVE = 1 << 12, // Battery Remove IRQ(bremove_irq) - AXP2101_IRQ_BAT_INSERT = 1 << 13, // Battery Insert IRQ(binsert_irq) - AXP2101_IRQ_VBUS_REMOVE = 1 << 14, // VBUS Remove IRQ(vremove_irq) - AXP2101_IRQ_VBUS_INSERT = 1 << 15, // VBUS Insert IRQ(vinsert_irq) - - // IRQ3 REG 42H - AXP2101_IRQ_BAT_OVER_VOLTAGE = 1 << 16, // Battery Over Voltage Protection IRQ(bovp_irq) - AXP2101_IRQ_CHAGER_TIMER = 1 << 17, // Charger Safety Timer1/2 expire IRQ(chgte_irq) - AXP2101_IRQ_DIE_OVER_TEMP = 1 << 18, // DIE Over Temperature level1 IRQ(dotl1_irq) - AXP2101_IRQ_BAT_CHG_START = 1 << 19, // Charger start IRQ(chgst_irq) - AXP2101_IRQ_BAT_CHG_DONE = 1 << 20, // Battery charge done IRQ(chgdn_irq) - AXP2101_IRQ_BATFET_OVER_CURR = 1 << 21, // BATFET Over Current Protection IRQ(bocp_irq) - AXP2101_IRQ_LDO_OVER_CURR = 1 << 22, // LDO Over Current IRQ(ldooc_irq) - AXP2101_IRQ_WDT_EXPIRE = 1 << 23, // Watchdog Expire IRQ(wdexp_irq) - - // ALL IRQ - AXP2101_IRQ_ALL = (0xFFFFFFFFUL) - } axp2101_irq_t; - class AXP2101_Class : public I2C_Device - { - public: - static constexpr uint8_t AXP2101_EFUS_OP_CFG = 0xF0; - static constexpr uint8_t AXP2101_EFREQ_CTRL = 0xF1; - static constexpr uint8_t AXP2101_TWI_ADDR_EXT = 0xFF; - - static constexpr std::uint8_t DEFAULT_ADDRESS = 0x34; - - AXP2101_Class(std::uint8_t i2c_addr = DEFAULT_ADDRESS, std::uint32_t freq = 400000, I2C_Class* i2c = &In_I2C) - : I2C_Device ( i2c_addr, freq, i2c ) - {} - - bool begin(void); - - /// Get the remaining battery power. - /// @return 0-100 level - std::int8_t getBatteryLevel(void); - - /// set battery charge enable. - /// @param enable true=enable / false=disable - void setBatteryCharge(bool enable); - - /// set battery precharge current - /// @param max_mA milli ampere. (0 - 200). - void setPreChargeCurrent(std::uint16_t max_mA); - - /// set battery charge current - /// @param max_mA milli ampere. (100 - 1320). - void setChargeCurrent(std::uint16_t max_mA); - - /// set battery charge voltage - /// @param max_mV milli volt. (4100 - 4360). - void setChargeVoltage(std::uint16_t max_mV); - - /// @return -1:discharge / 0:standby / 1:charge - int getChargeStatus(void); - - /// Get whether the battery is currently charging or not. - bool isCharging(void); - - - inline void setALDO1(int voltage) { _set_LDO(0, voltage); } - inline void setALDO2(int voltage) { _set_LDO(1, voltage); } - inline void setALDO3(int voltage) { _set_LDO(2, voltage); } - inline void setALDO4(int voltage) { _set_LDO(3, voltage); } - inline void setBLDO1(int voltage) { _set_LDO(4, voltage); } - inline void setBLDO2(int voltage) { _set_LDO(5, voltage); } - inline void setDLDO1(int voltage) { _set_DLDO(0, voltage); } - inline void setDLDO2(int voltage) { _set_DLDO(1, voltage); } - - inline bool getALDO1Enabled(void) { return _get_LDOEn(0); } - inline bool getALDO2Enabled(void) { return _get_LDOEn(1); } - inline bool getALDO3Enabled(void) { return _get_LDOEn(2); } - inline bool getALDO4Enabled(void) { return _get_LDOEn(3); } - inline bool getBLDO1Enabled(void) { return _get_LDOEn(4); } - inline bool getBLDO2Enabled(void) { return _get_LDOEn(5); } - - void powerOff(void); - - void setAdcState(bool enable); - void setAdcRate( std::uint8_t rate ); - - void setBACKUP(bool enable); - - bool isACIN(void); - bool isVBUS(void); - bool getBatState(void); - - float getBatteryVoltage(void); - float getBatteryDischargeCurrent(void); - float getBatteryChargeCurrent(void); - float getBatteryPower(void); - float getACINVoltage(void); - float getACINCurrent(void); - float getVBUSVoltage(void); - float getVBUSCurrent(void); - float getTSVoltage(void); - float getAPSVoltage(void); - float getInternalTemperature(void); - - /// @return 0:none / 1:Long press / 2:Short press / 3:both - std::uint8_t getPekPress(void); - - bool enableIRQ(std::uint64_t registerEn); - bool disableIRQ(std::uint64_t registerEn); - std::uint64_t getIRQStatuses(void); - void clearIRQStatuses(); - //IRQ STATUS 0 - bool isDropWarningLevel2Irq(void); - bool isDropWarningLevel1Irq(void); - bool isGaugeWdtTimeoutIrq(); - bool isBatChargerUnderTemperatureIrq(void); - bool isBatChargerOverTemperatureIrq(void); - bool isBatWorkOverTemperatureIrq(void); - bool isBatWorkUnderTemperatureIrq(void); - //IRQ STATUS 1 - bool isVbusInsertIrq(void); - bool isVbusRemoveIrq(void); - bool isBatInsertIrq(void); - bool isBatRemoveIrq(void); - bool isPekeyShortPressIrq(void); - bool isPekeyLongPressIrq(void); - bool isPekeyNegativeIrq(void); - bool isPekeyPositiveIrq(void); - //IRQ STATUS 2 - bool isWdtExpireIrq(void); - bool isLdoOverCurrentIrq(void); - bool isBatfetOverCurrentIrq(void); - bool isBatChagerDoneIrq(void); - bool isBatChagerStartIrq(void); - bool isBatDieOverTemperatureIrq(void); - bool isChagerOverTimeoutIrq(void); - bool isBatOverVoltageIrq(void); - - - private: - std::uint8_t statusRegister[AXP2101_IRQSTAT_CNT]; - std::uint8_t intRegister[AXP2101_IRQSTAT_CNT]; - - std::size_t readRegister12(std::uint8_t addr); - std::size_t readRegister14(std::uint8_t addr); - std::size_t readRegister16(std::uint8_t addr); - - void _set_LDO(std::uint8_t num, int voltage); - void _set_DLDO(std::uint8_t num, int voltage); - bool _get_LDOEn(std::uint8_t num); - - bool setIRQEnRegister(std::uint64_t registerEn, bool enable); - }; -} - -#endif diff --git a/esp32_marauder/BatteryInterface.cpp b/esp32_marauder/BatteryInterface.cpp index 17bf770..246dfd5 100644 --- a/esp32_marauder/BatteryInterface.cpp +++ b/esp32_marauder/BatteryInterface.cpp @@ -26,63 +26,41 @@ void BatteryInterface::RunSetup() { #ifdef HAS_BATTERY - Wire.begin(I2C_SDA, I2C_SCL); - Serial.println("Checking for battery monitors..."); + + #ifndef HAS_AXP2101 + Wire.begin(I2C_SDA, I2C_SCL); - Wire.beginTransmission(IP5306_ADDR); - error = Wire.endTransmission(); - - if (error == 0) { - Serial.println("Detected IP5306"); - this->has_ip5306 = true; - this->i2c_supported = true; - } - - Wire.beginTransmission(MAX17048_ADDR); - error = Wire.endTransmission(); - - if (error == 0) { - if (maxlipo.begin()) { - Serial.println("Detected MAX17048"); - this->has_max17048 = true; - this->i2c_supported = true; - } - } - - /*for(addr = 1; addr < 127; addr++ ) { - Wire.beginTransmission(addr); + Wire.beginTransmission(IP5306_ADDR); error = Wire.endTransmission(); - if (error == 0) - { - Serial.print("I2C device found at address 0x"); - - if (addr<16) - Serial.print("0"); + if (error == 0) { + Serial.println("Detected IP5306"); + this->has_ip5306 = true; + this->i2c_supported = true; + } - Serial.println(addr,HEX); - - if (addr == IP5306_ADDR) { - this->has_ip5306 = true; + Wire.beginTransmission(MAX17048_ADDR); + error = Wire.endTransmission(); + + if (error == 0) { + if (maxlipo.begin()) { + Serial.println("Detected MAX17048"); + this->has_max17048 = true; this->i2c_supported = true; } - - if (addr == MAX17048_ADDR) { - if (maxlipo.begin()) { - Serial.println("Detected MAX17048"); - this->has_max17048 = true; - this->i2c_supported = true; - } - } } - }*/ + #else + bool result = this->power.begin(Wire, AXP2101_SLAVE_ADDRESS, I2C_SDA, I2C_SCL); + + if (!result) + return; + + Serial.println("Detected AXP2101"); - /*if (this->maxlipo.begin()) { - Serial.println("Detected MAX17048"); - this->has_max17048 = true; this->i2c_supported = true; - }*/ + this->has_axp2101 = true; + #endif this->initTime = millis(); #endif @@ -120,4 +98,8 @@ int8_t BatteryInterface::getBatteryLevel() { else return percent; } + + if (this->has_axp2101) { + return this->power.getBatteryPercent(); + } } diff --git a/esp32_marauder/BatteryInterface.h b/esp32_marauder/BatteryInterface.h index bd0d2c4..d5748c9 100644 --- a/esp32_marauder/BatteryInterface.h +++ b/esp32_marauder/BatteryInterface.h @@ -8,6 +8,11 @@ #include "configs.h" #include "Adafruit_MAX1704X.h" +#ifdef HAS_AXP2101 + #define XPOWERS_CHIP_AXP2101 + #include "XPowersLib.h" +#endif + #include #define IP5306_ADDR 0x75 @@ -18,12 +23,17 @@ class BatteryInterface { uint32_t initTime = 0; Adafruit_MAX17048 maxlipo; + #ifdef HAS_AXP2101 + XPowersPMU power; + #endif + public: int8_t battery_level = 0; int8_t old_level = 0; bool i2c_supported = false; bool has_max17048 = false; bool has_ip5306 = false; + bool has_axp2101 = false; BatteryInterface(); diff --git a/esp32_marauder/configs.h b/esp32_marauder/configs.h index 4367517..4dee17b 100644 --- a/esp32_marauder/configs.h +++ b/esp32_marauder/configs.h @@ -27,7 +27,7 @@ //#define MARAUDER_CYD_2USB // Another 2432S028 but it has tWo UsBs OoOoOoO //#define MARAUDER_CYD_GUITION // ESP32-2432S024 GUITION //#define MARAUDER_C5 - //#define MARAUDER_CARDPUTER + #define MARAUDER_CARDPUTER //// END BOARD TARGETS #define MARAUDER_VERSION "v1.8.7" @@ -406,10 +406,6 @@ #define POWER_HOLD_PIN 4 #endif #endif - - #ifdef MARAUDER_CARDPUTER - #include "AXP2102_Class.h" - #endif //// END POWER MANAGEMENT //// BUTTON DEFINITIONS