adafruit / Adafruit_MP3

mp3 decoding on arduino
39 stars 17 forks source link

- Fixed issues with Teensy support - The code `NVIC_DisableIRQ(MP3_IR… #3

Closed richteel closed 4 years ago

richteel commented 5 years ago

NOTE: This release was tested with the Teensy 3.5 only. It is expected that it will work with all other supported boards. (At least as supported as the previous version.)

kesterlester commented 4 years ago

Is there anything I/we/others can do to get this request merged and into a new release of the Adafruit_MP3 library? I have just been pointed to it as a fix for Teensy 3.6 problems I was having over on https://github.com/adafruit/Adafruit_MP3/issues/7. The merge request seems to have been hanging around for a year now. I am not in a position to say whether this is a COMPLETE fix for everything needed to get this MP3 library working on the Teensy 3 series, however it is certainly better than the current latest release 1.0.4, in that I can at least now compile and can commence hardware testing .... :)

ladyada commented 4 years ago

hiya we had to fix the branch, it had merge conflicts. please try the latest branch in this PR (see command line instructions) and let us know if it still works!

kesterlester commented 4 years ago

Am checking here I am not misinterpreting your request. What I've done on my local machine is the following ...

git clone https://github.com/adafruit/Adafruit_MP3.git
cd Adafruit_MP3/
git checkout -b MOO     # Without this next line is unhappy!
git fetch origin pull/3/head:master
git checkout master      # Going back to master to see what I am here to see ....

The last command tells me ...

Switched to branch 'master'
Your branch is ahead of 'origin/master' by 2 commits.
  (use "git push" to publish your local commits)

... which I believe means that I now have a master that includes both the merged changes from richteel and the conflict-resolution fixes from you from the last hour or two. A quick check of a few lines of src/Adafruit_MP3.cpp seems to confirm this.

I note that the resulting code is a lot more white-space-messy than it was prior to this merge. I suspect someone did a whitespace cleanup on master recently, that this merge has “undone” all that good work. I don’t know how much the project cares about whitespace.

Nonetheless, whitespace changes aside:

As before I cannot confirm that MP3s actually decode and play as I have no suitable hardware to check this at present.

ladyada commented 4 years ago

image

kesterlester commented 4 years ago

I can't see those instructions as I don't have write access (supposedly). Here is what I see: image

ladyada commented 4 years ago

type the words in the screenshot

kesterlester commented 4 years ago

In summary, same results as before after following the Step 1 instructions from your screenshot

This was doing:

git clone https://github.com/adafruit/Adafruit_MP3.git
cd Adafruit_MP3
git checkout -b richteel-master master
git pull https://github.com/richteel/Adafruit_MP3.git master

It was reassuring to see that the above commands ultimately given me the same checked-out source (bit for bit) I tested in my last post -- though by a more efficient route, and leaving the rep in a happier state.