Commit 0c9a574

iabdalkadergiulcioffi

authored and

committed

Remove sensor auto-detection (as requested).

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

1 parent 143068b commit 0c9a574Copy full SHA for 0c9a574

File tree

3 files changed

+18

-26

lines changed

libraries/Portenta_Camera
- examples/CameraCaptureRawBytes
  - CameraCaptureRawBytes.ino
- src
  - camera.cpp
  - camera.h

3 files changed

+18

-26

lines changed

`‎libraries/Portenta_Camera/examples/CameraCaptureRawBytes/CameraCaptureRawBytes.ino‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`#include "camera.h"`
`2`	`2`	`#include "SDRAM.h"`
`3`		`-`
	`3`	`+#include"himax.h"`
`4`	`4`	`//REDIRECT_STDOUT_TO(Serial);`
`5`	`5`
`6`		`-Camera cam;`
	`6`	`+Camera cam(new HM01B0());`
`7`	`7`	`uint8_t fb = (uint8_t) SDRAM_START_ADDRESS;`
`8`	`8`
`9`	`9`	`void blink_error(uint32_t count)`

`‎libraries/Portenta_Camera/src/camera.cpp‎`

Lines changed: 5 additions & 21 deletions

Original file line number	Diff line number	Diff line change
`@@ -305,30 +305,17 @@ int Camera::Reset()`
`305`	`305`	`return 0;`
`306`	`306`	`}`
`307`	`307`
`308`		`-ImageSensor *Camera::ProbeSensor()`
	`308`	`+intCamera::ProbeSensor()`
`309`	`309`	`{`
`310`	`310`	`uint8_t addr;`
`311`		`- ImageSensor *sensor = NULL;`
`312`		`-`
`313`	`311`	`for (addr=1; addr<127; addr++) {`
`314`	`312`	`Wire.beginTransmission(addr);`
`315`	`313`	`if (Wire.endTransmission() == 0) {`
`316`	`314`	`break;`
`317`	`315`	`}`
`318`	`316`	`}`
`319`	`317`
`320`		`- switch (addr) {`
`321`		`- case HM01B0_I2C_ADDR:`
`322`		`- sensor = new HM01B0();`
`323`		`- break;`
`324`		`- case GC2145_I2C_ADDR:`
`325`		`- sensor = new GC2145();`
`326`		`- break;`
`327`		`- default:`
`328`		`- break;`
`329`		`- }`
`330`		`-`
`331`		`- return sensor;`
	`318`	`+ return addr;`
`332`	`319`	`}`
`333`	`320`
`334`	`321`	`int Camera::begin(uint32_t resolution, uint32_t framerate)`
`@@ -348,8 +335,7 @@ int Camera::begin(uint32_t resolution, uint32_t framerate)`
`348`	`335`	`Wire.begin();`
`349`	`336`	`Wire.setClock(400000);`
`350`	`337`
`351`		`- ImageSensor *sensor = ProbeSensor();`
`352`		`- if (sensor == NULL) {`
	`338`	`+ if (ProbeSensor() != this->sensor->GetID()) {`
`353`	`339`	`return -1;`
`354`	`340`	`}`
`355`	`341`
`@@ -359,20 +345,18 @@ int Camera::begin(uint32_t resolution, uint32_t framerate)`
`359`	`345`	`HAL_Delay(10);`
`360`	`346`	`}`
`361`	`347`
`362`		`- if (sensor->Init() != 0) {`
	`348`	`+ if (this->sensor->Init() != 0) {`
`363`	`349`	`return -1;`
`364`	`350`	`}`
`365`	`351`
`366`	`352`	`if (BSP_CAMERA_Init() != 0) {`
`367`	`353`	`return -1;`
`368`	`354`	`}`
`369`	`355`
`370`		`- // Must set sensor first before calling Camera methods.`
`371`		`- this->sensor = sensor;`
`372`		`-`
`373`	`356`	`if (SetResolution(resolution) != 0) {`
`374`	`357`	`return -1;`
`375`	`358`	`}`
	`359`	`+`
`376`	`360`	`return 0;`
`377`	`361`	`}`
`378`	`362`

`‎libraries/Portenta_Camera/src/camera.h‎`

Lines changed: 11 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,11 @@`
	`1`	`+/*`
	`2`	`+ * TODO: Add license.`
	`3`	`+ * Copyright (c) 2021`
	`4`	`+ *`
	`5`	`+ * This work is licensed under <>, see the file LICENSE for details.`
	`6`	`+ *`
	`7`	`+ * Camera driver.`
	`8`	`+ */`
`1`	`9`	`#ifndef __CAMERA_H`
`2`	`10`	`#define __CAMERA_H`
`3`	`11`	`#include "Wire.h"`
`@@ -70,10 +78,10 @@ class Camera {`
`70`	`78`	`uint32_t resolution;`
`71`	`79`	`ImageSensor *sensor;`
`72`	`80`	`int Reset();`
`73`		`- ImageSensor *ProbeSensor();`
	`81`	`+ intProbeSensor();`
`74`	`82`	`public:`
`75`		`- Camera(): sensor(NULL){}`
`76`		`- int begin(uint32_t resolution = CAMERA_R320x240, uint32_t framerate = 30);`
	`83`	`+ Camera(ImageSensor *sensor): sensor(sensor){}`
	`84`	`+ int begin(uint32_t resolution=CAMERA_R320x240, uint32_t framerate=30);`
`77`	`85`	`int GetID();`
`78`	`86`	`int SetFrameRate(uint32_t framerate);`
`79`	`87`	`int SetResolution(uint32_t resolution);`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 0c9a574

File tree

3 files changed

3 files changed

`‎libraries/Portenta_Camera/examples/CameraCaptureRawBytes/CameraCaptureRawBytes.ino‎`

`‎libraries/Portenta_Camera/src/camera.cpp‎`

`‎libraries/Portenta_Camera/src/camera.h‎`

0 commit comments