Diff: MARY_CAMERA.cpp

Revision:

12:614be3290c47

Parent:

11:61a025e8ab68

Child:

13:210f4bbd0cd6

--- a/MARY_CAMERA.cpp	Sat Mar 08 04:59:00 2014 +0000
+++ b/MARY_CAMERA.cpp	Mon Mar 10 01:41:23 2014 +0000
@@ -46,27 +46,107 @@
 
 int MARY_CAMERA::init( void )
 {
-    const char camera_register_setting[2][PARAM_NUM] = {
-        {
-            0x01,0x02,0x03,0x0c,0x0e,0x0f,0x11,0x12,0x15,0x16,0x17,0x18,0x19,0x1a,0x1e,0x21,0x22,
-            0x29,0x32,0x33,0x34,0x35,0x37,0x38,0x39,0x3b,0x3c,0x3d,0x3e,0x3f,0x40,0x41,0x41,
-            0x43,0x44,0x45,0x46,0x47,0x48,0x4b,0x4c,0x4d,0x4e,0x4f,0x50,0x51,0x52,0x53,
-            0x54,0x56,0x58,0x59,0x5a,0x5b,0x5c,0x5d,0x5e,0x69,0x6a,0x6b,0x6c,0x6d,0x6e,
-            0x6f,0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x8d,0x8e,0x8f,0x90,
-            0x91,0x96,0x96,0x97,0x98,0x99,0x9a,0x9a,0x9b,0x9c,0x9d,0x9e,0xa2,0xa4,0xb0,
-            0xb1,0xb2,0xb3,0xb8,0xc8,0xc9
-        },
-        {
-            0x40,0x60,0x02,0x0c,0x61,0x4b,0x81,0x04,0x00,0x02,0x39,0x03,0x03,0x7b,0x37,0x02,0x91,
-            0x07,0x80,0x0b,0x11,0x0b,0x1d,0x71,0x2a,0x12,0x78,0xc3,0x11,0x00,0xd0,0x08,0x38,
-            0x0a,0xf0,0x34,0x58,0x28,0x3a,0x09,0x00,0x40,0x20,0x80,0x80,0x00,0x22,0x5e,
-            0x80,0x40,0x9e,0x88,0x88,0x44,0x67,0x49,0x0e,0x00,0x40,0x0a,0x0a,0x55,0x11,
-            0x9f,0x3a,0x35,0x11,0xf1,0x10,0x05,0xe1,0x01,0x04,0x01,0x4f,0x00,0x00,0x00,
-            0x00,0x00,0x00,0x30,0x20,0x30,0x00,0x84,0x29,0x03,0x4c,0x3f,0x52,0x88,0x84,
-            0x0c,0x0e,0x82,0x0a,0xf0,0x60
-        }
-    };
-    char    s[ 2 ];
+    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 },
+        };
 
     //  SPI settings
 
@@ -83,15 +163,10 @@
 
     //  set camera registers
 
+
     for ( int i = 0; i < PARAM_NUM; i++ ) {
-        s[ 0 ]  = camera_register_setting[ 0 ][ i ];    //  register sddress
-        s[ 1 ]  = camera_register_setting[ 1 ][ i ];    //  register value
-
-        //  camera register setting through I2C
-        //  abort initialization if the I2C has problem
-        
-        if ( 0 != (_error_state = _i2c.write( CAM_I2C_ADDR, s, 2 )) )
-            break;  
+        if ( 0 != (_error_state = _i2c.write( CAM_I2C_ADDR, camera_register_setting[ i ], 2 )) )
+            break;
 
         wait_ms( 20 );  //  camera register writing requires this interval
     }
@@ -99,13 +174,11 @@
     return _error_state;    //  return non-zero if I2C access failed
 }
 
-int MARY_CAMERA::ready( void )
-{
+int MARY_CAMERA::ready( void ) {
     return _error_state;    //  return last state of I2C access
 }
 
-void MARY_CAMERA::transfer_a_line( short *p, int line_number, int x_offset, int n_of_pixels )
-{
+void MARY_CAMERA::transfer_a_line( short *p, int line_number, int x_offset, int n_of_pixels ) {
     char    tmp;
 
     //  set camera module's buffer address
@@ -121,8 +194,7 @@
     }
 }
 
-void MARY_CAMERA::open_transfer( void )
-{
+void MARY_CAMERA::open_transfer( void ) {
     //  send command to pause the camera buffer update
     write_register( CONTROL_DATA_REGISTER, CONTROL__PAUSE_BUFFER_UPDATE );
 
@@ -134,8 +206,7 @@
         ;
 }
 
-void MARY_CAMERA::close_transfer( void )
-{
+void MARY_CAMERA::close_transfer( void ) {
     //  send command to resume the camera buffer update
     write_register( CONTROL_DATA_REGISTER, CONTROL__RESUME_BUFFER_UPDATE );
 
@@ -147,40 +218,36 @@
         ;
 }
 
-void MARY_CAMERA::set_address( int address )
-{
+void MARY_CAMERA::set_address( int address ) {
     //  set memory address (3 bytes)
-    
+
     write_register( MEMORY_ADDR_LOW__REGISTER, (address >>  0) & 0xFF );
     write_register( MEMORY_ADDR_MID__REGISTER, (address >>  8) & 0xFF );
     write_register( MEMORY_ADDR_HIGH_REGISTER, (address >> 16) & 0xFF );
 }
 
-void MARY_CAMERA::write_register( char reg, char value )
-{
+void MARY_CAMERA::write_register( char reg, char value ) {
     //  camera register write
-    
+
     send_spi( COMMAND_WRITE | reg );    //  send command and register number
     send_spi( value );                  //  send register value
 }
 
-int MARY_CAMERA::read_register( char reg )
-{
+int MARY_CAMERA::read_register( char reg ) {
     //  camera register read
     //  returning current data in SPI buffer (data returned by previous command)
 
     return ( send_spi( COMMAND_READ | reg | ((reg == CAMERA_DATA_REGISTER) ? COMMAND_ADDR_INCREMENT : 0x00) ) );
 }
 
-int MARY_CAMERA::send_spi( char data )
-{
+int MARY_CAMERA::send_spi( char data ) {
     int     tmp;
-    
+
     //  SPI access
 
     _cs     = 0;
     tmp     = _spi.write( data );
     _cs     = 1;
-    
+
     return ( tmp );
 }