Diff: main.cpp

Revision:

4:5e1828a8e238

Parent:

3:152362acd181

Child:

6:f5b4e088087b

diff -r 152362acd181 -r 5e1828a8e238 main.cpp
--- a/main.cpp	Fri Feb 14 09:49:02 2014 +0000
+++ b/main.cpp	Fri Feb 14 14:20:08 2014 +0000
@@ -1,151 +1,10 @@
 #include "mbed.h"
 #include "MARMEX_OB_oled.h"
-
-
-#define PARAM_NUM       99
-#define CAM_I2C_ADDR    0x42
-
-const char param[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
-    }
-};
-
-
-MARMEX_OB_oled   oled1( p5, p7,  p20, p16, p15 ); // mosi, sclk, cs, rst, power_control     -- maple-mini-type-b-slot1
-
-
-SPI         camspi( p5, p6, p7 );
-DigitalOut  cs2( p22 );
-DigitalOut  vsync( p9 );
-DigitalOut  camera_reset( p26 );
-
-void init( void )
-{
-    I2C     i2c( p28, p27 );
-
-    vsync   = 0;
-    cs2 = 1;
-    camera_reset = 0;
-    wait_ms( 100 );
-    camera_reset = 1;
-    wait_ms( 100 );
-
-
-    for ( int i = 0; i < PARAM_NUM; i++ ) {
-        i2c.start();
-        i2c.write( CAM_I2C_ADDR );
-        i2c.write( param[ 0 ][ i ] );
-        i2c.write( param[ 1 ][ i ] );
-        i2c.stop();
-        wait_ms( 20 );
-    }
+#include "MARY_CAMERA.h"
 
 
-    camspi.format(8);
-    camspi.frequency( 1000000 );
-    vsync   = 0;
-
-}
-
-int send_spi( char data )
-{
-    int     tmp;
-
-    cs2 = 0;
-    tmp = camspi.write( data );
-    cs2 = 1;
-
-    return ( tmp );
-}
-
-
-#define     COMMAND_WRITE                   0x00
-#define     COMMAND_READ                    0x80
-#define     COMMAND_ADDR_INCREMENT          0x20
-
-#define     MEMORY_ADDR_LOW__REGISTER       0x0
-#define     MEMORY_ADDR_MID__REGISTER       0x1
-#define     MEMORY_ADDR_HIGH_REGISTER       0x2
-#define     CAMERA_DATA_REGISTER            0x8
-#define     CONTROL_DATA_REGISTER           0x3
-#define     STATUS_REGISTER                 0x4
-
-#define     CONTROL__PAUSE_BUFFER_UPDATE    0x01
-#define     CONTROL__RESUME_BUFFER_UPDATE   0x00
-
-void write_register( char reg, char value )
-{
-    send_spi( COMMAND_WRITE | reg );
-    send_spi( value );
-}
-
-int read_register( char reg )
-{
-//    printf( "0x%02X\r\n", COMMAND_READ | reg | ((reg == CAMERA_DATA_REGISTER) ? COMMAND_ADDR_INCREMENT : 0x00) );
-    
-    return ( send_spi( COMMAND_READ | reg | ((reg == CAMERA_DATA_REGISTER) ? COMMAND_ADDR_INCREMENT : 0x00) ) );
-//    return ( send_spi( COMMAND_READ | reg ) );
-}
-
-void open_transfer( void )
-{
-    write_register( CONTROL_DATA_REGISTER, CONTROL__PAUSE_BUFFER_UPDATE );
-
-    vsync   = 0;
-
-    read_register( STATUS_REGISTER );
-    while ( !(read_register( STATUS_REGISTER ) & 0x1) ); //  wait until LSB becomes '1'
-}
-
-void close_transfer( void )
-{
-    write_register( CONTROL_DATA_REGISTER, CONTROL__RESUME_BUFFER_UPDATE );
-
-    read_register( STATUS_REGISTER );
-    while ( read_register( STATUS_REGISTER ) & 0x1 ); //  wait until LSB becomes '0'
-
-    vsync   = 1;
-}
-
-
-void set_address( int address )
-{
-    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 );
-}
-
-#define     PIXEL_PER_LINE  176
-#define     BYTE_PER_PIXEL  2
-#define     BYTE_PER_LINE   (PIXEL_PER_LINE * BYTE_PER_PIXEL)
-
-
-void transfer_a_line( short *p, int line_number, int x_offset, int n_of_pixels )
-{
-    set_address( line_number * BYTE_PER_LINE + x_offset * BYTE_PER_PIXEL );
- 
-    read_register( CAMERA_DATA_REGISTER );
-
-    for( int x = 0; x < n_of_pixels; x++ )
-        *p++    = (read_register( CAMERA_DATA_REGISTER ) << 8) | (read_register( CAMERA_DATA_REGISTER ) << 0);
-}
-
+MARMEX_OB_oled  oled1( p5, p7,  p20, p16, p15 ); // mosi, sclk, cs, rst, power_control     -- maple-mini-type-b-slot1
+MARY_CAMERA     camera( p5, p6, p7, p22, p9, p26, p28, p27 ); // mosi, miso, sclk, cs, vsync, reset, I2C_SDA, I2C_SCL
 
 #define X_OFFSET    24
 #define Y_OFFSET    8
@@ -155,16 +14,18 @@
     oled1.cls();
 
     short   buf[ 128 ];
-    init();
+    camera.init();
+
+    printf( "init done\r\n" );
 
     while ( 1 ) {
-        open_transfer();
+        camera.open_transfer();
 
         for ( int line = 0; line < 128; line++  ) {
-            transfer_a_line( buf, line + Y_OFFSET, X_OFFSET, 128 );
+            camera.transfer_a_line( buf, line + Y_OFFSET, X_OFFSET, 128 );
             oled1.blit565( 0, line, 128, 1, buf );
         }
 
-        close_transfer();
+        camera.close_transfer();
     }
 }