Commits · 1c86adc760cab0a8f07463a345b4e6b5125a946f · 3D-printing / UMO-TMC2100

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
- Merge pull request #521 from lajos/azteeg_x1 · 312b4aa7
  ErikZalm authored Jun 15, 2013
```
added Azteeg X1 motherboard
```
  312b4aa7
- added Azteeg X1 motherboard · 02dee80f
  lajos authored Jun 15, 2013
  
  02dee80f
- Merge pull request #520 from henrikbrixandersen/Makefile-fixes · 73569d89
  ErikZalm authored Jun 15, 2013
```
Makefile fixes
```
  73569d89
- Fix location of avrdude.conf · 47dc70e3
  Henrik Brix Andersen authored Jun 15, 2013
  
  47dc70e3
- Allow command line compilation when using BEEPER. · 1d258903
  Henrik Brix Andersen authored Jun 15, 2013
  
  1d258903
Jun 11, 2013
- Delta disabled by default · e34c9981
  Erik van der Zalm authored Jun 11, 2013
  
  e34c9981
Jun 10, 2013
- More 3Drag controller patches. · 26a441fc
  Erik van der Zalm authored Jun 10, 2013
  
  26a441fc
- Merge branch 'deltabot' into Marlin_v1 · ac975ed8
  Erik van der Zalm authored Jun 10, 2013
  
  ac975ed8
- Merge pull request #511 from wolfmanjm/ezdelta · 58d12aad
  ErikZalm authored Jun 09, 2013
```
fix homing for deltas
```
  58d12aad
- fix homing for deltas · caa848f9
  Jim Morris authored Jun 09, 2013
  
  caa848f9
Jun 09, 2013
- Merge branch 'Marlin_v1' of https://github.com/codexmas/Marlin into codexmas-Marlin_v1 · 7ad12be7
  Erik van der Zalm authored Jun 09, 2013
```
Conflicts:
	Marlin/Configuration.h
	README.md
```
  7ad12be7
- Merge branch 'Marlin_v1' of https://github.com/BorisLandoni/Marlin into BorisLandoni-Marlin_v1 · 408169ae
  Erik van der Zalm authored Jun 09, 2013
```
Conflicts:
	Marlin/Configuration.h
	Marlin/language.h
	Marlin/pins.h
```
  408169ae
- Merge branch 'Marlin_v1' into thinkyhead · bd96d22b
  Erik van der Zalm authored Jun 09, 2013
```
Conflicts:
	Marlin/Configuration.h
	Marlin/Configuration_adv.h
	Marlin/Marlin.h
	Marlin/Marlin_main.cpp
	Marlin/Servo.cpp
	Marlin/language.h
	Marlin/pins.h
	Marlin/planner.cpp
	Marlin/ultralcd_implementation_hitachi_HD44780.h
	README.md
```
  bd96d22b
- Spanish updated so far. · 73f21cd5
  Erik van der Zalm authored Jun 09, 2013
  
  73f21cd5
- Merge branch 'deltabot' into Marlin_v1 · 6f4a6e53
  Erik van der Zalm authored Jun 09, 2013
  
  6f4a6e53
- Fix home_all_axis to make QUICK_HOME work with Repetier-Host which sends G28... · 01edf22a
  Erik van der Zalm authored Jun 09, 2013
```
 Fix home_all_axis to make QUICK_HOME work with Repetier-Host which sends G28 X0 Y0 Z0 instead of G28. Thanks to Matt Schoenholz for reporting this issue.
```
  01edf22a
- Moved corexy implementation from stepper to planner · ff6fa09e
  Erik van der Zalm authored Jun 09, 2013
```
(Thanks iquizzle)
```
  ff6fa09e
- Allow increasing the software PWM frequency. · c8dcc7c2
  Erik van der Zalm authored Jun 09, 2013
  
  c8dcc7c2
- Removed "awaiting translation" for french · 8b0d82e9
  Erik van der Zalm authored Jun 09, 2013
  
  8b0d82e9
- Make the beep tone less offensive · 1e05d192
  Erik van der Zalm authored Jun 09, 2013
  
  1e05d192
Jun 08, 2013
- Merge branch 'deltabot' of https://github.com/jcrocholl/Marlin into deltabot · 373f3eca
  Erik van der Zalm authored Jun 09, 2013
```
Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin_main.cpp
	Marlin/pins.h
```
  373f3eca
- Merge pull request #467 from kiyoshigawa/Marlin_v1 · e36d31a3
  ErikZalm authored Jun 08, 2013
```
Support for Elefu RA Board
```
  e36d31a3
- Trying to fix weird diff on ultralcd_implementation_hitachi_HD44780.h · f2957120
  kiyoshigawa authored Jun 08, 2013
  
  f2957120
- Fixed small error in lcd define statements. · 5c70c785
  kiyoshigawa authored Jun 08, 2013
  
  5c70c785
- Fixed small error in lcd define statements. · 69b02031
  kiyoshigawa authored Jun 08, 2013
  
  69b02031
- Fixed small error in lcd define statements. · 2ca6c5fb
  kiyoshigawa authored Jun 08, 2013
  
  2ca6c5fb
- Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 · 6a81291c
  kiyoshigawa authored Jun 08, 2013
```
This should fix issues with pull request 467, I hope.

Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin.pde
	Marlin/ultralcd_implementation_hitachi_HD44780.h
```
  6a81291c
- Update pins.h · 15b1b896
  BorisLandoni authored Jun 08, 2013
  
  15b1b896
- Update Configuration.h · c1cb5977
  BorisLandoni authored Jun 08, 2013
  
  c1cb5977
- Update Configuration.h · 8a5bd8a8
  BorisLandoni authored Jun 08, 2013
  
  8a5bd8a8
- Merge pull request #506 from codexmas/ServoEndstops · 3dea417c
  ErikZalm authored Jun 08, 2013
```
Servo Enstops working!
```
  3dea417c
Jun 07, 2013
- Update language.h · c1d7cf93
  BorisLandoni authored Jun 07, 2013
  
  c1d7cf93
- Update pins.h · 4c7d1436
  BorisLandoni authored Jun 07, 2013
  
  4c7d1436
- Update Configuration.h · 6588933c
  BorisLandoni authored Jun 07, 2013
  
  6588933c
Jun 06, 2013
- Apply all changes from latest Marlin_V1 · 5dabc954
  Scott Lahteine authored Jun 06, 2013
```
Diffed and merged, preserving my updates
```
  5dabc954