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.

Sign up for GitHub

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

Compile error when when LASER_FEATURE is enabled and SPINDLE_LASER_USE_PWM is disabled #25290

Merged
merged 12 commits into from
Apr 16, 2023
Merged

Compile error when when LASER_FEATURE is enabled and SPINDLE_LASER_USE_PWM is disabled #25290

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
6c4046f
🎨 Rename *_temp_error to *temp_error
thinkyhead Jan 4, 2023
48f533e
[cron] Bump distribution date (2023-01-04)
thinkyhead Jan 4, 2023
f8283a4
🧑‍💻 Add Temperature::is_above_target
thinkyhead Jan 4, 2023
5eb2a87
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
Bob-the-Kuhn Jan 8, 2023
e9d6b56
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
Bob-the-Kuhn Jan 9, 2023
d16b1ba
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
Bob-the-Kuhn Jan 11, 2023
8b00f58
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
Bob-the-Kuhn Jan 20, 2023
fed88ed
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
Bob-the-Kuhn Jan 23, 2023
9339086
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
Bob-the-Kuhn Jan 23, 2023
92711ae
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
Bob-the-Kuhn Jan 24, 2023
6d26425
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
Bob-the-Kuhn Jan 26, 2023
eb34063
spindle_laser.h bug fix
Bob-the-Kuhn Jan 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Marlin/src/feature/spindle_laser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ class SpindleLaser {
set_enabled(state);
if (state) {
if (!menuPower) menuPower = cpwr_to_upwr(SPEED_POWER_STARTUP);
power = upower_to_ocr(menuPower);
power = TERN(SPINDLE_LASER_USE_PWM, upower_to_ocr(menuPower), 255);
apply_power(power);
} else
apply_power(0);
Expand Down