Diff: MARY_CAMERA.cpp

Revision:

18:c9c3425d238c

Parent:

17:756fb618c0ed

Child:

19:1d07d6d762a9

--- a/MARY_CAMERA.cpp	Tue Mar 11 05:31:41 2014 +0000
+++ b/MARY_CAMERA.cpp	Tue Mar 11 05:42:29 2014 +0000
@@ -47,7 +47,6 @@
 int MARY_CAMERA::init( void )
 {
     const char camera_register_setting[ PARAM_NUM ][ 2 ] = {
-#ifdef CAMERA__PICTSIZE_QCIF
         { 0x01, 0x40 },
         { 0x02, 0x60 },
         { 0x03, 0x02 },
@@ -147,108 +146,6 @@
         { 0xB8, 0x0A },
         { 0xC8, 0xF0 },
         { 0xC9, 0x60 },
-#endif
-#ifdef CAMERA__PICTSIZE_VGA
-        { 0x01, 0x40 },
-        { 0x02, 0x60 },
-        { 0x03, 0x0A }, //
-        { 0x0C, 0x00 }, //
-        { 0x0E, 0x61 },
-        { 0x0F, 0x4B },
-        { 0x11, 0x81 },
-        { 0x12, 0x04 }, //
-        { 0x15, 0x00 },
-        { 0x16, 0x02 },
-        { 0x17, 0x13 }, //
-        { 0x18, 0x01 }, //
-        { 0x19, 0x02 }, //
-        { 0x1A, 0x7A }, //
-        { 0x1E, 0x37 },
-        { 0x21, 0x02 },
-        { 0x22, 0x91 },
-        { 0x29, 0x07 },
-        { 0x32, 0xB6 }, //
-        { 0x33, 0x0B },
-        { 0x34, 0x11 },
-        { 0x35, 0x0B },
-        { 0x37, 0x1D },
-        { 0x38, 0x71 },
-        { 0x39, 0x2A },
-        { 0x3B, 0x12 },
-        { 0x3C, 0x78 },
-        { 0x3D, 0xC3 },
-        { 0x3E, 0x00 }, //
-        { 0x3F, 0x00 },
-        { 0x40, 0xD0 },
-        { 0x41, 0x08 },
-        { 0x41, 0x38 },
-        { 0x43, 0x0A },
-        { 0x44, 0xF0 },
-        { 0x45, 0x34 },
-        { 0x46, 0x58 },
-        { 0x47, 0x28 },
-        { 0x48, 0x3A },
-        { 0x4B, 0x09 },
-        { 0x4C, 0x00 },
-        { 0x4D, 0x40 },
-        { 0x4E, 0x20 },
-        { 0x4F, 0x80 },
-        { 0x50, 0x80 },
-        { 0x51, 0x00 },
-        { 0x52, 0x22 },
-        { 0x53, 0x5E },
-        { 0x54, 0x80 },
-        { 0x56, 0x40 },
-        { 0x58, 0x9E },
-        { 0x59, 0x88 },
-        { 0x5A, 0x88 },
-        { 0x5B, 0x44 },
-        { 0x5C, 0x67 },
-        { 0x5D, 0x49 },
-        { 0x5E, 0x0E },
-        { 0x69, 0x00 },
-        { 0x6A, 0x40 },
-        { 0x6B, 0x0A },
-        { 0x6C, 0x0A },
-        { 0x6D, 0x55 },
-        { 0x6E, 0x11 },
-        { 0x6F, 0x9F },
-        { 0x70, 0x3A }, //
-        { 0x71, 0x35 }, //
-        { 0x72, 0x11 }, //
-        { 0x73, 0xF0 }, //
-        { 0x74, 0x10 },
-        { 0x75, 0x05 },
-        { 0x76, 0xE1 },
-        { 0x77, 0x01 },
-        { 0x78, 0x04 },
-        { 0x79, 0x01 },
-        { 0x8D, 0x4F },
-        { 0x8E, 0x00 },
-        { 0x8F, 0x00 },
-        { 0x90, 0x00 },
-        { 0x91, 0x00 },
-        { 0x96, 0x00 },
-        { 0x96, 0x00 },
-        { 0x97, 0x30 },
-        { 0x98, 0x20 },
-        { 0x99, 0x30 },
-        { 0x9A, 0x00 },
-        { 0x9A, 0x84 },
-        { 0x9B, 0x29 },
-        { 0x9C, 0x03 },
-        { 0x9D, 0x4C },
-        { 0x9E, 0x3F },
-        { 0xA2, 0x02 }, //
-        { 0xA4, 0x88 },
-        { 0xB0, 0x84 },
-        { 0xB1, 0x0C },
-        { 0xB2, 0x0E },
-        { 0xB3, 0x82 },
-        { 0xB8, 0x0A },
-        { 0xC8, 0xF0 },
-        { 0xC9, 0x60 },
-#endif
     };
     const char owreg[] = {
         0x12,
@@ -287,43 +184,14 @@
 
     //  set camera registers
 
-#if 1
     for ( int i = 0; i < PARAM_NUM; i++ ) {
         if ( 0 != (_error_state = _i2c.write( CAM_I2C_ADDR, camera_register_setting[ i ], 2 )) )
             break;
 
         wait_ms( 20 );  //  camera register writing requires this interval
     }
-#else
-    for ( int i = (PARAM_NUM - 1); i >= 0; i-- ) {
-        if ( 0 != (_error_state = _i2c.write( CAM_I2C_ADDR, camera_register_setting[ i ], 2 )) )
-            break;
 
-        wait_ms( 20 );  //  camera register writing requires this interval
-    }
-#endif
-
-
-
-
-
-
-#if 0
-    for ( int i = 0; i < PARAM_NUM; i++ ) {
-        if ( 0 != (_error_state = _i2c.write( CAM_I2C_ADDR, camera_register_settin2[ i ], 2 )) )
-            break;
-
-        wait_ms( 20 );  //  camera register writing requires this interval
-    }
-#endif
-
-
-
-
-
-
-
-#if 0
+#ifdef CAMERA__PICTSIZE_VGA
     for ( int i = 0; i < sizeof( owreg ); i++ ) {
         char    s[ 2 ];
         s[ 0 ]  = owreg[ i ];