Separate setResolutionWithZoom() and setResolution()

Adds back the setResolution() function to the camera drivers by calling setResolutionWithZoom() with default parameters.

Author: Alrik Vidstrom

libraries/Camera/src/camera.cpp

@@ -547,7 +547,7 @@ int Camera::setResolutionWithZoom(int32_t resolution, int32_t zoom_resolution, i
  }
  HAL_DCMI_ConfigCROP(&hdcmi, 0, 0, bpl - 1, restab[final_resolution][1] - 1);
 
- if (this->sensor->setResolution(resolution, zoom_resolution, zoom_x, zoom_y) == 0) {
+ if (this->sensor->setResolutionWithZoom(resolution, zoom_resolution, zoom_x, zoom_y) == 0) {
  this->resolution = final_resolution;
  return 0;
  }

libraries/Camera/src/camera.h

@@ -215,7 +215,9 @@ class ImageSensor {
  * @param zoom_y The desired y position of the zoom window.
  * @return int 0 on success, non-zero on failure
  */
- virtual int setResolution(int32_t resolution, int32_t zoom_resolution, uint32_t zoom_x, uint32_t zoom_y) = 0;
+ virtual int setResolutionWithZoom(int32_t resolution, int32_t zoom_resolution, uint32_t zoom_x, uint32_t zoom_y) = 0;
+
+ virtual int setResolution(int32_t resolution) = 0;
 
  /**
  * @brief Set the pixel (color) format of the image sensor.
@@ -531,7 +533,7 @@ class Camera {
  int zoomTo(int32_t zoom_resolution, uint32_t zoom_x, uint32_t zoom_y);
  int zoomToCenter(int32_t zoom_resolution);
  int setVerticalFlip(bool flip_enable);
- int setHorizontalMirror(bool mirror_enable;
+ int setHorizontalMirror(bool mirror_enable);
  uint32_t getResolutionWidth();
  uint32_t getResolutionHeight();
 

libraries/GC2145/gc2145.cpp

@@ -787,7 +787,12 @@ int GC2145::setHorizontalMirror(bool mirror_enable)
  return ((0 == retVal) ? 0 : -1);
 }
 
-int GC2145::setResolution(int32_t resolution, int32_t zoom_resolution, uint32_t zoom_x, uint32_t zoom_y)
+int GC2145::setResolution(int32_t resolution)
+{
+ setResolutionWithZoom(resolution, resolution, 0, 0);
+}
+
+int GC2145::setResolutionWithZoom(int32_t resolution, int32_t zoom_resolution, uint32_t zoom_x, uint32_t zoom_y)
 {
  int ret = 0;
 

libraries/GC2145/gc2145.h

@@ -39,7 +39,8 @@ class GC2145: public ImageSensor {
  bool getMono() { return false; };
  uint32_t getClockFrequency() { return 12000000; };
  int setFrameRate(int32_t framerate);
- int setResolution(int32_t resolution, int32_t zoom_resolution, uint32_t zoom_x, uint32_t zoom_y);
+ int setResolutionWithZoom(int32_t resolution, int32_t zoom_resolution, uint32_t zoom_x, uint32_t zoom_y);
+ int setResolution(int32_t resolution);
  int setPixelFormat(int32_t pixformat);
  int enableMotionDetection(md_callback_t callback) { return 0; };
  int disableMotionDetection() { return 0; };
@@ -50,5 +51,5 @@ class GC2145: public ImageSensor {
  int setHorizontalMirror(bool mirror_enable);
  void debug(Stream &stream);
 };
- 
+
 #endif /* __GC2145_H */

libraries/Himax_HM01B0/himax.cpp

@@ -351,7 +351,12 @@ int HM01B0::setHorizontalMirror(bool mirror_enable)
  return -1;
 }
 
-int HM01B0::setResolution(int32_t resolution, int32_t zoom_resolution, uint32_t zoom_x, uint32_t zoom_y)
+int HM01B0::setResolution(int32_t resolution)
+{
+ setResolutionWithZoom(resolution, resolution, 0, 0);
+}
+
+int HM01B0::setResolutionWithZoom(int32_t resolution, int32_t zoom_resolution, uint32_t zoom_x, uint32_t zoom_y)
 {
  int ret = 0;
 

libraries/Himax_HM01B0/himax.h

@@ -40,7 +40,8 @@ class HM01B0: public ImageSensor {
  bool getMono() { return true; };
  uint32_t getClockFrequency() { return 6000000; };
  int setFrameRate(int32_t framerate);
- int setResolution(int32_t resolution, int32_t zoom_resolution, uint32_t zoom_x, uint32_t zoom_y);
+ int setResolutionWithZoom(int32_t resolution, int32_t zoom_resolution, uint32_t zoom_x, uint32_t zoom_y);
+ int setResolution(int32_t resolution);
  int setPixelFormat(int32_t pixformat);
  int setTestPattern(bool enable, bool walking) override;
  int enableMotionDetection(md_callback_t callback=NULL);

libraries/Himax_HM0360/hm0360.cpp

@@ -596,7 +596,12 @@ int HM0360::setHorizontalMirror(bool mirror_enable)
  return -1;
 }
 
-int HM0360::setResolution(int32_t resolution, int32_t zoom_resolution, uint32_t zoom_x, uint32_t zoom_y)
+int HM0360::setResolution(int32_t resolution)
+{
+ setResolutionWithZoom(resolution, resolution, 0, 0);
+}
+
+int HM0360::setResolutionWithZoom(int32_t resolution, int32_t zoom_resolution, uint32_t zoom_x, uint32_t zoom_y)
 {
  int ret = 0;
 

libraries/Himax_HM0360/hm0360.h

@@ -40,7 +40,8 @@ class HM0360: public ImageSensor {
  bool getMono() { return true; };
  uint32_t getClockFrequency() { return 24000000; };
  int setFrameRate(int32_t framerate);
- int setResolution(int32_t resolution, int32_t zoom_resolution, uint32_t zoom_x, uint32_t zoom_y);
+ int setResolutionWithZoom(int32_t resolution, int32_t zoom_resolution, uint32_t zoom_x, uint32_t zoom_y);
+ int setResolution(int32_t resolution);
  int setPixelFormat(int32_t pixformat);
  int setTestPattern(bool enable, bool walking) override;
  int enableMotionDetection(md_callback_t callback=NULL);

libraries/OV7670/ov7670.cpp

@@ -707,7 +707,12 @@ int OV7670::setHorizontalMirror(bool mirror_enable)
  return -1;
 }
 
-int OV7670::setResolution(int32_t resolution, int32_t zoom_resolution, uint32_t zoom_x, uint32_t zoom_y)
+int OV7670::setResolution(int32_t resolution)
+{
+ setResolutionWithZoom(resolution, resolution, 0, 0);
+}
+
+int OV7670::setResolutionWithZoom(int32_t resolution, int32_t zoom_resolution, uint32_t zoom_x, uint32_t zoom_y)
 {
  int ret = 0;
 

libraries/OV7670/ov767x.h

@@ -45,7 +45,8 @@ class OV7670: public ImageSensor {
  bool getMono() { return false; };
  uint32_t getClockFrequency() { return 12000000; };
  int setFrameRate(int32_t framerate);
- int setResolution(int32_t resolution, int32_t zoom_resolution, uint32_t zoom_x, uint32_t zoom_y);
+ int setResolutionWithZoom(int32_t resolution, int32_t zoom_resolution, uint32_t zoom_x, uint32_t zoom_y);
+ int setResolution(int32_t resolution);
  int setPixelFormat(int32_t pixformat);
  int enableMotionDetection(md_callback_t callback) { return 0; };
  int disableMotionDetection() { return 0; };