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

Move MAX_EXTRUDERS to pins.h

Browse Source
This commit is contained in:
Scott Lahteine 2016-10-22 10:07:51 -05:00
parent 5f5a55a0de
commit ad64723354
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Marlin/configuration_store.cpp
View File

@ -40,7 +40,6 @@
// Change EEPROM version if these are changed: // Change EEPROM version if these are changed:
#define EEPROM_OFFSET 100 #define EEPROM_OFFSET 100
#define MAX_EXTRUDERS 4
/** /**
* V24 EEPROM Layout: * V24 EEPROM Layout:

4
Marlin/pins.h
View File

@ -275,6 +275,10 @@
#define SUICIDE_PIN -1 #define SUICIDE_PIN -1
#endif #endif
#ifndef MAX_EXTRUDERS
#define MAX_EXTRUDERS 4
#endif
// Marlin needs to account for pins that equal -1 // Marlin needs to account for pins that equal -1
#define marlinAnalogInputToDigitalPin(p) ((p) == -1 ? -1 : analogInputToDigitalPin(p)) #define marlinAnalogInputToDigitalPin(p) ((p) == -1 ? -1 : analogInputToDigitalPin(p))

2
Marlin/temperature.cpp
View File

@ -151,7 +151,7 @@ volatile bool Temperature::temp_meas_ready = false;
millis_t Temperature::next_bed_check_ms; millis_t Temperature::next_bed_check_ms;
#endif #endif
unsigned long Temperature::raw_temp_value[4] = { 0 }; unsigned long Temperature::raw_temp_value[MAX_EXTRUDERS] = { 0 };
unsigned long Temperature::raw_temp_bed_value = 0; unsigned long Temperature::raw_temp_bed_value = 0;
// Init min and max temp with extreme values to prevent false errors during startup // Init min and max temp with extreme values to prevent false errors during startup