Init screen

Author: rhgndf

ch32v305/src/feature/fm_audio_out/fm_audio_out.c

@@ -2,7 +2,7 @@
 
 #include "hw/dac.h"
 
-#define FM_AUDIO_OUT_GAIN_DEFAULT_Q16 (16UL << 8)
+#define FM_AUDIO_OUT_GAIN_DEFAULT_Q16 0UL
 
 /* State mirrors the fixed-point path: discriminator -> 4-sample CIC -> deemph -> DAC DMA. */
 static int32_t s_i_prev = 0;

ch32v305/src/hw/display/st7789.c

@@ -223,7 +223,7 @@ void ST7789_Init(void)
 	ST7789_UnSelect();
 
 	Delay_Ms(50);
-	ST7789_Fill_Color(WHITE);				//	Fill with Black.
+	ST7789_Fill_Color(BLACK);				//	Fill with Black.
 }
 
 /**

ch32v305/src/hw/tlv320adc6120.c

@@ -108,8 +108,8 @@
 
 /*
  * CHx_CFG1 (0x3D / 0x42):
- * - bit7: CHx_GAIN_SIGN_BIT = 0, positive gain
- * - bits6:0: CHx_GAIN = 0d, 0.0 dB in 0.5-dB steps
+ * - bits7:1: CHx_GAIN = 0..84, 0.0 dB to 42.0 dB in 0.5-dB steps
+ * - bit0: CHx_GAIN_SIGN_BIT = 0 for positive gain, 1 for negative gain
  */
 #define TLV320_CH_CFG1_GAIN_0DB        0x00U
 
@@ -187,6 +187,26 @@ ErrorStatus tlv320adc6120_hw_set_ch_gain_raw(uint8_t gain_raw)
     return READY;
 }
 
+ErrorStatus tlv320adc6120_hw_set_ch_gain_db_x2(int8_t gain_db_x2)
+{
+    uint8_t magnitude_db_x2;
+    uint8_t sign_bit;
+
+    if(gain_db_x2 < TLV320ADC6120_CH_GAIN_MIN_DB_X2)
+    {
+        gain_db_x2 = TLV320ADC6120_CH_GAIN_MIN_DB_X2;
+    }
+    if(gain_db_x2 > (int8_t)TLV320ADC6120_CH_GAIN_MAX_DB_X2)
+    {
+        gain_db_x2 = (int8_t)TLV320ADC6120_CH_GAIN_MAX_DB_X2;
+    }
+
+    sign_bit = (gain_db_x2 < 0) ? 1U : 0U;
+    magnitude_db_x2 = (uint8_t)((gain_db_x2 < 0) ? -gain_db_x2 : gain_db_x2);
+
+    return tlv320adc6120_hw_set_ch_gain_raw((uint8_t)((magnitude_db_x2 << 1U) | sign_bit));
+}
+
 ErrorStatus tlv320adc6120_hw_init(void)
 {
     /* Page 0 (default after POR; set explicitly after any page use). */

ch32v305/src/hw/tlv320adc6120.h

@@ -13,15 +13,20 @@
  * Use 0 for 1.8 V AVDD with AREG shorted to AVDD (external AREG path).
  */
 
+#include <stdint.h>
+
 #include "debug.h"
 
 #ifndef TLV320ADC6120_USE_INTERNAL_AREG
 #define TLV320ADC6120_USE_INTERNAL_AREG 1
 #endif
 
 #define TLV320ADC6120_I2C_ADDR_7BIT 0x4EU
+#define TLV320ADC6120_CH_GAIN_MIN_DB_X2 (-22)
+#define TLV320ADC6120_CH_GAIN_MAX_DB_X2 84U
 
 [[nodiscard]] ErrorStatus tlv320adc6120_hw_init(void);
 [[nodiscard]] ErrorStatus tlv320adc6120_hw_set_ch_gain_raw(uint8_t gain_raw);
+[[nodiscard]] ErrorStatus tlv320adc6120_hw_set_ch_gain_db_x2(int8_t gain_db_x2);
 
 #endif

ch32v305/src/hw/usb.c

@@ -24,6 +24,7 @@ static uint8_t usb_hw_tlv320_gain_req[USB_HW_TLV320_GAIN_REQ_SIZE];
 static uint8_t usb_hw_pll_lock_state[USB_HW_PLL_LOCK_STATE_SIZE];
 static ErrorStatus usb_hw_clk_freq_status = NoREADY;
 static uint8_t usb_hw_tlv320_gain_raw = 0x00U;
+static int8_t usb_hw_tlv320_gain_db_x2 = 0;
 static ErrorStatus usb_hw_tlv320_gain_status = NoREADY;
 static volatile uint32_t usb_hw_vendor_total_word_count = 0U;
 static volatile uint32_t usb_hw_vendor_dropped_word_count = 0U;
@@ -160,6 +161,32 @@ ErrorStatus usb_hw_set_tlv320_gain_raw(uint8_t gain_raw)
     return usb_hw_tlv320_gain_status;
 }
 
+ErrorStatus usb_hw_set_tlv320_gain_db_x2(int8_t gain_db_x2)
+{
+    uint8_t magnitude_db_x2 = (uint8_t)((gain_db_x2 < 0) ? -gain_db_x2 : gain_db_x2);
+    char sign = (gain_db_x2 < 0) ? '-' : '+';
+
+    usb_hw_tlv320_gain_status = tlv320adc6120_hw_set_ch_gain_db_x2(gain_db_x2);
+    if(usb_hw_tlv320_gain_status == READY)
+    {
+        usb_hw_tlv320_gain_db_x2 = gain_db_x2;
+        printf("TLV320: channel gain set to %c%lu.%lu dB\r\n",
+               sign,
+               (unsigned long)(magnitude_db_x2 / 2U),
+               (unsigned long)((magnitude_db_x2 & 1U) * 5U));
+    }
+    else
+    {
+        printf("TLV320: channel gain set failed for %c%lu.%lu dB (status %u)\r\n",
+               sign,
+               (unsigned long)(magnitude_db_x2 / 2U),
+               (unsigned long)((magnitude_db_x2 & 1U) * 5U),
+               (unsigned int)usb_hw_tlv320_gain_status);
+    }
+
+    return usb_hw_tlv320_gain_status;
+}
+
 ErrorStatus usb_hw_get_clk_freq_status(void)
 {
     return usb_hw_clk_freq_status;
@@ -298,7 +325,7 @@ bool tud_vendor_control_xfer_cb(uint8_t rhport, uint8_t stage, tusb_control_requ
                     }
                     if(stage == CONTROL_STAGE_DATA)
                     {
-                        return (usb_hw_set_tlv320_gain_raw(usb_hw_tlv320_gain_req[0]) == READY);
+                        return (usb_hw_set_tlv320_gain_db_x2((int8_t)usb_hw_tlv320_gain_req[0]) == READY);
                     }
                     return true;
 

ch32v305/src/hw/usb.h

@@ -19,6 +19,7 @@ uint32_t usb_receive_data(uint8_t *buffer, uint32_t len);
 ErrorStatus usb_hw_set_clk_freq_hz(uint64_t hz);
 ErrorStatus usb_hw_get_clk_freq_status(void);
 ErrorStatus usb_hw_set_tlv320_gain_raw(uint8_t gain_raw);
+ErrorStatus usb_hw_set_tlv320_gain_db_x2(int8_t gain_db_x2);
 ErrorStatus usb_hw_get_pll_lock(uint8_t *locked);
 
 #endif

ch32v305/src/main.cpp

@@ -161,35 +161,56 @@ static void TLV320_I2S_Poll(void)
     }
 }
 
+static uint8_t s_i2s_bitslip_check = 1U;
+static uint8_t s_i2s_bitslip_false_checks_in_a_row = 0U;
+static uint8_t s_i2s_bitslip_sync_displayed_count = UINT8_MAX;
+
 static void TLV320_I2S_CheckBitslip(void)
 {
-    static uint8_t enabled = 1U;
-    static uint8_t false_checks_in_a_row = 0U;
 
-    if(enabled == 0U)
+    if(s_i2s_bitslip_check == 0U)
     {
         return;
     }
 
     if(i2s_needs_reset())
     {
-        false_checks_in_a_row = 0U;
+        s_i2s_bitslip_false_checks_in_a_row = 0U;
         printf("bitslipped, resetting\n");
         i2s_hw_enable(DISABLE);
         i2s_hw_deinit();
         Delay_Ms(10);
         i2s_hw_init();
         i2s_hw_enable(ENABLE);
         s_tlv320_i2s_report_initialized = 0U;
-        enabled = 1U;
+        s_i2s_bitslip_check = 1U;
         return;
     }
 
-    ++false_checks_in_a_row;
-    if(false_checks_in_a_row >= 20U)
+    ++s_i2s_bitslip_false_checks_in_a_row;
+    if(s_i2s_bitslip_false_checks_in_a_row >= 20U)
+    {
+        s_i2s_bitslip_check = 0U;
+    }
+}
+
+static void Draw_I2S_Sync_Status(void)
+{
+    char sync_text[24];
+
+    if(s_i2s_bitslip_sync_displayed_count == s_i2s_bitslip_false_checks_in_a_row)
     {
-        enabled = 0U;
+        return;
     }
+
+    s_i2s_bitslip_sync_displayed_count = s_i2s_bitslip_false_checks_in_a_row;
+    snprintf(sync_text, sizeof(sync_text),
+             "Synced: %u/20",
+             (unsigned int)s_i2s_bitslip_false_checks_in_a_row);
+
+    ST7789_Fill(0U, 0U, ST7789_WIDTH - 1U, 49U, BLACK);
+    ST7789_WriteString(0U, 5U, "Initializing...", Font_11x18, WHITE, BLACK);
+    ST7789_WriteString(0U, 27U, sync_text, Font_11x18, WHITE, BLACK);
 }
 
 static uint64_t ticks_from_ms(uint32_t ms)
@@ -256,8 +277,6 @@ int main(void)
     printf("FM audio out: enabled (fixed-point FM demod to DAC)\r\n");
 
     blinky_init();
-    UI_FFT_Init();
-    UI_Init();
 
     //watchdog_init();
 
@@ -267,6 +286,16 @@ int main(void)
     PeriodicTrigger SysTickReportUSB{1000U, SysTick_Report_USB_EverySecond};
     PeriodicTrigger FFTDraw{1000U / 60U, UI_FFT_Draw};
 
+    while(s_i2s_bitslip_check)
+    {
+        Draw_I2S_Sync_Status();
+        I2SBitslipCheck();
+        tud_task();
+    }
+    
+    UI_FFT_Init();
+    UI_Init();
+
     while(1)
     {
         I2SBitslipCheck();

ch32v305/src/ui/fft.cpp

@@ -162,7 +162,6 @@ void UI_FFT_Init(void)
     s_fft_interp_instance.pData = i2s_fft_sample_arr;
     i2s_fft_sample_arr_reset();
 
-    ST7789_Fill_Color(BLACK);
     s_waterfall_line = ST7789_ScrollRows(FFT_WATERFALL_TOP, FFT_WATERFALL_BOTTOM, 0);
 }