bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Merge pull request #5814 from thinkyhead/hotend_loop_always

Browse Source 
Make HOTEND_LOOP more consistent, let compiler optimize it
This commit is contained in:
Scott Lahteine
2017-02-12 04:13:14 -06:00
committed by GitHub
parent adec219ca5 e44294bb4d
commit 7176de8605
4 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Marlin/temperature.cpp
View File

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