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

Merge remote-tracking branch 'tonokip/Marlin_v1' into Marlin_v1

Browse Source 
Conflicts:
	Marlin/Configuration.h
This commit is contained in:
Erik vd Zalm
2012-11-21 20:36:30 +01:00
parent e48dfcc2b3 ca811156a0
commit f934d0ef5b
8 changed files with 265 additions and 1872 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Marlin/Configuration.h
View File

@ -41,6 +41,7 @@
// 70 = Megatronics
// 90 = Alpha OMCA board
// 91 = Final OMCA board
// Rambo = 301
#ifndef MOTHERBOARD
#define MOTHERBOARD 7