bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Use uint8_t for all fan speeds (#12032)

Browse Source
This commit is contained in:
Scott Lahteine
2018-10-07 15:34:41 -05:00
committed by GitHub
parent cb7844c8d4
commit d6b0fbd771
25 changed files with 88 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Marlin/src/gcode/temperature/M106_M107.cpp
View File

@ -25,7 +25,7 @@
#if FAN_COUNT > 0
#include "../gcode.h"
#include "../../Marlin.h" // for fanSpeeds — should move those to Planner
#include "../../Marlin.h" // for fan_speed — should move those to Planner
/**
* M106: Set Fan Speed
@ -48,21 +48,22 @@ void GcodeSuite::M106() {
if (t > 0) {
switch (t) {
case 1:
fanSpeeds[p] = old_fanSpeeds[p];
fan_speed[p] = old_fan_speed[p];
break;
case 2:
old_fanSpeeds[p] = fanSpeeds[p];
fanSpeeds[p] = new_fanSpeeds[p];
old_fan_speed[p] = fan_speed[p];
fan_speed[p] = new_fan_speed[p];
break;
default:
new_fanSpeeds[p] = MIN(t, 255);
new_fan_speed[p] = MIN(t, 255);
break;
}
return;
}
#endif // EXTRA_FAN_SPEED
const uint16_t s = parser.ushortval('S', 255);
fanSpeeds[p] = MIN(s, 255U);
fan_speed[p] = MIN(s, 255U);
}
}
@ -71,7 +72,7 @@ void GcodeSuite::M106() {
*/
void GcodeSuite::M107() {
const uint16_t p = parser.ushortval('P');
if (p < FAN_COUNT) fanSpeeds[p] = 0;
if (p < FAN_COUNT) fan_speed[p] = 0;
}
#endif // FAN_COUNT > 0