diff options
| author | kliment <kliment.yanev@gmail.com> | 2011-07-11 15:57:08 +0200 |
|---|---|---|
| committer | kliment <kliment.yanev@gmail.com> | 2011-07-11 15:57:08 +0200 |
| commit | 9a8e8083f0bd77e833b975455a237c743fe8f345 (patch) | |
| tree | d23f03dbbbc61c69d2c0246d98e629edb899c456 | |
| parent | 80710aaaeb25f0545d50f4ef923237fd2e642537 (diff) | |
| parent | 1c4cbe4da712fd670abb56ee2c2d0b48ec8d14c4 (diff) | |
Merge branch 'master' into experimental
| -rw-r--r-- | Sprinter/Sprinter.pde | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Sprinter/Sprinter.pde b/Sprinter/Sprinter.pde index 5faf117..230bba0 100644 --- a/Sprinter/Sprinter.pde +++ b/Sprinter/Sprinter.pde @@ -737,16 +737,16 @@ inline void process_commands() if (code_seen('S')) target_bed_raw = temp2analogBed(code_value()); break; case 105: // M105 - #if (TEMP_0_PIN > -1) || defined (HEATER_USES_MAX6675) + #if (TEMP_0_PIN > -1) || defined (HEATER_USES_MAX6675)|| defined HEATER_USES_AD595 tt = analog2temp(current_raw); #endif - #if TEMP_1_PIN > -1 + #if TEMP_1_PIN > -1 || defined BED_USES_AD595 bt = analog2tempBed(current_bed_raw); #endif - #if (TEMP_0_PIN > -1) || defined (HEATER_USES_MAX6675) + #if (TEMP_0_PIN > -1) || defined (HEATER_USES_MAX6675) || defined HEATER_USES_AD595 Serial.print("ok T:"); Serial.print(tt); - #if TEMP_1_PIN > -1 + #if TEMP_1_PIN > -1 || defined BED_USES_AD595 Serial.print(" B:"); Serial.println(bt); #else @@ -1410,7 +1410,7 @@ void manage_heater() target_raw = 0; } #endif - #if (TEMP_0_PIN > -1) || defined (HEATER_USES_MAX66675) + #if (TEMP_0_PIN > -1) || defined (HEATER_USES_MAX6675) || defined (HEATER_USES_AD595) #ifdef PIDTEMP error = target_raw - current_raw; pTerm = (PID_PGAIN * error) / 100; |