fix Undef motor current PWM for unused axes #27087
Merged
+2
−2
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
We should not be directly committing to the codebase without it passing through a PR / proper CI checks. |
This was referenced May 12, 2024
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
Commit 08fe8a3 broke things
Two cases where the test was specifically for MOTOR_CURRENT_PWM_E and not MOTOR_CURRENT_PWM_E0 or MOTOR_CURRENT_PWM_E1 was replaced with HAS_MOTOR_CURRENT_PWM_E which is set when any of those three pins exist.
Resulting in failing to build for several stock configurations
Marlin/src/module/stepper.cpp: In static member function 'static void Stepper::set_digipot_current(uint8_t, int16_t)':
Marlin/src/module/stepper.cpp:3939:62: error: 'MOTOR_CURRENT_PWM_E_PIN' was not declared in this scope
#define WRITE_CURRENT_PWM(P) hal.set_pwm_duty(pin_t(MOTOR_CURRENT_PWM## P ##_PIN), 255L * current / (MOTOR_CURRENT_PWM_RANGE))
Requirements
MOTOR_CURRENT_PWM_E0, but no MOTOR_CURRENT_PWM_E, such as Marlin/src/pins/sam/pins_ARCHIM1.h
Benefits
It builds again
Configurations
https://github.com/MarlinFirmware/Configurations/tree/bugfix-2.1.x/config/examples/UltiMachine/Archim1