bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Merge branch 'Marlin_v1' of https://github.com/BorisLandoni/Marlin into BorisLandoni-Marlin_v1

Browse Source 
Conflicts:
	Marlin/Configuration.h
	Marlin/language.h
	Marlin/pins.h
This commit is contained in:
Erik van der Zalm
2013-06-09 22:57:40 +02:00
parent bd96d22bfb 15b1b896e8
commit 408169aef4
3 changed files with 146 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Marlin/Configuration.h
View File

@ -37,6 +37,7 @@
// 64 = STB V1.1
// 7 = Ultimaker
// 71 = Ultimaker (Older electronics. Pre 1.5.4. This is rare)
// 77 = 3Drag Controller
// 8 = Teensylu
// 80 = Rumba
// 81 = Printrboard (AT90USB1286)