Added UART print/input to capture app

- Fixed few print issues

Signed-off-by: Sivaraj R <sivaraj@ti.com>

diff --git a/cal_component.mk b/cal_component.mk
index d06b9428eb9d53f0ba3dc01070b9db58c13c4a0f..7e59a51915bdf41da40afba57d481ce67639f570 100644 (file)
--- a/cal_component.mk
+++ b/cal_component.mk
@@ -88,6 +88,8 @@ cal_app_utils_MAKEFILE = -fmakefile
 export cal_app_utils_LIBNAME
 export cal_app_utils_LIBPATH
 export cal_app_utils_MAKEFILE
+cal_app_utils_OBJPATH = $(cal_app_utils_RELPATH)
+export cal_app_utils_OBJPATH
 cal_app_utils_BOARD_DEPENDENCY = yes
 cal_app_utils_CORE_DEPENDENCY = yes
 export cal_app_utils_COMP_LIST
@@ -110,6 +112,8 @@ cal_app_utils_baremetal_MAKEFILE = -fmakefile_baremetal
 export cal_app_utils_baremetal_LIBNAME
 export cal_app_utils_baremetal_LIBPATH
 export cal_app_utils_baremetal_MAKEFILE
+cal_app_utils_baremetal_OBJPATH = $(cal_app_utils_baremetal_RELPATH)_baremetal
+export cal_app_utils_baremetal_OBJPATH
 cal_app_utils_baremetal_BOARD_DEPENDENCY = yes
 cal_app_utils_baremetal_CORE_DEPENDENCY = yes
 export cal_app_utils_baremetal_COMP_LIST

diff --git a/examples/cal_capture_test/src/CaptureCal_main.c b/examples/cal_capture_test/src/CaptureCal_main.c
index a41682765f9a08188915bfd18d0b0d89333ad82b..f2dc759d5dd72fba2520f1c65b66af6a28cb18af 100644 (file)
--- a/examples/cal_capture_test/src/CaptureCal_main.c
+++ b/examples/cal_capture_test/src/CaptureCal_main.c
@@ -45,7 +45,6 @@
 /* ========================================================================== */
 
 #include <CaptureCal_main.h>
-#include <ti/board/board.h>
 
 /* ========================================================================== */
 /*                           Macros & Typedefs                                */
@@ -54,7 +53,7 @@
 /**< CSI2 PHY Clock Custom sensor. */
 #define APP_CAPT_CAL_SENSOR_BYPASS_PHY_CLK_MHz (400U)
 
-#define APP_CAPT_MAX_WIDTH (1280U)
+#define APP_CAPT_MAX_WIDTH  (1280U)
 #define APP_CAPT_MAX_HEIGHT (720U)
 
 /* ========================================================================== */
@@ -87,7 +86,7 @@ static int32_t appCaptEnableErrorReporting(appCaptObj_t *appObj);
 static int32_t appCaptEnableFrameEventNotification(appCaptObj_t *appObj,
                                                     appCaptCfg_t *pCfg);
 static void appCaptChkFrameEvents(appCaptObj_t *appObj);
-static int32_t appBoardInit(void);
+void App_print(const char *format, ...);
 
 /* ========================================================================== */
 /*                            Global Variables                                */
@@ -168,10 +167,13 @@ void Cal_captureTest(void)
 
 static void appCaptInit(appCaptObj_t *appObj)
 {
-    int32_t  retVal;
+    int32_t         retVal;
+    Fvid2_InitPrms  initPrms;
 
     /* Fvid2 init */
-    retVal = Fvid2_init(NULL);
+    Fvid2InitPrms_init(&initPrms);
+    initPrms.printFxn = &App_print;
+    retVal = Fvid2_init(&initPrms);
     if (retVal != FVID2_SOK)
     {
         GT_0trace(CalTrace, GT_ERR,
@@ -193,13 +195,6 @@ static void appCaptInit(appCaptObj_t *appObj)
                   APP_NAME ": Mem Init Failed!!!\r\n");
     }
 
-    retVal = appBoardInit();
-    if (retVal != FVID2_SOK)
-    {
-        GT_0trace(CalTrace, GT_ERR,
-                  APP_NAME ": Mem Init Failed!!!\r\n");
-    }
-
     if (FVID2_SOK == retVal)
     {
         GT_0trace(CalTrace, GT_INFO,
@@ -721,7 +716,8 @@ static int32_t appCaptAllocAndQFrames(appCaptObj_t *appObj)
     Fvid2_Format           fmt;
     Fvid2_Frame           *pFrm;
     static Fvid2_FrameList frmList;
-    static Char            fileStr[50U];
+    static Char            fileStr[200U];
+    char                  *fmtStr;
 
     /* for every stream and channel in a capture handle */
     Fvid2FrameList_init(&frmList);
@@ -763,10 +759,16 @@ static int32_t appCaptAllocAndQFrames(appCaptObj_t *appObj)
             break;
         }
 
+        fmtStr = "yuyv422";
+        if(CAL_CSI2_RGB888 == appObj->testPrms.inCsi2DataFormat)
+        {
+            fmtStr = "rgb888";
+        }
         snprintf(fileStr, sizeof (fileStr),
-                 "captureCalOption%uStr%u_prog_packed_%u_%u.tigf",
+                 "captureCalOption%uStr%u_%s_prog_packed_%u_%u.tigf",
                  (unsigned int) appObj->testPrms.cfgId,
                  (unsigned int) streamId,
+                 fmtStr,
                  (unsigned int) appObj->testPrms.width,
                  (unsigned int) appObj->testPrms.height);
         CalUtils_memFrameGetSize(&fmt, &bufSize, NULL);
@@ -1071,7 +1073,7 @@ static int32_t appCaptGetTestId(appCaptObj_t *appObj)
 
     while (1U)
     {
-        scanf("%d", &testId);
+        UART_scanFmt("%d", &testId);
         GT_1trace(CalTrace, GT_INFO, "%d\r\n", testId);
         if ((testId >= 0) && (testId < APP_CAPT_NUM_OPTS))
         {
@@ -1260,14 +1262,16 @@ static void appCaptChkFrameEvents(appCaptObj_t *appObj)
 
 }
 
-static int32_t appBoardInit(void)
+void App_print(const char *format, ...)
 {
-    Board_initCfg boardCfg;
+    va_list     vaArgPtr;
 
-    boardCfg = BOARD_INIT_PINMUX_CONFIG |
-                BOARD_INIT_UNLOCK_MMR |
-                BOARD_INIT_UART_STDIO;
-    Board_init(boardCfg);
+    va_start(vaArgPtr, format);
 
-    return FVID2_SOK;
+    UART_printf(format, vaArgPtr);
+    printf(format, vaArgPtr);
+
+    va_end(vaArgPtr);
+
+    return;
 }

diff --git a/examples/cal_capture_test/src/CaptureCal_main.h b/examples/cal_capture_test/src/CaptureCal_main.h
index e1d59032d33f091d9f4859b176a24f66d9df5b09..a95d105ab7abbd463fffe78a04dc8d6be545cf63 100644 (file)
--- a/examples/cal_capture_test/src/CaptureCal_main.h
+++ b/examples/cal_capture_test/src/CaptureCal_main.h
@@ -47,6 +47,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+/* This is needed for vsnprintf */
+#include <stdarg.h>
 
 #ifndef BARE_METAL
 #include <xdc/std.h>
@@ -58,6 +60,8 @@
 
 #include <ti/drv/fvid2/fvid2.h>
 #include <ti/drv/cal/cal.h>
+#include <ti/drv/uart/UART.h>
+#include <ti/drv/uart/UART_stdio.h>
 
 #include <ti/drv/cal/examples/utils/calutils.h>
 

diff --git a/examples/cal_capture_test/src/main_baremetal.c b/examples/cal_capture_test/src/main_baremetal.c
index 2524613e1ab3e78da8348ffb8aaf4c622d751c96..7f5aa0d46f652ecb2b605bd3c31921023189316f 100644 (file)
--- a/examples/cal_capture_test/src/main_baremetal.c
+++ b/examples/cal_capture_test/src/main_baremetal.c
@@ -40,8 +40,8 @@
 /*                             Include Files                                  */
 /* ========================================================================== */
 
-#include <stdio.h>
 #include <stdint.h>
+#include <ti/board/board.h>
 
 /* ========================================================================== */
 /*                           Macros & Typedefs                                */
@@ -60,6 +60,7 @@
 /* ========================================================================== */
 
 extern int32_t Cal_captureTest(void);
+static int32_t appBoardInit(void);
 
 /* ========================================================================== */
 /*                            Global Variables                                */
@@ -73,7 +74,20 @@ extern int32_t Cal_captureTest(void);
 
 int main(void)
 {
+    appBoardInit();
     Cal_captureTest();
 
     return(0);
 }
+
+static int32_t appBoardInit(void)
+{
+    Board_initCfg boardCfg;
+
+    boardCfg = BOARD_INIT_PINMUX_CONFIG |
+                BOARD_INIT_UNLOCK_MMR |
+                BOARD_INIT_UART_STDIO;
+    Board_init(boardCfg);
+
+    return 0;
+}

diff --git a/examples/cal_capture_test/src/main_tirtos.c b/examples/cal_capture_test/src/main_tirtos.c
index 4da101e802ed519aeaadc31e17402e7b7ca0e82b..33e5a06fa70621a500da1a55633c4b8965b0cb83 100644 (file)
--- a/examples/cal_capture_test/src/main_tirtos.c
+++ b/examples/cal_capture_test/src/main_tirtos.c
@@ -40,7 +40,7 @@
 /*                             Include Files                                  */
 /* ========================================================================== */
 
-#include <stdio.h>
+#include <stdint.h>
 /* XDCtools Header files */
 #include <xdc/std.h>
 #include <xdc/runtime/Error.h>
@@ -51,6 +51,7 @@
 #if defined (__aarch64__)
 #include <ti/sysbios/family/arm/v8a/Mmu.h>
 #endif
+#include <ti/board/board.h>
 
 /* ========================================================================== */
 /*                           Macros & Typedefs                                */
@@ -73,6 +74,7 @@
 /* ========================================================================== */
 static Void taskFxn(UArg a0, UArg a1);
 extern void Cal_captureTest(void);
+static int32_t appBoardInit(void);
 
 /* ========================================================================== */
 /*                            Global Variables                                */
@@ -111,10 +113,23 @@ int main(void)
 
 static Void taskFxn(UArg a0, UArg a1)
 {
+    appBoardInit();
     Cal_captureTest();
     return;
 }
 
+static int32_t appBoardInit(void)
+{
+    Board_initCfg boardCfg;
+
+    boardCfg = BOARD_INIT_PINMUX_CONFIG |
+                BOARD_INIT_UNLOCK_MMR |
+                BOARD_INIT_UART_STDIO;
+    Board_init(boardCfg);
+
+    return 0;
+}
+
 #if defined (__aarch64__)
 volatile int32_t emuwait_mmu = 1;
 void InitMmu(void)
@@ -222,7 +237,7 @@ void InitMmu(void)
     {
          goto mmu_exit;
     }
-        
+
 
      mapIdx++;
     retVal = Mmu_map(0x06F00000, 0x06F00000, 0x0008000, &attrs); /* cal        */