Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[1.1.x] BLTouch V3.0 and 3.1 #14839

Merged

Conversation

InsanityAutomation
Copy link
Contributor

Parity with 2.0.x for BLTouch

I have not had a chance to run this on hardware yet but everything builds. Please test vigorously.

@FanDjango @thinkyhead @Roxy-3D

InsanityAutomation and others added 27 commits April 16, 2018 13:15
This reverts commit 5c90a5b, reversing
changes made to baae6dd.
This reverts commit 1cfe6d7, reversing
changes made to a9b30ac.
This reverts commit 1cb2de3, reversing
changes made to fd94570.
This reverts commit 1cfe6d7, reversing
changes made to a9b30ac.
@tpruvot
Copy link
Contributor

tpruvot commented Aug 5, 2019

Current code in 2.x is not good, and 1.1 is supposed to stay as is. A PR not even tested ???

@InsanityAutomation
Copy link
Contributor Author

Current code in 2.x is not good, and 1.1 is supposed to stay as is. A PR not even tested ???

This one is a bit outside the norm. Paris at antclabs had requested changes for 3.1 in the 1.1.x branch via email and there was some discussion there with thinkyhead, Roxy, bob-the-khun, fandjango and myself. I had time to backport it but didn't have time to test anything. This puts it in a space most of that list can change anything needed I may have missed, and Paris can get the code to test on their end. This will definitely not be merged without testing from several involved parties

@Roxy-3D
Copy link
Member

Roxy-3D commented Aug 5, 2019

Current code in 2.x is not good, and 1.1 is supposed to stay as is. A PR not even tested ???

This is a special case. We are treating the BL-Touch v3.x code updates as a 'bug fix'. While the BL-Touch code that was in v1.1.9 worked, when BL-Touch v3.x came out the code no longer functioned. So, without some adjustments, nobody buying a new BL-Touch would be able to use the v1.1.9 branch.

@trouch
Copy link
Contributor

trouch commented Aug 5, 2019

So, without some adjustments, nobody buying a new BL-Touch would be able to use the v1.1.9 branch.

This statement is true with any other new hardware that has non backward compatible design change. People should upgrade to software with proper support for their new hardware. As an example, what about TMC2209 and 5160 ? Maybe Trinamic would support Marlin as much as Antclabs to get them back ported into 1.1.x branch ;-)

@InsanityAutomation
Copy link
Contributor Author

So, without some adjustments, nobody buying a new BL-Touch would be able to use the v1.1.9 branch.

This statement is true with any other new hardware that has non backward compatible design change. People should upgrade to software with proper support for their new hardware. As an example, what about TMC2209 and 5160 ? Maybe Trinamic would support Marlin as much as Antclabs to get them back ported into 1.1.x branch ;-)

The difference is users will buy a generic bltouch with no idea of version until its too late. Drivers you know exactly what youre getting. Older revisions are no longer available anywhere. This is more to cover for the accidental surprise.

@trouch
Copy link
Contributor

trouch commented Aug 5, 2019

The difference is users will buy a generic bltouch with no idea of version until its too late

Aw, yeah I admit buying a BLTouch can be a nightmare 😅

@InsanityAutomation
Copy link
Contributor Author

Hurrah! travis was just a couple easy fixes! Probably good to keep it where it can build just in case anything else comes up prior to 2.0 hitting a release.

@thinkyhead thinkyhead changed the title Backport BLTouch V3.0 and 3.1 to 1.1.x [1.1.x] BLTouch V3.0 and 3.1 Aug 7, 2019
@thinkyhead
Copy link
Member

Thanks for the back-port. It will be merged shortly.

Note that the commit log is kind of a nightmare. Perhaps in future you will be kind enough to do a rebase and squash or rebuild the commits from scratch before submitting your PR…? With so many issues and PRs coming in every day, this will save the maintainers a lot of headaches.

@thinkyhead thinkyhead merged commit 93f9209 into MarlinFirmware:bugfix-1.1.x Aug 7, 2019
@InsanityAutomation
Copy link
Contributor Author

Thanks for the back-port. It will be merged shortly.

Note that the commit log is kind of a nightmare. Perhaps in future you will be kind enough to do a rebase and squash or rebuild the commits from scratch before submitting your PR…? With so many issues and PRs coming in every day, this will save the maintainers a lot of headaches.

I saw how messed up the history got and figured this will probably be my last push to 1.1.x. If I ever end up doing another one, ill fix my branch first.

@reloxx13
Copy link
Contributor

i would like to suggest a 1.1.10 release with the bltouch v3 fixed.
pls think about it, alot users which buy a bltouch will get the v3 now and they are using the release download 1.1.9 (this is what i see on fb groups).

@InsanityAutomation InsanityAutomation deleted the BLTouch119Backport branch August 19, 2019 18:41
@bogaskilop
Copy link

bogaskilop commented Sep 2, 2019

Hi all recently i get 4 bltouches for new printers and all of them are bltouch v3.1 so now i'm looking for configuration of those bltouches and at configuration_adv.h in marlin 1.1.9 bug-fix there are few additional settings and is there any guide step by step how to use those new bltouch probes with marlin 1.1.x bug-fix ?

I do not understund those options and i dont want to fry my bltouches :

#if ENABLED(BLTOUCH)
  /**
   * Either: Use the defaults (recommended) or: For special purposes, use the following DEFINES
   * Do not activate settings that the probe might not understand. Clones might misunderstand
   * advanced commands.
   *
   * Note: If the probe is not deploying, check a "Cmd: Reset" and "Cmd: Self-Test" and then
   *       check the wiring of the BROWN, RED and ORANGE wires.
   *
   * Note: If the trigger signal of your probe is not being recognized, it has been very often
   *       because the BLACK and WHITE wires needed to be swapped. They are not "interchangeable"
   *       like they would be with a real switch. So please check the wiring first.
   *
   * Settings for all BLTouch and clone probes:
   */

  // Safety: The probe needs time to recognize the command.
  //         Minimum command delay (ms). Enable and increase if needed.
  //#define BLTOUCH_DELAY 500

  /**
   * Settings for BLTOUCH Classic 1.2, 1.3 or BLTouch Smart 1.0, 2.0, 2.2, 3.0, 3.1, and most clones:
   */

  // Feature: Switch into SW mode after a deploy. It makes the output pulse longer. Can be useful
  //          in special cases, like noisy or filtered input configurations.
  //#define BLTOUCH_FORCE_SW_MODE

  /**
   * Settings for BLTouch Smart 3.0 and 3.1
   * Summary:
   *   - Voltage modes: 5V and OD (open drain - "logic voltage free") output modes
   *   - High-Speed mode
   *   - Disable LCD voltage options
   */

  /**
   * Danger: Don't activate 5V mode unless attached to a 5V-tolerant controller!
   * V3.0 or 3.1: Set default mode to 5V mode at Marlin startup.
   * If disabled, OD mode is the hard-coded default on 3.0
   * On startup, Marlin will compare its eeprom to this vale. If the selected mode
   * differs, a mode set eeprom write will be completed at initialization.
   * Use the option below to force an eeprom write to a V3.1 probe regardless.
   */
  //#define BLTOUCH_SET_5V_MODE

  /**
   * Safety: Activate if connecting a probe with an unknown voltage mode.
   * V3.0: Set a probe into mode selected above at Marlin startup. Required for 5V mode on 3.0
   * V3.1: Force a probe with unknown mode into selected mode at Marlin startup ( = Probe EEPROM write )
   * To preserve the life of the probe, use this once then turn it off and re-flash.
   */
  //#define BLTOUCH_FORCE_MODE_SET

  // Safety: Enable voltage mode settings in the LCD menu.
  //#define BLTOUCH_LCD_VOLTAGE_MENU

#endif // BLTOUCH

so how should I set those options ?

@thinkyhead
Copy link
Member

@bogaskilop

This Issue Queue is for Marlin bug reports and development-related issues, and we prefer not to handle user-support questions here. (As noted on this page.) For best results getting help with configuration and troubleshooting, please use the following resources:

@AnHardt
Copy link
Member

AnHardt commented Sep 2, 2019

As always - it depends.
Impossible to answer without information about the board - if it's 5V tolerant or not, ++.

thinkyhead pushed a commit that referenced this pull request Sep 2, 2019
TiagoJustino added a commit to TiagoJustino/Marlin that referenced this pull request Apr 2, 2020
* MarlinFirmware/1.1.x: (133 commits)
  Fix Z position after ABL bilinear G29 with fade (MarlinFirmware#17174)
  Change DUMMY_PID_VALUE to NAN (MarlinFirmware#17079)
  Disable integration testing
  Enable DUAL_NOZZLE_DUPLICATION_MODE (MarlinFirmware#16436)
  [1.1.x] Polish language UTF8 (MarlinFirmware#16141)
  Links for the "New Issue" page
  Add Korean language (MarlinFirmware#15918)
  [1.1.x] MKS_GEN_L_V2 controller (MarlinFirmware#15805)
  Update bug_report.md
  [1.1.x] Fix autostart w/out SD_DETECT_PIN (MarlinFirmware#15667)
  [1.1.x] RAMPS + Viki1 LCD compatibility (MarlinFirmware#15736)
  [1.1.x] Fix compiler warning (MarlinFirmware#15642)
  [1.1.x] Fix for G2/G3 rounding error (MarlinFirmware#15546)
  Let MINIPANEL use SW SPI if needed (MarlinFirmware#15246)
  Fix BLTouch debugging (MarlinFirmware#15232)
  Fix Creality bed thermistor
  Fix PT-BR strings (MarlinFirmware#15023)
  Fix #else extra tokens (MarlinFirmware#15013)
  [1.1.x] Autobuild formatting (MarlinFirmware#14858)
  [1.1.x] BLTouch 3.0 - 3.1 (MarlinFirmware#14839)
  ...
coreyjboyle pushed a commit to coreyjboyle/Marlin that referenced this pull request Apr 21, 2020
bakaufman pushed a commit to bakaufman/Marlin that referenced this pull request Oct 16, 2020
maz3max pushed a commit to maz3max/Marlin that referenced this pull request Aug 24, 2021
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.

8 participants