Skip to content

M
MarlinKimbra
Commit 8c8a5a33 authored by Franco (nextime) Lanza's avatar Franco (nextime) Lanza
Browse files
Options

Merge branch 'master' into nextime

parents 781bfe3f 83fe78d6
Pipeline #129 skipped
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
MK/module/MK_Main.cpp
View file @ 8c8a5a33
...@@ -10115,7 +10115,7 @@ void kill(const char* lcd_msg) { ...@@ -10115,7 +10115,7 @@ void kill(const char* lcd_msg) {
#if ENABLED(FAST_PWM_FAN) || ENABLED(FAST_PWM_COOLER) #if ENABLED(FAST_PWM_FAN) || ENABLED(FAST_PWM_COOLER)
void setPwmFrequency(uint8_t pin, int val) { void setPwmFrequency(uint8_t pin, uint8_t val) {
val &= 0x07; val &= 0x07;
switch(digitalPinToTimer(pin)) { switch(digitalPinToTimer(pin)) {
......
MK/module/MK_Main.h
View file @ 8c8a5a33
...@@ -121,7 +121,7 @@ inline void refresh_cmd_timeout() { previous_cmd_ms = millis(); } ...@@ -121,7 +121,7 @@ inline void refresh_cmd_timeout() { previous_cmd_ms = millis(); }
extern void delay_ms(millis_t ms); extern void delay_ms(millis_t ms);
#if ENABLED(FAST_PWM_FAN) || ENABLED(FAST_PWM_COOLER) #if ENABLED(FAST_PWM_FAN) || ENABLED(FAST_PWM_COOLER)
void setPwmFrequency(uint8_t pin, int val); void setPwmFrequency(uint8_t pin, uint8_t val);
#endif #endif
extern float homing_feedrate[]; extern float homing_feedrate[];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment