dasdgw / yoradio

Web-radio based on ESP32-audioI2S library
GNU General Public License v3.0
4 stars 2 forks source link

update audioI2S with new release #16

Open frankalicious opened 1 month ago

frankalicious commented 1 month ago

https://github.com/dasdgw/yoradio/tree/main/yoRadio/src/audioI2S

https://github.com/schreibfaul1/ESP32-audioI2S/releases/tag/3.0.12

frankalicious commented 1 month ago

I tried to apply the yoRadio changes to the ESP32-audioI2 HEAD.
But there are some conflicts to be solved. Maybe there is an easier way?

$ git clone git@github.com:dasdgw/yoradio.git
cd yoradio
$ grep Version yoRadio/src/audioI2S/Audio.h
 *  Version 3.0.11c
$ cd ..
$ git clone git@github.com:schreibfaul1/ESP32-audioI2S.git
$ cd ESP32-audioI2S.git

Search for the commit used in yoRadio

$ git grep "Version 3.0.11c" $(git rev-list --all)|head -2
d9a2421081229b66aaa3bb51095931a7752bdb87:src/Audio.cpp: *  Version 3.0.11c
d9a2421081229b66aaa3bb51095931a7752bdb87:src/Audio.h: *  Version 3.0.11c

Create a patch with the diff between yoradio and the corresponding ESP32-audioI2S commit

$ git checkout d9a2421081229b66aaa3bb51095931a7752bdb87
$ cp -R ../yoradio/yoRadio/src/audioI2S/* src/
$ git add src
$ git commit -m "apply yoradio changes"
$ git format-patch HEAD~
0001-apply-yoradio-changes.patch

Trying to apply yoradio changes to audioI2S HEAD

$ git checkout src
$ git checkout master
$ git apply --stat 0001-apply-yoradio-changes.patch
$ git apply --check 0001-apply-yoradio-changes.patch
$ git apply -3 0001-apply-yoradio-changes.patch
$ git mergetool
dasdgw commented 3 weeks ago

Created a new branch https://github.com/dasdgw/yoradio/tree/esp32-audioI2S-3.0.12h. I just manually merged the sources. Audio on es32 internal DAC is distorted, that's why I keep it in a separate branch for now.