Revision 7:a069c1750fbc, committed 2015-07-05

Comitter:

dflet

Date:

Sun Jul 05 22:18:04 2015 +0000

Parent:

6:37fb696395d7

Child:

8:529a12812c53

Commit message:

WIP commit 8

Changed in this revision

--- a/camera_app/camera_app.cpp	Fri Jul 03 22:42:45 2015 +0000
+++ b/camera_app/camera_app.cpp	Sun Jul 05 22:18:04 2015 +0000
@@ -60,7 +60,7 @@
 
 using namespace mbed_cc3100;
 
-//#define ENABLE_JPEG
+#define ENABLE_JPEG
 
 //*****************************************************************************
 // Macros
@@ -103,7 +103,7 @@
 //#ifdef ENABLE_JPEG
 	char g_header[SMTP_BUF_LEN] /*= {'\0'}*/;
 //#endif
-	unsigned int g_image_buffer[NUM_OF_4B_CHUNKS];//60Kb 15360, 50Kb 12800
+	uint32_t g_image_buffer[NUM_OF_4B_CHUNKS];//60Kb 15360, 50Kb 12800
 };
 
 ImageBuffer g_image;
@@ -331,32 +331,36 @@
 static unsigned short CaptureImage(char** WriteBuffer)
 {
 //    Uart_Write((uint8_t*)"CaptureImage \n\r");
-
-    memset(g_image.g_image_buffer,0xF80F,sizeof(g_image.g_image_buffer));
+//    memset(g_image.g_image_buffer,0xF80F,sizeof(g_image.g_image_buffer));
+    memset(g_image.g_image_buffer,0x0F,sizeof(g_image.g_image_buffer));
     p_buffer = &(g_image.g_image_buffer[0]);
-    int32_t image_size;
     DMAConfig();
     
     //
     // Perform Image Capture 
     //
 //    Uart_Write((uint8_t*)"CaptureImage Start\n\r");
-//    HAL_DCMI_Start_DMA(&phdcmi, DCMI_MODE_SNAPSHOT, (uint32_t)p_buffer, sizeof(g_image.g_image_buffer)); 
+//    HAL_DCMI_Start_DMA(&phdcmi, DCMI_MODE_SNAPSHOT, (uint32_t)p_buffer, sizeof(g_image.g_image_buffer));
+//    wait(1); 
     HAL_DCMI_Start_DMA(&phdcmi, DCMI_MODE_SNAPSHOT, (uint32_t)p_buffer, FRAME_SIZE_IN_BYTES); 
     g_frame_end = 1;
     
 //    Uart_Write((uint8_t*)"\n\rCaptureImage Complete\n\r");
  
     /* Read the number of data items transferred */
-    image_size = (FRAME_SIZE_IN_BYTES - (hdma_dcmi.Instance->NDTR*4));
+    g_frame_size_in_bytes = (FRAME_SIZE_IN_BYTES - (hdma_dcmi.Instance->NDTR*4));
 //    p_buffer += image_size;
 //    image_size = hdma_dcmi.Instance->NDTR *4;
 //    HttpDebug("hdma_dcmi.Instance->NDTR = %i\r\n",hdma_dcmi.Instance->NDTR *4);     
 //    image_size = (sizeof(g_image.g_image_buffer) - (hdma_dcmi.Instance->NDTR * 4));
 //    HttpDebug("image_size = %i\r\n",image_size);
     g_dma_txn_done = 1;
-    g_frame_size_in_bytes = image_size;
+//    g_frame_size_in_bytes = image_size;
     g_total_dma_intrpts = 1;
+//    int i;
+//    for(i = 0;i<10;i++){    	
+//    	HttpDebug("%x ",g_image.g_image_buffer[0]);
+ //   }
     
     //
     // Create JPEG Header
@@ -368,14 +372,20 @@
 
     // This loop pushes the header to the end of the array so that the entire picture can be contiguous in memory
     unsigned short shift;
+    HttpDebug("p_buffer = 0x%x \n\r",p_buffer);
+    memcpy(p_buffer + (g_frame_size_in_bytes/4),g_image.g_header,g_header_length);
+    HttpDebug("\n\rCaptureImage Complete\n\r");
+//    for(shift=1; shift <= g_header_length; shift++)
+//    {
+//    	g_image.g_image_buffer[(g_frame_size_in_bytes + g_header_length) - shift] = g_image.g_header[g_header_length - shift];
+//    	g_image.g_header[SMTP_BUF_LEN - shift] = g_image.g_header[g_header_length - shift];
 
-    for(shift=1; shift <= g_header_length; shift++)
-    {
-    	g_image.g_header[SMTP_BUF_LEN - shift] = g_image.g_header[g_header_length - shift];
-
-    }
+//    }
 #endif
-    *WriteBuffer = &(g_image.g_header[SMTP_BUF_LEN - g_header_length]);
+    HttpDebug("\n\rCaptureImage Complete\n\r");
+    *WriteBuffer = (char*)p_buffer;//(char*)&(g_image.g_image_buffer[0]);
+    HttpDebug("Data Len = 0x%x \n\r",WriteBuffer);
+//    *WriteBuffer = &(g_image.g_header[SMTP_BUF_LEN - g_header_length]);
 //#endif
 	return(g_header_length + g_frame_size_in_bytes);
 }
@@ -403,9 +413,9 @@
     hdma_dcmi.Init.MemInc              = DMA_MINC_ENABLE;
     hdma_dcmi.Init.PeriphDataAlignment = DMA_PDATAALIGN_BYTE;
     hdma_dcmi.Init.MemDataAlignment    = DMA_MDATAALIGN_BYTE;
-    hdma_dcmi.Init.Mode                = DMA_NORMAL;//DMA_CIRCULAR;
+    hdma_dcmi.Init.Mode                = DMA_CIRCULAR;
     hdma_dcmi.Init.Priority            = DMA_PRIORITY_HIGH;
-    hdma_dcmi.Init.FIFOMode            = DMA_FIFOMODE_ENABLE;//DMA_FIFOMODE_DISABLE;
+    hdma_dcmi.Init.FIFOMode            = DMA_FIFOMODE_DISABLE;
     hdma_dcmi.Init.FIFOThreshold       = DMA_FIFO_THRESHOLD_FULL;
     hdma_dcmi.Init.MemBurst            = DMA_MBURST_SINGLE;
     hdma_dcmi.Init.PeriphBurst         = DMA_PBURST_SINGLE;
@@ -413,12 +423,12 @@
     __HAL_LINKDMA(&phdcmi,DMA_Handle,hdma_dcmi);
     
      /* DMA interrupt init */
-    HAL_NVIC_SetPriority(DMA2_Stream1_IRQn, 5, 0);
+    HAL_NVIC_SetPriority(DMA2_Stream1_IRQn, 1, 0);
     HAL_NVIC_EnableIRQ(DMA2_Stream1_IRQn);
  
     phdcmi.Instance = DCMI;
     phdcmi.Init.SynchroMode      = DCMI_SYNCHRO_HARDWARE;
-    phdcmi.Init.PCKPolarity      = DCMI_PCKPOLARITY_RISING;//FALLING
+    phdcmi.Init.PCKPolarity      = DCMI_PCKPOLARITY_RISING;
     phdcmi.Init.VSPolarity       = DCMI_VSPOLARITY_LOW;
     phdcmi.Init.HSPolarity       = DCMI_HSPOLARITY_LOW;
     phdcmi.Init.CaptureRate      = DCMI_CR_ALL_FRAME;
@@ -435,46 +445,50 @@
    __GPIOE_CLK_ENABLE();
    __GPIOA_CLK_ENABLE();
    __GPIOB_CLK_ENABLE();
-   __GPIOC_CLK_ENABLE();  
-   __GPIOH_CLK_ENABLE(); //Enable HSE Clock 8MHz  
+   __GPIOC_CLK_ENABLE();   
       
    /**MCO2 GPIO Configuration 
-    PC9     ------> MCO2    
+    PC9     ------> RCC_MCO_2
+    PA8     ------> RCC_MCO_1    
     */
        
     /* Peripheral clock enable */
     __DCMI_CLK_ENABLE();
   
-    /**DCMI GPIO Configuration    
+    /**DCMI GPIO Configuration
+    PA9     ------> DCMI_D0
+    PA10    ------> DCMI_D1
+    PC8     ------> DCMI_D2
+    PE1     ------> DCMI_D3    
     PE4     ------> DCMI_D4
+    PB6     ------> DCMI_D5
     PE5     ------> DCMI_D6
     PE6     ------> DCMI_D7
+    PA6     ------> DCMI_PIXCK
     PA4     ------> DCMI_HSYNC
-    PA6     ------> DCMI_PIXCK
-    PC8     ------> DCMI_D2
-    PE1     ------> DCMI_D3
-    PA9     ------> DCMI_D0
-    PA10    ------> DCMI_D1
-    PB6     ------> DCMI_D5
-    PB7     ------> DCMI_VSYNC 
+    PB7     ------> DCMI_VSYNC
+    PC9     ------> MCLK 
     */
+    /* D3 D4 D6 D7 */
     GPIO_InitStruct.Pin = GPIO_PIN_1|GPIO_PIN_4|GPIO_PIN_5|GPIO_PIN_6;
     GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
-    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    GPIO_InitStruct.Pull = GPIO_PULLUP;
     GPIO_InitStruct.Speed = GPIO_SPEED_HIGH;
     GPIO_InitStruct.Alternate = GPIO_AF13_DCMI;
     HAL_GPIO_Init(GPIOE, &GPIO_InitStruct);
-
+    
+    /* HSYNC PIXCLK D0 D1 */
     GPIO_InitStruct.Pin = GPIO_PIN_4|GPIO_PIN_6|GPIO_PIN_9|GPIO_PIN_10;
     GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
-    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    GPIO_InitStruct.Pull = GPIO_PULLUP;
     GPIO_InitStruct.Speed = GPIO_SPEED_HIGH;
     GPIO_InitStruct.Alternate = GPIO_AF13_DCMI;
     HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
-
+    
+    /* D2 */
     GPIO_InitStruct.Pin = GPIO_PIN_8;
     GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
-    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    GPIO_InitStruct.Pull = GPIO_PULLUP;
     GPIO_InitStruct.Speed = GPIO_SPEED_HIGH;
     GPIO_InitStruct.Alternate = GPIO_AF13_DCMI;
     HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
@@ -482,20 +496,29 @@
     /*Configure GPIO pin : GPIO_AF0_MCO PC9 */
     GPIO_InitStruct.Pin = GPIO_PIN_9;
     GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
-    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    GPIO_InitStruct.Pull = GPIO_PULLUP;
     GPIO_InitStruct.Speed = GPIO_SPEED_HIGH;
     GPIO_InitStruct.Alternate = GPIO_AF0_MCO;
     HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
-
+    
+    /*Configure GPIO pin : PA8 */
+    GPIO_InitStruct.Pin = GPIO_PIN_8;
+    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    GPIO_InitStruct.Speed = GPIO_SPEED_LOW;
+    GPIO_InitStruct.Alternate = GPIO_AF0_MCO;
+    HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+    
+    /* D5 VSYNC */
     GPIO_InitStruct.Pin = GPIO_PIN_6|GPIO_PIN_7;
     GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
-    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    GPIO_InitStruct.Pull = GPIO_PULLUP;
     GPIO_InitStruct.Speed = GPIO_SPEED_HIGH;
     GPIO_InitStruct.Alternate = GPIO_AF13_DCMI;
     HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
 
   /* System interrupt init*/
-    HAL_NVIC_SetPriority(DCMI_IRQn, 5, 0);
+    HAL_NVIC_SetPriority(DCMI_IRQn, 1, 0);
     HAL_NVIC_EnableIRQ(DCMI_IRQn);
 
     HAL_DMA_Init(&hdma_dcmi);
@@ -563,7 +586,7 @@
 #ifdef ENABLE_JPEG
 static int JfifApp0Marker(char *pbuf)
 {
-    Uart_Write((uint8_t*)"JfifApp0Marker \n\r");
+//    Uart_Write((uint8_t*)"JfifApp0Marker \n\r");
     *pbuf++= 0xFF;                  // APP0 marker 
     *pbuf++= 0xE0;
     *pbuf++= 0x00;                  // length 
@@ -600,7 +623,7 @@
 //*****************************************************************************
 static int FrameHeaderMarker(char *pbuf, int width, int height, int format)
 {
-    Uart_Write((uint8_t*)"FrameHeaderMarker \n\r");
+//    Uart_Write((uint8_t*)"FrameHeaderMarker \n\r");
     int length;
     if (format == FORMAT_MONOCHROME)
         length = 11;
@@ -717,7 +740,7 @@
 //*****************************************************************************
 static int DefineQuantizationTableMarker (unsigned char *pbuf, int qscale, int format)
 {
-    Uart_Write((uint8_t*)"DefineQuantizationTableMarker \n\r");
+//    Uart_Write((uint8_t*)"DefineQuantizationTableMarker \n\r");
     int i, length, temp;
     unsigned char newtbl[64];           // temporary array to store scaled zigzagged quant entries 
 
@@ -785,7 +808,7 @@
 //*****************************************************************************
 static int DefineHuffmanTableMarkerDC(char *pbuf, unsigned int *htable, int class_id)
 {
-    Uart_Write((uint8_t*)"DefineHuffmanTableMarkerDC \n\r");
+//    Uart_Write((uint8_t*)"DefineHuffmanTableMarkerDC \n\r");
     int i, l, count;
     int length;
     char *plength;
@@ -845,7 +868,7 @@
 //*****************************************************************************
 static int DefineHuffmanTableMarkerAC(char *pbuf, unsigned int *htable, int class_id)
 {
-    Uart_Write((uint8_t*)"DefineHuffmanTableMarkerAC \n\r");
+//    Uart_Write((uint8_t*)"DefineHuffmanTableMarkerAC \n\r");
     int i, l, a, b, count;
     char *plength;
     int length;
@@ -929,7 +952,7 @@
 //*****************************************************************************
 static int DefineRestartIntervalMarker(char *pbuf, int ri)
 {
-    Uart_Write((uint8_t*)"DefineRestartIntervalMarker \n\r");
+//    Uart_Write((uint8_t*)"DefineRestartIntervalMarker \n\r");
     *pbuf++= 0xFF;                  // define restart interval marker 
     *pbuf++= 0xDD;
     *pbuf++= 0x00;                  // length 
@@ -957,7 +980,7 @@
 static int CreateJpegHeader(char *header, int width, int height,
                             int format, int restart_int, int qscale)
 {
-    Uart_Write((uint8_t*)"CreateJpegHeader \n\r");
+//    Uart_Write((uint8_t*)"CreateJpegHeader \n\r");
     char *pbuf = header;
     int length;
 

--- a/camera_app/httpserverapp/httpserverapp.cpp	Fri Jul 03 22:42:45 2015 +0000
+++ b/camera_app/httpserverapp/httpserverapp.cpp	Sun Jul 05 22:18:04 2015 +0000
@@ -108,7 +108,7 @@
 		if(g_close == 0)
 		{
 			Write.uLength = StartCamera((char **)&Write.pData);
-            HttpDebug("Data Len = 0x%x \n\r",Write.uLength);
+            HttpDebug("Data Len = 0x%x \n\r",Write.pData);
 			if(!sl_WebSocketSend(g_uConnection, Write, Opcode))
 			{
 				Uart_Write((uint8_t*)"sl_WebSocketSend failed.\n\r");

--- a/camera_app/mt9d111/i2cconfig.cpp	Fri Jul 03 22:42:45 2015 +0000
+++ b/camera_app/mt9d111/i2cconfig.cpp	Sun Jul 05 22:18:04 2015 +0000
@@ -63,7 +63,7 @@
 uint32_t I2CInit()
 {
 //    Uart_Write((uint8_t*)"I2CInit \n\r");
-    i2c.frequency (400000); 
+    i2c.frequency (100000); 
 
     return 0;
 }
@@ -89,10 +89,20 @@
 {
 //	Uart_Write((uint8_t*)"I2CBufferRead \n\r");
 //    uint32_t ulNdx;
+    bool err;
+    if(ucFlags == I2C_SEND_START){
+    	i2c.start(); 	   
+    }
     
     // Set I2C slave address
-    i2c.read(ucDevAddr, ucBuffer, ulSize);  
-
+    err = i2c.read(ucDevAddr, ucBuffer, ulSize);
+    if(!err){
+    	return 1;
+    }
+    if(ucFlags == I2C_SEND_STOP){
+    	i2c.stop();
+    }
+    
     return 0;
 }
 //****************************************************************************
@@ -117,9 +127,19 @@
 {
 //	Uart_Write((uint8_t*)"I2CBufferWrite \n\r");
 //    uint32_t ulNdx;
+    bool err;
+    if(ucFlags == I2C_SEND_START){
+    	i2c.start(); 	   
+    }
     
    // Set I2C slave address
-    i2c.write(ucDevAddr, ucBuffer, ulSize);
+    err = i2c.write(ucDevAddr, ucBuffer, ulSize);
+    if(!err){
+    	return 1;
+    }
+    if(ucFlags == I2C_SEND_STOP){
+    	i2c.stop();
+    }
 
     return 0;
 }

--- a/camera_app/mt9d111/mt9d111.cpp	Fri Jul 03 22:42:45 2015 +0000
+++ b/camera_app/mt9d111/mt9d111.cpp	Sun Jul 05 22:18:04 2015 +0000
@@ -443,6 +443,7 @@
                 ASSERT_ON_ERROR(lRetVal);
                 if(I2CBufferRead(CAM_I2C_SLAVE_ADDR,ucBuffer,2,1))
                 {
+                    Uart_Write((uint8_t*)"\n\rError reading ucBuffer \n\r");
                     return RET_ERROR;
                 }
 
@@ -459,6 +460,7 @@
             ucBuffer[2] = (unsigned char)(pRegLst->ucPageAddr);
             if(0 != I2CBufferWrite(CAM_I2C_SLAVE_ADDR,ucBuffer,3,I2C_SEND_STOP))
             {
+                Uart_Write((uint8_t*)"\n\rError writing ucBuffer \n\r");
                 return RET_ERROR;
             }
 
@@ -498,6 +500,7 @@
             if(0 != I2CBufferWrite(CAM_I2C_SLAVE_ADDR,ucBuffer,
                                                       ulSize,I2C_SEND_STOP))
             {
+                Uart_Write((uint8_t*)"\n\rError writting I2C_SEND_STOP \n\r");
                 return RET_ERROR;
             }
         }

--- a/http/server/HttpSocket.cpp	Fri Jul 03 22:42:45 2015 +0000
+++ b/http/server/HttpSocket.cpp	Sun Jul 05 22:18:04 2015 +0000
@@ -29,7 +29,6 @@
 
 using namespace mbed_cc3100;
 
-//cc3100 _cc3100_Module(NC, NC, PE_5, PE_4, PE_6, SPI(PB_5, PB_4, PB_3));//Seeed_Arch_Max  irq, nHib, cs, mosi, miso, sck
 cc3100 _cc3100_Module(NC, NC, PD_12, PD_13, PD_11, SPI(PB_5, PB_4, PB_3));//Seeed_Arch_Max  irq, nHib, cs, mosi, miso, sck
 
 #define OSI_DELAY(x)    osi_Sleep(x); //os idle
@@ -216,7 +215,7 @@
 
 int ClientSocketSend(long socket, char * buffer, unsigned int len)
 {
-  HttpDebug("\r\n ClientSocketSend\n\r");
+//  HttpDebug("\r\n ClientSocketSend\n\r");
   int send_len = 0, Ittr = 0;
 
   do

--- a/main.cpp	Fri Jul 03 22:42:45 2015 +0000
+++ b/main.cpp	Sun Jul 05 22:18:04 2015 +0000
@@ -52,7 +52,7 @@
 #include "httpserverapp.h"
 
 //#include "stm32f4xx_hal.h"
-//#include "stm32f4xx_hal_rcc.h"
+#include "stm32f4xx_hal_rcc.h"
 
 /* Free-RTOS includes */
 #include "osi.h"
@@ -64,34 +64,9 @@
 using namespace mbed_cc3100;
 
 static void SystemClock_Config(void);
-static void MX_DMA_Init(void);
-static void MX_DCMI_Init(void);
 
 void DCMI_IRQHandler(void);
 void DMA2_Stream1_IRQHandler(void);
- 
- /**
-  * Initializes the Global MSP.
-  */
-//void HAL_MspInit(void)
-//{
-  /* USER CODE BEGIN MspInit 0 */
-
-  /* USER CODE END MspInit 0 */
-
-//  HAL_NVIC_SetPriorityGrouping(NVIC_PRIORITYGROUP_4);
-
-  /* System interrupt init*/
-/* SysTick_IRQn interrupt configuration */
-//  HAL_NVIC_SetPriority(SysTick_IRQn, 0, 0);
-
-  /* USER CODE BEGIN MspInit 1 */
-
-  /* USER CODE END MspInit 1 */
-//}
- 
-//DCMI_HandleTypeDef hdcmi;
-//DMA_HandleTypeDef hdma_dcmi;
 
 /** System Clock Configuration
 */
@@ -102,10 +77,10 @@
   
   RCC_OscInitTypeDef RCC_OscInitStruct;
   RCC_ClkInitTypeDef RCC_ClkInitStruct;
-//  RCC_PeriphCLKInitTypeDef PeriphClkInitStruct;//Used for ov7670 test
+  RCC_PeriphCLKInitTypeDef PeriphClkInitStruct;//Used for ov7670 test
   
   __PWR_CLK_ENABLE();
-
+//  __GPIOH_CLK_ENABLE(); //Enable HSE Clock 8MHz 
   __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1);
 
   RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE;
@@ -127,24 +102,27 @@
   HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_5);
   
   //Used for ov7670 test
-//  PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_PLLI2S;
-//  PeriphClkInitStruct.PLLI2S.PLLI2SN = 192;
-//  PeriphClkInitStruct.PLLI2S.PLLI2SR = 2;
-//  HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct);
+  PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_PLLI2S;
+  PeriphClkInitStruct.PLLI2S.PLLI2SN = 192;
+  PeriphClkInitStruct.PLLI2S.PLLI2SR = 2;
+  HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct);
   
-  /* RCC_MCODIV_5 33.6MHz mco output on pin PC_9 (cam xclk) */
-  /* RCC_MCODIV_4 42MHz mco output on pin PC_9 (cam xclk) */
-  /* RCC_MCODIV_3 56MHz mco output on pin PC_9 (cam xclk) */
-//  HAL_RCC_MCOConfig(RCC_MCO2, RCC_MCO2SOURCE_SYSCLK, RCC_MCODIV_3);
+  /* RCC_MCODIV_5 33.6MHz mco2 output on pin PC_9 (cam xclk) */
+  /* RCC_MCODIV_4 42MHz mco2 output on pin PC_9 (cam xclk) */
+  /* RCC_MCODIV_3 56MHz mco2 output on pin PC_9 (cam xclk) */
+//  HAL_RCC_MCOConfig(RCC_MCO2, RCC_MCO2SOURCE_SYSCLK, RCC_MCODIV_4);
 
-  /* RCC_MCODIV_1 8MHz mco output on pin PC_9 (cam xclk) */ 
-  /* RCC_MCODIV_2 4MHz mco output on pin PC_9 (cam xclk) */ 
-  /* RCC_MCODIV_4 2MHz mco output on pin PC_9 (cam xclk) */  
-  HAL_RCC_MCOConfig(RCC_MCO2, RCC_MCO2SOURCE_HSE, RCC_MCODIV_4);
+  /* RCC_MCODIV_1 16MHz mco1 output on pin PA_8 (cam xclk) */
+  HAL_RCC_MCOConfig(RCC_MCO1, RCC_MCO1SOURCE_HSI, RCC_MCODIV_1);
+
+  /* RCC_MCODIV_1 8MHz mco2 output on pin PC_9 (cam xclk) */ 
+  /* RCC_MCODIV_2 4MHz mco2 output on pin PC_9 (cam xclk) */ 
+  /* RCC_MCODIV_4 2MHz mco2 output on pin PC_9 (cam xclk) */  
+//  HAL_RCC_MCOConfig(RCC_MCO2, RCC_MCO2SOURCE_HSE, RCC_MCODIV_1);
 
   //Used for ov7670 test
-  /* RCC_MCODIV_4 24MHz mco output on pin PC_9 (cam xclk) */
-//  HAL_RCC_MCOConfig(RCC_MCO2, RCC_MCO2SOURCE_PLLI2SCLK, RCC_MCODIV_4);
+  /* RCC_MCODIV_4 24MHz mco2 output on pin PC_9 (cam xclk) */
+  HAL_RCC_MCOConfig(RCC_MCO2, RCC_MCO2SOURCE_PLLI2SCLK, RCC_MCODIV_4);
 
   HAL_SYSTICK_Config(HAL_RCC_GetHCLKFreq()/1000);
   
@@ -158,43 +136,6 @@
 //  }
   
 }
- 
-void MX_DCMI_Init()
-{
-  DCMI_HandleTypeDef hdcmi;
-  DMA_HandleTypeDef hdma_dcmi;
-
-  hdcmi.Instance = DCMI;
-  hdcmi.Init.SynchroMode = DCMI_SYNCHRO_HARDWARE;
-  hdcmi.Init.PCKPolarity = DCMI_PCKPOLARITY_RISING;//FALLING
-  hdcmi.Init.VSPolarity = DCMI_VSPOLARITY_LOW;
-  hdcmi.Init.HSPolarity = DCMI_HSPOLARITY_LOW;
-  hdcmi.Init.CaptureRate = DCMI_CR_ALL_FRAME;
-  hdcmi.Init.ExtendedDataMode = DCMI_EXTEND_DATA_8B;
-#ifdef ENABLE_JPEG  
-  hdcmi.Init.JPEGMode = DCMI_JPEG_ENABLE;
-#else
-  hdcmi.Init.JPEGMode = DCMI_JPEG_DISABLE;
-#endif
-
-  HAL_DCMI_MspInit(&hdcmi);  
-  HAL_DCMI_Init(&hdcmi);
-
-}
-
-/** 
-  * Enable DMA controller clock
-  */
-void MX_DMA_Init(void) 
-{
-  /* DMA controller clock enable */
-   __DMA2_CLK_ENABLE();
-
-  /* DMA interrupt init */
-  HAL_NVIC_SetPriority(DMA2_Stream1_IRQn, 5, 5);
-//  HAL_NVIC_EnableIRQ(DMA2_Stream1_IRQn);
-
-}
 
 /* Warning if pin changes are made below then the same changes have to be made in the following files.
  * httpserverapp.cpp
@@ -280,11 +221,7 @@
    // Configuring UART
    //
    CLI_Configure();
-   
-/* Initialize all configured peripherals */
-//   MX_DMA_Init();
-//   MX_DCMI_Init();
-//   initLEDs();
+   initLEDs();
 
 //   toggleLed(1);
 //#ifndef NOTERM