Code

Fix conflict (AUD-621)#13

Code

Open

donny681 wants to merge 15 commits intoespressif:masterespressif/esp-adf:masterfrom donny681:masterdonny681/esp-adf:masterCopy head branch name to clipboard

+157,368-85

Commits

Commits on Apr 28, 2018

• add ac101 codec

  

  aithinker

  committed
  a07c242

Commits on May 5, 2018

• fix conflict

  

  aithinker

  committed
  24a973a

• Merge pull request #1 from donny681/aithinker_ac101

  Show description for e87044c
  donny681

  authored
  e87044c

Commits on Jul 17, 2018

• nothing

  

  aithinker

  committed
  05639c4

• nothing

  

  aithinker

  committed
  38a86fe

• fix esp-idf

  

  aithinker

  committed
  640af5f

• update

  

  aithinker

  committed
  5a51ebc

• delete build

  

  aithinker

  committed
  4e5070f

Commits on Jul 18, 2018

• fix

  

  aithinker

  committed
  66add71

Commits on Jul 26, 2018

• l&r

  

  aithinker

  committed
  172a2f8

Commits on Jul 27, 2018

• fix mic2 recode voice too low

  

  aithinker

  committed
  e3e1f28

Commits on Jul 28, 2018

• Merge pull request #4 from DanielLiMing/master

  Show description for a37e5ac
  donny681

  authored
  a37e5ac

Commits on Aug 1, 2018

• sync spk and earphone

  

  aithinker

  committed
  dbd5096

Commits on Aug 14, 2018

• fix android phone bt from esp

  

  aithinker

  committed
  b67175c

Commits on Sep 7, 2018

• Merge pull request #5 from DanielLiMing/master

  Show description for 9a16c63
  donny681

  authored
  9a16c63