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

Fixed comments that were not needed

Browse source
This commit is contained in:
GadgetAngel 2020-11-08 15:35:35 -05:00 • committed by Scott Lahteine
parent b2bd547a27
commit 2a0300097d
2 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Marlin/src/inc/SanityCheck.h
View file

@ -1814,11 +1814,11 @@ static_assert(hbm[Z_AXIS] >= 0, "HOMING_BUMP_MM.Z must be greater than or equal
#error "TEMP_SENSOR_1 is required with TEMP_SENSOR_1_AS_REDUNDANT." #error "TEMP_SENSOR_1 is required with TEMP_SENSOR_1_AS_REDUNDANT."
#endif #endif
#if MAX6675_IS_MAX31865 && (!defined(MAX31865_SENSOR_OHMS_0) || !defined(MAX31865_CALIBRATION_OHMS_0)) //ga #if MAX6675_IS_MAX31865 && (!defined(MAX31865_SENSOR_OHMS_0) || !defined(MAX31865_CALIBRATION_OHMS_0))
#error "MAX31865_SENSOR_OHMS_0 and MAX31865_CALIBRATION_OHMS_0 must be set in Configuration.h when using a MAX31865 temperature sensor on TEMP_SENSOR_0." #error "MAX31865_SENSOR_OHMS_0 and MAX31865_CALIBRATION_OHMS_0 must be set in Configuration.h when using a MAX31865 temperature sensor on TEMP_SENSOR_0."
#endif #endif
#if MAX6675_IS_MAX31865 && (!defined(MAX31865_SENSOR_OHMS_1) || !defined(MAX31865_CALIBRATION_OHMS_1)) && TEMP_SENSOR_1 == -5 //ga #if MAX6675_IS_MAX31865 && (!defined(MAX31865_SENSOR_OHMS_1) || !defined(MAX31865_CALIBRATION_OHMS_1)) && TEMP_SENSOR_1 == -5
#error "MAX31865_SENSOR_OHMS_1 and MAX31865_CALIBRATION_OHMS_1 must be set in Configuration.h when using a MAX31865 temperature sensor on TEMP_SENSOR_1." #error "MAX31865_SENSOR_OHMS_1 and MAX31865_CALIBRATION_OHMS_1 must be set in Configuration.h when using a MAX31865 temperature sensor on TEMP_SENSOR_1."
#endif #endif

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

@ -63,14 +63,14 @@
#ifndef MAX31865_SCK_PIN #ifndef MAX31865_SCK_PIN
#define MAX31865_SCK_PIN MAX6675_SCK_PIN // 40 #define MAX31865_SCK_PIN MAX6675_SCK_PIN // 40
#endif #endif
Adafruit_MAX31865 max31865_0 = Adafruit_MAX31865(MAX31865_CS_PIN //ga Adafruit_MAX31865 max31865_0 = Adafruit_MAX31865(MAX31865_CS_PIN
#if MAX31865_CS_PIN != MAX6675_SS_PIN #if MAX31865_CS_PIN != MAX6675_SS_PIN
, MAX31865_MOSI_PIN // For software SPI also set MOSI/MISO/SCK , MAX31865_MOSI_PIN // For software SPI also set MOSI/MISO/SCK
, MAX31865_MISO_PIN , MAX31865_MISO_PIN
, MAX31865_SCK_PIN , MAX31865_SCK_PIN
#endif #endif
); );
#if TEMP_SENSOR_1 == -5 //ga #if TEMP_SENSOR_1 == -5
#if MAX31865_CS2_PIN #if MAX31865_CS2_PIN
Adafruit_MAX31865 max31865_1 = Adafruit_MAX31865(MAX31865_CS2_PIN Adafruit_MAX31865 max31865_1 = Adafruit_MAX31865(MAX31865_CS2_PIN
#if MAX31865_CS2_PIN != MAX6675_SS2_PIN #if MAX31865_CS2_PIN != MAX6675_SS2_PIN
@ -1489,7 +1489,7 @@ void Temperature::manage_heater() {
#elif HEATER_0_USES_MAX6675 #elif HEATER_0_USES_MAX6675
return ( return (
#if MAX6675_IS_MAX31865 #if MAX6675_IS_MAX31865
max31865_0.temperature(MAX31865_SENSOR_OHMS_0, MAX31865_CALIBRATION_OHMS_0) //ga max31865_0.temperature(MAX31865_SENSOR_OHMS_0, MAX31865_CALIBRATION_OHMS_0)
#else #else
raw * 0.25 raw * 0.25
#endif #endif
@ -1507,7 +1507,7 @@ void Temperature::manage_heater() {
#elif HEATER_1_USES_MAX6675 #elif HEATER_1_USES_MAX6675
return ( return (
#if TEMP_SENSOR_1 == -5 #if TEMP_SENSOR_1 == -5
max31865_1.temperature(MAX31865_SENSOR_OHMS_1, MAX31865_CALIBRATION_OHMS_1) //ga max31865_1.temperature(MAX31865_SENSOR_OHMS_1, MAX31865_CALIBRATION_OHMS_1)
#else #else
raw * 0.25 raw * 0.25
#endif #endif
@ -1713,10 +1713,10 @@ void Temperature::updateTemperaturesFromRawValues() {
*/ */
void Temperature::init() { void Temperature::init() {
TERN_(MAX6675_IS_MAX31865, max31865_0.begin(MAX31865_2WIRE)); // MAX31865_2WIRE, MAX31865_3WIRE, MAX31865_4WIRE //ga TERN_(MAX6675_IS_MAX31865, max31865_0.begin(MAX31865_2WIRE)); // MAX31865_2WIRE, MAX31865_3WIRE, MAX31865_4WIRE
#if TEMP_SENSOR_1 == -5 #if TEMP_SENSOR_1 == -5
TERN_(MAX6675_IS_MAX31865, max31865_1.begin(MAX31865_2WIRE)); // MAX31865_2WIRE, MAX31865_3WIRE, MAX31865_4WIRE //ga TERN_(MAX6675_IS_MAX31865, max31865_1.begin(MAX31865_2WIRE)); // MAX31865_2WIRE, MAX31865_3WIRE, MAX31865_4WIRE
#endif #endif
#if EARLY_WATCHDOG #if EARLY_WATCHDOG
@ -2247,7 +2247,7 @@ void Temperature::disable_all_heaters() {
#define MAX6675_ERROR_MASK 7 #define MAX6675_ERROR_MASK 7
#define MAX6675_DISCARD_BITS 18 #define MAX6675_DISCARD_BITS 18
#define MAX6675_SPEED_BITS 3 // (_BV(SPR1)) // clock ÷ 64 #define MAX6675_SPEED_BITS 3 // (_BV(SPR1)) // clock ÷ 64
#elif ENABLED(MAX6675_IS_MAX31865) //ga #elif ENABLED(MAX6675_IS_MAX31865)
static uint16_t max6675_temp = 2000; //from datasheet 16 bits D15-D0 static uint16_t max6675_temp = 2000; //from datasheet 16 bits D15-D0
#define MAX6675_ERROR_MASK 1 //D0 Bit not used #define MAX6675_ERROR_MASK 1 //D0 Bit not used
#define MAX6675_DISCARD_BITS 1 //data is in D15-D1 #define MAX6675_DISCARD_BITS 1 //data is in D15-D1
@ -2274,12 +2274,12 @@ void Temperature::disable_all_heaters() {
next_max6675_ms[hindex] = ms + MAX6675_HEAT_INTERVAL; next_max6675_ms[hindex] = ms + MAX6675_HEAT_INTERVAL;
#if COUNT_6675 == 1 && MAX6675_IS_MAX31865 #if COUNT_6675 == 1 && MAX6675_IS_MAX31865
max6675_temp = int(max31865_0.temperature(MAX31865_SENSOR_OHMS_0, MAX31865_CALIBRATION_OHMS_0)); //ga max6675_temp = int(max31865_0.temperature(MAX31865_SENSOR_OHMS_0, MAX31865_CALIBRATION_OHMS_0));
#endif #endif
#if COUNT_6675 > 1 && MAX6675_IS_MAX31865 #if COUNT_6675 > 1 && MAX6675_IS_MAX31865
#if hindex == 0 #if hindex == 0
max6675_temp = int(max31865_0.temperature(MAX31865_SENSOR_OHMS_0, MAX31865_CALIBRATION_OHMS_0)); //ga max6675_temp = int(max31865_0.temperature(MAX31865_SENSOR_OHMS_0, MAX31865_CALIBRATION_OHMS_0));
#elif hindex == 1 #elif hindex == 1
max6675_temp = int(max31865_1.temperature(MAX31865_SENSOR_OHMS_1, MAX31865_CALIBRATION_OHMS_1)); max6675_temp = int(max31865_1.temperature(MAX31865_SENSOR_OHMS_1, MAX31865_CALIBRATION_OHMS_1));
#endif #endif
@ -2329,13 +2329,13 @@ void Temperature::disable_all_heaters() {
fault = max31865_0.readFault(); fault = max31865_0.readFault();
#elif ENABLED(MAX6675_IS_MAX31865) #elif ENABLED(MAX6675_IS_MAX31865)
#if hindex == 0 #if hindex == 0
fault = max31865_0.readFault(); //ga fault = max31865_0.readFault();
#elif hindex == 1 #elif hindex == 1
fault = max31865_1.readFault(); fault = max31865_1.readFault();
#endif #endif
#endif #endif
if (DISABLED(IGNORE_THERMOCOUPLE_ERRORS) && (max6675_temp & MAX6675_ERROR_MASK) && fault) { //ga if (DISABLED(IGNORE_THERMOCOUPLE_ERRORS) && (max6675_temp & MAX6675_ERROR_MASK) && fault) {
max6675_errors[hindex] += 1; max6675_errors[hindex] += 1;
if (max6675_errors[hindex] > THERMOCOUPLE_MAX_ERRORS) { if (max6675_errors[hindex] > THERMOCOUPLE_MAX_ERRORS) {
SERIAL_ERROR_START(); SERIAL_ERROR_START();
@ -2348,7 +2348,7 @@ void Temperature::disable_all_heaters() {
SERIAL_ECHOLNPGM("Short to GND"); SERIAL_ECHOLNPGM("Short to GND");
else if (max6675_temp & 4) else if (max6675_temp & 4)
SERIAL_ECHOLNPGM("Short to VCC"); SERIAL_ECHOLNPGM("Short to VCC");
#elif MAX6675_ERROR_MASK == 1 //ga #elif MAX6675_ERROR_MASK == 1
if (fault) { if (fault) {
SERIAL_ECHOPAIR("MAX31865 Fault :(", fault, ") >>"); SERIAL_ECHOPAIR("MAX31865 Fault :(", fault, ") >>");
if (fault & MAX31865_FAULT_HIGHTHRESH) if (fault & MAX31865_FAULT_HIGHTHRESH)