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

Merge remote-tracking branch 'justblair/master' into Marlin_v1

Browse Source
This commit is contained in:
Erik van der Zalm
2012-03-03 20:20:55 +01:00
parent 1d5809d458 4879de08e8
commit cb0c84e075
14 changed files with 582 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/pins.h
View File

@ -285,7 +285,7 @@
#define FAN_PIN 4 // IO pin. Buffer needed
#endif
#define PS_ON_PIN 12
#define KILL_PIN -1
#define KILL_PIN 31
#define HEATER_0_PIN 10 // EXTRUDER 1
#if MOTHERBOARD == 33
@ -322,7 +322,7 @@
#define BLEN_B 1
#define BLEN_A 0
#define SDCARDDETECT 31 // Ramps does not use this port
#define SDCARDDETECT -1 // Ramps does not use this port
//encoder rotation values
#define encrot0 0