Merge branch 'master' into k40_noflow_nocooler

2e8b1f17 · Franco (nextime) Lanza · 945441ea · 83fe78d6 · 2e8b1f17 · 2e8b1f17
Commit 2e8b1f17 authored Jun 05, 2016 by Franco (nextime) Lanza
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

MK_Main.cpp MK/module/MK_Main.cpp +1 -1

MK_Main.h MK/module/MK_Main.h +1 -1

No files found.
--- a/MK/module/MK_Main.cpp
+++ b/MK/module/MK_Main.cpp
@@ -10115,7 +10115,7 @@ void kill(const char* lcd_msg) {

 #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;
    switch(digitalPinToTimer(pin)) {


--- a/MK/module/MK_Main.h
+++ b/MK/module/MK_Main.h
@@ -121,7 +121,7 @@ inline void refresh_cmd_timeout() { previous_cmd_ms = millis(); }
 extern void delay_ms(millis_t ms);

 #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

 extern float homing_feedrate[];