CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patches for compiler warnings/errors

Browse Source
This commit is contained in:
Scott Lahteine 2017-11-13 03:32:39 -06:00
parent 98efc18f2c
commit 91baca6abb
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,7 +45,6 @@ void GcodeSuite::M106() {
if (p < FAN_COUNT) { if (p < FAN_COUNT) {
#if ENABLED(EXTRA_FAN_SPEED) #if ENABLED(EXTRA_FAN_SPEED)
const int16_t t = parser.intval('T'); const int16_t t = parser.intval('T');
NOMORE(t, 255);
if (t > 0) { if (t > 0) {
switch (t) { switch (t) {
case 1: case 1:
@ -56,7 +55,7 @@ void GcodeSuite::M106() {
fanSpeeds[p] = new_fanSpeeds[p]; fanSpeeds[p] = new_fanSpeeds[p];
break; break;
default: default:
new_fanSpeeds[p] = t; new_fanSpeeds[p] = min(t, 255);
break; break;
} }
return; return;

6
Marlin/src/module/temperature.cpp
View File

@ -1717,15 +1717,15 @@ void Temperature::isr() {
#if ENABLED(FAN_SOFT_PWM) #if ENABLED(FAN_SOFT_PWM)
#if HAS_FAN0 #if HAS_FAN0
soft_pwm_count_fan[0] = (soft_pwm_count_fan[0] & pwm_mask) + soft_pwm_amount_fan[0] >> 1; soft_pwm_count_fan[0] = ((soft_pwm_count_fan[0] & pwm_mask) + soft_pwm_amount_fan[0]) >> 1;
WRITE_FAN(soft_pwm_count_fan[0] > pwm_mask ? HIGH : LOW); WRITE_FAN(soft_pwm_count_fan[0] > pwm_mask ? HIGH : LOW);
#endif #endif
#if HAS_FAN1 #if HAS_FAN1
soft_pwm_count_fan[1] = (soft_pwm_count_fan[1] & pwm_mask) + soft_pwm_amount_fan[1] >> 1; soft_pwm_count_fan[1] = ((soft_pwm_count_fan[1] & pwm_mask) + soft_pwm_amount_fan[1]) >> 1;
WRITE_FAN1(soft_pwm_count_fan[1] > pwm_mask ? HIGH : LOW); WRITE_FAN1(soft_pwm_count_fan[1] > pwm_mask ? HIGH : LOW);
#endif #endif
#if HAS_FAN2 #if HAS_FAN2
soft_pwm_count_fan[2] = (soft_pwm_count_fan[2] & pwm_mask) + soft_pwm_amount_fan[2] >> 1; soft_pwm_count_fan[2] = ((soft_pwm_count_fan[2] & pwm_mask) + soft_pwm_amount_fan[2]) >> 1;
WRITE_FAN2(soft_pwm_count_fan[2] > pwm_mask ? HIGH : LOW); WRITE_FAN2(soft_pwm_count_fan[2] > pwm_mask ? HIGH : LOW);
#endif #endif
#endif #endif