Merge branch 'master' into experimental

This commit is contained in:
kliment 2011-07-16 21:59:32 +02:00
commit 2f2839b35a

View file

@ -733,7 +733,9 @@ inline void process_commands()
#endif
break;
case 140: // M140 set bed temp
if (code_seen('S')) target_bed_raw = temp2analogBed(code_value());
#if TEMP_1_PIN > -1 || defined BED_USES_AD595
if (code_seen('S')) target_bed_raw = temp2analogBed(code_value());
#endif
break;
case 105: // M105
#if (TEMP_0_PIN > -1) || defined (HEATER_USES_MAX6675)|| defined HEATER_USES_AD595