Diff: OV5642.cpp

Revision:

2:8cb6d03dccb8

Parent:

0:fc90ec271280

Child:

3:ee782b77485e

--- a/OV5642.cpp	Thu Oct 29 06:57:48 2015 +0000
+++ b/OV5642.cpp	Thu Oct 29 07:56:55 2015 +0000
@@ -67,24 +67,28 @@
     spi.write(BURST_FIFO_READ);
 }
 
-void ArduCAM::InitCAM(){
-            wrSensorReg16_8(0x3008, 0x80);
-            wait_ms(100);
-#ifdef ENABLE_JPEG             
-            wrSensorRegs16_8(ov5642_dvp_fmt_global_init); 
-            wait_ms(100);
-            OV5642_set_JPEG_size(); 
-//            wrSensorRegs16_8(ov5642_dvp_fmt_jpeg_vga);
-            wrSensorRegs16_8(ov5642_dvp_fmt_jpeg_qvga); 
-            wrSensorReg16_8(0x4407,0x0C);                
-#else                        
-            wrSensorRegs16_8(OV5642_RGB_QVGA);
-            rdSensorReg16_8(0x3818, &reg_val);
-            wrSensorReg16_8(0x3818, (reg_val | 0x60) & 0xff);
-            rdSensorReg16_8(0x3621, &reg_val);
-            wrSensorReg16_8(0x3621, reg_val & 0xdf);
-            
-#endif//ENABLE_JPEG
+void ArduCAM::InitCAM()
+{
+    uint8_t reg_val;
+    
+    wrSensorReg16_8(0x3008, 0x80);
+
+    wait_ms(100);
+    if(m_fmt == JPEG)
+    {
+        wrSensorRegs16_8(ov5642_dvp_fmt_global_init); 
+        wait_ms(100); 
+        wrSensorRegs16_8(ov5642_dvp_fmt_jpeg_qvga); 
+        wrSensorReg16_8(0x4407,0x0C);
+    }
+    else
+    {
+        wrSensorRegs16_8(OV5642_RGB_QVGA);
+        rdSensorReg16_8(0x3818,&reg_val);
+        wrSensorReg16_8(0x3818, (reg_val | 0x60) & 0xff);
+        rdSensorReg16_8(0x3621,&reg_val);
+        wrSensorReg16_8(0x3621, reg_val & 0xdf);
+    }
 }
 
 //Write ArduChip internal registers