Update esp-idf example

lewisxhe · Jan 9, 2024 · af62c5b · af62c5b
1 parent 5253b15
commit af62c5b
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 5 deletions.
diff --git a/examples/ESP_IDF_Example/main/Kconfig.projbuild b/examples/ESP_IDF_Example/main/Kconfig.projbuild
@@ -13,6 +13,18 @@ menu "XPowersLib Configuration"
             bool "Xpowers AXP192"
     endchoice
 
+    choice I2C_COMMUNICATION_METHOD
+        prompt "XPowersLIb read and write methods"
+        default I2C_COMMUNICATION_METHOD_BUILTIN_RW
+        help
+            Define XPowersLIb read and write methods
+
+        config I2C_COMMUNICATION_METHOD_BUILTIN_RW
+            bool "Implemented using built-in read and write methods"
+        config I2C_COMMUNICATION_METHOD_CALLBACK_RW
+            bool "Implemented using read and write callback methods"
+    endchoice
+
     config I2C_MASTER_PORT_NUM
         int "PMU I2C Port Number"
         default 1

diff --git a/examples/ESP_IDF_Example/main/main.cpp b/examples/ESP_IDF_Example/main/main.cpp
@@ -61,14 +61,17 @@ extern "C" void app_main(void)
     // Register PMU interrupt pins
     irq_init();
 
+#if CONFIG_I2C_COMMUNICATION_METHOD_CALLBACK_RW
     ESP_ERROR_CHECK(i2c_init());
-
     ESP_LOGI(TAG, "I2C initialized successfully");
+#endif
 
     ESP_ERROR_CHECK(pmu_init());
 
     xTaskCreate(pmu_hander_task, "App/pwr", 4 * 1024, NULL, 10, NULL);
 
+    ESP_LOGI(TAG, "Run...");
+
 }
 
 

diff --git a/examples/ESP_IDF_Example/main/port_axp192.cpp b/examples/ESP_IDF_Example/main/port_axp192.cpp
@@ -18,12 +18,27 @@ extern int pmu_register_write_byte(uint8_t devAddr, uint8_t regAddr, uint8_t *da
 
 esp_err_t pmu_init()
 {
+    //* Implemented using read and write callback methods, applicable to other platforms
+#if CONFIG_I2C_COMMUNICATION_METHOD_CALLBACK_RW
+    ESP_LOGI(TAG, "Implemented using read and write callback methods");
     if (PMU.begin(AXP192_SLAVE_ADDRESS, pmu_register_read, pmu_register_write_byte)) {
         ESP_LOGI(TAG, "Init PMU SUCCESS!");
     } else {
         ESP_LOGE(TAG, "Init PMU FAILED!");
         return ESP_FAIL;
     }
+#endif
+
+    //* Use the built-in esp-idf communication method
+#if CONFIG_I2C_COMMUNICATION_METHOD_BUILTIN_RW
+    ESP_LOGI(TAG, "Implemented using built-in read and write methods");
+    if (PMU.begin((i2c_port_t)CONFIG_I2C_MASTER_PORT_NUM, AXP192_SLAVE_ADDRESS, CONFIG_PMU_I2C_SDA, CONFIG_PMU_I2C_SCL)) {
+        ESP_LOGI(TAG, "Init PMU SUCCESS!");
+    } else {
+        ESP_LOGE(TAG, "Init PMU FAILED!");
+        return false;
+    }
+#endif
 
     ESP_LOGI(TAG, "getID:0x%x", PMU.getChipID());
 

diff --git a/examples/ESP_IDF_Example/main/port_axp2101.cpp b/examples/ESP_IDF_Example/main/port_axp2101.cpp
@@ -3,6 +3,7 @@
 #include "sdkconfig.h"
 #include "esp_log.h"
 #include "esp_err.h"
+#include "driver/i2c.h"
 
 #ifdef CONFIG_XPOWERS_CHIP_AXP2101
 
@@ -18,13 +19,27 @@ extern int pmu_register_write_byte(uint8_t devAddr, uint8_t regAddr, uint8_t *da
 
 esp_err_t pmu_init()
 {
+    //* Implemented using read and write callback methods, applicable to other platforms
+#if CONFIG_I2C_COMMUNICATION_METHOD_CALLBACK_RW
+    ESP_LOGI(TAG, "Implemented using read and write callback methods");
     if (PMU.begin(AXP2101_SLAVE_ADDRESS, pmu_register_read, pmu_register_write_byte)) {
         ESP_LOGI(TAG, "Init PMU SUCCESS!");
     } else {
         ESP_LOGE(TAG, "Init PMU FAILED!");
         return ESP_FAIL;
     }
+#endif
 
+    //* Use the built-in esp-idf communication method
+#if CONFIG_I2C_COMMUNICATION_METHOD_BUILTIN_RW
+    ESP_LOGI(TAG, "Implemented using built-in read and write methods");
+    if (PMU.begin((i2c_port_t)CONFIG_I2C_MASTER_PORT_NUM, AXP2101_SLAVE_ADDRESS, CONFIG_PMU_I2C_SDA, CONFIG_PMU_I2C_SCL)) {
+        ESP_LOGI(TAG, "Init PMU SUCCESS!");
+    } else {
+        ESP_LOGE(TAG, "Init PMU FAILED!");
+        return false;
+    }
+#endif
     //Turn off not use power channel
     PMU.disableDC2();
     PMU.disableDC3();
@@ -134,9 +149,9 @@ esp_err_t pmu_init()
     // Set the watchdog trigger event type
     // PMU.setWatchdogConfig(XPOWERS_AXP2101_WDT_IRQ_TO_PIN);
     // Set watchdog timeout
-    // PMU.setWatchdogTimeout(XPOWERS_AXP2101_WDT_TIMEOUT_4S);
+    PMU.setWatchdogTimeout(XPOWERS_AXP2101_WDT_TIMEOUT_4S);
     // Enable watchdog to trigger interrupt event
-    // PMU.enableWatchdog();
+    PMU.enableWatchdog();
     return ESP_OK;
 }
 

diff --git a/examples/ESP_IDF_Example/main/port_i2c.cpp b/examples/ESP_IDF_Example/main/port_i2c.cpp
@@ -9,7 +9,7 @@
 
 static const char *TAG = "XPowersLib";
 
-
+#if CONFIG_I2C_COMMUNICATION_METHOD_CALLBACK_RW
 #define I2C_MASTER_NUM                  (i2c_port_t)CONFIG_I2C_MASTER_PORT_NUM
 #define I2C_MASTER_FREQ_HZ              CONFIG_I2C_MASTER_FREQUENCY /*!< I2C master clock frequency */
 #define I2C_MASTER_SDA_IO               (gpio_num_t)CONFIG_PMU_I2C_SDA
@@ -106,4 +106,5 @@ esp_err_t i2c_init(void)
     i2c_conf.master.clk_speed = I2C_MASTER_FREQ_HZ;
     i2c_param_config(I2C_MASTER_NUM, &i2c_conf);
     return i2c_driver_install(I2C_MASTER_NUM, i2c_conf.mode, I2C_MASTER_RX_BUF_DISABLE, I2C_MASTER_TX_BUF_DISABLE, 0);
-}
+}
+#endif