Skip to content

[2.0.x] Anycubic LinearPlus, Trigorilla 1.4#11730

Merged
thinkyhead merged 4 commits intoMarlinFirmware:bugfix-2.0.xfrom
thinkyhead:bf2_linearplus_and_trigorilla
Sep 11, 2018
Merged

[2.0.x] Anycubic LinearPlus, Trigorilla 1.4#11730
thinkyhead merged 4 commits intoMarlinFirmware:bugfix-2.0.xfrom
thinkyhead:bf2_linearplus_and_trigorilla

Conversation

@thinkyhead
Copy link
Member

Changes from #11356 @grbd

  • Add configs for LinearPlus delta.
  • Mods for Trigorilla 1.4

@thinkyhead thinkyhead force-pushed the bf2_linearplus_and_trigorilla branch 2 times, most recently from 9b6597e to 3963686 Compare September 5, 2018 08:50
@thinkyhead
Copy link
Member Author

Perhaps @ANYCUBIC-3D would like to review this…?

@brandstaetter
Copy link
Contributor

we should check the diffs with my #11725 and check if we can unify them more

@thinkyhead
Copy link
Member Author

Is the AnyCubic LinearPlus the same as the "Kossel"?

To compare configs, I usually just drop the ones I want to compare onto the configs open in Github Desktop and then the diffs are all highlighted and ready to cherry-pick line by line.

@brandstaetter
Copy link
Contributor

Yes, the full name should be Anycubic Kossel Linear Plus - it's the bigger brother of the normal Anycubic Kossel.

I did some initial comparing of the 2 configs, and it looks like I activated way more features on my version (Autocalibration, other convenience things...) - I'll work on unifying the configs and will provide an updated pull request for Anycubic Kossel and Anycubic Kossel Linear Plus so I vote against merging our 2 pull requests for now

@thinkyhead
Copy link
Member Author

thinkyhead commented Sep 6, 2018

You can just add commits to your PR's branch to update it. I posted instructions there.

And, you can submit any changes to this PR by

  • checking out my bf2_linearplus_and_trigorilla branch
  • adding commits to your working copy
  • publishing those changes to your fork (i.e., origin), and
  • submitting a PR from your copy of bf2_linearplus_and_trigorilla to the bf2_linearplus_and_trigorilla branch in my fork.

When I merge your PR to bf2_linearplus_and_trigorilla it will cause this PR to also be updated.

@thinkyhead thinkyhead force-pushed the bf2_linearplus_and_trigorilla branch 2 times, most recently from 9d94fd1 to cec7c3f Compare September 6, 2018 07:11
@brandstaetter
Copy link
Contributor

please discard in favour of #11752

@thinkyhead thinkyhead force-pushed the bf2_linearplus_and_trigorilla branch from cec7c3f to cca9980 Compare September 7, 2018 23:52
@thinkyhead
Copy link
Member Author

thinkyhead commented Sep 8, 2018

I brought your changes into this PR instead. I also combined the V1 / V2 configs to cut the number of configs in half.

@brandstaetter
Copy link
Contributor

Thanks - although I work with git daily, github does some things differently than we do, so I was confused.

I'll add another sample config soon (as soon as I've tested it) for the version without heated bed and without autolevel.

Who could support me with issue #11337 because it makes this firmware a bit dangerous for the unaware (can break the z-probe)?

thinkyhead and others added 2 commits September 9, 2018 02:21
Co-Authored-By: grbd <garlicbready@googlemail.com>
Co-Authored-By: grbd <garlicbready@googlemail.com>
@thinkyhead thinkyhead force-pushed the bf2_linearplus_and_trigorilla branch from cca9980 to a2bf6ec Compare September 9, 2018 07:21
@thinkyhead thinkyhead merged commit fe9f088 into MarlinFirmware:bugfix-2.0.x Sep 11, 2018
@thinkyhead thinkyhead deleted the bf2_linearplus_and_trigorilla branch September 11, 2018 02:25
@Palatis
Copy link
Contributor

Palatis commented Sep 13, 2018

I think the pins are correct for E1 except E1_CS_PIN (which is used for FAN2_PIN)

https://github.com/ANYCUBIC-3D/I3-MEGA/blob/master/Marlin_TFT_CR_V1.1.1/pins_RAMPS.h#L73

however I prefer something like

#if defined(E1_CS_PIN) && defined(FAN2_PIN) && (E1_CS_PIN == FAN2_PIN)
  #warning E1_CS_PIN and FAN2_PIN are the same
#endif

so it don't #undef my CS defs in configuration_adv.h...

@brandstaetter
Copy link
Contributor

@Palatis can you provide a pull request for this change?

@Palatis
Copy link
Contributor

Palatis commented Sep 18, 2018

@Palatis can you provide a pull request for this change?

please take a look at #11869 :-D

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants