Remove sensor auto-detection (as requested).

* Pass a specific sensor object to Camera class.
* Update example to match API changes.

Author: iabdalkader

libraries/Portenta_Camera/examples/CameraCaptureRawBytes/CameraCaptureRawBytes.ino

@@ -1,9 +1,9 @@
 #include "camera.h"
 #include "SDRAM.h"
-
+#include "himax.h"
 //REDIRECT_STDOUT_TO(Serial);
 
-Camera cam;
+Camera cam(new HM01B0());
 uint8_t *fb = (uint8_t*) SDRAM_START_ADDRESS;
 
 void blink_error(uint32_t count)

libraries/Portenta_Camera/src/camera.cpp

@@ -305,30 +305,17 @@ int Camera::Reset()
     return 0;
 }
 
-ImageSensor *Camera::ProbeSensor()
+int Camera::ProbeSensor()
 {
     uint8_t addr;
-    ImageSensor *sensor = NULL;
-
     for (addr=1; addr<127; addr++) {
         Wire.beginTransmission(addr);
         if (Wire.endTransmission() == 0) {
             break;
         }
     }
 
-    switch (addr) {
-        case HM01B0_I2C_ADDR:
-            sensor = new HM01B0();
-            break;
-        case GC2145_I2C_ADDR:
-            sensor = new GC2145();
-            break;
-        default:
-            break;
-    }
-
-    return sensor;
+    return addr;
 }
 
 int Camera::begin(uint32_t resolution, uint32_t framerate)
@@ -348,8 +335,7 @@ int Camera::begin(uint32_t resolution, uint32_t framerate)
     Wire.begin();
     Wire.setClock(400000);
 
-    ImageSensor *sensor = ProbeSensor();
-    if (sensor == NULL) {
+    if (ProbeSensor() != this->sensor->GetID()) {
         return -1;
     }
 
@@ -359,20 +345,18 @@ int Camera::begin(uint32_t resolution, uint32_t framerate)
         HAL_Delay(10);
     }
 
-    if (sensor->Init() != 0) {
+    if (this->sensor->Init() != 0) {
         return -1;
     }
 
     if (BSP_CAMERA_Init() != 0) {
         return -1;
     }
 
-    // Must set sensor first before calling Camera methods.
-    this->sensor = sensor;
-
     if (SetResolution(resolution) != 0) {
         return -1;
     }
+
     return 0;
 }
 

libraries/Portenta_Camera/src/camera.h

@@ -1,3 +1,11 @@
+/*
+ * TODO: Add license.
+ * Copyright (c) 2021
+ *
+ * This work is licensed under <>, see the file LICENSE for details.
+ *
+ * Camera driver.
+ */
 #ifndef __CAMERA_H
 #define __CAMERA_H
 #include "Wire.h"
@@ -70,10 +78,10 @@ class Camera {
         uint32_t resolution;
         ImageSensor *sensor;
         int Reset();
-        ImageSensor *ProbeSensor();
+        int ProbeSensor();
     public:
-        Camera(): sensor(NULL){}
-        int begin(uint32_t resolution = CAMERA_R320x240, uint32_t framerate = 30);
+        Camera(ImageSensor *sensor): sensor(sensor){}
+        int begin(uint32_t resolution=CAMERA_R320x240, uint32_t framerate=30);
         int GetID();
         int SetFrameRate(uint32_t framerate);
         int SetResolution(uint32_t resolution);