Diff: main.cpp

Revision:

8:d1c41eca57f0

Parent:

7:e1dfd64eba81

Child:

9:f5b37c71856d

--- a/main.cpp	Sat Dec 28 21:11:56 2019 +0000
+++ b/main.cpp	Sat Dec 28 23:26:48 2019 +0000
@@ -13,11 +13,12 @@
 // #define AUDIO_BLOCK_SIZE   ((uint32_t)512)
 #define AUDIO_BLOCK_SIZE   ((uint32_t)256)
 
-#define SDRAM_DEVICE_ADDR_AUDIO_MEM  ((uint32_t)0xC00A0000)
+//#define SDRAM_DEVICE_ADDR_AUDIO_MEM  ((uint32_t)0xC0200000)
+#define SDRAM_DEVICE_ADDR_AUDIO_MEM  ((uint32_t)0xC0400000)
 #define AUDIO_BUFFER_IN     SDRAM_DEVICE_ADDR_AUDIO_MEM
 #define AUDIO_BUFFER_OUT   (AUDIO_BUFFER_IN + (AUDIO_BLOCK_SIZE * 2))
 
-#define OSC_START_X_POS     10
+#define OSC_START_X_POS     20
 #define OSC_LINE_SIZE       256
 #define L_CHANNEL_Y_POS     120
 #define R_CHANNEL_Y_POS     220
@@ -25,7 +26,7 @@
 
 volatile uint32_t  audio_rec_buffer_state = BUFFER_OFFSET_NONE;
 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);
+static void Draw_Trace(uint16_t Xpos, uint16_t L_Ypos, uint16_t R_Ypos, uint16_t* Mem_start, uint16_t Length);
 
 int main()
 {
@@ -41,6 +42,8 @@
     BSP_LCD_SetBackColor(LCD_COLOR_BLACK);
     BSP_LCD_SetTextColor(LCD_COLOR_ORANGE);
     BSP_LCD_DisplayStringAt(0, 0, (uint8_t *)"487 Mic Audio Test Code", LEFT_MODE);
+    BSP_LCD_DisplayStringAt(0, L_CHANNEL_Y_POS, (uint8_t *)"L", LEFT_MODE);
+    BSP_LCD_DisplayStringAt(0, R_CHANNEL_Y_POS, (uint8_t *)"R", LEFT_MODE);
 
     printf("\n\nAUDIO LOOPBACK EXAMPLE START:\n");
 
@@ -87,8 +90,13 @@
         /* Copy recorded 1st half block */
         memcpy((uint16_t *)(AUDIO_BUFFER_OUT), (uint16_t *)(AUDIO_BUFFER_IN), AUDIO_BLOCK_SIZE);
 
+    /* Plot trace of first half block recording */   
+        Erase_Trace(OSC_START_X_POS, L_CHANNEL_Y_POS, R_CHANNEL_Y_POS, AUDIO_BLOCK_SIZE);
+        Draw_Trace(OSC_START_X_POS, L_CHANNEL_Y_POS, R_CHANNEL_Y_POS, (uint16_t *) AUDIO_BUFFER_IN, AUDIO_BLOCK_SIZE);
+
     /* Second Half */
 
+
         /* Wait end of one block recording */
         while (audio_rec_buffer_state == BUFFER_OFFSET_FULL) {
         }
@@ -97,8 +105,9 @@
         /* 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);
 
-        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);
+    /* Plot second half recording */
+        Erase_Trace(OSC_START_X_POS+AUDIO_BLOCK_SIZE, L_CHANNEL_Y_POS, R_CHANNEL_Y_POS, 50);
+        Draw_Trace(OSC_START_X_POS+AUDIO_BLOCK_SIZE, L_CHANNEL_Y_POS, R_CHANNEL_Y_POS, (uint16_t *) AUDIO_BUFFER_IN + (AUDIO_BLOCK_SIZE), 50);
         
         counter++;
         sprintf(buf, "%d", counter);
@@ -125,8 +134,8 @@
     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);
+    BSP_LCD_DrawHLine(Xpos, L_CHANNEL_Y_POS, Length);
+    BSP_LCD_DrawHLine(Xpos, R_CHANNEL_Y_POS, Length);
 
 }
 
@@ -140,7 +149,7 @@
   * @param  Length: length of trace
   * @retval None
   */
-void Draw_Trace(uint16_t Xpos, uint16_t L_Ypos, uint16_t R_Ypos, uint32_t Mem_start, uint16_t Length)
+void Draw_Trace(uint16_t Xpos, uint16_t L_Ypos, uint16_t R_Ypos, uint16_t* Mem_start, uint16_t Length)
 {
     uint16_t i;
     uint32_t data_value;
@@ -153,13 +162,16 @@
     L_audio_value = (int16_t) ((data_value >> 16) & 0xFFFF);
     R_audio_value = (int16_t) (data_value & 0xFFFF);
     
+    //sprintf(buf, "%12d", data_value);
+    //BSP_LCD_DisplayStringAt(0, 60, (uint8_t *) buf, LEFT_MODE);
+    
     //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);
       
-    for (i=0; i<Length+50; i++)
+    for (i=0; i<Length; i++)
    {
         mem_address = (uint32_t*) Mem_start + i;
         data_value = *((uint32_t*) mem_address);