Merge branch 'reisnyderb' of https://github.com/ErikZalm/Marlin into Marlin_v1

2013-06-05 17:44:48 +02:00
parent 1520de0093 5090c56651
commit 79374f0b93
6 changed files with 254 additions and 203 deletions
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@ -1055,7 +1055,7 @@ void process_commands()
    case 105 : // M105
      if(setTargetedHotend(105)){
        break;
-      }
+        }
      #if defined(TEMP_0_PIN) && TEMP_0_PIN > -1
        SERIAL_PROTOCOLPGM("ok T:");
        SERIAL_PROTOCOL_F(degHotend(tmp_extruder),1);
@ -2281,4 +2281,4 @@ bool setTargetedHotend(int code){
    }
  }
  return false;
-}
+}