fixed camera init i2c bus conflict issues

Author: Gitshaoxiang

examples/Basic/camera/camera.ino

@@ -25,7 +25,8 @@
 
 // #define CONVERT_TO_JPEG
 
-void setup() {
+void setup()
+{
     auto cfg = M5.config();
     CoreS3.begin(cfg);
     CoreS3.Display.setTextColor(GREEN);
@@ -34,28 +35,22 @@ void setup() {
     CoreS3.Display.setTextSize(1);
 
     if (!CoreS3.Camera.begin()) {
-        CoreS3.Display.drawString("Camera Init Fail",
-                                  CoreS3.Display.width() / 2,
-                                  CoreS3.Display.height() / 2);
+        CoreS3.Display.drawString("Camera Init Fail", CoreS3.Display.width() / 2, CoreS3.Display.height() / 2);
     }
-    CoreS3.Display.drawString("Camera Init Success", CoreS3.Display.width() / 2,
-                              CoreS3.Display.height() / 2);
-
-    CoreS3.Camera.sensor->set_framesize(CoreS3.Camera.sensor, FRAMESIZE_QVGA);
+    CoreS3.Display.drawString("Camera Init Success", CoreS3.Display.width() / 2, CoreS3.Display.height() / 2);
 }
 
-void loop() {
+void loop()
+{
     if (CoreS3.Camera.get()) {
 #ifdef CONVERT_TO_JPEG
         uint8_t *out_jpg   = NULL;
         size_t out_jpg_len = 0;
         frame2jpg(CoreS3.Camera.fb, 255, &out_jpg, &out_jpg_len);
-        CoreS3.Display.drawJpg(out_jpg, out_jpg_len, 0, 0,
-                               CoreS3.Display.width(), CoreS3.Display.height());
+        CoreS3.Display.drawJpg(out_jpg, out_jpg_len, 0, 0, CoreS3.Display.width(), CoreS3.Display.height());
         free(out_jpg);
 #else
-        CoreS3.Display.pushImage(0, 0, CoreS3.Display.width(),
-                                 CoreS3.Display.height(),
+        CoreS3.Display.pushImage(0, 0, CoreS3.Display.width(), CoreS3.Display.height(),
                                  (uint16_t *)CoreS3.Camera.fb->buf);
 #endif
 

src/utility/GC0308.cpp

@@ -29,10 +29,11 @@ static camera_config_t camera_config = {
     .fb_count      = 2,
     .fb_location   = CAMERA_FB_IN_PSRAM,
     .grab_mode     = CAMERA_GRAB_WHEN_EMPTY,
-    .sccb_i2c_port = M5.In_I2C.getPort(),
+    .sccb_i2c_port = -1,
 };
 
-bool GC0308::begin() {
+bool GC0308::begin()
+{
     M5.In_I2C.release();
     esp_err_t err = esp_camera_init(&camera_config);
     if (err != ESP_OK) {
@@ -42,15 +43,17 @@ bool GC0308::begin() {
     return true;
 }
 
-bool GC0308::get() {
+bool GC0308::get()
+{
     fb = esp_camera_fb_get();
     if (!fb) {
         return false;
     }
     return true;
 }
 
-bool GC0308::free() {
+bool GC0308::free()
+{
     if (fb) {
         esp_camera_fb_return(fb);
         return true;