fixes for camera tests

Author: pnndra

libraries/Himax_HM01B0/himax.cpp

@@ -205,12 +205,13 @@ uint8_t HIMAX_Open(void)
 {
     Wire.begin();
 
-    printf("Model: %x:%x\n", HIMAX_RegRead(MODEL_ID_H), HIMAX_RegRead(MODEL_ID_L));
+    //printf("Model: %x:%x\n", HIMAX_RegRead(MODEL_ID_H), HIMAX_RegRead(MODEL_ID_L));
 
-    HIMAX_Reset();
-    HIMAX_Boot();
+    if (HIMAX_Reset()!=0) return -1;
+    //HIMAX_Boot();
     //For debugging camera Configuration
-    HIMAX_PrintReg();
+    //HIMAX_PrintReg();
+    HAL_Delay(200);
 
     return 0;
 }
@@ -269,22 +270,23 @@ static uint8_t HIMAX_RegRead(uint16_t addr)
 
 static uint8_t HIMAX_Reset()
 {
+    uint32_t max_timeout=100;
     do {
         HIMAX_RegWrite(SW_RESET, HIMAX_RESET);
-        delayMicroseconds(50);
-    } while (HIMAX_RegRead(MODE_SELECT) != HIMAX_Standby);
+        delay(1);
+    } while (HIMAX_RegRead(MODE_SELECT) != HIMAX_Standby && ((--max_timeout)>0) );
 
-    return 0;
+    return max_timeout>0 ? 0: -1 ;
 }
 
 static uint8_t HIMAX_Boot()
 {
     uint32_t i;
 
     for(i = 0; i < (sizeof(himax_default_regs) / sizeof(regval_list_t)); i++) {
-        printf("%d\n", i);
+        //printf("%d\n", i);
         HIMAX_RegWrite(himax_default_regs[i].reg_num, himax_default_regs[i].value);
-        delayMicroseconds(50);
+        //delay(1);
     }
 
     HIMAX_RegWrite(PCLK_POLARITY, (0x20 | PCLK_FALLING_EDGE));
@@ -303,10 +305,22 @@ static void HIMAX_GrayScale(uint8_t value)
 void HIMAX_TestPattern(bool enable, bool walking)
 {
     uint8_t reg = 0;
+    HIMAX_RegWrite(PCLK_POLARITY, (0x20 | PCLK_FALLING_EDGE));
+    HIMAX_RegWrite(0x2100,  0 ); //AE 
+    HIMAX_RegWrite(0x1000,  0 ); //BLC 
+    HIMAX_RegWrite(0x1008,  0 ); //DPC 
+    HIMAX_RegWrite(0x0205,  0 ); //AGAIN 
+    HIMAX_RegWrite(0x020e,  1 ); //DGAINH 
+    HIMAX_RegWrite(0x020f,  0 ); //DGAINL 
+    
     if (enable) {
         reg = 1 | (walking ? (1 << 4) : 0);
     }
     HIMAX_RegWrite(0x0601,  reg );
+    HIMAX_RegWrite(0x0104,  1 ); //group hold 
+
+    HAL_Delay(100);
+
 }
 
 static void HIMAX_FrameRate()

libraries/Portenta_Camera/camera.cpp

@@ -180,7 +180,7 @@ uint32_t BSP_CAMERA_GetRotation(void)
 uint8_t BSP_CAMERA_Init(uint32_t Resolution)
 {
   DCMI_HandleTypeDef *phdcmi;
-  uint8_t status = 0;
+  uint8_t status = -1;
 
   /* Get the DCMI handle structure */
   phdcmi = &hdcmi_discovery;
@@ -197,7 +197,7 @@ uint8_t BSP_CAMERA_Init(uint32_t Resolution)
 
   /* Power up camera */
   BSP_CAMERA_PwrUp();
-  HIMAX_Open();
+  if (HIMAX_Open()!=0) return status;
 
   /* DCMI Initialization */
   BSP_CAMERA_MspInit(&hdcmi_discovery, NULL);
@@ -212,15 +212,15 @@ uint8_t BSP_CAMERA_Init(uint32_t Resolution)
   */
 //HAL_StatusTypeDef HAL_DCMI_ConfigCrop(DCMI_HandleTypeDef *hdcmi, uint32_t X0, uint32_t Y0, uint32_t XSize, uint32_t YSize)
 
-  HAL_DCMI_ConfigCROP(phdcmi, (QVGA_RES_X - CameraResX) / 2, (QVGA_RES_Y - CameraResY / 2), CameraResX, CameraResY);
+  HAL_DCMI_ConfigCROP(phdcmi, (QVGA_RES_X - CameraResX) / 2, (QVGA_RES_Y - CameraResY / 2), CameraResX-1, CameraResY-1);
   HAL_DCMI_EnableCROP(phdcmi);
 
   //HAL_DCMI_DisableCROP(phdcmi);
 
   CameraCurrentResolution = Resolution;
 
   /* Return CAMERA_OK status */
-  status = 1;
+  status = 0;
 
   return status;
 }
@@ -532,24 +532,26 @@ int CameraClass::begin(int horizontalResolution, int verticalResolution)
 
   /*## Camera Initialization and capture start ############################*/
   /* Initialize the Camera in QVGA mode */
-  if(BSP_CAMERA_Init(CAMERA_R320x240) != 1)
+  if(BSP_CAMERA_Init(CAMERA_R320x240) != 0)
   {
-    return 0;
+    return -1;
   }
-
+  return 0;
 }
 
-int CameraClass::start(void)
+int CameraClass::start(uint32_t timeout)
 {
   HIMAX_Mode(HIMAX_Streaming);
 
   /* Start the Camera Snapshot Capture */
   BSP_CAMERA_ContinuousStart((uint8_t *)LCD_FRAME_BUFFER);
+  uint32_t time =millis();
 
   /* Wait until camera frame is ready : DCMI Frame event */
-  while(camera_frame_ready == 0)
+  while((camera_frame_ready == 0) && ((timeout+time)>millis()))
   {
   }
+  return camera_frame_ready ? 0: -1;
 }
 
 uint8_t* CameraClass::grab(void)

libraries/Portenta_Camera/camera.h

@@ -2,7 +2,7 @@ class CameraClass {
 public:
 	int begin(int horizontalResolution, int verticalResolution);
 	uint8_t* snapshot();
-	int start(void);
+	int start(uint32_t timeout);
 	uint8_t* grab(void);
 	void testPattern(bool walking);
 };