3d_print_resources/Marlin
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix HAS_MULTIP_6675 null condition & compiler warning

Browse source 
In temperature.h if HAS_MULTI_6675 does not have a 1 after it. HAS_MULTI_6675 is defined as NUL

In temperature.cpp  when Thermocouple is open the max6675_temp value is meant to have a TMAX * 4 so I added the pair of parentheses so the compiler would stop throwing a waring message about the statement being a binary statement.
This commit is contained in:
GadgetAngel 2020-11-10 20:43:16 -05:00 • committed by Scott Lahteine
parent e71c2b78c4
commit 72d680b915
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/module/temperature.cpp
View file

@ -2328,7 +2328,7 @@ void Temperature::disable_all_heaters() {
#endif #endif
// Thermocouple open // Thermocouple open
max6675_temp = 4 * MAX6675_SEL(HEATER_0_MAX6675_TMAX, HEATER_1_MAX6675_TMAX); max6675_temp = 4 * (MAX6675_SEL(HEATER_0_MAX6675_TMAX, HEATER_1_MAX6675_TMAX));
} }
else else
max6675_temp >>= MAX6675_DISCARD_BITS; max6675_temp >>= MAX6675_DISCARD_BITS;

2
Marlin/src/module/temperature.h
View file

@ -811,7 +811,7 @@ class Temperature {
#if HAS_MAX6675 #if HAS_MAX6675
#define COUNT_6675 1 + BOTH(HEATER_0_USES_MAX6675, HEATER_1_USES_MAX6675) #define COUNT_6675 1 + BOTH(HEATER_0_USES_MAX6675, HEATER_1_USES_MAX6675)
#if COUNT_6675 > 1 #if COUNT_6675 > 1
#define HAS_MULTI_6675 #define HAS_MULTI_6675 1
#define READ_MAX6675(N) read_max6675(N) #define READ_MAX6675(N) read_max6675(N)
#else #else
#define READ_MAX6675(N) read_max6675() #define READ_MAX6675(N) read_max6675()