Update Marlin to 2.1.x #2488
Draft
Update Marlin to 2.1.x #2488
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
subrepo: subdir: "lib/Marlin" merged: "733ca940c0" upstream: origin: "[email protected]:prusa3d/Marlin.git" branch: "buddy" commit: "733ca940c0" git-subrepo: version: "0.4.3" origin: "???" commit: "???"
(cherry picked from commit b7823c6efd9e83368094e11f7b2a414151276af7)
(cherry picked from commit 062e2df1b565ab116e951ba57282eb3b9ec8744e)
…er file (cherry picked from commit 1b5784b0cb67fa0559b9668ef6c19dec6d8aafa8)
A3ides - FIL_RUNOUT_PIN fix (cherry picked from commit 066be00ad94242557c27a3c640824bd9f7cbff48)
A3ides - fixed definition of FIL_RUNOUT_PIN (cherry picked from commit e3f3b0a9f81442fade0878c4257ea6710176fbca)
M73_PE fix (cherry picked from commit bc1ed84718cebdac4d91fc3793752d20e93e80e9)
Stepper E-axis count_position with LA (cherry picked from commit cdf34761cd61d05779f72d464d908e6211623975)
Stepper - motion flag fix (cherry picked from commit c4cd248df0bbaedc04ea516d73a77554d88cc644)
M73_PE fix (cherry picked from commit 71dc330fabbcc9cdd4dd0abb7e4229da797c3f12)
Filament unload tunning for MINI (faster, prevent stringing) (cherry picked from commit 9a176dcc562b8d9b624e942866ffae92b32e0317)
Merge commit '7dbcbe0' into HEAD (cherry picked from commit ffd75372f8c76a69b124fee769aa8ef269c9edf9)
(cherry picked from commit d567c618d2f4bdaa67d77b00272fefa130b5a862)
Merge commit '4986a2b' into HEAD (cherry picked from commit 1dee1add3ffb329520b64388c868f153cf31a1fa)
(cherry picked from commit 87317f6d4049be72f053d25923bbd54b92750383)
…ation_adv.h. (cherry picked from commit 9392f9bd86ec47af5c8300f35d44fd4f98687607)
(cherry picked from commit ed35fa349a83124d83d402ebcf8f811609d51dd3)
as the deploy/stow is already being done within probe_at_point
"G29" alone expands to multiple G29 PX gcodes
…nqueue without echo
- add new type of thermistor(2001): 100k NTC with 4k7 pullup
Remove unnecessary board thermistor heater functions. Board thersmistor is only temperature sensor not heater with regulation Can be squashed with "marlin: Add board thermistor"
mkbel
force-pushed
the
update_marlin_2
branch
from
f216870
to
8ecf4d9
Compare
# Conflicts: # src/gui/screen_crash_recovery.cpp # src/guiapi/include/WindowMenuSpin.hpp
Change parameters xpos and ypos to int8_t. Ensure marlin client mesh copy index is not out of range. Log error otherwise.
…s: 'const unsigned int' and 'const int' [-Wsign-compare]
This is not needed as hwio_buddy implementation is used and Marlin task is started after pins are initialized.
This does nothing as no pins for esp are defined. In MARLIN_DEV_MODE it would log time and "esp_wifi.cpp" and do nothing as no pins for esp are defined.
# Conflicts: # src/common/appmain.cpp # src/common/bsod_gui.cpp
# Conflicts: # include/marlin/Configuration_MINI_adv.h Replace axes_need_homing by !axis_is_trusted in pause.cpp
mkbel
force-pushed
the
update_marlin_2
branch
from
a9c55c7
to
ebd36f7
Compare
This reverts to the state before switching from HAL_STM32_F4_F7 to STM32 HAL
Buddy uses TIM14 for:
fanctl_tick();
record_fanctl_metrics();
jogwheel.Update1msFromISR();
Sound_Update1ms();
adc_tick_1ms();
So it can not be reused by Marlin.
supplied by our Arduino emulation layer. Marlin STM32 HAL default is 12 bits, which is already supplied by our AnalogRead implementation. Supplying ADC_RESOLUTION 10 just confusingly switched Marlin to non-standard 10 bit resolution. This led to wrong temperature readings.
# Conflicts: # src/marlin_stubs/pause/pause.cpp
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.
Known limitations: