search

Desuuuu / Marlin

Optimized firmware for RepRap 3D printers based on the Arduino platform. Modified with a new DWIN T5UID1 touchscreen implementation.
GNU General Public License v3.0
31 stars 10 forks source link

Fix https://github.com/Desuuuu/Marlin/issues/6 #13

Closed mrv96 closed 3 years ago

mrv96 commented 3 years ago

This branch fixes https://github.com/Desuuuu/Marlin/issues/6. To avoid merge conflicts it already include https://github.com/Desuuuu/Marlin/pull/12

Hence you can approve this and reject https://github.com/Desuuuu/Marlin/pull/12 if you agree.

mrv96 commented 3 years ago

Do i have to redo this PR based on the your new repo in order to avoid conflicts? Or are you able to solve them?

Desuuuu commented 3 years ago

No need to worry about it, I'll take care of resolving the conflicts when I get to it.