Add Malyan 3d printer variants #382
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Hi @xC0000005 |
|
I'm working on figuring out how to rebase this (sorry for the messy history). |
xC0000005
force-pushed
the
MalyanVariants
branch
from
feb7819 to
8867bb1
Compare
fpistm
requested changes
Dec 21, 2018
fpistm
reviewed
Dec 21, 2018
|
@fpistm - I've tested the updates on the M200 V1 and V2. If I've missed something, I'm happy to make adjustments, but I'm not sure what to do next. |
fpistm
requested changes
Jan 14, 2019
| const PinMap PinMap_USB[] = { | ||
| {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF10_USB_FS)}, // USB_DM | ||
| {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF10_USB_FS)}, // USB_DP | ||
| {PA_13, USB, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_USB_FS)}, // USB_NOE |
There was a problem hiding this comment.
Is NOE used? If not then you can comment it to avoid init this pin.
fpistm
reviewed
Jan 14, 2019
fpistm
reviewed
Jan 14, 2019
fpistm
reviewed
Jan 14, 2019
|
I just rebased this last night - oh, I forgot to push. Hopefully git does the right thing and figures it out.
… On Jan 28, 2019, at 7:53 AM, Frederic Pillon ***@***.***> wrote:
@fpistm commented on this pull request.
In boards.txt <#382 (comment)>:
> @@ -721,6 +761,54 @@ RAK.menu.upload_method.STLink.upload.tool=stlink_upload
3dprinter.menu.upload_method.serialMethod.upload.protocol=maple_serial
3dprinter.menu.upload_method.serialMethod.upload.tool=serial_upload
+###############################
Conflicts resolved
—
You are receiving this because you were assigned.
Reply to this email directly, view it on GitHub <#382 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/Aeppcb7bwfGlC65bqWPjn0cb7DggttGqks5vHxzvgaJpZM4Y2IwL>.
|
:D |
fpistm
reviewed
Jan 28, 2019
|
I’m sorry - I thought i already reverted this out. I’ll fix it tonight.
… On Jan 28, 2019, at 8:11 AM, Frederic Pillon ***@***.***> wrote:
@fpistm commented on this pull request.
In package.json <#382 (comment)>:
> @@ -0,0 +1,7 @@
+{
To remove
—
You are receiving this because you were assigned.
Reply to this email directly, view it on GitHub <#382 (review)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AeppcU9E2XVNg72EBgnxIPkcZay6TMtJks5vHyErgaJpZM4Y2IwL>.
|
fpistm
reviewed
Jan 28, 2019
|
I will do a clean before merge. |
|
I get it - my rebase and your rebase didn’t conflict, but the result was a double definition.
… On Jan 28, 2019, at 8:13 AM, Frederic Pillon ***@***.***> wrote:
I will do a clean before merge.
—
You are receiving this because you were assigned.
Reply to this email directly, view it on GitHub <#382 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AeppcebHEjUmx71ShUJs-jgXNcetCdljks5vHyGkgaJpZM4Y2IwL>.
|
|
This PR has been rebased and cleaned in #422 |
|
I’ll pull it down and test when I’m home.
… On Jan 28, 2019, at 9:08 AM, Frederic Pillon ***@***.***> wrote:
This PR has been rebased and cleaned in #422 <#422>
—
You are receiving this because you were assigned.
Reply to this email directly, view it on GitHub <#382 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AeppcRMqje2-yM_eACPoCZUdWeRAPOGZks5vHy5ygaJpZM4Y2IwL>.
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This adds the variants for Malyan's M200 v1 (an STM32F103 printer) and M200 v2 (STM32F070 printer). It may also work with the MP Mini Delta and Malyan M100, but those are untested. I didn't mean to add the package.json, but I can't figure out how to remove it from the PR (sorry). It's only needed for PlatformIO to download a package.