diff --git a/hardware/BOM_邮票孔模块2023-07-04.xlsx b/hardware/BOM_邮票孔模块2023-07-04.xlsx index 6f46ea7..f64255f 100644 Binary files a/hardware/BOM_邮票孔模块2023-07-04.xlsx and b/hardware/BOM_邮票孔模块2023-07-04.xlsx differ diff --git a/software/ESP-IDF/PMU_AXP20x/.vscode/c_cpp_properties.json b/software/ESP-IDF/PMU_AXP20x/.vscode/c_cpp_properties.json new file mode 100644 index 0000000..f81a3a9 --- /dev/null +++ b/software/ESP-IDF/PMU_AXP20x/.vscode/c_cpp_properties.json @@ -0,0 +1,19 @@ +{ + "configurations": [ + { + "name": "Win32", + "includePath": [ + "${workspaceFolder}/**", + "C:\\Users\\69180\\Desktop\\PMU_AXP20x\\components/**", + "C:\\Espressif/**" + ], + "defines": [ + "_DEBUG", + "UNICODE", + "_UNICODE" + ], + "configurationProvider": "ms-vscode.makefile-tools" + } + ], + "version": 4 +} \ No newline at end of file diff --git a/software/ESP-IDF/PMU_AXP20x/.vscode/launch.json b/software/ESP-IDF/PMU_AXP20x/.vscode/launch.json new file mode 100644 index 0000000..c4b8cab --- /dev/null +++ b/software/ESP-IDF/PMU_AXP20x/.vscode/launch.json @@ -0,0 +1,35 @@ +{ + // 使用 IntelliSense 了解相关属性。 + // 悬停以查看现有属性的描述。 + // 欲了解更多信息,请访问: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "name": "(gdb) 启动", + "type": "cppdbg", + "request": "launch", + "program": "${workspaceFolder}/build/PMU_AXP202x.elf", + "args": [], + "stopAtEntry": false, + "cwd": "${workspaceFolder}", + "environment": [], + "externalConsole": false, + "MIMode": "gdb", + "miDebuggerPath": "C:/Espressif/tools/riscv32-esp-elf-gdb/11.2_20220823/riscv32-esp-elf-gdb/bin/riscv32-esp-elf-gdb.exe", + "setupCommands": [ + { + "description": "为 gdb 启用整齐打印", + "text": "-enable-pretty-printing", + "ignoreFailures": true + }, + { + "description": "将反汇编风格设置为 Intel", + "text": "-gdb-set disassembly-flavor intel", + "ignoreFailures": true + } + ] + } + + ] + +} \ No newline at end of file diff --git a/software/ESP-IDF/PMU_AXP20x/.vscode/settings.json b/software/ESP-IDF/PMU_AXP20x/.vscode/settings.json new file mode 100644 index 0000000..bf83d18 --- /dev/null +++ b/software/ESP-IDF/PMU_AXP20x/.vscode/settings.json @@ -0,0 +1,10 @@ +{ + "idf.adapterTargetName": "esp32s3", + "idf.openOcdConfigs": [ + "board/esp32s3-builtin.cfg" + ], + "idf.flashType": "JTAG", + "idf.portWin": "COM17", + "idf.flashBaudRate": "2000000", + "cmake.configureOnOpen": true +} \ No newline at end of file diff --git a/software/ESP-IDF/PMU_AXP20x/CMakeLists.txt b/software/ESP-IDF/PMU_AXP20x/CMakeLists.txt index db9fe74..34665ba 100644 --- a/software/ESP-IDF/PMU_AXP20x/CMakeLists.txt +++ b/software/ESP-IDF/PMU_AXP20x/CMakeLists.txt @@ -3,4 +3,4 @@ cmake_minimum_required(VERSION 3.5) include($ENV{IDF_PATH}/tools/cmake/project.cmake) -project(PMU_AXP202) +project(PMU_AXP202x) diff --git a/software/ESP-IDF/PMU_AXP20x/Makefile b/software/ESP-IDF/PMU_AXP20x/Makefile index 2ab275c..d80bc1e 100644 --- a/software/ESP-IDF/PMU_AXP20x/Makefile +++ b/software/ESP-IDF/PMU_AXP20x/Makefile @@ -3,7 +3,7 @@ # project subdirectory. # -PROJECT_NAME := PMU_AXP202 +PROJECT_NAME := PMU_AXP202x include $(IDF_PATH)/make/project.mk diff --git a/software/ESP-IDF/PMU_AXP20x/README.md b/software/ESP-IDF/PMU_AXP20x/README.md index e257431..e69de29 100644 --- a/software/ESP-IDF/PMU_AXP20x/README.md +++ b/software/ESP-IDF/PMU_AXP20x/README.md @@ -1 +0,0 @@ -基本的功能验证,需要在menuconfig设置I2C与IRQ引脚 \ No newline at end of file diff --git a/software/ESP-IDF/PMU_AXP20x/components/AXP202X_Library/src/axp20x.cpp b/software/ESP-IDF/PMU_AXP20x/components/AXP202X_Library/src/axp20x.cpp index 0e4e0d3..e52f3d3 100644 --- a/software/ESP-IDF/PMU_AXP20x/components/AXP202X_Library/src/axp20x.cpp +++ b/software/ESP-IDF/PMU_AXP20x/components/AXP202X_Library/src/axp20x.cpp @@ -1307,6 +1307,15 @@ int AXP20X_Class::setMeteringSystem(bool en) return AXP_PASS; } +int AXP20X_Class::setChgLEDContrl(axp_chgled_control_t opt) +{ + uint8_t val = 0; + _readByte(AXP202_OFF_CTL, 1, &val); + val &= 0b11110111; + val |= opt; + _writeByte(AXP202_OFF_CTL, 1, &val); + return AXP_PASS; +} int AXP20X_Class::setChgLEDMode(axp_chgled_mode_t mode) { @@ -2285,3 +2294,5 @@ int AXP20X_Class::_writeByte(uint8_t reg, uint8_t nbytes, uint8_t *data) #endif return 0; } + +AXP20X_Class axp; diff --git a/software/ESP-IDF/PMU_AXP20x/components/AXP202X_Library/src/axp20x.hpp b/software/ESP-IDF/PMU_AXP20x/components/AXP202X_Library/src/axp20x.hpp index 376fd8b..0fcc7f8 100644 --- a/software/ESP-IDF/PMU_AXP20x/components/AXP202X_Library/src/axp20x.hpp +++ b/software/ESP-IDF/PMU_AXP20x/components/AXP202X_Library/src/axp20x.hpp @@ -39,6 +39,10 @@ github:https://github.com/lewisxhe/AXP202X_Libraries ///////////////////////////////////////////////////////////////// #pragma once +#ifdef __cplusplus +extern "C" { +#endif + #ifdef ARDUINO #include #include @@ -484,11 +488,16 @@ typedef enum { AXP202_LDO5_3500MV, } axp_ldo5_table_t; +typedef enum { + AXP20X_LED_CHARGING_CTL = 0, + AXP20X_LED_REG_32H_CTL = 1, +} axp_chgled_control_t; + typedef enum { AXP20X_LED_OFF, AXP20X_LED_BLINK_1HZ, AXP20X_LED_BLINK_4HZ, - AXP20X_LED_LOW_LEVEL, + AXP20X_LED_LOW_LEVEL, //Still Light } axp_chgled_mode_t; typedef enum { @@ -840,7 +849,8 @@ public: int enableIRQ(uint64_t params, bool en); int readIRQ(void); void clearIRQ(void); - + + int setChgLEDContrl(axp_chgled_control_t opt); int setChgLEDMode(axp_chgled_mode_t mode); //! Only AXP202 support @@ -943,3 +953,9 @@ private: #endif bool _isAxp173; }; + +extern AXP20X_Class axp; + +#ifdef __cplusplus +} +#endif diff --git a/software/ESP-IDF/PMU_AXP20x/gdbinit b/software/ESP-IDF/PMU_AXP20x/gdbinit new file mode 100644 index 0000000..78bd5ec --- /dev/null +++ b/software/ESP-IDF/PMU_AXP20x/gdbinit @@ -0,0 +1,7 @@ +@REM set remotetimeout 100 +target remote :3333 +set remote hardware-watchpoint-limit 2 +mon reset halt +flushregs +thb app_main +c \ No newline at end of file diff --git a/software/ESP-IDF/PMU_AXP20x/main/main.cpp b/software/ESP-IDF/PMU_AXP20x/main/main.cpp index 251e34c..16738a5 100644 --- a/software/ESP-IDF/PMU_AXP20x/main/main.cpp +++ b/software/ESP-IDF/PMU_AXP20x/main/main.cpp @@ -42,9 +42,6 @@ static const char *TAG = "AXP20x"; // //! ESP32C3只有I2C_NUM_0一个I2C通道 -AXP20X_Class axp; - - static QueueHandle_t gpio_evt_queue = NULL; static void IRAM_ATTR axp_isr_handler(void *arg) @@ -55,7 +52,6 @@ static void IRAM_ATTR axp_isr_handler(void *arg) static void axp_irq_init() { - static gpio_config_t io_conf; //enable interrupt io_conf.intr_type = GPIO_INTR_NEGEDGE; @@ -79,74 +75,127 @@ static void axp_irq_init() gpio_evt_queue = xQueueCreate(10, sizeof(uint32_t)); } +static void axp_config_init() +{ + if (axp.begin(twi_read, twi_write, AXP202_SLAVE_ADDRESS)) + { + ESP_LOGE(TAG, "Error init axp20x !!!"); + while (1); + } + ESP_LOGI(TAG, "Success init axp20x !!!"); + + // 两个警告等级(类似于手机20%一提醒,10%一提醒)和一个关机电压(类似于手机3%关机,实际显示0%) + axp.setVWarningLevel1(3450); + axp.setVWarningLevel2(3400); + axp.setPowerDownVoltage(2600); + uint16_t level1 = axp.getVWarningLevel1(); + uint16_t level2 = axp.getVWarningLevel2(); + uint16_t level3 = axp.getPowerDownVoltage(); + ESP_LOGI(TAG, "getVWarningLevel1:%u mV", level1 ); + ESP_LOGI(TAG, "getVWarningLevel2:%u mV", level2); + ESP_LOGI(TAG, "getPowerDonwLevel3:%u mV", level3); + + axp.setPowerOutPut(AXP202_DCDC3, AXP202_ON); // 主控供电,十轴传感器供电 + axp.setPowerOutPut(AXP202_DCDC2, AXP202_ON); + + axp.setLDO2Voltage(3300); // 屏幕与SD卡供电 + axp.setPowerOutPut(AXP202_LDO2, AXP202_ON); + + axp.setLDO4Voltage(AXP202_LDO4_3300MV); // 音频供电 + axp.setPowerOutPut(AXP202_LDO4, AXP202_ON); + + axp.setLDO3Voltage(3500); // 触觉驱动器供电 + axp.setPowerOutPut(AXP202_LDO3, AXP202_ON); + + axp.setPowerOutPut(AXP202_EXTEN, AXP202_ON); + + if (axp.isDCDC2Enable()) + { + ESP_LOGI(TAG, "DC2: %u mV", axp.getDCDC2Voltage()); + } + else + { + ESP_LOGI(TAG, "DC2: DISABLE"); + } + + if (axp.isDCDC3Enable()) + { + ESP_LOGI(TAG, "DC3: %u mV", axp.getDCDC3Voltage()); + } + else + { + ESP_LOGI(TAG, "DC3: DISABLE"); + } + + if (axp.isLDO2Enable()) + { + ESP_LOGI(TAG, "LDO2: %u mV", axp.getLDO2Voltage()); + } + else + { + ESP_LOGI(TAG, "LDO2: DISABLE"); + } + + if (axp.isLDO3Enable()) + { + ESP_LOGI(TAG, "LDO3: %u mV", axp.getLDO3Voltage()); + } + else + { + ESP_LOGI(TAG, "LDO3: DISABLE"); + } + + if (axp.isLDO4Enable()) + { + ESP_LOGI(TAG, "LDO4: %u mV", axp.getLDO4Voltage()); + } + else + { + ESP_LOGI(TAG, "LDO4: DISABLE"); + } + + if (axp.isExtenEnable()) + { + ESP_LOGI(TAG, "Exten: ENABLE"); + } + else + { + ESP_LOGI(TAG, "Exten: DISABLE"); + } + + // When the chip is axp192 / 173, the allowed values are 0 ~ 15, + // corresponding to the axp1xx_charge_current_t enumeration + // axp.setChargeControlCur(AXP1XX_CHARGE_CUR_550MA); + + // axp202 allows maximum charging current of 1800mA, minimum 300mA + axp.setChargeControlCur(300); + + axp.setChgLEDContrl(AXP20X_LED_CHARGING_CTL); // CHGLED由充电状态控制 + axp.setChgLEDChargingMode(AXP20X_LED_LIGHT_WHEN_CHARGING); // CHGLED由充电状态控制模式 + // axp.setChgLEDContrl(AXP20X_LED_REG_32H_CTL); // CHGLED由REG32H控制 + // axp.setChgLEDMode(AXP20X_LED_BLINK_4HZ); // CHGLED由REG32H控制模式 + + ESP_LOGI(TAG, "setChargeControlCur:%u", axp.getChargeControlCur()); + ESP_LOGI(TAG, "getCoreTemp:%.2f C", axp.getTemp()); + + // Backup battery charge control + // Backup Battery model: KTS CR2032W 3.0V 220mAh + axp.setBackupChargeControl(AXP202_ON); + axp.setBackupChargeVoltage(AXP202_BACKUP_VOLTAGE_3V0); + axp.setBackupChargeCurrent(AXP202_BACKUP_CURRENT_100UA); + + axp.setGPIOMode(AXP_GPIO_0, AXP_IO_OUTPUT_HIGH_MODE); // 打开主板指示灯PIO0 + axp.gpioWrite(AXP_GPIO_0, 1); +} + + extern "C" void app_main(void) { ESP_ERROR_CHECK(i2c_master_init()); axp_irq_init(); - if (axp.begin(twi_read, twi_write, AXP202_SLAVE_ADDRESS)) { - ESP_LOGE(TAG, "Error init axp20x !!!"); - while (1); - } - ESP_LOGI(TAG, "Success init axp20x !!!"); - - axp.setPowerOutPut(AXP202_DCDC3, AXP202_ON); - axp.setPowerOutPut(AXP202_EXTEN, AXP202_ON); - axp.setPowerOutPut(AXP202_LDO2, AXP202_ON); - axp.setPowerOutPut(AXP202_LDO4, AXP202_ON); - axp.setPowerOutPut(AXP202_DCDC2, AXP202_ON); - axp.setLDO4Voltage(AXP202_LDO4_3300MV); - axp.setLDO3Voltage(3500); - axp.setPowerOutPut(AXP202_LDO3, AXP202_ON); - - if ( axp.isDCDC2Enable()) { - ESP_LOGI(TAG, "DC2: %u mV", axp.getDCDC2Voltage()); - } else { - ESP_LOGI(TAG, "DC2: DISABLE"); - } - - if (axp.isDCDC3Enable()) { - ESP_LOGI(TAG, "DC3: %u mV", axp.getDCDC3Voltage()); - } else { - ESP_LOGI(TAG, "DC3: DISABLE"); - } - - if (axp.isLDO2Enable()) { - ESP_LOGI(TAG, "LDO2: %u mV", axp.getLDO2Voltage()); - } else { - ESP_LOGI(TAG, "LDO2: DISABLE"); - } - - if (axp.isLDO3Enable()) { - ESP_LOGI(TAG, "LDO3: %u mV", axp.getLDO3Voltage()); - } else { - ESP_LOGI(TAG, "LDO3: DISABLE"); - } - - if (axp.isLDO4Enable()) { - ESP_LOGI(TAG, "LDO4: %u mV", axp.getLDO4Voltage()); - } else { - ESP_LOGI(TAG, "LDO4: DISABLE"); - } - - if (axp.isExtenEnable()) { - ESP_LOGI(TAG, "Exten: ENABLE"); - } else { - ESP_LOGI(TAG, "Exten: DISABLE"); - } - - //When the chip is axp192 / 173, the allowed values are 0 ~ 15, - //corresponding to the axp1xx_charge_current_t enumeration - // axp.setChargeControlCur(AXP1XX_CHARGE_CUR_550MA); - - //axp202 allows maximum charging current of 1800mA, minimum 300mA - axp.setChargeControlCur(300); - - ESP_LOGI(TAG, "setChargeControlCur:%u", axp.getChargeControlCur()); - - axp.setGPIOMode(AXP_GPIO_0, AXP_IO_OUTPUT_HIGH_MODE); - axp.gpioWrite(AXP_GPIO_0, 1); + axp_config_init(); //! Enable all irq channel axp.enableIRQ(AXP202_ALL_IRQ, true); @@ -167,3 +216,4 @@ extern "C" void app_main(void) } } } +