[nasa/nos3#462] Updated the File logic in device to be togged with a tag in platform_cfg/device_cfg for checkout, and made it so it is disabled by default (as it has been) for cFS, and enabled by default for the checkout.

Author: kevincbruce

fsw/cfs/platform_inc/cam_platform_cfg.h

@@ -46,6 +46,8 @@ [email protected]
     //#define OV2640
     #define OV5640 
     //#define OV5642
+    //enable file mode:
+    //#define FILE_MODE
 #endif 
 
 #endif 

fsw/shared/cam_device.c

@@ -501,7 +501,7 @@ int32_t CAM_read(char* buf, uint16_t* i, uint8_t* status)
     uint8_t spiw[2] = { 0x3D, 0x00}; // FIFO read
 
     #ifdef FILE_OUTPUT
-        FILE *fp1 = fopen("pic.jpg", "a"); 
+        FILE *fp1 = fopen("/home/jstar/Desktop/github-nos3/pic.jpg", "a"); 
         if (!fp1)
         {
             OS_printf("\t ERROR: Could not create file\n");

fsw/shared/cam_device.h

@@ -26,7 +26,9 @@ [email protected]
 /************************************************************************
 ** Debug Definitions
 *************************************************************************/
-//#define FILE_OUTPUT
+#ifdef FILE_MODE
+    #define FILE_OUTPUT
+#endif
 //#define STF1_DEBUG
 
 /************************************************************************

fsw/standalone/arducam_checkout.c

@@ -93,87 +93,96 @@ int get_command(const char* str)
 
 int take_picture(uint8_t size)
 {
-    int32_t status = OS_SUCCESS;
+    uint8_t status = 1;
     uint32_t length = 0;
     uint8_t data[CAM_DATA_SIZE];
     uint16_t x = 0;
+    int32_t result = OS_ERROR;
+    int32_t read_result = OS_SUCCESS;
 
-    // Initialize Inter-Integrated Circuit
-    status = CAM_init_i2c();
-    if (status != OS_SUCCESS) return OS_ERROR;
+    while( status == 1)
+    {
+        // Initialize Inter-Integrated Circuit
+    result = CAM_init_i2c();
+    if (result != OS_SUCCESS) return OS_ERROR;
     OS_printf("I2C initialization success\n");
 
     // Initialize Serial Peripheral Interface
-    status = CAM_init_spi();
-    if (status != OS_SUCCESS) return OS_ERROR;
+    result = CAM_init_spi();
+    if (result != OS_SUCCESS) return OS_ERROR;
     OS_printf("SPI initialization success\n");
 
     // Configure Camera for Upload
-    status = CAM_config();
-    if (status != OS_SUCCESS) return OS_ERROR;
+    result = CAM_config();
+    if (result != OS_SUCCESS) return OS_ERROR;
     OS_printf("Configuration success\n");
 
     // Configure Registers
-    status = CAM_jpeg_init();
-    if (status != OS_SUCCESS) return OS_ERROR;
+    result = CAM_jpeg_init();
+    if (result != OS_SUCCESS) return OS_ERROR;
     OS_printf("JPEG init success\n");
 
     // Configure Registers
-    status = CAM_yuv422();
-    if (status != OS_SUCCESS) return OS_ERROR;
+    result = CAM_yuv422();
+    if (result != OS_SUCCESS) return OS_ERROR;
     OS_printf("YUV422 success\n");
 
     // Configure Registers
-    status = CAM_jpeg();
-    if (status != OS_SUCCESS) return OS_ERROR;
+    result = CAM_jpeg();
+    if (result != OS_SUCCESS) return OS_ERROR;
     OS_printf("JPEG success\n");
 
     // Configure Camera for Size
-    status = CAM_setup();
-    if (status != OS_SUCCESS) return OS_ERROR;
+    result = CAM_setup();
+    if (result != OS_SUCCESS) return OS_ERROR;
     OS_printf("Configuration success\n");
 
     // Upload Size
-    status = CAM_setSize(size);
-    if (status != OS_SUCCESS) return OS_ERROR;
+    result = CAM_setSize(size);
+    if (result != OS_SUCCESS) return OS_ERROR;
     OS_printf("Set size success\n");
 
     // Prepare for Capture
-    status = CAM_capture_prep();
-    if (status != OS_SUCCESS) return OS_ERROR;
+    result = CAM_capture_prep();
+    if (result != OS_SUCCESS) return OS_ERROR;
     OS_printf("Capture prep success\n");
 
     // Capture Image
-    status = CAM_capture();
-    if (status != OS_SUCCESS) return OS_ERROR;
+    result = CAM_capture();
+    if (result != OS_SUCCESS) return OS_ERROR;
     OS_printf("Capture success\n");
 
     // Read FIFO Size
-    status = CAM_read_fifo_length(&length);
-    if (status != OS_SUCCESS) return OS_ERROR;
+    result = CAM_read_fifo_length(&length);
+    if (result != OS_SUCCESS) return OS_ERROR;
     OS_printf("Read fifo length success\n");
 
     // Prepare for FIFO Read
-    status = CAM_read_prep((char*) &data, (uint16_t*) &x);
-    if (status != OS_SUCCESS) return OS_ERROR;
+    result = CAM_read_prep((char*) &data, (uint16_t*) &x);
+    if (result != OS_SUCCESS) return OS_ERROR;
     OS_printf("Read prep success\n");
 
     //// Read FIFO
-    FILE *expFile;
-    expFile = fopen("exp.jpg", "wb");
-
-    if(expFile == NULL)
+    while( (status > 0) && (status <= 8) )
     {
-        OS_printf("Error opening file!\n");
-        status = OS_ERROR;
-    }
 
-    status = CAM_read((char*) &data, (uint16_t*) &x, (uint8_t*) &status);
+        read_result = CAM_read((char*) &data, (uint16_t*) &x, (uint8_t*) &status);
+
+        if (read_result != OS_SUCCESS)
+        {	
+            OS_printf("CAM read error");
+        }
+        if (read_result != OS_SUCCESS) break;	 
+        x = 0;
+
+        OS_TaskDelay(250);
+    }
 
-    fwrite(data, x, 1, expFile); 
-    fclose(expFile);
     if (status != OS_SUCCESS) return OS_ERROR;
     OS_printf("FIFO success\n");
+    break;
+    }
+    
 
     return OS_SUCCESS;
 }

fsw/standalone/device_cfg.h

@@ -19,5 +19,6 @@
 //#define OV2640
 #define OV5640 
 //#define OV5642
+#define FILE_MODE
 
 #endif /* _ARDUCAM_CHECKOUT_DEVICE_CFG_H_ */