update:继续完善audio

openLuat · Jan 24, 2024 · e19d1ea · e19d1ea
1 parent 676da57
commit e19d1ea
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/components/multimedia/luat_audio_es8311.c b/components/multimedia/luat_audio_es8311.c
@@ -243,6 +243,8 @@ static int es8311_mode_standby(luat_audio_codec_conf_t* conf,uint8_t selece){
 }
 
 static int es8311_mode_pwrdown(luat_audio_codec_conf_t* conf){
+	es8311_dacvol_bak = es8311_read_reg(conf,ES8311_DAC_REG32);
+	es8311_adcvol_bak = es8311_read_reg(conf,ES8311_ADC_REG17);
     es8311_write_reg(conf,ES8311_DAC_REG32,0x00);
     es8311_write_reg(conf,ES8311_ADC_REG17,0x00);
     es8311_write_reg(conf,ES8311_SYSTEM_REG0E,0xff);

diff --git a/luat/include/luat_audio.h b/luat/include/luat_audio.h
@@ -39,6 +39,7 @@ typedef struct luat_audio_conf {
     uint8_t debug_on_off;
     uint8_t is_sleep;
     uint8_t wakeup_ready;
+    uint8_t pa_on_enable;
 } luat_audio_conf_t;
 
 /**
@@ -54,9 +55,11 @@ int luat_audio_setup_codec(uint8_t multimedia_id, const luat_audio_codec_conf_t
  * @brief 初始化codec
  *
  * @param multimedia_id 多媒体通道，目前只有0
+ * @param init_vol 默认硬件音量，如果不带调节功能的codec，则忽略
+ * @param init_mic_vol 默认MIC音量，如果不带调节功能的codec，则忽略
  * @return int =0成功，其他失败
  */
-int luat_audio_init_codec(uint8_t multimedia_id);
+int luat_audio_init_codec(uint8_t multimedia_id, uint16_t init_vol, uint16_t init_mic_vol);
 /**
  * @brief audio休眠控制，进入休眠状态时，芯片才允许进入休眠
  *
@@ -183,7 +186,8 @@ luat_audio_conf_t *luat_audio_get_config(uint8_t multimedia_id);
 
 void luat_audio_play_debug_onoff(uint8_t multimedia_id, uint8_t onoff);
 
-int luat_audio_play_blank(uint8_t multimedia_id);
+int luat_audio_standby(uint8_t multimedia_id);
+
+int luat_audio_check_ready(uint8_t multimedia_id);
 
-int luat_audio_check_wakeup(uint8_t multimedia_id);
 #endif