Diff: MARY_CAMERA.h

Revision:

2:ee71ffdf317e

Parent:

0:f4584dba3bac

Child:

3:e5752853eb26

--- a/MARY_CAMERA.h	Fri Feb 14 14:19:49 2014 +0000
+++ b/MARY_CAMERA.h	Mon Feb 17 05:57:10 2014 +0000
@@ -1,28 +1,11 @@
 #ifndef        MBED_MARY_CAMERA
 #define        MBED_MARY_CAMERA
 
-#define PARAM_NUM       99
-#define CAM_I2C_ADDR    0x42
-
-#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
-
 #define     PIXEL_PER_LINE  176
 #define     BYTE_PER_PIXEL  2
 #define     BYTE_PER_LINE   (PIXEL_PER_LINE * BYTE_PER_PIXEL)
 
-#define     SPI_FREQUENCY                   1000000
+#define     SPI_FREQUENCY                   10000000
 
 //  sample  MARY_CAMERA     camera( p5, p6, p7, p22, p9, p26, p28, p27 )
 
@@ -44,7 +27,6 @@
         PinName spi_miso,
         PinName spi_sck,
         PinName spi_cs,
-        PinName cam_vsync,
         PinName cam_reset,
         PinName i2c_sda,
         PinName i2c_scl
@@ -59,37 +41,14 @@
     void write_register( char reg, char value );
     int read_register( char reg );
     void set_address( int address );
-
+    void very_short_wait( void );
 
     SPI         spi;
     DigitalOut  cs;
-    DigitalOut  vsync;
     DigitalOut  reset;
     I2C         i2c;
 };
 
 
 
-
-#if 0
-SPI         camspi( p5, p6, p7 );
-DigitalOut  cs2( p22 );
-DigitalOut  vsync( p9 );
-DigitalOut  camera_reset( p26 );
-#endif
-
-#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
-
 #endif  //  MBED_MARY_CAMERA
\ No newline at end of file