9938 Commits (18996d25956e82aeb29afd8b30509643bacbe0b6)

Author SHA1 Message Date
Karl Andersson 64a4649290 STM32 - Fix SD write (#12897) 6 years ago
Ludy 294521439e Clean up Configuration_adv.h (#12900) 6 years ago
InsanityAutomation 59b18aaeef Allow resume from pause with parking enabled (#12893)
Currently, Pause of an SD-Memory card print does not work.    This has been verified to resolve the issue by multiple people.   

I understand more work needs to be done to resolve some of the concerns...
6 years ago
Giuliano Zaro 85f149befe Save some progmem (#12913) 6 years ago
mikeshub 7fde8d9d1e Add CreatorPro / Makerbot / QIDI / etc and Mightboard RevE support (#12855)
- Fix a bug in MAXxxxx thermocouple temp reporting.
- Add support for 3-wire HD44780.
- Add support for PCA9533 RGB driver.
- Add configuration examples for FlashForge CreatorPro.
6 years ago
Scott Lahteine 3644c940bf Tweak SD section of Main Menu 6 years ago
teemuatlut 1a79878dff Remove TMC_Z_CALIBRATION in favor of Z_STEPPER_AUTO_ALIGN 6 years ago
Scott Lahteine 7cfce20cd3 Update comments on M125 6 years ago
Jason dc4786a504 Config files for PowerWASP Printer (#12889) 6 years ago
Scott Lahteine 3e867008f0 Fix some HAL_STM32F1 type declarations 6 years ago
Scott Lahteine eb78aed863
Rename LCD menus according to variable types (#12892) 6 years ago
InsanityAutomation ed3ab5e212 Fix M24 not starting new job (#12887) 6 years ago
Nils Hasenbanck f9299c4461 Make timer definition in pin files for STM32 possible (#12874)
RemRam needs to redefine a particular timer to work correctly. The HAL did foresee this possibility and checks if the timer was already defined for either the stepper or temperature timer.

Prior to this commit the header file for the timers couldn't see those definitions in the pin file, but this commit will fix this.

Tested on an actual hardware to verify. (It wouldn't boot without it.)
6 years ago
InsanityAutomation 082f6a27de ADAPTIVE_FAN_SLOWING extension to hotend thermal protection (#12853) 6 years ago
Scott Lahteine 459f4fef60 Fix Temperature::init bug with HEATER_4_PIN 6 years ago
InsanityAutomation a403d9a50c Improve menu pause / resume (#12876) 6 years ago
Alain Martel 432c21456f Add 3DFabXYZ Migbot example config (#12775)
Co-Authored-By: Alain Martel <alain74martel@gmail.com>
6 years ago
Scott Lahteine fb8111553e getStatus => report_status 6 years ago
Chris Pepper 2919f3045d [LPC176x] Update PIO extrascript (#12878) 6 years ago
Scott Lahteine 19fea772e5 Use E_AXIS_N where it makes sense 6 years ago
Scott Lahteine 0d30ccf767 Tweaks to TMC26XStepper 6 years ago
HackingGulliver 1fd8e2c649 Fix: Junction Deviation calculates wrong cos(theta) on CoreXY (#12879) 6 years ago
Scott Lahteine b402040059 Split bed size sanity check into two 6 years ago
Chris Barr 1d33784bf9 Add RUMBA32 Board (#12856) 6 years ago
Ondřej Nový a0ef6198ff Level bed corners Z-hop height option (#12858) 6 years ago
Karl Andersson 8ae6f1e556 Fix errors and some compiler warnings with HAL_STM32 PlatformIO build (#12869) 6 years ago
Scott Lahteine e6484d9dab Return to status when SD card is removed 6 years ago
Scott Lahteine 5f2d75f45b Move PINS_DEBUGGING to @section develop 6 years ago
Scott Lahteine da42f27c9e Use maths macros for ceil/floor 6 years ago
Ludy de4561c980 VORON Add LCD option BEEP_ON_FEEDRATE_CHANGE (#12822) 6 years ago
Giuliano Zaro 709a6356f7 Remove obsolete test conditions (#12829) 6 years ago
Luu Lac bcf347403b Fix M106 extruder & fan count (#12820) 6 years ago
Kaushik Vemparala ba7e35cbab Add LCD option BEEP_ON_FEEDRATE_CHANGE (#12774) 6 years ago
jmz52 d372e7e477 SDIO support for STM32F1 (#12782) 6 years ago
Marcio Teixeira 6a8fb0f25f Simplify backlash compensation code. (#12813)
- Use `TEST(dm,axis)` to determine directions instead of doing comparisons.
- Remove recomputation of `millimeters` and `delta_mm` since backlash compensation should not affect the distance over which material is extruded.
6 years ago
luxflow 7f244f9b9c Update LPC SD pins for BIQU SKR (#12767)
(Exactly matching the Azteeg X5 MINI Wifi)
6 years ago
jmz52 813a4ea107 Add support for Mks Robin TFT display (#12706)
* Add support for MKS Robin TFT display

- Add support for MKS Robin TFT display and encoder for MKS Robin board.
- Generic 128x64 UI with x2 upscale is used (for now).
- Tested on MKS Robin TFT V2.0 with ST7789V controller.
6 years ago
jmz52 c4237b529f Fix MKS Mini and SD card conflct over SPI mode (#12783) 6 years ago
Phr3d13 01f75591c6 Fix GTM32_PRO_VB Serial and HAL via watchdog (#12753)
Move `watchdog_reset` from `.h` to `.cpp` to eliminate the need to include `MarlinConfig.h` in a HAL-related file.
6 years ago
Scott Lahteine 288340cb6c Followup to VORON 6 years ago
Scott Lahteine 2aaa681dea Remove unused Cheaptronic pins 6 years ago
Marcio Teixeira 81e753064a Fix ExtUI compile warnings and error (#12799) 6 years ago
Ludy 74c47803f7 Add VORON printer (#12705) 6 years ago
kAdonis 637fb20c75 Allow 4 fan animation frames (#12772) 6 years ago
petieken d9cf5e4883 Update pins_BIQU_SKR_V1.1.h (#12758) 6 years ago
TheLongAndOnly cb643d87df Adding missing code for triple Z-stepper auto-align (#12786) 6 years ago
Ludy 14a7faf087 Fix compile warning comparison uint and int (#12788) 6 years ago
Marcio Teixeira 60cb36bef3 Misc. improvements (#12747)
* Make ExtUI respect MAXTEMP limits
  - Temperatures are now clamped by MAXTEMP limits rather than arbitrary values.
* Speed up USB init, add status
  - Speed up USB initialization
  - Show status message if init failed
* Enable status messages for EXTENSIBLE_UI
* Adjust max limit to MAX_TEMP - 15
* Misc. tweaks to formatting, const, etc.
6 years ago
InsanityAutomation 4f2473053c Fix M106 with SINGLENOZZLE 6 years ago
Reece Kibble 7557f8d68c Rename all Stm32f1 to STM32F1 (#12639) 6 years ago
Scott Lahteine 371d9a1acf Fix line-endings, formatting, whitespace
Followup to #12770
6 years ago
Ludy 135c74017c Fix compile DEBUG_EEPROM_READWRITE error (#12746) 6 years ago
Giuliano Zaro 54ba44ee37 Fix bad sanitycheck (#12748) 6 years ago
swilkens b01a630bd0 [2.0.x] Correct Ender 3 bed size (#12769) 6 years ago
Alain Martel 44ed34475b Add MKS BASE 1.4 pins (#12770) 6 years ago
Roxy-3D 3a16cb6d7f
Slightly Slower Max X Axis speed
On some T-Rex 2+ machines the previous max step rate could lose steps....
6 years ago
Ludy 814d93c7cf Fix G33 sprintf output warning (#12738) 6 years ago
Ludy 3877bf9704 Fix compile error with delta and sensorless homing (#12740) 6 years ago
Ludy cfc5e96b4b Move JD to Config.h (and fix jerk->eeprom bug) (#12720) 6 years ago
Roman Moravčík 594898aea7 Limit hotend / bed temperature to maxtemp-15 (#12713) 6 years ago
InsanityAutomation 530ef5846f Make nomove=false for toolchange on filament swap (#12739) 6 years ago
InsanityAutomation 14ddda285c Confirmation on Abort SD print (#12717) 6 years ago
Msq001 f8c5d31864 Bugfix 2.0.x add motherboard pins define (#12689)
- `pins_BIQU_B300_V1.0.h` defines pins for B300, as found in the BIQU Thunder 3D printer.
- `pins_BIQU_SKR_V1.1.h` defines pins for bigtree/BIQU SKR V1.1 motherboard.
6 years ago
InsanityAutomation b7a8dcc35d Update Formbot T-Rex 3 pins (#12662) 6 years ago
Ludy f7127c44f8 Wanhao Duplicator i3 Plus pins create (#12701) 6 years ago
jmz52 33abb86b7e Add support for MKS Robin board (#12650)
Implement initial support for MKS Robin (STM32F103ZET6) board.
Custom build script is used to generate encrypted firmware compatible with original MSK Robin bootloader (i.e. safe firmware update from SD card and possibility to go back to original close-source firmware).
6 years ago
InsanityAutomation 367a9f65aa Add Formbot 350c Thermistor (#12661) 6 years ago
Ludy 33f3c75213 GTM32 Pro VB FAN-PIN correction (#12666) 6 years ago
Scott Lahteine 9d59a9c840 Followup to #12691 (typo) 6 years ago
Ludy 3829d6ccf8 FYSETC F6 13 - E2_SERIAL_TX_PIN correction (#12667) 6 years ago
Kadah d35dcafa3d Added MKS MINI 12864 support to FYSETC F6 V1.3 (#12656) 6 years ago
Roman Moravčík 98cf546771 Limit set hotend temperature to maxtemp. (#12690) 6 years ago
Roman Moravčík 4dad489a50 [2.0.x] Limit PID autotune target to maxtemp-15 (#12691) 6 years ago
Marcio Teixeira 8dcc28c9ae Squelch warning mentioned in #11061 (#12676) 6 years ago
Ondřej Nový 4c8a6eee7b [2.0.x] Update Czech translation (#12683) 6 years ago
Ondřej Nový fcaed685b2 [2.0.x] Set DEFAULT_NOMINAL_FILAMENT_DIA to 1.75 in Anet A6 config (#12664) 6 years ago
Ondřej Nový 0572be9439 [2.0.x] Enable PIDTEMPBED in Anet A8 example config (#12655) 6 years ago
Luc Van Daele c6e09c2689 [2.0.x] G33 clean up (#12648)
Remove obsolete workarounds in G33 for the now fixed zprobe_zoffset bug
6 years ago
teemuatlut 7a5e637a37 Add spreadCycle parameter sets (#12645) 6 years ago
Marcio Teixeira 902d5b0f8b Allow ExtUI to use LCD_SET_PROGRESS_MANUALLY (#12628) 6 years ago
Dave Johnson 9a4a463ec4 Sanity-check LIGHTWEIGHT_UI, move comment up (#12630) 6 years ago
teemuatlut 55144284c2 TMC connection test, spreadCycle parameters, improved debugging (#12616) 6 years ago
Ludy 97de9d54a5 Fix broken pins file include (#12617) 6 years ago
Ludy a7b3a61424 Improve some config comments readability (#12615) 6 years ago
Scott Lahteine daf07e4200 Align classic bed icon consistently 6 years ago
MasterPIC 3bb8b3529a Center ABL grid on bed with H parameter. (#12610) 6 years ago
Scott Lahteine 6cf8d40f41 Fix some serial echos of pin states 6 years ago
Scott Lahteine f6321f878a
Simpler AVR + Trinamic + Soft Serial sanity-check (#12606) 6 years ago
Scott Lahteine 7d15854514 Add Z_MIN_PROBE_PIN to MKS SBASE pins 6 years ago
Scott Lahteine e8bda62d2a Followup to servo angles patch
Fix #12594
6 years ago
Scott Lahteine 18fedafbc5 Refresh screen on SD Init 6 years ago
Marcio Teixeira b22716e938 M425 Backlash Correction (#11061) 6 years ago
Scott Lahteine fa47ce369a Sanity-check for negative steps, feedrate, accel 6 years ago
Scott Lahteine ef81b5f03e Link to font docs in ultralcd_DOGM.cpp 6 years ago
Scott Lahteine 4388015f1a Tweak config formatting 6 years ago
Scott Lahteine b7e38ea249 Signal an invalid mesh for M420 enable / load 6 years ago
teemuatlut 50b2fbd031 Trinamic: Split stealthChop, improve driver monitoring, etc. (#12582) 6 years ago
Scott Lahteine 9fbd73d931 Fix up some delta settings 6 years ago
Dave Johnson 0947b92734 Build and CI fixes and optimizations (#12584)
-Disable LDF "deep+" mode on AT90USB platforms. Appears not needed any longer (likely due to fix 7322df26ad). Results in identical binary output and cuts compile time in half
-Disable Cartesio config from CircleCI (compile failure)
-Disable Geetech I3 Pro X GT2560 from CircleCI (compile failure)
-Enable EEPROM on Micromake example config (fix compile failure)
-Move FolgerTech/i3-2020 to AVR platform in CircleCI (fix CirculeCI build failure)
-Disable various examples failing to build in CircleCI
-Enable various examples no longer failing to build in CircleCI
6 years ago
mr-miky 11c7945365 Don't include STM32 Core code when compiling STM32 Generic (#12575) 6 years ago
Scott Lahteine 64389acdf1 Print a space after scrolling status 6 years ago
Scott Lahteine 7a361ad36a
Alternative fan image option (#12579)
* Alternative fan bitmap
* Move bed over by 3px
6 years ago
Scott Lahteine 261c6f4b96 Fix pause/resume SD print
Followup to #12551, addressing #12566
6 years ago
Scott Lahteine 2224a4d61a Remove AVR-only MARLIN_DEV_MODE code 6 years ago
Scott Lahteine e874f9664c Tweaks to endstops code 6 years ago
Scott Lahteine 3c58b16c9f
Move stepper enable/disable to stepper_indirection.h (#12562) 6 years ago
Scott Lahteine aaf862aef2
Fix angles for disabled EDITABLE_SERVO_ANGLES (#12559) 6 years ago
Scott Lahteine c986239837
A single SERIAL_ECHO macro type (#12557) 6 years ago
Scott Lahteine 69d869c3d9 Tweak FR icon. Update font data. 6 years ago
Scott Lahteine 0c1cd9f590 Fix "No SD Card" indicator 6 years ago
Jacob Jordan 8be91677df Fix Skew factors (#12555)
- Ensure Skew factors are calculated from test square measurements
6 years ago
Scott Lahteine 03ef2d6c82
Fix "paused" message and M125 called by M25 (#12551) 6 years ago
Scott Lahteine 95d154a91f Fans loop macro 6 years ago
Scott Lahteine 61db0b65b6 Followup to heating progress 6 years ago
Scott Lahteine 4f9ec9ab45
Add heating progress bars (#12543) 6 years ago
Scott Lahteine 929a513a6b
Add poll_runout_states, which returns 1 for runouts (#12547) 6 years ago
Scott Lahteine 01b5c810d5 Space out multiple edit lines a bit 6 years ago
Scott Lahteine cd88ea2106 Fix runout debug output
Followup to #12544
6 years ago
Scott Lahteine cecc238f68 Save recovery info on SD pause 6 years ago
Marcio Teixeira 439a3e8463 Improve runout sensor, fix LIGHTWEIGHT_UI screen size (#12544) 6 years ago
Scott Lahteine 5b24ce9024 Hide M217 compile warning 6 years ago
David Bates d94b50a3d8 Add sample config for Delta with MKS SBASE (#10819) 6 years ago
InsanityAutomation dec721c52b Add Formbot Raptor2 and Raise3D pins (#12532)
* Add Formbot Raptor2 board
* Add Raise3D Rumba board
6 years ago
Scott Lahteine 6aae199572 Add missing boards to Makefile 6 years ago
Scott Lahteine 0a638cc022 Adjust Formbot Raptor pins 6 years ago
Ludy e5019a0481 Fix English special symbols (#12529) 6 years ago
Scott Lahteine 09d6db491a Fix wait_for_bed compile error 6 years ago
Roman Moravčík d545f984b0 Update Slovak translation (#12523) 6 years ago
Ludy 730f223100 Correct FANMUX2_PIN (#12538) 6 years ago
Yücel Temel d857cdfb27 Update Turkish language (#12524) 6 years ago
Scott Lahteine 4a7c6f7241 NUM_ARRAY => COUNT 6 years ago
Giuliano Zaro 31113c5adf Update Italian language (#12512) 6 years ago
Scott Lahteine b57343c255 Put status screen options in Configuration_adv.h 6 years ago
Scott Lahteine 1fcc13b011 Allow Serial Overrun Protection to be disabled 6 years ago
Scott Lahteine 29c53f2402 Hide some compile warnings 6 years ago
Scott Lahteine caca3c8503 Use wait_for_bed with WAIT_FOR_BED_HEATER
Addressing #12517
6 years ago
Scott Lahteine f1efcfed14 Fix backslash in language_test.h 6 years ago
Yücel Temel 3b186a55ac Don't show superscript ³ with NOT_EXTENDED_ISO10646_1_5X7 (#12513) 6 years ago
Scott Lahteine 82c96c971e Bring superscripts slightly lower in BDF fonts 6 years ago
Sinisa Culic 8a0992d921 Fast PWM for controller fan (#12485) 6 years ago
Ludy e98d195901 Remove extra declarations in cardreader.cpp (#12520) 6 years ago
Scott Lahteine fd2998efd5
Revert ADC_KEYPAD direction behavior (#12508) 6 years ago
Scott Lahteine d29cb09b3e Fix a minor compile warning 6 years ago
Yücel Temel 5b1d52671c Use superscript 3 in language_en.h (#12504) 6 years ago
Marcio Teixeira 7109dadd21 Additional pin definitions for Archim 2 (#12500)
- Added GPIO pins to Archim 2
- Added new 108 pin to `fastio_Due.h`
6 years ago
Andy Shaw 4975b13b74 Fix problems with LPC1768 EEPROM flash emulation (#12503)
* Remove duplicate calls to PrepareSector

Some flash memory API calls require that a call to `PrepareSector` is done before use. However this call is already made by the LPC1768 framework so the calls in this code are not required.

* Ensure correct alignment of RAM buffer

The LPC176X flash API requires that the RAM buffer used for write operations must be word-aligned. This change ensures that this is the case.
6 years ago
Scott Lahteine b738972e69 General cleanup of Re-ARM pins 6 years ago
Scott Lahteine ee423dcdd0 Invert hotend bitmaps, by default 6 years ago
Scott Lahteine c5642a894f
Fix ADC_KEYPAD middle button (#12493) 6 years ago
Scott Lahteine 0946cbcdca Revert some const changes (for now) 6 years ago
Scott Lahteine 4def8b3b5e Expanded options for _Statusscreen.h (#12455)
See the PR for full details. The updated system will be documented on the website in the near future.
6 years ago
Scott Lahteine d51e5690f4 Don't show updir with no card present 6 years ago
Scott Lahteine ec9d21a234 Shift YZ on graphical display to fit Z+123.45 6 years ago
Scott Lahteine 817a37169a Apply/unapply const here and there 6 years ago
Scott Lahteine 643e0066a0 Followup to #12451 6 years ago
Marcio Teixeira 4bcb63b705 Fix for #12482 (#12483)
Fix Z-move to uninitialized position in SWITCHING_EXTRUDERS tool_change (no_move=true)
6 years ago
Marcio Teixeira 50ee747787 Fix compilation errors. Followup to #12439 (#12481) 6 years ago
Ludy 90a58488b5 Corrected unused var, default switch, Travis tests (#12477) 6 years ago
Scott Lahteine a4c15dc54f
Modify MBL to use IJ instead of XY (#12478) 6 years ago
Scott Lahteine fc3f1c4572 Get u8g reference for lcdprint 6 years ago
Scott Lahteine 88c57eaf55
Clean up some u8g code (#12476) 6 years ago
Ludy 1f93d2bcf7 Fix LCD compile error, etc. (#12472) 6 years ago
Scott Lahteine 826d570162
Combine Travis CI option-setting commands (#12474) 6 years ago
Scott Lahteine 9d13f07d09 GTM32 Pro VB changes from Markku Sinisalo 6 years ago
Roman Moravčík 5fbe5cabc8 Fixed displaying of kill MSG_OUTAGE_RECOVERY string. (#12470) 6 years ago
kAdonis 4ae9a06c60 Update M303.cpp (#12471) 6 years ago
Ludy c0b75f49b6 Fix "no effect" and "unused variable" compile warnings (#12473) 6 years ago
Nils Hasenbanck 5a4fd8e0a6 Fix access to the DWT peripheral for STM32 HAL (#12434)
Access to the DWT peripheral for the `CYCCNT` register needs to happen before `main()`. The code needs to be called after the setup of the system clocks, so the right place is between the `premain()` and `main()` function of the STM32 Arduino core.

This patch moves the DWT access code to a new function, which is then placed between `premain()` and `main()`.
6 years ago
Scott Lahteine 7f225b9421 Fix MAX_MESSAGE_LENGTH 6 years ago
Scott Lahteine 06674a321a Remove extra include 6 years ago
Marcio Teixeira c1e17037e5 Various fixes for MarlinUI and ExtUI (#12439) 6 years ago
Giuliano Zaro d3605cfc26 Don't start watching heaters when target is 0 (#12453) 6 years ago
Ludy 93e958f695 Fix compile error with ZONESTAR_LCD+NO_LCD_MENUS (#12466) 6 years ago
Ludy 22d7fed60a Fix compile error with SD_FIRMWARE_UPDATE (#12462) 6 years ago
Nils Hasenbanck 779b2709ec Change temperature pin order for RemRam V1 (#12458)
Beta testers suggested to adopt the RAMPS order of temperature probe connectors. This commit fixes the order to the RAMPS order.
6 years ago
Scott Lahteine 8ebb4dc294 Followup to static CardReader 6 years ago
Scott Lahteine 7ee5894360 Allow float XY probe offsets
Responding to #12383

XY probe offsets should be integers because adding decimal points makes the code larger. But if decimals are very much wanted, this commit removes the old restriction.
6 years ago
Giuliano Zaro 43ecdb606f Fix a compile warning (#12452) 6 years ago
Ph0non 984c4ba8c7 Enable SD Card on RepRap Display and RADDS (#12446)
* Enable SD Card on RepRap Display and RADDS

Define the necessary pins in `pins_RADDS.h` (copied from the `RADDS_DISPLAY` section) for the use of the SD card slot on RRD.
6 years ago
Ludy 56a94c2a26 Use 'target_extruder' in M104 as with M109 (#12448) 6 years ago
Scott Lahteine 66580f32c2
Make CardReader class static (#12451)
* Make CardReader a static class
* Make CardReader flags into bitfields
6 years ago
Scott Lahteine 3e9ffaddb6
Consolidate, optimize some LCD menu code (#12450) 6 years ago
Scott Lahteine d97e31db4c
Optimize Power-Loss Recovery (#12440) 6 years ago
Mateusz Krawczuk ca21ac6b9b Support two MAX6675 thermocouples (#8686) 6 years ago
Scott Lahteine 0e610815e4 No need for Cap:PAREN_COMMENTS 6 years ago
Scott Lahteine 7a075a5dc9 Tweak extruder errors 6 years ago
Scott Lahteine 2d92f333f5 Fix GcodeSuite::T active_extruder reference 6 years ago
Scott Lahteine d2bb53702a
Optimize target_extruder, ignore T with mixing (#12432)
* Optimize target_extruder, ignore T with mixing
* Give G-code Tn parity with tool_change
6 years ago
Marcio Teixeira 5e586a6b39 Fix to runout sensor code. (#12431)
- "old_state" is no longer a class static variable.
6 years ago
Scott Lahteine d82c350de7
Miscellaneous LCD code renaming, reordering (#12430)
* Move special characters to language.h
* Apply some naming standards
* Clean up menu item draw functions
* Rename some Temperature methods
* UI => ExtUI
6 years ago
Scott Lahteine edfd106bc5
Rejigger Filament Runout class (#12428) 6 years ago
Scott Lahteine f4c128ecaa
Move RRW keypad code to a common method (#12429) 6 years ago
Scott Lahteine 54ec5528a0 hasstatus => has_status 6 years ago
Scott Lahteine ebf585b673 Fix an old sanity check 6 years ago
Ryan 052d102ded UltiMachine Archim 1 support (#12404) 6 years ago
Scott Lahteine 664e20754d Clean up pins files 6 years ago
Scott Lahteine 1eb5249598 Fix Formbot Trex-2+ configs
Followup to #12422
6 years ago
thiagodesacosta 075a22ed65 Update Portuguese-Brazilian translation (#12402) 6 years ago
Marcio Teixeira 3ceab8474c Add required "cardreader.h" include (#12419) 6 years ago
Giuliano Zaro 98c2fc4e42 Endstops fix followup (#12423)
Followup to #12413
6 years ago