Change parameter names for flipping and mirroring

Alrik Vidstrom · Alrik Vidstrom · commit ef80ad4b2c79 · 2023-04-14T13:14:20.000+02:00
The parameter names are changed from _mode to _enable.
diff --git a/libraries/Camera/src/camera.cpp b/libraries/Camera/src/camera.cpp
@@ -598,14 +598,14 @@ int Camera::zoomToCenter(int32_t zoom_resolution)
     return setResolutionWithZoom(this->original_resolution, zoom_resolution, zoom_x, zoom_y);
 }
 
-int Camera::setVerticalFlip(bool flip_mode)
+int Camera::setVerticalFlip(bool flip_enable)
 {
-    return (this->sensor->setVerticalFlip(flip_mode));
+    return (this->sensor->setVerticalFlip(flip_enable));
 }
 
-int Camera::setHorizontalMirror(bool mirror_mode)
+int Camera::setHorizontalMirror(bool mirror_enable)
 {
-    return (this->sensor->setHorizontalMirror(mirror_mode));
+    return (this->sensor->setHorizontalMirror(mirror_enable));
 }
 
 uint32_t Camera::getResolutionWidth()
diff --git a/libraries/Camera/src/camera.h b/libraries/Camera/src/camera.h
@@ -78,8 +78,8 @@ class ImageSensor {
         virtual int setMotionDetectionWindow(uint32_t x, uint32_t y, uint32_t w, uint32_t h) = 0;
         virtual int setMotionDetectionThreshold(uint32_t threshold) = 0;
         virtual int motionDetected() = 0;
-        virtual int setVerticalFlip(bool flip_mode) = 0;
-        virtual int setHorizontalMirror(bool flip_mode) = 0;        
+        virtual int setVerticalFlip(bool flip_enable) = 0;
+        virtual int setHorizontalMirror(bool flip_enable) = 0;        
         virtual void debug(Stream &stream) = 0;
 
         virtual int setStandby(bool enable) {
@@ -143,8 +143,8 @@ class Camera {
         int motionDetected();
         int zoomTo(int32_t zoom_resolution, uint32_t zoom_x, uint32_t zoom_y);
         int zoomToCenter(int32_t zoom_resolution);
-        int setVerticalFlip(bool flip_mode);
-        int setHorizontalMirror(bool mirror_mode);
+        int setVerticalFlip(bool flip_enable);
+        int setHorizontalMirror(bool mirror_enable;
         uint32_t getResolutionWidth();
         uint32_t getResolutionHeight();
         void debug(Stream &stream);
diff --git a/libraries/GC2145/gc2145.cpp b/libraries/GC2145/gc2145.cpp
@@ -763,26 +763,26 @@ int GC2145::setFrameRate(int32_t framerate)
     return 0;
 }
 
-int GC2145::setVerticalFlip(bool flip_mode)
+int GC2145::setVerticalFlip(bool flip_enable)
 {
     // The GC2145 doesn't return this value when reading the Analog mode 1 register
     // so we have to save it for setHorizontalMirror()
-    vertical_flip_state = flip_mode;
+    vertical_flip_state = flip_enable;
     // Using the Analog mode 1 register (0x17)
     uint8_t old_value = regRead(GC2145_I2C_ADDR, 0x17);
-    int retVal = regWrite(GC2145_I2C_ADDR, 0x17, (old_value & 0b11111100) | (flip_mode << 1) | horizontal_mirror_state);
+    int retVal = regWrite(GC2145_I2C_ADDR, 0x17, (old_value & 0b11111100) | (flip_enable << 1) | horizontal_mirror_state);
     // Notice that the error codes from regWrite() are positive ones passed on from Wire, not -1
     return ((0 == retVal) ? 0 : -1);
 }
 
-int GC2145::setHorizontalMirror(bool mirror_mode)
+int GC2145::setHorizontalMirror(bool mirror_enable)
 {
     // The GC2145 doesn't return this value when reading the Analog mode 1 register
     // so we have to save it for setVerticalFlip()
-    horizontal_mirror_state = mirror_mode;
+    horizontal_mirror_state = mirror_enable;
     // Using the Analog mode 1 register (0x17)
     uint8_t old_value = regRead(GC2145_I2C_ADDR, 0x17);
-    int retVal = regWrite(GC2145_I2C_ADDR, 0x17, (old_value & 0b11111100) | mirror_mode | (vertical_flip_state << 1));
+    int retVal = regWrite(GC2145_I2C_ADDR, 0x17, (old_value & 0b11111100) | mirror_enable | (vertical_flip_state << 1));
     // Notice that the error codes from regWrite() are positive ones passed on from Wire, not -1
     return ((0 == retVal) ? 0 : -1);
 }
diff --git a/libraries/GC2145/gc2145.h b/libraries/GC2145/gc2145.h
@@ -46,8 +46,8 @@ class GC2145: public ImageSensor {
         int setMotionDetectionWindow(uint32_t x, uint32_t y, uint32_t w, uint32_t h) { return 0; };
         int setMotionDetectionThreshold(uint32_t threshold) { return 0; };
         int motionDetected() { return 0; };
-        int setVerticalFlip(bool flip_mode);
-        int setHorizontalMirror(bool mirror_mode);
+        int setVerticalFlip(bool flip_enable);
+        int setHorizontalMirror(bool mirror_enable);
         void debug(Stream &stream);
 };
  
diff --git a/libraries/Himax_HM01B0/himax.cpp b/libraries/Himax_HM01B0/himax.cpp
@@ -341,12 +341,12 @@ int HM01B0::reset()
     return (max_timeout > 0) ? 0 : -1;
 }
 
-int HM01B0::setVerticalFlip(bool flip_mode)
+int HM01B0::setVerticalFlip(bool flip_enable)
 {
   return -1;
 }
 
-int HM01B0::setHorizontalMirror(bool mirror_mode)
+int HM01B0::setHorizontalMirror(bool mirror_enable)
 {
   return -1;
 }
diff --git a/libraries/Himax_HM01B0/himax.h b/libraries/Himax_HM01B0/himax.h
@@ -50,8 +50,8 @@ class HM01B0: public ImageSensor {
         int motionDetected();
         int pollMotionDetection();
         int clearMotionDetection();
-        int setVerticalFlip(bool flip_mode);
-        int setHorizontalMirror(bool mirror_mode);
+        int setVerticalFlip(bool flip_enable);
+        int setHorizontalMirror(bool mirror_enable);
 
         uint8_t printRegs();
         void debug(Stream &stream);
diff --git a/libraries/Himax_HM0360/hm0360.cpp b/libraries/Himax_HM0360/hm0360.cpp
@@ -586,12 +586,12 @@ int HM0360::reset()
     return (max_timeout > 0) ? 0 : -1;
 }
 
-int HM0360::setVerticalFlip(bool flip_mode)
+int HM0360::setVerticalFlip(bool flip_enable)
 {
   return -1;
 }
 
-int HM0360::setHorizontalMirror(bool mirror_mode)
+int HM0360::setHorizontalMirror(bool mirror_enable)
 {
   return -1;
 }
diff --git a/libraries/Himax_HM0360/hm0360.h b/libraries/Himax_HM0360/hm0360.h
@@ -50,8 +50,8 @@ class HM0360: public ImageSensor {
         int motionDetected();
         int pollMotionDetection();
         int clearMotionDetection();
-        int setVerticalFlip(bool flip_mode);
-        int setHorizontalMirror(bool mirror_mode);
+        int setVerticalFlip(bool flip_enable);
+        int setHorizontalMirror(bool mirror_enable);
 
         uint8_t printRegs();
         void debug(Stream &stream);
diff --git a/libraries/OV7670/ov7670.cpp b/libraries/OV7670/ov7670.cpp
@@ -697,12 +697,12 @@ int OV7670::setFrameRate(int32_t framerate)
     return 0;
 }
 
-int OV7670::setVerticalFlip(bool flip_mode)
+int OV7670::setVerticalFlip(bool flip_enable)
 {
   return -1;
 }
 
-int OV7670::setHorizontalMirror(bool mirror_mode)
+int OV7670::setHorizontalMirror(bool mirror_enable)
 {
   return -1;
 }
diff --git a/libraries/OV7670/ov767x.h b/libraries/OV7670/ov767x.h
@@ -52,8 +52,8 @@ class OV7670: public ImageSensor {
         int setMotionDetectionWindow(uint32_t x, uint32_t y, uint32_t w, uint32_t h) { return 0; };
         int setMotionDetectionThreshold(uint32_t threshold) { return 0; };
         int motionDetected() { return 0; };
-        int setVerticalFlip(bool flip_mode);
-        int setHorizontalMirror(bool mirror_mode);
+        int setVerticalFlip(bool flip_enable);
+        int setHorizontalMirror(bool mirror_enable);
         void debug(Stream &stream);
 };
 

Original file line number	Diff line number	Diff line change
`@@ -598,14 +598,14 @@ int Camera::zoomToCenter(int32_t zoom_resolution)`
`598`	`598`	`return setResolutionWithZoom(this->original_resolution, zoom_resolution, zoom_x, zoom_y);`
`599`	`599`	`}`
`600`	`600`
`601`		`-int Camera::setVerticalFlip(bool flip_mode)`
	`601`	`+int Camera::setVerticalFlip(bool flip_enable)`
`602`	`602`	`{`
`603`		`- return (this->sensor->setVerticalFlip(flip_mode));`
	`603`	`+ return (this->sensor->setVerticalFlip(flip_enable));`
`604`	`604`	`}`
`605`	`605`
`606`		`-int Camera::setHorizontalMirror(bool mirror_mode)`
	`606`	`+int Camera::setHorizontalMirror(bool mirror_enable)`
`607`	`607`	`{`
`608`		`- return (this->sensor->setHorizontalMirror(mirror_mode));`
	`608`	`+ return (this->sensor->setHorizontalMirror(mirror_enable));`
`609`	`609`	`}`
`610`	`610`
`611`	`611`	`uint32_t Camera::getResolutionWidth()`
Original file line number	Diff line number	Diff line change
`@@ -341,12 +341,12 @@ int HM01B0::reset()`
`341`	`341`	`return (max_timeout > 0) ? 0 : -1;`
`342`	`342`	`}`
`343`	`343`
`344`		`-int HM01B0::setVerticalFlip(bool flip_mode)`
	`344`	`+int HM01B0::setVerticalFlip(bool flip_enable)`
`345`	`345`	`{`
`346`	`346`	`return -1;`
`347`	`347`	`}`
`348`	`348`
`349`		`-int HM01B0::setHorizontalMirror(bool mirror_mode)`
	`349`	`+int HM01B0::setHorizontalMirror(bool mirror_enable)`
`350`	`350`	`{`
`351`	`351`	`return -1;`
`352`	`352`	`}`
Original file line number	Diff line number	Diff line change
`@@ -586,12 +586,12 @@ int HM0360::reset()`
`586`	`586`	`return (max_timeout > 0) ? 0 : -1;`
`587`	`587`	`}`
`588`	`588`
`589`		`-int HM0360::setVerticalFlip(bool flip_mode)`
	`589`	`+int HM0360::setVerticalFlip(bool flip_enable)`
`590`	`590`	`{`
`591`	`591`	`return -1;`
`592`	`592`	`}`
`593`	`593`
`594`		`-int HM0360::setHorizontalMirror(bool mirror_mode)`
	`594`	`+int HM0360::setHorizontalMirror(bool mirror_enable)`
`595`	`595`	`{`
`596`	`596`	`return -1;`
`597`	`597`	`}`
Original file line number	Diff line number	Diff line change
`@@ -697,12 +697,12 @@ int OV7670::setFrameRate(int32_t framerate)`
`697`	`697`	`return 0;`
`698`	`698`	`}`
`699`	`699`
`700`		`-int OV7670::setVerticalFlip(bool flip_mode)`
	`700`	`+int OV7670::setVerticalFlip(bool flip_enable)`
`701`	`701`	`{`
`702`	`702`	`return -1;`
`703`	`703`	`}`
`704`	`704`
`705`		`-int OV7670::setHorizontalMirror(bool mirror_mode)`
	`705`	`+int OV7670::setHorizontalMirror(bool mirror_enable)`
`706`	`706`	`{`
`707`	`707`	`return -1;`
`708`	`708`	`}`