Diff: main.cpp

Revision:

7:e1dfd64eba81

Parent:

6:e689075b04ed

Child:

8:d1c41eca57f0

--- a/main.cpp	Sat Dec 28 18:50:08 2019 +0000
+++ b/main.cpp	Sat Dec 28 21:11:56 2019 +0000
@@ -21,9 +21,11 @@
 #define OSC_LINE_SIZE       256
 #define L_CHANNEL_Y_POS     120
 #define R_CHANNEL_Y_POS     220
+#define AUDIO_DRAW_LIMIT    30
 
 volatile uint32_t  audio_rec_buffer_state = BUFFER_OFFSET_NONE;
-static void Draw_Trace(uint16_t Xpos, uint16_t Ypos, uint32_t Mem_start, uint16_t Length);
+static void Erase_Trace(uint16_t Xpos, uint16_t L_Ypos, uint16_t R_Ypos, uint16_t Length);
+static void Draw_Trace(uint16_t Xpos, uint16_t L_Ypos, uint16_t R_Ypos, uint32_t Mem_start, uint16_t Length);
 
 int main()
 {
@@ -38,14 +40,14 @@
 
     BSP_LCD_SetBackColor(LCD_COLOR_BLACK);
     BSP_LCD_SetTextColor(LCD_COLOR_ORANGE);
-    BSP_LCD_DisplayStringAt(0, 0, (uint8_t *)"487 Audio Loopback Test Code", LEFT_MODE);
+    BSP_LCD_DisplayStringAt(0, 0, (uint8_t *)"487 Mic Audio Test Code", LEFT_MODE);
 
     printf("\n\nAUDIO LOOPBACK EXAMPLE START:\n");
 
     BSP_AUDIO_IN_OUT_Init(INPUT_DEVICE_DIGITAL_MICROPHONE_2, OUTPUT_DEVICE_HEADPHONE, DEFAULT_AUDIO_IN_FREQ, DEFAULT_AUDIO_IN_BIT_RESOLUTION, DEFAULT_AUDIO_IN_CHANNEL_NBR);
     printf("AUDIO loop from digital micro (U20 & U21 components on board) to headphone (CN10 jack connector)\n");
 
-    BSP_LCD_DisplayStringAt(10, 20, (uint8_t *)"SDRAM Initialization", LEFT_MODE);
+    // BSP_LCD_DisplayStringAt(10, 20, (uint8_t *)"SDRAM Initialization", LEFT_MODE);
 
 
     /* Initialize SDRAM buffers */
@@ -95,11 +97,8 @@
         /* Copy recorded 2nd half block */
         memcpy((uint16_t *)(AUDIO_BUFFER_OUT + (AUDIO_BLOCK_SIZE)), (uint16_t *)(AUDIO_BUFFER_IN + (AUDIO_BLOCK_SIZE)), AUDIO_BLOCK_SIZE);
 
-        BSP_LCD_SetTextColor(LCD_COLOR_BLUE);
-        BSP_LCD_DrawHLine(OSC_START_X_POS, L_CHANNEL_Y_POS, OSC_LINE_SIZE);
-        BSP_LCD_DrawHLine(OSC_START_X_POS, R_CHANNEL_Y_POS, OSC_LINE_SIZE);
-
-        Draw_Trace(OSC_START_X_POS, L_CHANNEL_Y_POS, AUDIO_BUFFER_OUT, 256);
+        Erase_Trace(OSC_START_X_POS, L_CHANNEL_Y_POS, R_CHANNEL_Y_POS, 256);
+        Draw_Trace(OSC_START_X_POS, L_CHANNEL_Y_POS, R_CHANNEL_Y_POS, AUDIO_BUFFER_OUT, 256);
         
         counter++;
         sprintf(buf, "%d", counter);
@@ -108,37 +107,85 @@
     }
 }
 
+/**
+  * @brief  Draws a trace of the data line.
+  * @param  Xpos: X position
+  * @param  L_Ypos: Left channel Y position
+  * @param  R_Ypos: Right channel Y position
+  * @param  Mem_start: Start of memory location
+  * @param  Length: length of trace
+  * @retval None
+  */
+void Erase_Trace(uint16_t Xpos, uint16_t L_Ypos, uint16_t R_Ypos, uint16_t Length)
+{
+    BSP_LCD_SetTextColor(LCD_COLOR_BROWN);
+    BSP_LCD_FillRect(Xpos, L_Ypos - AUDIO_DRAW_LIMIT, Length, AUDIO_DRAW_LIMIT);
+    BSP_LCD_FillRect(Xpos, L_Ypos+1, Length, AUDIO_DRAW_LIMIT);
+    BSP_LCD_FillRect(Xpos, R_Ypos - AUDIO_DRAW_LIMIT, Length, AUDIO_DRAW_LIMIT);
+    BSP_LCD_FillRect(Xpos, R_Ypos+1, Length, AUDIO_DRAW_LIMIT);
+    
+    BSP_LCD_SetTextColor(LCD_COLOR_BLUE);
+    BSP_LCD_DrawHLine(OSC_START_X_POS, L_CHANNEL_Y_POS, Length);
+    BSP_LCD_DrawHLine(OSC_START_X_POS, R_CHANNEL_Y_POS, Length);
+
+}
+
 
 /**
   * @brief  Draws a trace of the data line.
   * @param  Xpos: X position
-  * @param  Ypos: Y position
+  * @param  L_Ypos: Left channel Y position
+  * @param  R_Ypos: Right channel Y position
   * @param  Mem_start: Start of memory location
   * @param  Length: length of trace
   * @retval None
   */
-void Draw_Trace(uint16_t Xpos, uint16_t Ypos, uint32_t Mem_start, uint16_t Length)
+void Draw_Trace(uint16_t Xpos, uint16_t L_Ypos, uint16_t R_Ypos, uint32_t Mem_start, uint16_t Length)
 {
-    uint32_t i;
-    int data_value;
-    char buf[12];
+    uint16_t i;
+    uint32_t data_value;
+    uint32_t* mem_address;
+    char buf[10];
+    int16_t L_audio_value;
+    int16_t R_audio_value;
     
-    sprintf(buf, "%12d", *((uint32_t*) Mem_start));
-    BSP_LCD_DisplayStringAt(0, 60, (uint8_t *) buf, LEFT_MODE);
+    data_value = *((uint32_t*) Mem_start);
+    L_audio_value = (int16_t) ((data_value >> 16) & 0xFFFF);
+    R_audio_value = (int16_t) (data_value & 0xFFFF);
+    
+    //sprintf(buf, "%12d", L_audio_value);
+    //BSP_LCD_DisplayStringAt(0, 60, (uint8_t *) buf, LEFT_MODE);
     
-    sprintf(buf, "%12d", *((uint32_t*) Mem_start+1));
-    BSP_LCD_DisplayStringAt(0, 80, (uint8_t *) buf, LEFT_MODE);
-    
-    sprintf(buf, "%12d", *((uint32_t*) Mem_start+2));
-    BSP_LCD_DisplayStringAt(0, 100, (uint8_t *) buf, LEFT_MODE);    
-    /*
-    
-    for (i=1; i<=Length; i++)
+    //sprintf(buf, "%12d", R_audio_value);
+    //BSP_LCD_DisplayStringAt(0, 80, (uint8_t *) buf, LEFT_MODE);
+      
+    for (i=0; i<Length+50; i++)
    {
-       data_value = *((uint32_t*) (Mem_start + i));
-       BSP_LCD_DrawPixel(Xpos + i, int16_t((int) Ypos + data_value), LCD_COLOR_WHITE);
+        mem_address = (uint32_t*) Mem_start + i;
+        data_value = *((uint32_t*) mem_address);
+        L_audio_value = (int16_t) ((data_value >> 16) & 0xFFFF);
+        R_audio_value = (int16_t) (data_value & 0xFFFF);
+        
+        L_audio_value = L_audio_value / 50;
+        R_audio_value = R_audio_value / 50;
+        
+        //sprintf(buf, "%12d", L_audio_value);
+        //BSP_LCD_DisplayStringAt(0, 60, (uint8_t *) buf, LEFT_MODE);
+        
+        //sprintf(buf, "%12d", R_audio_value);
+        //BSP_LCD_DisplayStringAt(0, 80, (uint8_t *) buf, LEFT_MODE);
+
+
+        //L_audio_value = -i;
+        if (L_audio_value > AUDIO_DRAW_LIMIT) {L_audio_value = AUDIO_DRAW_LIMIT;}
+        else if (L_audio_value < -AUDIO_DRAW_LIMIT) {L_audio_value = -AUDIO_DRAW_LIMIT;}
+
+        if (R_audio_value > AUDIO_DRAW_LIMIT) {R_audio_value = AUDIO_DRAW_LIMIT;}
+        else if (R_audio_value < -AUDIO_DRAW_LIMIT) {R_audio_value = -AUDIO_DRAW_LIMIT;}
+        
+        BSP_LCD_DrawPixel(Xpos + i, (uint16_t) ((int16_t) L_Ypos + L_audio_value), LCD_COLOR_WHITE);
+        BSP_LCD_DrawPixel(Xpos + i, (uint16_t) ((int16_t) R_Ypos + R_audio_value), LCD_COLOR_WHITE);
    }
-   */
    
 }