Commits · e578f988d3a0c167947ba33a7207cc724c9a8a4e · 3D-printing / UMO-TMC2100

Jul 23, 2013
- Merge pull request #553 from iXce/req413 · e578f988
  ErikZalm authored Jul 23, 2013
```
Update #413 for merging, fix languages.h
```
  e578f988
- Only display poweron/poweroff if PS_ON_PIN > -1 · 76841450
  Guillaume Seguin authored Jul 23, 2013
  
  76841450
- Uniformly reindent language.h · 44f327d7
  Guillaume Seguin authored Jul 23, 2013
  
  44f327d7
- Update language.h so that all languages compile · 326d2db0
  Guillaume Seguin authored Jul 23, 2013
```
Some strings still need translation, but at least everything compiles.
```
  326d2db0
- Run Marlin/language.h through dos2unix · 2cb716f5
  Guillaume Seguin authored Jul 23, 2013
  
  2cb716f5
- Merge github.com:ErikZalm/Marlin into Marlin_v1 · 34da3a0a
  Guillaume Seguin authored Jul 23, 2013
```
Conflicts:
	Marlin/language.h
```
  34da3a0a
Jul 22, 2013
- Merge pull request #550 from buildrob101/MinimalDualXCarriage · a105e100
  ErikZalm authored Jul 22, 2013
```
Fixed compile error when QUICK_HOME is defined.
```
  a105e100
- Fixed compile error when QUICK_HOME is defined. · fb5334f4
  Robert F-C authored Jul 22, 2013
```
As well a couple of minor changes to handling of extruder offset for
dual x-carriage mode.
```
  fb5334f4
Jul 20, 2013
- Merge pull request #549 from buildrob101/MinimalDualXCarriage · c5bf8298
  ErikZalm authored Jul 20, 2013
```
Disable DUAL_X_CARRIAGE by default
```
  c5bf8298
- Disable DUAL_X_CARRIAGE by default · c3568398
  Robert F-C authored Jul 20, 2013
  
  c3568398
- Merge pull request #548 from buildrob101/MinimalDualXCarriage · 96a773fa
  ErikZalm authored Jul 20, 2013
```
Dual x-carriage support
```
  96a773fa
- Remove dual x-carriage functionality that could/should be implemented in slicer · 39cd3dbd
  Robert F-C authored Jul 20, 2013
```
Also added a couple of missed merge lines in homeaxis() from previous
commit.
```
  39cd3dbd
Jul 17, 2013

Support dual x-carriage printers · d7390e13

Robert F-C authored Jul 17, 2013

Dual x-carriage designs offer some substantial improvements for dual
extruder printing.

d7390e13

Jul 15, 2013
- Merge pull request #545 from MStohn/fix-bad-lcd-commit-from-makr3d · 5ab872de
  ErikZalm authored Jul 15, 2013
```
fixed bad lcd commit from makr3d
```
  5ab872de
- fixed bad lcd commit from makr3d · 9da94c24
  Maik Stohn authored Jul 15, 2013
```
#elsif does not exist #elif is correct
```
  9da94c24
- Fixed typo · 59004023
  Erik van der Zalm authored Jul 15, 2013
  
  59004023
Jul 14, 2013
- Added : M32 - Select file and start SD print (Can be used when printing from SD card) · 461dad6e
  Erik van der Zalm authored Jul 14, 2013
```
Untested
```
  461dad6e
- M109 and M190 now wait when cooling down if R is used instead of S. · c4a20779
  Erik van der Zalm authored Jul 14, 2013
```
M109 S180 waits only when heating.
M109 R180 also waits when cooling.
```
  c4a20779
- Merge pull request #531 from iXce/Marlin_v1_lcd · 8a2a3ef9
  ErikZalm authored Jul 14, 2013
```
Only clamp panel movements if software endstops are enabled
```
  8a2a3ef9
- restored configuration.h defaults · 6397b333
  Erik van der Zalm authored Jul 14, 2013
  
  6397b333
- Merge branch 'Marlin_v1' of https://github.com/makr3d/Marlin into makr3d-Marlin_v1 · cdaaad3d
  Erik van der Zalm authored Jul 14, 2013
  
  cdaaad3d
- fixed missing #endif · e3bdefd8
  Erik van der Zalm authored Jul 14, 2013
  
  e3bdefd8
- no message · a5be0c52
  Erik van der Zalm authored Jul 14, 2013
  
  a5be0c52
- Merge pull request #535 from GabinoLopez/patch-1 · e73611f5
  ErikZalm authored Jul 14, 2013
```
Update language.h
```
  e73611f5
- added contrast control function for gLCDs · e509cdbe
  Michael Mayer authored Jul 14, 2013
  
  e509cdbe
- added MaKr3d Melzi board · 99b7e926
  Michael Mayer authored Jul 14, 2013
  
  99b7e926
Jul 04, 2013

Update language.h · 68be33b1

Gabino Lopez authored Jul 04, 2013

I update the spanish Messages, now this compile for spanish language.

68be33b1

Jul 02, 2013
- Merge pull request #534 from xifle/Marlin_v1 · acb3271c
  daid authored Jul 01, 2013
```
Fixes compiler warning for feedrate deadzone
```
  acb3271c
Jul 01, 2013
- Should fix compiler warning for feedrate deadzone · 61fe430d
  xifle authored Jun 29, 2013
  
  61fe430d
Jun 28, 2013
- Merge pull request #532 from codexmas/ServoEndstops · d77f5ee7
  daid authored Jun 28, 2013
```
Fix for ugly code compilation errors in SERVO_ENDSTOP checks
```
  d77f5ee7
- Fix for ugly code compilation errors in SERVO_ENDSTOP checks · fde17d57
  Gord Christmas authored Jun 28, 2013
  
  fde17d57
- Only clamp panel movements if software endstops are enabled · aa65c20d
  Guillaume Seguin authored Jun 28, 2013
  
  aa65c20d
Jun 27, 2013
- Added thermistor 60 to configuration.h · ecf3ab5d
  Erik van der Zalm authored Jun 27, 2013
  
  ecf3ab5d
Jun 20, 2013
- Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin.git into Marlin_v1 · 2daa8591
  Nicolas Rossi authored Jun 20, 2013
```
Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin_main.cpp
	Marlin/language.h
	Marlin/pins.h
	Marlin/ultralcd.cpp
```
  2daa8591
Jun 18, 2013
- Added DISABLE_MIN_ENDSTOPS · 2015989f
  Erik van der Zalm authored Jun 18, 2013
  
  2015989f
Jun 17, 2013
- Merge pull request #526 from ch100/Marlin_v1 · 1c86adc7
  ErikZalm authored Jun 17, 2013
```
Fix Pin Description Typo
```
  1c86adc7
Jun 16, 2013
- Fix Pin Description Typo · 648d45cf
  Christian Inci authored Jun 16, 2013
```
Reverse 'Bed' and 'Fan' at the RAMPS 33 Description.

Signed-off-by: Christian Inci <chris.pcguy.inci@gmail.com>
```
  648d45cf
- Merge pull request #525 from lajos/ultralcd_pid · 171719f1
  ErikZalm authored Jun 16, 2013
```
ultralcd.cpp compile errors when !defined(PIDTEMP)
```
  171719f1
- fixed another !defined(PIDTEMP) compile in ultralcd.cpp · b519af4f
  lajos authored Jun 15, 2013
  
  b519af4f
Jun 15, 2013
- fixed compile error in ultralcd.cpp when PIDTEMP undefined · 7d03c525
  lajos authored Jun 15, 2013
  
  7d03c525

Admin message