Tedd OKANO / MARY_CAMERA
Revision:
23:214896356355
Parent:
22:1a923c255be6
Child:
24:cc4271d1545f
--- a/MARY_CAMERA.cpp	Tue Mar 11 11:40:30 2014 +0000
+++ b/MARY_CAMERA.cpp	Wed Mar 12 00:46:48 2014 +0000
@@ -47,105 +47,31 @@
 int MARY_CAMERA::init( void )
 {
     const char camera_register_setting[ PARAM_NUM ][ 2 ] = {
-        { 0x01, 0x40 },
-        { 0x02, 0x60 },
-        { 0x03, 0x02 },
-        { 0x0C, 0x0C },
-        { 0x0E, 0x61 },
-        { 0x0F, 0x4B },
-        { 0x11, 0x81 },
-        { 0x12, 0x04 },
-        { 0x15, 0x00 },
-        { 0x16, 0x02 },
-        { 0x17, 0x39 },
-        { 0x18, 0x03 },
-        { 0x19, 0x03 },
-        { 0x1A, 0x7B },
-        { 0x1E, 0x37 },
-        { 0x21, 0x02 },
-        { 0x22, 0x91 },
-        { 0x29, 0x07 },
-        { 0x32, 0x80 },
-        { 0x33, 0x0B },
-        { 0x34, 0x11 },
-        { 0x35, 0x0B },
-        { 0x37, 0x1D },
-        { 0x38, 0x71 },
-        { 0x39, 0x2A },
-        { 0x3B, 0x12 },
-        { 0x3C, 0x78 },
-        { 0x3D, 0xC3 },
-        { 0x3E, 0x11 },
-        { 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, 0xF1 },
-        { 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, 0x52 },
-        { 0xA4, 0x88 },
-        { 0xB0, 0x84 },
-        { 0xB1, 0x0C },
-        { 0xB2, 0x0E },
-        { 0xB3, 0x82 },
-        { 0xB8, 0x0A },
-        { 0xC8, 0xF0 },
-        { 0xC9, 0x60 },
+        { 0x01, 0x40 }, { 0x02, 0x60 }, { 0x03, 0x02 }, { 0x0C, 0x0C },
+        { 0x0E, 0x61 }, { 0x0F, 0x4B }, { 0x11, 0x81 }, { 0x12, 0x04 },
+        { 0x15, 0x00 }, { 0x16, 0x02 }, { 0x17, 0x39 }, { 0x18, 0x03 },
+        { 0x19, 0x03 }, { 0x1A, 0x7B }, { 0x1E, 0x37 }, { 0x21, 0x02 },
+        { 0x22, 0x91 }, { 0x29, 0x07 }, { 0x32, 0x80 }, { 0x33, 0x0B },
+        { 0x34, 0x11 }, { 0x35, 0x0B }, { 0x37, 0x1D }, { 0x38, 0x71 },
+        { 0x39, 0x2A }, { 0x3B, 0x12 }, { 0x3C, 0x78 }, { 0x3D, 0xC3 },
+        { 0x3E, 0x11 }, { 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, 0xF1 },
+        { 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, 0x52 }, { 0xA4, 0x88 },
+        { 0xB0, 0x84 }, { 0xB1, 0x0C }, { 0xB2, 0x0E }, { 0xB3, 0x82 },
+        { 0xB8, 0x0A }, { 0xC8, 0xF0 }, { 0xC9, 0x60 },
     };
 
     //  SPI settings
@@ -210,12 +136,16 @@
     for ( int i = 0; i < OVERWRITE_PARAM_NUM; i++ ) {
         d[ 0 ]  = over_write_param[ 0 ][ i ];
         d[ 1 ]  = over_write_param[ res ][ i ];
-        
+
         if ( 0 != (_error_state = _i2c.write( CAM_I2C_ADDR, d, 2 )) )
             break;
-            
+
         wait_ms( 20 );  //  camera register writing requires this interval
     }
+
+    //  wait 1 frame buffer update
+    open_transfer();
+    close_transfer();
 }
 
 void MARY_CAMERA::colorbar( SwitchState sw )
@@ -247,6 +177,9 @@
 void MARY_CAMERA::transfer_a_line( short *p, int line_number, int x_offset, int n_of_pixels )
 {
     char    tmp;
+    
+    if ( line_number < 0 )
+        return;
 
     //  set camera module's buffer address
     set_address( line_number * horizontal_size() * BYTE_PER_PIXEL + x_offset * BYTE_PER_PIXEL );