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

Make HOTEND_LOOP more consistent, let compiler optimize it

Browse Source
This commit is contained in:
Scott Lahteine 2017-02-12 02:50:05 -06:00
parent e1702816f6
commit e44294bb4d
4 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/configuration_store.cpp
View File

@ -787,8 +787,6 @@ void Config_ResetDefault() {
#if ENABLED(PIDTEMP) #if ENABLED(PIDTEMP)
#if ENABLED(PID_PARAMS_PER_HOTEND) && HOTENDS > 1 #if ENABLED(PID_PARAMS_PER_HOTEND) && HOTENDS > 1
HOTEND_LOOP() HOTEND_LOOP()
#else
int e = 0; UNUSED(e); // only need to write once
#endif #endif
{ {
PID_PARAM(Kp, e) = DEFAULT_Kp; PID_PARAM(Kp, e) = DEFAULT_Kp;

15
Marlin/temperature.cpp
View File

@ -731,7 +731,7 @@ void Temperature::manage_heater() {
} }
#endif #endif
} // Hotends Loop } // HOTEND_LOOP
#if HAS_AUTO_FAN #if HAS_AUTO_FAN
if (ELAPSED(ms, next_auto_fan_check_ms)) { // only need to check fan state very infrequently if (ELAPSED(ms, next_auto_fan_check_ms)) { // only need to check fan state very infrequently
@ -885,9 +885,8 @@ void Temperature::updateTemperaturesFromRawValues() {
#if ENABLED(HEATER_0_USES_MAX6675) #if ENABLED(HEATER_0_USES_MAX6675)
current_temperature_raw[0] = read_max6675(); current_temperature_raw[0] = read_max6675();
#endif #endif
HOTEND_LOOP() { HOTEND_LOOP()
current_temperature[e] = Temperature::analog2temp(current_temperature_raw[e], e); current_temperature[e] = Temperature::analog2temp(current_temperature_raw[e], e);
}
current_temperature_bed = Temperature::analog2tempBed(current_temperature_bed_raw); current_temperature_bed = Temperature::analog2tempBed(current_temperature_bed_raw);
#if ENABLED(TEMP_SENSOR_1_AS_REDUNDANT) #if ENABLED(TEMP_SENSOR_1_AS_REDUNDANT)
redundant_temperature = Temperature::analog2temp(redundant_temperature_raw, 1); redundant_temperature = Temperature::analog2temp(redundant_temperature_raw, 1);
@ -939,15 +938,7 @@ void Temperature::init() {
#endif #endif
// Finish init of mult hotend arrays // Finish init of mult hotend arrays
HOTEND_LOOP() { HOTEND_LOOP() maxttemp[e] = maxttemp[0];
// populate with the first value
maxttemp[e] = maxttemp[0];
#if ENABLED(PIDTEMP)
#if ENABLED(PID_EXTRUSION_SCALING)
last_e_position = 0;
#endif
#endif //PIDTEMP
}
#if ENABLED(PIDTEMP) && ENABLED(PID_EXTRUSION_SCALING) #if ENABLED(PIDTEMP) && ENABLED(PID_EXTRUSION_SCALING)
last_e_position = 0; last_e_position = 0;

4
Marlin/temperature.h
View File

@ -40,12 +40,12 @@
#define SOFT_PWM_SCALE 0 #define SOFT_PWM_SCALE 0
#endif #endif
#define HOTEND_LOOP() for (int8_t e = 0; e < HOTENDS; e++)
#if HOTENDS == 1 #if HOTENDS == 1
#define HOTEND_LOOP() const int8_t e = 0;
#define HOTEND_INDEX 0 #define HOTEND_INDEX 0
#define EXTRUDER_IDX 0 #define EXTRUDER_IDX 0
#else #else
#define HOTEND_LOOP() for (int8_t e = 0; e < HOTENDS; e++)
#define HOTEND_INDEX e #define HOTEND_INDEX e
#define EXTRUDER_IDX active_extruder #define EXTRUDER_IDX active_extruder
#endif #endif

2
Marlin/ultralcd.cpp
View File

@ -1403,7 +1403,7 @@ KeepDrawing:
// Cooldown // Cooldown
// //
bool has_heat = false; bool has_heat = false;
HOTEND_LOOP() if (thermalManager.target_temperature[HOTEND_INDEX]) { has_heat = true; } HOTEND_LOOP() if (thermalManager.target_temperature[HOTEND_INDEX]) { has_heat = true; break; }
#if HAS_TEMP_BED #if HAS_TEMP_BED
if (thermalManager.target_temperature_bed) has_heat = true; if (thermalManager.target_temperature_bed) has_heat = true;
#endif #endif