Tedd OKANO / MARY_CAMERA

Important changes to repositories hosted on mbed.com

Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.

To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.

It is also possible to export all your personal repositories from the account settings page.

Diff: MARY_CAMERA.cpp

Revision:
17:756fb618c0ed
Parent:
16:be1a6e3056fe
Child:
18:c9c3425d238c
--- a/MARY_CAMERA.cpp	Tue Mar 11 05:23:35 2014 +0000
+++ b/MARY_CAMERA.cpp	Tue Mar 11 05:31:41 2014 +0000
@@ -47,6 +47,7 @@
 int MARY_CAMERA::init( void )
 {
     const char camera_register_setting[ PARAM_NUM ][ 2 ] = {
+#ifdef CAMERA__PICTSIZE_QCIF
         { 0x01, 0x40 },
         { 0x02, 0x60 },
         { 0x03, 0x02 },
@@ -146,9 +147,8 @@
         { 0xB8, 0x0A },
         { 0xC8, 0xF0 },
         { 0xC9, 0x60 },
-    };
-    #if 0
-    const char camera_register_setting2[ PARAM_NUM ][ 2 ] = {
+#endif
+#ifdef CAMERA__PICTSIZE_VGA
         { 0x01, 0x40 },
         { 0x02, 0x60 },
         { 0x03, 0x0A }, //
@@ -248,8 +248,8 @@
         { 0xB8, 0x0A },
         { 0xC8, 0xF0 },
         { 0xC9, 0x60 },
+#endif
     };
-#endif
     const char owreg[] = {
         0x12,
         0x17,