Add Z_SERVO_INTERMEDIATE_STOW and measuring angle for servo probe #21427
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
Option for a probe that is mechanically deployed by moving to a certain angle but then to allow measuring needs the servo to move back to make some room for the probe to move up without forcing the servo.
Option for a probe that is mechanically deployed by moving to a certain angle but then to allow measuring needs the servo to move back to make some room for the probe to move up without forcing the servo.
…' into feature/tri-state-servo
|
I made the mistake of including my personal config in the initial commit. Should now be corrected and while at it merged in latest bugfix2.0 state ... |
|
@thisiskeithb & @thinkyhead, sorry for my ignorance, but do I now need to do something additional to get this reviewed and possibly merged? For reference, I'm using these change for https://www.thingiverse.com/thing:4804130, which Thingiverse for some reason doesn't want to display in its searches or even in my own dashboard (but it is counting it as one of my designs). |
Nope. This will be reviewed as maintainers have time. |
thinkyhead
reviewed
Mar 31, 2021
thinkyhead
force-pushed
the
bugfix-2.0.x
branch
2 times, most recently
from
83cc0bc
to
73f6426
Compare
thinkyhead
force-pushed
the
bugfix-2.0.x
branch
3 times, most recently
from
1eaff6a
to
aee971b
Compare
thinkyhead
force-pushed
the
bugfix-2.0.x
branch
2 times, most recently
from
9852ef9
to
0e40d47
Compare
thinkyhead
force-pushed
the
bugfix-2.0.x
branch
2 times, most recently
from
abffbbe
to
22ae09a
Compare
thinkyhead
force-pushed
the
bugfix-2.0.x
branch
from
f9aa794
to
90cd1ca
Compare
thinkyhead
force-pushed
the
bugfix-2.0.x
branch
2 times, most recently
from
f4c2f00
to
02ae11e
Compare
thinkyhead
force-pushed
the
bugfix-2.0.x
branch
from
cc92a7a
to
2ded50b
Compare
thinkyhead
force-pushed
the
bugfix-2.1.x
branch
5 times, most recently
from
627f8ef
to
20dea22
Compare
thinkyhead
force-pushed
the
bugfix-2.1.x
branch
2 times, most recently
from
97117d0
to
5979aab
Compare
thinkyhead
force-pushed
the
bugfix-2.1.x
branch
2 times, most recently
from
43e0584
to
6ad5711
Compare
thinkyhead
force-pushed
the
bugfix-2.1.x
branch
from
52a9e5e
to
7e60d15
Compare
thinkyhead
force-pushed
the
bugfix-2.1.x
branch
from
a71a62c
to
250fd60
Compare
thinkyhead
force-pushed
the
bugfix-2.1.x
branch
from
40e1292
to
339773d
Compare
thinkyhead
force-pushed
the
bugfix-2.1.x
branch
2 times, most recently
from
e90c213
to
4b9bb85
Compare
thinkyhead
added a commit
to MarlinFirmware/Configurations
that referenced
this pull request
Mar 9, 2023
thinkyhead
force-pushed
the
feature/tri-state-servo
branch
from
3ab92e2
to
8092cf1
Compare
ncksnydr
added a commit
to ncksnydr/Narungol-Marlin-Firmware
that referenced
this pull request
Mar 11, 2023
… into feature/bugfix-2.1.x * 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marlin: (252 commits) 🐛 Fix Anet ET4 SD_SS_PIN (MarlinFirmware#25492) [cron] Bump distribution date (2023-03-11) ✨ BTT Octopus Max EZ 1.0, SKR 3.0 / 3.0 EZ (MarlinFirmware#25387) [cron] Bump distribution date (2023-03-10) ✨ Z_SAFE_HOMING_POINT_ABSOLUTE (MarlinFirmware#23069) [cron] Bump distribution date (2023-03-09) 🔨 VSCode + Devcontainer support (MarlinFirmware#22420) 🔧 Update some config.ini options ✨ Extra Z Servo Probe options (MarlinFirmware#21427) [cron] Bump distribution date (2023-03-08) 🔧 Add DGUS_LCD_UI RELOADED conditions 🌐 DGUS Reloaded non-accented French (MarlinFirmware#25443) [cron] Bump distribution date (2023-03-07) 🌐 Update Turkish language 🧑💻 Script to make non-accented languages [cron] Bump distribution date (2023-03-06) 🌐 Update Turkish language (MarlinFirmware#25447) 🐛 Fix Flash EEPROM for STM32G0B1CB (MarlinFirmware#25469) 🐛 Fix apply_power for SPINDLE_SERVO (MarlinFirmware#25465) [cron] Bump distribution date (2023-03-05) ... Signed-off-by: Nick Snyder <nick@nicksnyder.is> # Conflicts: # config/ncksnydr/narungol/2.1/Configuration_adv.h
shadow578
added a commit
to shadow578/Marlin-H32
that referenced
this pull request
Apr 7, 2023
* [cron] Bump distribution date (2023-03-05) * 🐛 Fix apply_power for SPINDLE_SERVO (MarlinFirmware#25465) * 🐛 Fix Flash EEPROM for STM32G0B1CB (MarlinFirmware#25469) * 🌐 Update Turkish language (MarlinFirmware#25447) * [cron] Bump distribution date (2023-03-06) * 🧑💻 Script to make non-accented languages * 🌐 Update Turkish language Followup to MarlinFirmware#25447 * [cron] Bump distribution date (2023-03-07) * 🌐 DGUS Reloaded non-accented French (MarlinFirmware#25443) Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com> * 🔧 Add DGUS_LCD_UI RELOADED conditions * [cron] Bump distribution date (2023-03-08) * ✨ Extra Z Servo Probe options (MarlinFirmware#21427) Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com> * 🔧 Update some config.ini options * 🔨 VSCode + Devcontainer support (MarlinFirmware#22420) * [cron] Bump distribution date (2023-03-09) * ✨ Z_SAFE_HOMING_POINT_ABSOLUTE (MarlinFirmware#23069) * [cron] Bump distribution date (2023-03-10) * ✨ BTT Octopus Max EZ 1.0, SKR 3.0 / 3.0 EZ (MarlinFirmware#25387) BTT Octopus Max EZ V1.0 (STM32H723VE/ZE), SKR V3.0 / V3.0 EZ (STM32H723VG) * [cron] Bump distribution date (2023-03-11) * 🐛 Fix Anet ET4 SD_SS_PIN (MarlinFirmware#25492) * [cron] Bump distribution date (2023-03-12) * BTT Octopus … followup (MarlinFirmware#25495) Followup to MarlinFirmware#25387 * ⚡️ Exit from ISR on AVR already does sei Co-Authored-By: tombrazier <68918209+tombrazier@users.noreply.github.com> * 🎨 Cosmetic stepper updates Co-Authored-By: tombrazier <68918209+tombrazier@users.noreply.github.com> * ✨ MAX7219_DEBUG_MULTISTEPPING Co-Authored-By: tombrazier <68918209+tombrazier@users.noreply.github.com> * ⚡️ Use hal_timer_t for timing vars Co-Authored-By: tombrazier <68918209+tombrazier@users.noreply.github.com> * ⚡️ Use cached la_active state Co-Authored-By: tombrazier <68918209+tombrazier@users.noreply.github.com> * ⚡️ Use AxisFlags for step_needed Co-Authored-By: tombrazier <68918209+tombrazier@users.noreply.github.com> * [cron] Bump distribution date (2023-03-13) * ⚡️ Major shaper optimization Co-Authored-By: tombrazier <68918209+tombrazier@users.noreply.github.com> * ⚡️ Set steps_per_isr in calc_multistep_timer_interval Co-Authored-By: tombrazier <68918209+tombrazier@users.noreply.github.com> * 🔧 Expose MULTISTEPPING_LIMIT option Co-Authored-By: tombrazier <68918209+tombrazier@users.noreply.github.com> * ⚡️ Optimize speed lookup for AVR Co-Authored-By: tombrazier <68918209+tombrazier@users.noreply.github.com> * ⚡️ Update ISR cycle counts Co-Authored-By: tombrazier <68918209+tombrazier@users.noreply.github.com> * 📺 DGUS_RELOADED 1.03 (MarlinFirmware#25490) * [cron] Bump distribution date (2023-03-14) * 🐛 Fix Polargraph without Z (MarlinFirmware#25514) * 🐛 Fix long filename read/report (MarlinFirmware#25509) * 🩹 Fix IA_CREALITY float, startup (MarlinFirmware#25493) Followup to MarlinFirmware#25440 * [cron] Bump distribution date (2023-03-15) * 🎨 Misc. formatting * 🎨 Misc. tramming menu cleanup (MarlinFirmware#25519) * 🩹 Fan Menu / Status fixes Followup to MarlinFirmware#21888 * 🩹 Fix DWIN MarlinUI Fan/E/XY (MarlinFirmware#25502) * [cron] Bump distribution date (2023-03-16) * 🔧 Safer default for Z_MIN_PROBE_PIN override (MarlinFirmware#25524) Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com> * ♻️ Refactor PROBE_PT_[123] * ♻️ Refactor UBL 'G29 J' * [cron] Bump distribution date (2023-03-17) * 🚸 Refinements for UBL G29 J (tilt mesh) (MarlinFirmware#25486) * [cron] Bump distribution date (2023-03-18) * 🔧 Optional MPC_AUTOTUNE to save 5.5 - 5.8KB * ✨ Sovol v1.3.1 (Sovol SV06) (MarlinFirmware#25267) * 🧑💻 More IntelliSense-friendly declares * 🎨 Clean up IA_CREALITY includes (MarlinFirmware#25530) * 🎨 Suppress warning (MarlinFirmware#25529) * 🔧 SQUARE_WAVE_STEPPING => EDGE_STEPPING (MarlinFirmware#25526) Co-Authored-By: Scott Lahteine <thinkyhead@users.noreply.github.com> * 🚸 Improve Z-Probe raise for deploy (MarlinFirmware#25498) Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com> * 🐛 Fix LVGL / MKS WiFi long filename (MarlinFirmware#25483) Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com> * 🔨 Fix STM32H723Vx_btt for case-sensitive (MarlinFirmware#25535) * 🐛 Fix FYSETC Cheetah v2.0 Servo/Probe pins (MarlinFirmware#24635) Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com> * 🐛 Prevent MPC E-permm overrun in Load Filament (MarlinFirmware#25531) Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com> * 🚸 Fix / improve LCD_BED_TRAMMING (MarlinFirmware#25425) Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com> * 🔧 Sanity-check PRINTCOUNTER_SAVE_INTERVAL + ESP32 I2S Exp (MarlinFirmware#25527) Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com> * ⚡️ Smart Adaptive Multi-Stepping (MarlinFirmware#25474) * 🚸 Temperature Variance Monitor tweaks (MarlinFirmware#23571) Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com> * 🩹 Fix Ender 2 stock LCD (MarlinFirmware#25538) * ⚡️ Misc. optimizations * [cron] Bump distribution date (2023-03-19) * ✨ REPORT_ADAPTIVE_FAN_SLOWING (MarlinFirmware#25537) * 🩹 Fix a serial_ternary * ✨ Z_SERVO_DEACTIVATE_AFTER_STOW (MarlinFirmware#24215) * 🐛 Avoid step rate overflow (MarlinFirmware#25541) * [cron] Bump distribution date (2023-03-20) * ✨ PROBING_TOOL (MarlinFirmware#24411) * [cron] Bump distribution date (2023-03-22) * ✨ FILAMENT_SWITCH_AND_MOTION (MarlinFirmware#25548) Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com> * 🧑💻 ExtUI::onSetPowerLoss * [cron] Bump distribution date (2023-03-23) * 🎨 calibration_stage => stage * [cron] Bump distribution date (2023-03-24) * 🩹 Reset touch screen calibration on failure (MarlinFirmware#25334) Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com> * 🎨 TMC SPI Pins Co-Authored-By: Martin Turski <turningtides@outlook.de> * 🎨 Pins header comments Co-Authored-By: Martin Turski <turningtides@outlook.de> * 🎨 Wrap font includes Co-Authored-By: Martin Turski <turningtides@outlook.de> * 🎨 LPC_SOFTWARE_SPI => SOFTWARE_SPI Co-Authored-By: Martin Turski <turningtides@outlook.de> * 🔨 INI Updates Co-Authored-By: Martin Turski <turningtides@outlook.de> * 🎨 Misc. fixes, cleanup Co-Authored-By: Martin Turski <turningtides@outlook.de> * 🩹 Update TRONXY_V10 SPI_FLASH pins * [cron] Bump distribution date (2023-03-25) * 🩹 Fix Chitu3D V6 default probe pin (MarlinFirmware#25552) * 🔧 Remove TVPM warning (MarlinFirmware#25551) * 🐛 Fix MKS Gen L 2.1 MOSFET pins (MarlinFirmware#25542) * 🩹 Refine MKS boards with a dedicated FAN port (MarlinFirmware#25567) * 🎨 Rename FAN_PIN to FAN0_PIN (MarlinFirmware#25568) * 📝 Fix spelling (MarlinFirmware#25563) * [cron] Bump distribution date (2023-03-26) * 🎨 Timer tweaks * 🔧 Refactor endstop state config (MarlinFirmware#25574) * ✨ AnyCubic Vyper / Vyper LCD (MarlinFirmware#25405) * 🩹 Fix Touch Calibration first point (MarlinFirmware#25298) * 🧑💻 Auto Fan / Cooler Fan updates (MarlinFirmware#25554) * 🐛 Prevent divide-by-zero in calc_timer_interval (MarlinFirmware#25557) * 🔧 Sanity-check for endstop inverting Followup to MarlinFirmware#25574 * 🔧 Clarify axis disable / timeout (MarlinFirmware#25571) * [cron] Bump distribution date (2023-03-27) * 🔨 Fix thread-unsafe deque iteration * 🐛 Fix AnyCubic Vyper ProcessPanelRequest Followup to MarlinFirmware#25405 * 🎨 Suppress a type warning (MarlinFirmware#25575) * ⚡️ Improve TFT DMA for STM32 (MarlinFirmware#25359) * 🐛 Fix M23 long filename support (MarlinFirmware#25540) * [cron] Bump distribution date (2023-03-28) * 🎨 Misc. cleanup * 🔧 Fix up WiFi options (MarlinFirmware#25586) * 🔨 Update config.ini endstop states Followup to MarlinFirmware#25574 * [cron] Bump distribution date (2023-03-29) * 🔧 Impose Hephestos 2 Bed Kit requirements (MarlinFirmware#25585) * 🎨 Remove unused ProUI : UBLValidMesh (MarlinFirmware#25591) * 🔨 Improve Docker local tests support (MarlinFirmware#25583) * 🔨 MarlinSimUI updates (MarlinFirmware#25589) * [cron] Bump distribution date (2023-03-30) * 🩹 Update Trigorilla V006 fan pin Followup to MarlinFirmware#25568 * 🩹 Fix Ender-3 V2 with no fan * 🐛 Fix _HAS_FAN for fan on Pin 0 * 🎨 Refine probe, more debug * 🩹 Fix displayed mix percentages * [cron] Bump distribution date (2023-03-31) * 🔧 DGUS_LCD_UI selectable options * 🔧 Fix SENSORLESS hit state error (MarlinFirmware#25604) * 🧑💻 CardReader adjustments (MarlinFirmware#25611) * [cron] Bump distribution date (2023-04-01) * 🎨 HAS_SHAPING => HAS_ZV_SHAPING * ✨ Fixed-Time Motion with Input Shaping by Ulendo (MarlinFirmware#25394) Co-authored-by: Ulendo Alex <alex@ulendo.io> * 🐛 Fix Long FIlename lookup (MarlinFirmware#25598) * 🌐 Update Italian language (MarlinFirmware#25587) * 🔨 Move Docker local test script Followup to MarlinFirmware#25583 * 🩹 FT_MOTION Followup * 🐛 Ensure root for 'M503 C' * 🐛 Clean up DELTA babystep Z * 🐛 INVERT_*_DIR for FT_MOTION (MarlinFirmware#25637) * 🔧 Move DOGLCD options * 🧑💻 Update pinsformat.js * 📝 Update Ender # labels * [cron] Bump distribution date (2023-04-07) * 🚸 Support CoreXY without Z (MarlinFirmware#25630) * 🎨 Apply const (MarlinFirmware#25643) * update `pins_Aquila_X2.h` to new format --------- Co-authored-by: thinkyhead <thinkyhead@users.noreply.github.com> Co-authored-by: Hans-Christian Ebke <ebke@cs.rwth-aachen.de> Co-authored-by: alextrical <35117191+alextrical@users.noreply.github.com> Co-authored-by: Abdullah YILMAZ <h.abdullahyilmaz@hotmail.com> Co-authored-by: albatorsssx <albator_ssx@hotmail.com> Co-authored-by: Kurt Haenen <Misterke@users.noreply.github.com> Co-authored-by: Sion Williams <sion5@hotmail.co.uk> Co-authored-by: Evgeniy Zhabotinskiy <evg-zhabotinsky@users.noreply.github.com> Co-authored-by: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com> Co-authored-by: tombrazier <68918209+tombrazier@users.noreply.github.com> Co-authored-by: Neo2003 <Neo2003@users.noreply.github.com> Co-authored-by: jbubik <jbubik@centrum.cz> Co-authored-by: Eduard Sukharev <sukharev.eh@gmail.com> Co-authored-by: Davide Rombolà <davide.rombola@gmail.com> Co-authored-by: dwzg <50058606+dwzg@users.noreply.github.com> Co-authored-by: ellensp <530024+ellensp@users.noreply.github.com> Co-authored-by: jamespearson04 <jamespearson04@hotmail.co.uk> Co-authored-by: Michael Hill <mhill@hillsoftware.com> Co-authored-by: James Gilliland <neclimdul@gmail.com> Co-authored-by: Liam Powell <liam+github@liampwll.com> Co-authored-by: George Fu <nailao_5918@163.com> Co-authored-by: Piotr Paczyński <ppaczyn@gmail.com> Co-authored-by: Farva42 <100859196+Farva42@users.noreply.github.com> Co-authored-by: John Robertson <john@cirtech.co.uk> Co-authored-by: John Lagonikas <39417467+zeleps@users.noreply.github.com> Co-authored-by: StevilKnevil <stevilknevil@hotmail.co.uk> Co-authored-by: FilippoR <filippo.rossoni@gmail.com> Co-authored-by: BIGTREETECH <38851044+bigtreetech@users.noreply.github.com> Co-authored-by: Martin Turski <turningtides@outlook.de> Co-authored-by: Giuliano Zaro <3684609+GMagician@users.noreply.github.com> Co-authored-by: Bob Kuhn <bob.kuhn@att.net> Co-authored-by: Alexander Gavrilenko <jmz52@users.noreply.github.com> Co-authored-by: Andrew <18502096+classicrocker883@users.noreply.github.com> Co-authored-by: John Unland <junland.foss@gmail.com> Co-authored-by: Chris Pepper <p3p@p3psoft.co.uk> Co-authored-by: Ulendo Alex <alex@ulendo.io>
thinkyhead
added a commit
that referenced
this pull request
Apr 7, 2023
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
EvilGremlin
pushed a commit
to EvilGremlin/Marlin
that referenced
this pull request
Apr 8, 2023
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
thinkyhead
added a commit
that referenced
this pull request
Apr 10, 2023
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
thinkyhead
added a commit
to thinkyhead/Marlin
that referenced
this pull request
May 16, 2023
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
EvilGremlin
pushed a commit
to EvilGremlin/Marlin
that referenced
this pull request
May 17, 2023
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
tspiva
pushed a commit
to tspiva/Marlin
that referenced
this pull request
May 25, 2023
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
Andy-Big
pushed a commit
to Andy-Big/Marlin_FB_Reborn
that referenced
this pull request
Jul 9, 2023
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
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.
Description
Add option for a probe that is mechanically deployed by moving a servo to a certain angle but then to allow measuring needs the servo to move back to make some room for the probe to move up without forcing the servo. That measuring angle is defined by Z_SERVO_MEASURE_ANGLE.
To avoid said probe to collide into bed clips or other stuff also an option to stow the probe between measurement points is added by enabling Z_SERVO_INTERMEDIATE_STOW.
Requirements
Only makes sense with specific types of servo probe. That said, the changes should not be limited to the probe design I'm currently working on, but could benefit other designs too.
Benefits
Allows more complex forms of servo-based ABL probes.
Configurations
Involved configuration options are included.