search

miketeachman / micropython-esp32-i2s-examples

Usage and examples for I2S support on the ESP32 microcontroller
MIT License
152 stars 29 forks source link

Can no longer merge PR in mainline micropython #21

Closed mdaeron closed 3 years ago

mdaeron commented 3 years ago

I used to be able to build firmware for the TinyPICO with:

git clone https://github.com/micropython/micropython.git
cd micropython
git fetch origin pull/4471/head:esp32_i2s
git checkout master
git merge esp32_i2s

Now this yields a conflict in ports/esp32/modmachine.c. I can change things manually, but I was wondering if there's a simpler, automated way to do so.

miketeachman commented 3 years ago

thanks for reporting this @mdaeron !

I'll rebase to the latest MicroPython commit and fix the conflict.

miketeachman commented 3 years ago

I've fixed the conflict and updated the PR. Thanks again for reporting this problem.

mdaeron commented 3 years ago

No problem. Thanks to you, actually: having I2S on micropython is really nice. I hope it gets incorporated into mainline soon.