board.cpp: Fix I2C1 initialization exception of CoreS3.

Signed-off-by: lbuque <[email protected]>

Author: lbuque

m5stack/board.cpp

@@ -8,12 +8,27 @@
 
 extern "C" {
     #include "uiflow_utility.h"
+    #include <driver/periph_ctrl.h>
 
     void board_init()
     {
         auto cfg = M5.config();
         cfg.output_power = false;
         M5.begin(cfg);
+        if (M5.getBoard() == m5::board_t::board_M5StackCoreS3) {
+            periph_module_disable(PERIPH_I2C1_MODULE);
+            i2c_config_t conf;
+            memset(&conf, 0, sizeof(i2c_config_t));
+            conf.mode = I2C_MODE_MASTER;
+            conf.sda_io_num = GPIO_NUM_12;
+            conf.sda_pullup_en = GPIO_PULLUP_ENABLE;
+            conf.scl_io_num = GPIO_NUM_11;
+            conf.scl_pullup_en = GPIO_PULLUP_ENABLE;
+            conf.master.clk_speed = 100000;
+            // .clk_flags = 0,          /*!< Optional, you can use I2C_SCLK_SRC_FLAG_* flags to choose i2c source clock here. */
+            i2c_param_config(I2C_NUM_1, &conf);
+            i2c_driver_install(I2C_NUM_1, I2C_MODE_MASTER, 0, 0, 0);
+        }
     }
 
     void power_init()

m5stack/components/M5Unified/M5GFX

@@ -35,6 +35,8 @@ extern "C"
 {
 #include "mpy_m5unified.h"
 #include "mphalport.h"
+#include <driver/i2c.h>
+#include <driver/periph_ctrl.h>
 
 typedef struct _machine_hw_i2c_obj_t {
     mp_obj_base_t base;
@@ -360,7 +362,23 @@ mp_obj_t m5_begin(size_t n_args, const mp_obj_t *args) {
 
     // initial
     M5.begin(cfg);
-    M5.In_I2C.release();
+    // if (M5.getBoard() == m5::board_t::board_M5StackCoreS3) {
+    //     periph_module_disable(PERIPH_I2C1_MODULE);
+    //     i2c_config_t conf;
+    //     memset(&conf, 0, sizeof(i2c_config_t));
+    //     conf.mode = I2C_MODE_MASTER;
+    //     conf.sda_io_num = GPIO_NUM_12;
+    //     conf.sda_pullup_en = GPIO_PULLUP_ENABLE;
+    //     conf.scl_io_num = GPIO_NUM_11;
+    //     conf.scl_pullup_en = GPIO_PULLUP_ENABLE;
+    //     conf.master.clk_speed = 100000;
+    //     // .clk_flags = 0,          /*!< Optional, you can use I2C_SCLK_SRC_FLAG_* flags to choose i2c source clock here. */
+    //     esp_err_t ret = i2c_param_config(I2C_NUM_1, &conf);
+    //     ESP_LOGE("*", "i2c_param_config: %d", ret);
+    //     ret = i2c_driver_install(I2C_NUM_1, I2C_MODE_MASTER, 0, 0, 0);
+    //     ESP_LOGE("*", "i2c_driver_install: %d", ret);
+    // }
+    // M5.In_I2C.release();
 
     M5.Display.clear();
     // default display