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

Follow-up the PR #4955, etc

Browse Source 
・More ANALOG NUMBERING to Analog Input
・Add comment header to all the section of all the pins files

・Sort sections as follows:
1. Some special definitions (USBCON, LARGE_FLASH, etc)
2. Servos
3. Limit Switches
4. Z Probe
5. Steppers
6. Temperature Sensors
7. Heaters / Fans
8. Misc. Functions
9. LCD / Controller

・Move MAX6675_SS into "Temperature Sensors" section
・Adjust spacing
This commit is contained in:
esenapaj
2016-10-09 05:27:04 +09:00
parent 00456b0cb3
commit f41c60d4a4
49 changed files with 739 additions and 484 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
Marlin/pins_RAMBO.h
View File

@ -56,6 +56,13 @@
#define SERVO2_PIN 24 // Motor header MX3
#define SERVO3_PIN 5 // PWM header pin 5
//
// Z Probe (when not Z_MIN_PIN)
//
#ifndef Z_MIN_PROBE_PIN
#define Z_MIN_PROBE_PIN 30
#endif
#if ENABLED(Z_PROBE_SLED)
#define SLED_PIN -1
#endif
@ -70,43 +77,38 @@
#define Z_MIN_PIN 10
#define Z_MAX_PIN 30
//
// Z Probe (when not Z_MIN_PIN)
//
#ifndef Z_MIN_PROBE_PIN
#define Z_MIN_PROBE_PIN 30
#endif
//
// Steppers
//
#define X_STEP_PIN 37
#define X_DIR_PIN 48
#define X_ENABLE_PIN 29
#define X_MS1_PIN 40
#define X_MS2_PIN 41
#define Y_STEP_PIN 36
#define Y_DIR_PIN 49
#define Y_ENABLE_PIN 28
#define Y_MS1_PIN 69
#define Y_MS2_PIN 39
#define Z_STEP_PIN 35
#define Z_DIR_PIN 47
#define Z_ENABLE_PIN 27
#define Z_MS1_PIN 68
#define Z_MS2_PIN 67
#define E0_STEP_PIN 34
#define E0_DIR_PIN 43
#define E0_ENABLE_PIN 26
#define E0_MS1_PIN 65
#define E0_MS2_PIN 66
#define E1_STEP_PIN 33
#define E1_DIR_PIN 42
#define E1_ENABLE_PIN 25
// Microstepping pins - Mapping not from fastio.h (?)
#define X_MS1_PIN 40
#define X_MS2_PIN 41
#define Y_MS1_PIN 69
#define Y_MS2_PIN 39
#define Z_MS1_PIN 68
#define Z_MS2_PIN 67
#define E0_MS1_PIN 65
#define E0_MS2_PIN 66
#define E1_MS1_PIN 63
#define E1_MS2_PIN 64
@ -116,9 +118,9 @@
//
// Temperature Sensors
//
#define TEMP_0_PIN 0
#define TEMP_1_PIN 1
#define TEMP_BED_PIN 2
#define TEMP_0_PIN 0 // Analog Input
#define TEMP_1_PIN 1 // Analog Input
#define TEMP_BED_PIN 2 // Analog Input
//
// Heaters / Fans
@ -137,9 +139,12 @@
//
#define SDSS 53
#define LED_PIN 13
#define FILWIDTH_PIN 3 // ANALOG NUMBERING
#define FILWIDTH_PIN 3 // Analog Input
#define PS_ON_PIN 4
//
// LCD / Controller
//
#if ENABLED(ULTRA_LCD)
#define KILL_PIN 80
@ -155,9 +160,9 @@
#if ENABLED(VIKI2) || ENABLED(miniVIKI)
#define BEEPER_PIN 44
//NB: Panucatt's Viki 2.0 wiring diagram (v1.2) indicates that the
// beeper/buzzer is connected to pin 33; however, the pin used in the
// diagram is actually pin 44, so this is correct.
// NB: Panucatt's Viki 2.0 wiring diagram (v1.2) indicates that the
// beeper/buzzer is connected to pin 33; however, the pin used in the
// diagram is actually pin 44, so this is correct.
#define DOGLCD_A0 70
#define DOGLCD_CS 71
@ -185,12 +190,12 @@
#endif // VIKI2/miniVIKI
#else //!NEWPANEL - old style panel with shift register
#else // !NEWPANEL - old style panel with shift register
// No Beeper added
#define BEEPER_PIN 33
//buttons are attached to a shift register
// buttons are attached to a shift register
// Not wired yet
//#define SHIFT_CLK 38
//#define SHIFT_LD 42