Переглянути джерело

Follow-up the PR #4955, etc

・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
esenapaj 7 роки тому
джерело
коміт
f41c60d4a4
49 змінених файлів з 728 додано та 473 видалено
  1. 9
    6
      Marlin/pins_3DRAG.h
  2. 1
    1
      Marlin/pins_5DPRINT.h
  3. 3
    0
      Marlin/pins_99.h
  4. 40
    33
      Marlin/pins_A4JP.h
  5. 3
    0
      Marlin/pins_AZTEEG_X3.h
  6. 11
    7
      Marlin/pins_AZTEEG_X3_PRO.h
  7. 3
    0
      Marlin/pins_BAM_DICE_DUE.h
  8. 24
    6
      Marlin/pins_BQ_ZUM_MEGA_3D.h
  9. 4
    0
      Marlin/pins_BRAINWAVE.h
  10. 1
    2
      Marlin/pins_BRAINWAVE_PRO.h
  11. 3
    0
      Marlin/pins_CHEAPTRONIC.h
  12. 9
    11
      Marlin/pins_CNCONTROLS_11.h
  13. 10
    12
      Marlin/pins_CNCONTROLS_12.h
  14. 17
    17
      Marlin/pins_ELEFU_3.h
  15. 9
    0
      Marlin/pins_FELIX2.h
  16. 1
    1
      Marlin/pins_GEN3_MONOLITHIC.h
  17. 3
    3
      Marlin/pins_GEN3_PLUS.h
  18. 6
    10
      Marlin/pins_GEN6.h
  19. 3
    0
      Marlin/pins_GEN7_14.h
  20. 7
    2
      Marlin/pins_GEN7_CUSTOM.h
  21. 20
    7
      Marlin/pins_K8400.h
  22. 8
    9
      Marlin/pins_LEAPFROG.h
  23. 6
    7
      Marlin/pins_MEGACONTROLLER.h
  24. 7
    7
      Marlin/pins_MEGATRONICS.h
  25. 7
    7
      Marlin/pins_MEGATRONICS_2.h
  26. 9
    8
      Marlin/pins_MEGATRONICS_3.h
  27. 14
    12
      Marlin/pins_MINIRAMBO.h
  28. 7
    4
      Marlin/pins_MINITRONICS.h
  29. 6
    0
      Marlin/pins_MKS_13.h
  30. 3
    0
      Marlin/pins_MKS_BASE.h
  31. 32
    16
      Marlin/pins_OMCA.h
  32. 4
    0
      Marlin/pins_OMCA_A.h
  33. 45
    30
      Marlin/pins_PRINTRBOARD.h
  34. 46
    31
      Marlin/pins_PRINTRBOARD_REVF.h
  35. 29
    24
      Marlin/pins_RAMBO.h
  36. 30
    29
      Marlin/pins_RAMPS.h
  37. 15
    15
      Marlin/pins_RAMPS_OLD.h
  38. 59
    43
      Marlin/pins_RIGIDBOARD.h
  39. 4
    1
      Marlin/pins_RIGIDBOARD_V2.h
  40. 30
    26
      Marlin/pins_RUMBA.h
  41. 3
    0
      Marlin/pins_SAINSMART_2IN1.h
  42. 47
    25
      Marlin/pins_SANGUINOLOLU_11.h
  43. 34
    11
      Marlin/pins_SAV_MKI.h
  44. 9
    6
      Marlin/pins_SETHI.h
  45. 36
    18
      Marlin/pins_TEENSY2.h
  46. 29
    10
      Marlin/pins_TEENSYLU.h
  47. 8
    6
      Marlin/pins_ULTIMAIN_2.h
  48. 12
    8
      Marlin/pins_ULTIMAKER.h
  49. 2
    2
      Marlin/pins_ULTIMAKER_OLD.h

+ 9
- 6
Marlin/pins_3DRAG.h Переглянути файл

36
   #define DEFAULT_SOURCE_CODE_URL "http://3dprint.elettronicain.it/"
36
   #define DEFAULT_SOURCE_CODE_URL "http://3dprint.elettronicain.it/"
37
 #endif
37
 #endif
38
 
38
 
39
+//
40
+// Heaters / Fans
41
+//
39
 #define RAMPS_D8_PIN 9
42
 #define RAMPS_D8_PIN 9
40
 #define RAMPS_D9_PIN 8
43
 #define RAMPS_D9_PIN 8
41
 #define MOSFET_D_PIN 12
44
 #define MOSFET_D_PIN 12
55
 #define Z_ENABLE_PIN       63
58
 #define Z_ENABLE_PIN       63
56
 
59
 
57
 //
60
 //
58
-// SD Card
61
+// Heaters / Fans
62
+//
63
+#define HEATER_2_PIN        6
64
+
65
+//
66
+// Misc. Functions
59
 //
67
 //
60
 #undef SDSS
68
 #undef SDSS
61
 #define SDSS               25
69
 #define SDSS               25
64
 #define SD_DETECT_PIN      53
72
 #define SD_DETECT_PIN      53
65
 
73
 
66
 //
74
 //
67
-// Heaters / Fans
68
-//
69
-#define HEATER_2_PIN        6
70
-
71
-//
72
 // LCD / Controller
75
 // LCD / Controller
73
 //
76
 //
74
 #if ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL)
77
 #if ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL)

+ 1
- 1
Marlin/pins_5DPRINT.h Переглянути файл

89
 #define FAN_PIN            16
89
 #define FAN_PIN            16
90
 
90
 
91
 //
91
 //
92
-// SD Card
92
+// Misc. Functions
93
 //
93
 //
94
 #define SDSS               20
94
 #define SDSS               20

+ 3
- 0
Marlin/pins_99.h Переглянути файл

64
 #define HEATER_0_PIN       13
64
 #define HEATER_0_PIN       13
65
 #define HEATER_BED_PIN      4
65
 #define HEATER_BED_PIN      4
66
 
66
 
67
+//
68
+// Misc. Functions
69
+//
67
 #define SDSS               53
70
 #define SDSS               53
68
 #define PS_ON_PIN           9
71
 #define PS_ON_PIN           9

+ 40
- 33
Marlin/pins_A4JP.h Переглянути файл

30
 
30
 
31
 #define BOARD_NAME "AJ4P"
31
 #define BOARD_NAME "AJ4P"
32
 
32
 
33
+#define LARGE_FLASH true
34
+
35
+/************************************************
36
+ * Rambo pin assignments old
37
+ ************************************************/
38
+
33
 //
39
 //
34
 // Servos
40
 // Servos
35
 //
41
 //
38
 #define SERVO2_PIN 24 // Motor header MX3
44
 #define SERVO2_PIN 24 // Motor header MX3
39
 #define SERVO3_PIN  5 // PWM header pin 5
45
 #define SERVO3_PIN  5 // PWM header pin 5
40
 
46
 
41
-#define SLED_PIN -1
42
-
43
-#define FILWIDTH_PIN        3   // Analog Input
44
-
45
-/************************************************
46
- * Rambo pin assignments old
47
- ************************************************/
48
-
49
-#define LARGE_FLASH true
50
-
51
 //
47
 //
52
 // Limit Switches
48
 // Limit Switches
53
 //
49
 //
65
   #define Z_MIN_PROBE_PIN   30
61
   #define Z_MIN_PROBE_PIN   30
66
 #endif
62
 #endif
67
 
63
 
64
+#define SLED_PIN -1
65
+
68
 //
66
 //
69
 // Steppers
67
 // Steppers
70
 //
68
 //
71
 #define X_STEP_PIN          37
69
 #define X_STEP_PIN          37
72
 #define X_DIR_PIN           48
70
 #define X_DIR_PIN           48
73
 #define X_ENABLE_PIN        29
71
 #define X_ENABLE_PIN        29
74
-#define X_MS1_PIN           40
75
-#define X_MS2_PIN           41
76
 
72
 
77
 #define Y_STEP_PIN          36
73
 #define Y_STEP_PIN          36
78
 #define Y_DIR_PIN           49
74
 #define Y_DIR_PIN           49
79
 #define Y_ENABLE_PIN        28
75
 #define Y_ENABLE_PIN        28
80
-#define Y_MS1_PIN           69
81
-#define Y_MS2_PIN           39
82
 
76
 
83
 #define Z_STEP_PIN          35
77
 #define Z_STEP_PIN          35
84
 #define Z_DIR_PIN           47
78
 #define Z_DIR_PIN           47
85
 #define Z_ENABLE_PIN        27
79
 #define Z_ENABLE_PIN        27
86
-#define Z_MS1_PIN           68
87
-#define Z_MS2_PIN           67
88
 
80
 
89
 #define E0_STEP_PIN         34
81
 #define E0_STEP_PIN         34
90
 #define E0_DIR_PIN          43
82
 #define E0_DIR_PIN          43
91
 #define E0_ENABLE_PIN       26
83
 #define E0_ENABLE_PIN       26
92
-#define E0_MS1_PIN          65
93
-#define E0_MS2_PIN          66
94
 
84
 
95
 #define E1_STEP_PIN         33
85
 #define E1_STEP_PIN         33
96
 #define E1_DIR_PIN          42
86
 #define E1_DIR_PIN          42
97
 #define E1_ENABLE_PIN       25
87
 #define E1_ENABLE_PIN       25
88
+
89
+// Microstepping pins - Mapping not from fastio.h (?)
90
+#define X_MS1_PIN           40
91
+#define X_MS2_PIN           41
92
+#define Y_MS1_PIN           69
93
+#define Y_MS2_PIN           39
94
+#define Z_MS1_PIN           68
95
+#define Z_MS2_PIN           67
96
+#define E0_MS1_PIN          65
97
+#define E0_MS2_PIN          66
98
 #define E1_MS1_PIN          63
98
 #define E1_MS1_PIN          63
99
 #define E1_MS2_PIN          64
99
 #define E1_MS2_PIN          64
100
 
100
 
102
 #define DIGIPOT_CHANNELS {4,5,3,0,1} // X Y Z E0 E1 digipot channels to stepper driver mapping
102
 #define DIGIPOT_CHANNELS {4,5,3,0,1} // X Y Z E0 E1 digipot channels to stepper driver mapping
103
 
103
 
104
 //
104
 //
105
+// Temperature Sensors
106
+//
107
+#define TEMP_0_PIN           0   // Analog Input
108
+#define TEMP_BED_PIN         7   // Analog Input
109
+
110
+//
105
 // Heaters / Fans
111
 // Heaters / Fans
106
 //
112
 //
107
 #define HEATER_0_PIN         9
113
 #define HEATER_0_PIN         9
112
 #define FAN0_PIN             6
118
 #define FAN0_PIN             6
113
 #define FAN1_PIN             2
119
 #define FAN1_PIN             2
114
 
120
 
115
-#define TEMP_0_PIN           0   // Analog Input
116
-#define TEMP_BED_PIN         7   // Analog Input
117
-
121
+//
122
+// Misc. Functions
123
+//
118
 #define SDSS                53
124
 #define SDSS                53
119
 #define LED_PIN             13
125
 #define LED_PIN             13
120
 #define PS_ON_PIN            4
126
 #define PS_ON_PIN            4
127
+#define FILWIDTH_PIN         3   // Analog Input
121
 
128
 
122
 //
129
 //
123
 // LCD / Controller
130
 // LCD / Controller
124
 //
131
 //
125
-#define LCD_PINS_RS         70 //ext2_5
126
-#define LCD_PINS_ENABLE     71 //ext2_7
127
-#define LCD_PINS_D4         72 ///////Ext2 9 ?
128
-#define LCD_PINS_D5         73 ///////Ext2 11 ?
129
-#define LCD_PINS_D6         74 //ext2_13
130
-#define LCD_PINS_D7         75 ///////Ext2 15 ?
132
+#define LCD_PINS_RS         70 // Ext2_5
133
+#define LCD_PINS_ENABLE     71 // Ext2_7
134
+#define LCD_PINS_D4         72 // Ext2_9 ?
135
+#define LCD_PINS_D5         73 // Ext2_11 ?
136
+#define LCD_PINS_D6         74 // Ext2_13
137
+#define LCD_PINS_D7         75 // Ext2_15 ?
131
 #define BEEPER_PIN          -1
138
 #define BEEPER_PIN          -1
132
 
139
 
133
-#define BTN_HOME            80 //ext_16
134
-#define BTN_CENTER          81 //ext_14
140
+#define BTN_HOME            80 // Ext_16
141
+#define BTN_CENTER          81 // Ext_14
135
 #define BTN_ENC             BTN_CENTER
142
 #define BTN_ENC             BTN_CENTER
136
-#define BTN_RIGHT           82 //ext_12
137
-#define BTN_LEFT            83 //ext_10
138
-#define BTN_UP              84 //ext2_8
139
-#define BTN_DOWN            85 //ext2_6
143
+#define BTN_RIGHT           82 // Ext_12
144
+#define BTN_LEFT            83 // Ext_10
145
+#define BTN_UP              84 // Ext2_8
146
+#define BTN_DOWN            85 // Ext2_6
140
 
147
 
141
 #define HOME_PIN            BTN_HOME
148
 #define HOME_PIN            BTN_HOME
142
 
149
 

+ 3
- 0
Marlin/pins_AZTEEG_X3.h Переглянути файл

32
 
32
 
33
 #include "pins_RAMPS_13.h"
33
 #include "pins_RAMPS_13.h"
34
 
34
 
35
+//
36
+// LCD / Controller
37
+//
35
 #if ENABLED(VIKI2) || ENABLED(miniVIKI)
38
 #if ENABLED(VIKI2) || ENABLED(miniVIKI)
36
 
39
 
37
   #undef DOGLCD_A0
40
   #undef DOGLCD_A0

+ 11
- 7
Marlin/pins_AZTEEG_X3_PRO.h Переглянути файл

29
 #include "pins_RAMPS.h"
29
 #include "pins_RAMPS.h"
30
 
30
 
31
 //
31
 //
32
+// Servos
33
+//
32
 // Tested this pin with bed leveling on a Delta with 1 servo.
34
 // Tested this pin with bed leveling on a Delta with 1 servo.
33
 // Physical wire attachment on EXT1: GND, 5V, D47.
35
 // Physical wire attachment on EXT1: GND, 5V, D47.
34
 //
36
 //
36
 #define SERVO0_PIN         47
38
 #define SERVO0_PIN         47
37
 
39
 
38
 //
40
 //
41
+// Limit Switches
42
+//
39
 // Swap the MIN and MAX endstop pins because the X3 Pro comes with only
43
 // Swap the MIN and MAX endstop pins because the X3 Pro comes with only
40
 // MIN endstop pin headers soldered onto the board.
44
 // MIN endstop pin headers soldered onto the board.
41
 //
45
 //
80
 //
84
 //
81
 // Temperature Sensors
85
 // Temperature Sensors
82
 //
86
 //
83
-#define TEMP_2_PIN         12   // ANALOG NUMBERING
84
-#define TEMP_3_PIN         11   // ANALOG NUMBERING
85
-#define TEMP_4_PIN         10   // ANALOG NUMBERING
86
-#define TC1                 4   // ANALOG NUMBERING Thermo couple on Azteeg X3Pro
87
-#define TC2                 5   // ANALOG NUMBERING Thermo couple on Azteeg X3Pro
87
+#define TEMP_2_PIN         12   // Analog Input
88
+#define TEMP_3_PIN         11   // Analog Input
89
+#define TEMP_4_PIN         10   // Analog Input
90
+#define TC1                 4   // Analog Input (Thermo couple on Azteeg X3Pro)
91
+#define TC2                 5   // Analog Input (Thermo couple on Azteeg X3Pro)
88
 
92
 
89
 //
93
 //
90
 // Heaters / Fans
94
 // Heaters / Fans
97
 #define HEATER_7_PIN       11
101
 #define HEATER_7_PIN       11
98
 
102
 
99
 #undef FAN_PIN
103
 #undef FAN_PIN
100
-#define FAN_PIN             6 //Part Cooling System
104
+#define FAN_PIN             6 // Part Cooling System
101
 
105
 
102
-#define CONTROLLERFAN_PIN   4 //Pin used for the fan to cool motherboard (-1 to disable)
106
+#define CONTROLLERFAN_PIN   4 // Pin used for the fan to cool motherboard (-1 to disable)
103
 
107
 
104
 // Fans/Water Pump to cool the hotend cool side.
108
 // Fans/Water Pump to cool the hotend cool side.
105
 #define EXTRUDER_0_AUTO_FAN_PIN   5
109
 #define EXTRUDER_0_AUTO_FAN_PIN   5

+ 3
- 0
Marlin/pins_BAM_DICE_DUE.h Переглянути файл

32
 
32
 
33
 #include "pins_RAMPS.h"
33
 #include "pins_RAMPS.h"
34
 
34
 
35
+//
36
+// Temperature Sensors
37
+//
35
 #undef TEMP_0_PIN
38
 #undef TEMP_0_PIN
36
 #undef TEMP_1_PIN
39
 #undef TEMP_1_PIN
37
 #define TEMP_0_PIN          9   // Analog Input
40
 #define TEMP_0_PIN          9   // Analog Input

+ 24
- 6
Marlin/pins_BQ_ZUM_MEGA_3D.h Переглянути файл

30
 
30
 
31
 #define BOARD_NAME "ZUM Mega 3D"
31
 #define BOARD_NAME "ZUM Mega 3D"
32
 
32
 
33
+//
34
+// Heaters / Fans
35
+//
33
 #define RAMPS_D8_PIN  10
36
 #define RAMPS_D8_PIN  10
34
 #define RAMPS_D9_PIN  12
37
 #define RAMPS_D9_PIN  12
35
 #define RAMPS_D10_PIN  9
38
 #define RAMPS_D10_PIN  9
37
 
40
 
38
 #include "pins_RAMPS_13.h"
41
 #include "pins_RAMPS_13.h"
39
 
42
 
43
+//
44
+// Limit Switches
45
+//
40
 #undef X_MAX_PIN
46
 #undef X_MAX_PIN
41
-#define X_MAX_PIN         79 //  2
47
+#define X_MAX_PIN         79 // 2
42
 
48
 
49
+//
50
+// Z Probe (when not Z_MIN_PIN)
51
+//
43
 #undef Z_MIN_PROBE_PIN
52
 #undef Z_MIN_PROBE_PIN
44
 #define Z_MIN_PROBE_PIN   19 // IND_S_5V
53
 #define Z_MIN_PROBE_PIN   19 // IND_S_5V
45
 
54
 
46
 #undef Z_ENABLE_PIN
55
 #undef Z_ENABLE_PIN
47
 #define Z_ENABLE_PIN      77 // 62
56
 #define Z_ENABLE_PIN      77 // 62
48
 
57
 
58
+//
59
+// Steppers
60
+//
61
+#define DIGIPOTSS_PIN     22
62
+#define DIGIPOT_CHANNELS  { 4, 5, 3, 0, 1 }
63
+
64
+//
65
+// Temperature Sensors
66
+//
49
 #undef TEMP_1_PIN
67
 #undef TEMP_1_PIN
50
-#define TEMP_1_PIN        14 // 15
68
+#define TEMP_1_PIN        14   // Analog Input (15)
51
 
69
 
52
 #undef TEMP_BED_PIN
70
 #undef TEMP_BED_PIN
53
-#define TEMP_BED_PIN      15 // 14
54
-
55
-#define DIGIPOTSS_PIN     22
56
-#define DIGIPOT_CHANNELS  { 4, 5, 3, 0, 1 }
71
+#define TEMP_BED_PIN      15   // Analog Input (14)
57
 
72
 
73
+//
74
+// Misc. Functions
75
+//
58
 #undef PS_ON_PIN             // 12
76
 #undef PS_ON_PIN             // 12
59
 #define PS_ON_PIN         81 // External Power Supply
77
 #define PS_ON_PIN         81 // External Power Supply

+ 4
- 0
Marlin/pins_BRAINWAVE.h Переглянути файл

76
 //
76
 //
77
 #define HEATER_0_PIN        4  // Extruder
77
 #define HEATER_0_PIN        4  // Extruder
78
 #define HEATER_BED_PIN     38  // Bed
78
 #define HEATER_BED_PIN     38  // Bed
79
+
79
 #define FAN_PIN             3  // Fan
80
 #define FAN_PIN             3  // Fan
80
 
81
 
82
+//
83
+// Misc. Functions
84
+//
81
 #define LED_PIN            39
85
 #define LED_PIN            39

+ 1
- 2
Marlin/pins_BRAINWAVE_PRO.h Переглянути файл

90
 #define FAN_PIN            16  // Fan, PWM
90
 #define FAN_PIN            16  // Fan, PWM
91
 
91
 
92
 //
92
 //
93
-// LCD / Controller
93
+// Misc. Functions
94
 //
94
 //
95
 #define SDSS               20
95
 #define SDSS               20
96
 #define SD_DETECT_PIN      12
96
 #define SD_DETECT_PIN      12
97
-
98
 #define LED_PIN            19
97
 #define LED_PIN            19

+ 3
- 0
Marlin/pins_CHEAPTRONIC.h Переглянути файл

75
 #define HEATER_1_PIN       23 // EXTRUDER 2
75
 #define HEATER_1_PIN       23 // EXTRUDER 2
76
 #define HEATER_BED_PIN     22
76
 #define HEATER_BED_PIN     22
77
 
77
 
78
+//
79
+// LCD / Controller
80
+//
78
 // Cheaptronic v1.0 doesn't support LCD
81
 // Cheaptronic v1.0 doesn't support LCD
79
 #define LCD_PINS_RS        -1
82
 #define LCD_PINS_RS        -1
80
 #define LCD_PINS_ENABLE    -1
83
 #define LCD_PINS_ENABLE    -1

+ 9
- 11
Marlin/pins_CNCONTROLS_11.h Переглянути файл

56
 #define TEMP_2_PIN          2   // Analog Input.  9 for tool3 -> 2 for chambertemp
56
 #define TEMP_2_PIN          2   // Analog Input.  9 for tool3 -> 2 for chambertemp
57
 #define TEMP_3_PIN         11   // Analog Input. 11 for tool4 -> 2 for chambertemp
57
 #define TEMP_3_PIN         11   // Analog Input. 11 for tool4 -> 2 for chambertemp
58
 #define TEMP_BED_PIN        1   // Analog Input
58
 #define TEMP_BED_PIN        1   // Analog Input
59
+//#define TEMP_CHAMBER_PIN    2   // Analog Input
59
 
60
 
60
 //
61
 //
61
 // Heaters / Fans
62
 // Heaters / Fans
66
 #define HEATER_3_PIN       46
67
 #define HEATER_3_PIN       46
67
 #define HEATER_BED_PIN      2
68
 #define HEATER_BED_PIN      2
68
 
69
 
70
+//#define FAN_PIN           7  // common PWM pin for all tools
71
+
72
+//
73
+// Misc. Functions
74
+//
75
+#define SDSS               53
76
+#define SD_DETECT_PIN      13
77
+
69
 // Tools
78
 // Tools
70
 
79
 
71
 //#define TOOL_0_PIN           4
80
 //#define TOOL_0_PIN           4
76
 
85
 
77
 // Common I/O
86
 // Common I/O
78
 
87
 
79
-//#define TEMP_CHAMBER_PIN     2  // ANALOG INPUT !!
80
 //#define FIL_RUNOUT_PIN      -1
88
 //#define FIL_RUNOUT_PIN      -1
81
 //#define PWM_1_PIN           11
89
 //#define PWM_1_PIN           11
82
 //#define PWM_2_PIN           10
90
 //#define PWM_2_PIN           10
83
 //#define SPARE_IO            12
91
 //#define SPARE_IO            12
84
-//#define FAN_PIN              7  // common PWM pin for all tools
85
-
86
-//
87
-// SD Card
88
-//
89
-#define SDSS               53
90
-#define SD_DETECT_PIN      13
91
 
92
 
92
 //
93
 //
93
 // LCD / Controller
94
 // LCD / Controller
112
 //#define UI1                31
113
 //#define UI1                31
113
 //#define UI2                22
114
 //#define UI2                22
114
 
115
 
115
-//
116
-// Misc. Functions
117
-//
118
 #define STAT_LED_BLUE_PIN  -1
116
 #define STAT_LED_BLUE_PIN  -1
119
 #define STAT_LED_RED_PIN   31
117
 #define STAT_LED_RED_PIN   31

+ 10
- 12
Marlin/pins_CNCONTROLS_12.h Переглянути файл

69
 
69
 
70
 #define FAN_PIN             5  // 5 is PWMtool3 -> 7 is common PWM pin for all tools
70
 #define FAN_PIN             5  // 5 is PWMtool3 -> 7 is common PWM pin for all tools
71
 
71
 
72
-//#define PWM_1_PIN          12
73
-//#define PWM_2_PIN          13
74
-//#define SPARE_IO           17
72
+//
73
+// Misc. Functions
74
+//
75
+#define SDSS               53
76
+#define SD_DETECT_PIN      15
75
 
77
 
76
 // Tools
78
 // Tools
77
 
79
 
86
 
88
 
87
 // Common I/O
89
 // Common I/O
88
 
90
 
91
+#define FIL_RUNOUT_PIN     18
92
+//#define PWM_1_PIN          12
93
+//#define PWM_2_PIN          13
94
+//#define SPARE_IO           17
95
+
89
 //
96
 //
90
 // LCD / Controller
97
 // LCD / Controller
91
 //
98
 //
113
 
120
 
114
 #define STAT_LED_BLUE_PIN  -1
121
 #define STAT_LED_BLUE_PIN  -1
115
 #define STAT_LED_RED_PIN   10 // TOOL_0_PWM_PIN
122
 #define STAT_LED_RED_PIN   10 // TOOL_0_PWM_PIN
116
-
117
-//
118
-// SD Card
119
-//
120
-#define SDSS               53
121
-#define SD_DETECT_PIN      15
122
-
123
-// Other
124
-#define FIL_RUNOUT_PIN     18

+ 17
- 17
Marlin/pins_ELEFU_3.h Переглянути файл

116
 #endif // RA_CONTROL_PANEL
116
 #endif // RA_CONTROL_PANEL
117
 
117
 
118
 #if ENABLED(RA_DISCO)
118
 #if ENABLED(RA_DISCO)
119
-  //variables for which pins the TLC5947 is using
119
+  // variables for which pins the TLC5947 is using
120
   #define TLC_CLOCK_PIN    25
120
   #define TLC_CLOCK_PIN    25
121
   #define TLC_BLANK_PIN    23
121
   #define TLC_BLANK_PIN    23
122
   #define TLC_XLAT_PIN     22
122
   #define TLC_XLAT_PIN     22
123
   #define TLC_DATA_PIN     24
123
   #define TLC_DATA_PIN     24
124
 
124
 
125
-  //We also need to define pin to port number mapping for the 2560 to match the pins listed above. If you change the TLC pins, update this as well per the 2560 datasheet!
126
-  //This currently only works with the RA Board.
127
-  #define TLC_CLOCK_BIT 3 //bit 3 on port A
128
-  #define TLC_CLOCK_PORT &PORTA //bit 3 on port A
125
+  // We also need to define pin to port number mapping for the 2560 to match the pins listed above. If you change the TLC pins, update this as well per the 2560 datasheet!
126
+  // This currently only works with the RA Board.
127
+  #define TLC_CLOCK_BIT 3 // bit 3 on port A
128
+  #define TLC_CLOCK_PORT &PORTA // bit 3 on port A
129
 
129
 
130
-  #define TLC_BLANK_BIT 1 //bit 1 on port A
131
-  #define TLC_BLANK_PORT &PORTA //bit 1 on port A
130
+  #define TLC_BLANK_BIT 1 // bit 1 on port A
131
+  #define TLC_BLANK_PORT &PORTA // bit 1 on port A
132
 
132
 
133
-  #define TLC_DATA_BIT 2 //bit 2 on port A
134
-  #define TLC_DATA_PORT &PORTA //bit 2 on port A
133
+  #define TLC_DATA_BIT 2 // bit 2 on port A
134
+  #define TLC_DATA_PORT &PORTA // bit 2 on port A
135
 
135
 
136
-  #define TLC_XLAT_BIT 0 //bit 0 on port A
137
-  #define TLC_XLAT_PORT &PORTA //bit 0 on port A
136
+  #define TLC_XLAT_BIT 0 // bit 0 on port A
137
+  #define TLC_XLAT_PORT &PORTA // bit 0 on port A
138
 
138
 
139
-  //change this to match your situation. Lots of TLCs takes up the arduino SRAM very quickly, so be careful
140
-  //Leave it at at least 1 if you have enabled RA_LIGHTING
141
-  //The number of TLC5947 boards chained together for use with the animation, additional ones will repeat the animation on them, but are not individually addressable and mimic those before them. You can leave the default at 2 even if you only have 1 TLC5947 module.
139
+  // change this to match your situation. Lots of TLCs takes up the arduino SRAM very quickly, so be careful
140
+  // Leave it at at least 1 if you have enabled RA_LIGHTING
141
+  // The number of TLC5947 boards chained together for use with the animation, additional ones will repeat the animation on them, but are not individually addressable and mimic those before them. You can leave the default at 2 even if you only have 1 TLC5947 module.
142
   #define NUM_TLCS 2
142
   #define NUM_TLCS 2
143
 
143
 
144
-  //These TRANS_ARRAY values let you change the order the LEDs on the lighting modules will animate for chase functions.
145
-  //Modify them according to your specific situation.
146
-  //NOTE: the array should be 8 long for every TLC you have. These defaults assume (2) TLCs.
144
+  // These TRANS_ARRAY values let you change the order the LEDs on the lighting modules will animate for chase functions.
145
+  // Modify them according to your specific situation.
146
+  // NOTE: the array should be 8 long for every TLC you have. These defaults assume (2) TLCs.
147
   #define TRANS_ARRAY {0, 1, 2, 3, 4, 5, 6, 7, 15, 14, 13, 12, 11, 10, 9, 8} //forwards
147
   #define TRANS_ARRAY {0, 1, 2, 3, 4, 5, 6, 7, 15, 14, 13, 12, 11, 10, 9, 8} //forwards
148
   //#define TRANS_ARRAY {7, 6, 5, 4, 3, 2, 1, 0, 8, 9, 10, 11, 12, 13, 14, 15} //backwards
148
   //#define TRANS_ARRAY {7, 6, 5, 4, 3, 2, 1, 0, 8, 9, 10, 11, 12, 13, 14, 15} //backwards
149
 #endif // RA_DISCO
149
 #endif // RA_DISCO

+ 9
- 0
Marlin/pins_FELIX2.h Переглянути файл

30
 
30
 
31
 #define BOARD_NAME "Felix 2.0+"
31
 #define BOARD_NAME "Felix 2.0+"
32
 
32
 
33
+//
34
+// Heaters / Fans
35
+//
33
 // Power outputs EFBF or EFBE
36
 // Power outputs EFBF or EFBE
34
 #define MOSFET_D_PIN 7
37
 #define MOSFET_D_PIN 7
35
 
38
 
36
 #include "pins_RAMPS.h"
39
 #include "pins_RAMPS.h"
37
 
40
 
41
+//
42
+// Misc. Functions
43
+//
38
 #undef SDPOWER
44
 #undef SDPOWER
39
 #define SDPOWER             1
45
 #define SDPOWER             1
40
 
46
 
41
 #define PS_ON_PIN          12
47
 #define PS_ON_PIN          12
42
 
48
 
49
+//
50
+// LCD / Controller
51
+//
43
 #if ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL)
52
 #if ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL)
44
 
53
 
45
   #define SD_DETECT_PIN 6
54
   #define SD_DETECT_PIN 6

+ 1
- 1
Marlin/pins_GEN3_MONOLITHIC.h Переглянути файл

68
 #define HEATER_0_PIN       16
68
 #define HEATER_0_PIN       16
69
 
69
 
70
 //
70
 //
71
-// Etc.
71
+// Misc. Functions
72
 //
72
 //
73
 #define PS_ON_PIN          14 // Alex, does this work on the card?
73
 #define PS_ON_PIN          14 // Alex, does this work on the card?
74
 
74
 

+ 3
- 3
Marlin/pins_GEN3_PLUS.h Переглянути файл

56
 #define E0_DIR_PIN         21
56
 #define E0_DIR_PIN         21
57
 #define E0_ENABLE_PIN      13
57
 #define E0_ENABLE_PIN      13
58
 
58
 
59
-#define PS_ON_PIN          14
60
-
61
 //
59
 //
62
 // Temperature Sensors
60
 // Temperature Sensors
63
 //
61
 //
71
 #define HEATER_BED_PIN     16
69
 #define HEATER_BED_PIN     16
72
 
70
 
73
 //
71
 //
74
-// SD Card
72
+// Misc. Functions
75
 //
73
 //
76
 #define SDSS                4
74
 #define SDSS                4
75
+#define PS_ON_PIN          14
76
+

+ 6
- 10
Marlin/pins_GEN6.h Переглянути файл

56
 #define Z_DIR_PIN          28
56
 #define Z_DIR_PIN          28
57
 #define Z_ENABLE_PIN       29
57
 #define Z_ENABLE_PIN       29
58
 
58
 
59
-#define E0_STEP_PIN         4   //Edited @ EJE Electronics 20100715
60
-#define E0_DIR_PIN          2   //Edited @ EJE Electronics 20100715
61
-#define E0_ENABLE_PIN       3   //Added @ EJE Electronics 20100715
59
+#define E0_STEP_PIN         4   // Edited @ EJE Electronics 20100715
60
+#define E0_DIR_PIN          2   // Edited @ EJE Electronics 20100715
61
+#define E0_ENABLE_PIN       3   // Added @ EJE Electronics 20100715
62
 
62
 
63
 //
63
 //
64
 // Temperature Sensor
64
 // Temperature Sensor
68
 //
68
 //
69
 // Heaters
69
 // Heaters
70
 //
70
 //
71
-#define HEATER_0_PIN       14   //changed @ rkoeppl 20110410
71
+#define HEATER_0_PIN       14   // changed @ rkoeppl 20110410
72
 
72
 
73
 #if !MB(GEN6)
73
 #if !MB(GEN6)
74
-  #define HEATER_BED_PIN    1   //changed @ rkoeppl 20110410
74
+  #define HEATER_BED_PIN    1   // changed @ rkoeppl 20110410
75
   #define TEMP_BED_PIN      0   // Analog Input
75
   #define TEMP_BED_PIN      0   // Analog Input
76
 #endif
76
 #endif
77
 
77
 
78
 //
78
 //
79
-// SD Card
80
-//
81
-#define SDSS               17
82
-
83
-//
84
 // Misc. Functions
79
 // Misc. Functions
85
 //
80
 //
81
+#define SDSS               17
86
 #define DEBUG_PIN           0
82
 #define DEBUG_PIN           0
87
 
83
 
88
 // RS485 pins
84
 // RS485 pins

+ 3
- 0
Marlin/pins_GEN7_14.h Переглянути файл

70
 #define HEATER_0_PIN 4
70
 #define HEATER_0_PIN 4
71
 #define HEATER_BED_PIN 3
71
 #define HEATER_BED_PIN 3
72
 
72
 
73
+//
74
+// Misc. Functions
75
+//
73
 #define PS_ON_PIN 15
76
 #define PS_ON_PIN 15
74
 
77
 
75
 // A pin for debugging
78
 // A pin for debugging

+ 7
- 2
Marlin/pins_GEN7_CUSTOM.h Переглянути файл

71
 #define HEATER_0_PIN     4
71
 #define HEATER_0_PIN     4
72
 #define HEATER_BED_PIN   3  // (bed)
72
 #define HEATER_BED_PIN   3  // (bed)
73
 
73
 
74
-#define SDSS            31                  // SCL pin of I2C header || CS Pin for SD Card support
75
-
74
+//
75
+// Misc. Functions
76
+//
77
+#define SDSS            31  // SCL pin of I2C header || CS Pin for SD Card support
76
 #define PS_ON_PIN       19
78
 #define PS_ON_PIN       19
77
 
79
 
78
 // A pin for debugging
80
 // A pin for debugging
79
 #define DEBUG_PIN       -1
81
 #define DEBUG_PIN       -1
80
 
82
 
83
+//
84
+// LCD / Controller
85
+//
81
 #define BEEPER_PIN      -1
86
 #define BEEPER_PIN      -1
82
 
87
 
83
 // 4bit LCD Support
88
 // 4bit LCD Support

+ 20
- 7
Marlin/pins_K8400.h Переглянути файл

37
 
37
 
38
 #include "pins_3DRAG.h"
38
 #include "pins_3DRAG.h"
39
 
39
 
40
-#undef X_MAX_PIN
41
-#undef X_MIN_PIN
42
-#undef Y_MAX_PIN
43
-#undef Y_MIN_PIN
40
+//
41
+// Limit Switches
42
+//
44
 #define X_STOP_PIN  3
43
 #define X_STOP_PIN  3
45
 #define Y_STOP_PIN 14
44
 #define Y_STOP_PIN 14
46
 
45
 
46
+#undef X_MIN_PIN
47
+#undef X_MAX_PIN
48
+#undef Y_MIN_PIN
49
+#undef Y_MAX_PIN
50
+
51
+//
52
+// Steppers
53
+//
47
 #undef E1_STEP_PIN
54
 #undef E1_STEP_PIN
48
 #define E1_STEP_PIN   32
55
 #define E1_STEP_PIN   32
49
 
56
 
50
-#undef PS_ON_PIN
51
-#undef KILL_PIN
52
-
57
+//
58
+// Heaters / Fans
59
+//
53
 #undef HEATER_1_PIN
60
 #undef HEATER_1_PIN
54
 #define HEATER_1_PIN  11
61
 #define HEATER_1_PIN  11
62
+
63
+//
64
+// Misc. Functions
65
+//
66
+#undef PS_ON_PIN
67
+#undef KILL_PIN

+ 8
- 9
Marlin/pins_LEAPFROG.h Переглянути файл

64
 #define E1_ENABLE_PIN      36 // 36
64
 #define E1_ENABLE_PIN      36 // 36
65
 
65
 
66
 //
66
 //
67
-// Misc. Functions
68
-//
69
-#define SDSS               11
70
-#define LED_PIN            13
71
-#define SOL1_PIN           16
72
-#define SOL2_PIN           17
73
-
74
-//
75
 // Temperature Sensors
67
 // Temperature Sensors
76
 //
68
 //
77
 #define TEMP_0_PIN         13   // Analog Input (D27)
69
 #define TEMP_0_PIN         13   // Analog Input (D27)
88
 
80
 
89
 #define FAN_PIN             7
81
 #define FAN_PIN             7
90
 
82
 
91
-/*  Unused (1) (2) (3) 4 5 6 7 8 9 10 11 12 13 (14) (15) (16) 17 (18) (19) (20) (21) (22) (23) 24 (25) (26) (27) 28 (29) (30) (31)  */
83
+//
84
+// Misc. Functions
85
+//
86
+#define SDSS               11
87
+#define LED_PIN            13
88
+#define SOL1_PIN           16
89
+#define SOL2_PIN           17
92
 
90
 
91
+/*  Unused (1) (2) (3) 4 5 6 7 8 9 10 11 12 13 (14) (15) (16) 17 (18) (19) (20) (21) (22) (23) 24 (25) (26) (27) 28 (29) (30) (31)  */

+ 6
- 7
Marlin/pins_MEGACONTROLLER.h Переглянути файл

83
 #define E1_ENABLE_PIN      25
83
 #define E1_ENABLE_PIN      25
84
 
84
 
85
 //
85
 //
86
-// Misc. Functions
87
-//
88
-#define SDSS               53
89
-#define LED_PIN            13
90
-
91
-//
92
 // Temperature Sensors
86
 // Temperature Sensors
93
 //
87
 //
94
 #if TEMP_SENSOR_0 == -1
88
 #if TEMP_SENSOR_0 == -1
127
 #define FAN_SOFT_PWM
121
 #define FAN_SOFT_PWM
128
 
122
 
129
 //
123
 //
124
+// Misc. Functions
125
+//
126
+#define SDSS               53
127
+#define LED_PIN            13
128
+
129
+//
130
 // LCD / Controller
130
 // LCD / Controller
131
 //
131
 //
132
 #if ENABLED(MINIPANEL)
132
 #if ENABLED(MINIPANEL)
150
 
150
 
151
   #define SD_DETECT_PIN    49
151
   #define SD_DETECT_PIN    49
152
 #endif // MINIPANEL
152
 #endif // MINIPANEL
153
-

+ 7
- 7
Marlin/pins_MEGATRONICS.h Переглянути файл

72
 #define E1_ENABLE_PIN      30
72
 #define E1_ENABLE_PIN      30
73
 
73
 
74
 //
74
 //
75
-// Misc. Functions
76
-//
77
-#define SDSS               53
78
-#define LED_PIN            13
79
-#define PS_ON_PIN          12
80
-
81
-//
82
 // Temperature Sensors
75
 // Temperature Sensors
83
 //
76
 //
84
 #if TEMP_SENSOR_0 == -1
77
 #if TEMP_SENSOR_0 == -1
99
 #define FAN_PIN             7   // IO pin. Buffer needed
92
 #define FAN_PIN             7   // IO pin. Buffer needed
100
 
93
 
101
 //
94
 //
95
+// Misc. Functions
96
+//
97
+#define SDSS               53
98
+#define LED_PIN            13
99
+#define PS_ON_PIN          12
100
+
101
+//
102
 // LCD / Controller
102
 // LCD / Controller
103
 //
103
 //
104
 #define BEEPER_PIN         33
104
 #define BEEPER_PIN         33

+ 7
- 7
Marlin/pins_MEGATRONICS_2.h Переглянути файл

76
 #define E2_ENABLE_PIN      22
76
 #define E2_ENABLE_PIN      22
77
 
77
 
78
 //
78
 //
79
-// Misc. Functions
80
-//
81
-#define SDSS               53
82
-#define LED_PIN            13
83
-#define PS_ON_PIN          12
84
-
85
-//
86
 // Temperature Sensors
79
 // Temperature Sensors
87
 //
80
 //
88
 #if TEMP_SENSOR_0 == -1
81
 #if TEMP_SENSOR_0 == -1
114
 #define FAN1_PIN            6
107
 #define FAN1_PIN            6
115
 
108
 
116
 //
109
 //
110
+// Misc. Functions
111
+//
112
+#define SDSS               53
113
+#define LED_PIN            13
114
+#define PS_ON_PIN          12
115
+
116
+//
117
 // LCD / Controller
117
 // LCD / Controller
118
 //
118
 //
119
 #define BEEPER_PIN         64
119
 #define BEEPER_PIN         64

+ 9
- 8
Marlin/pins_MEGATRONICS_3.h Переглянути файл

63
   #define Z_MIN_PROBE_PIN  19
63
   #define Z_MIN_PROBE_PIN  19
64
 #endif
64
 #endif
65
 
65
 
66
+#define SLED_PIN           -1
67
+
66
 //
68
 //
67
 // Steppers
69
 // Steppers
68
 //
70
 //
91
 #define E2_ENABLE_PIN      23
93
 #define E2_ENABLE_PIN      23
92
 
94
 
93
 //
95
 //
94
-// Misc. Functions
95
-//
96
-#define SDSS               53
97
-#define LED_PIN            13
98
-#define PS_ON_PIN          12
99
-#define SLED_PIN           -1
100
-
101
-//
102
 // Temperature Sensors
96
 // Temperature Sensors
103
 //
97
 //
104
 #if TEMP_SENSOR_0 == -1
98
 #if TEMP_SENSOR_0 == -1
134
 #define FAN1_PIN            7
128
 #define FAN1_PIN            7
135
 
129
 
136
 //
130
 //
131
+// Misc. Functions
132
+//
133
+#define SDSS               53
134
+#define LED_PIN            13
135
+#define PS_ON_PIN          12
136
+
137
+//
137
 // LCD / Controller
138
 // LCD / Controller
138
 //
139
 //
139
 #define BEEPER_PIN         61
140
 #define BEEPER_PIN         61

+ 14
- 12
Marlin/pins_MINIRAMBO.h Переглянути файл

54
 #define X_STEP_PIN         37
54
 #define X_STEP_PIN         37
55
 #define X_DIR_PIN          48
55
 #define X_DIR_PIN          48
56
 #define X_ENABLE_PIN       29
56
 #define X_ENABLE_PIN       29
57
-#define X_MS1_PIN          40
58
-#define X_MS2_PIN          41
59
 
57
 
60
 #define Y_STEP_PIN         36
58
 #define Y_STEP_PIN         36
61
 #define Y_DIR_PIN          49
59
 #define Y_DIR_PIN          49
62
 #define Y_ENABLE_PIN       28
60
 #define Y_ENABLE_PIN       28
63
-#define Y_MS1_PIN          69
64
-#define Y_MS2_PIN          39
65
 
61
 
66
 #define Z_STEP_PIN         35
62
 #define Z_STEP_PIN         35
67
 #define Z_DIR_PIN          47
63
 #define Z_DIR_PIN          47
68
 #define Z_ENABLE_PIN       27
64
 #define Z_ENABLE_PIN       27
69
-#define Z_MS1_PIN          68
70
-#define Z_MS2_PIN          67
71
 
65
 
72
 #define E0_STEP_PIN        34
66
 #define E0_STEP_PIN        34
73
 #define E0_DIR_PIN         43
67
 #define E0_DIR_PIN         43
74
 #define E0_ENABLE_PIN      26
68
 #define E0_ENABLE_PIN      26
75
-#define E0_MS1_PIN         65
76
-#define E0_MS2_PIN         66
77
 
69
 
78
 #define E1_STEP_PIN        -1
70
 #define E1_STEP_PIN        -1
79
 #define E1_DIR_PIN         -1
71
 #define E1_DIR_PIN         -1
80
 #define E1_ENABLE_PIN      -1
72
 #define E1_ENABLE_PIN      -1
81
 
73
 
74
+// Microstepping pins - Mapping not from fastio.h (?)
75
+#define X_MS1_PIN          40
76
+#define X_MS2_PIN          41
77
+#define Y_MS1_PIN          69
78
+#define Y_MS2_PIN          39
79
+#define Z_MS1_PIN          68
80
+#define Z_MS2_PIN          67
81
+#define E0_MS1_PIN         65
82
+#define E0_MS2_PIN         66
83
+
82
 #define MOTOR_CURRENT_PWM_XY_PIN 46
84
 #define MOTOR_CURRENT_PWM_XY_PIN 46
83
 #define MOTOR_CURRENT_PWM_Z_PIN  45
85
 #define MOTOR_CURRENT_PWM_Z_PIN  45
84
 #define MOTOR_CURRENT_PWM_E_PIN  44
86
 #define MOTOR_CURRENT_PWM_E_PIN  44
85
-//Motor current PWM conversion, PWM value = MotorCurrentSetting * 255 / range
87
+// Motor current PWM conversion, PWM value = MotorCurrentSetting * 255 / range
86
 #define MOTOR_CURRENT_PWM_RANGE 2000
88
 #define MOTOR_CURRENT_PWM_RANGE 2000
87
 #define DEFAULT_PWM_MOTOR_CURRENT  {1300, 1300, 1250}
89
 #define DEFAULT_PWM_MOTOR_CURRENT  {1300, 1300, 1250}
88
 
90
 
129
     #define LCD_PINS_D6    85
131
     #define LCD_PINS_D6    85
130
     #define LCD_PINS_D7    71
132
     #define LCD_PINS_D7    71
131
 
133
 
132
-    //buttons are directly attached using AUX-2
134
+    // buttons are directly attached using AUX-2
133
     #define BTN_EN1        14
135
     #define BTN_EN1        14
134
     #define BTN_EN2        72
136
     #define BTN_EN2        72
135
     #define BTN_ENC         9  // the click
137
     #define BTN_ENC         9  // the click
136
 
138
 
137
     #define SD_DETECT_PIN  15
139
     #define SD_DETECT_PIN  15
138
 
140
 
139
-  #endif //NEWPANEL
140
-#endif //ULTRA_LCD
141
+  #endif // NEWPANEL
142
+#endif // ULTRA_LCD

+ 7
- 4
Marlin/pins_MINITRONICS.h Переглянути файл

71
 //
71
 //
72
 // Temperature Sensors
72
 // Temperature Sensors
73
 //
73
 //
74
-#define SDSS               16
75
-#define LED_PIN            46
76
-
77
 #define TEMP_0_PIN          7   // Analog Input
74
 #define TEMP_0_PIN          7   // Analog Input
78
 #define TEMP_1_PIN          6   // Analog Input
75
 #define TEMP_1_PIN          6   // Analog Input
79
 #define TEMP_BED_PIN        6   // Analog Input
76
 #define TEMP_BED_PIN        6   // Analog Input
88
 #define FAN_PIN             9
85
 #define FAN_PIN             9
89
 
86
 
90
 //
87
 //
88
+// Misc. Functions
89
+//
90
+#define SDSS               16
91
+#define LED_PIN            46
92
+
93
+//
91
 // LCD / Controller
94
 // LCD / Controller
92
 //
95
 //
93
 #define BEEPER_PIN         -1
96
 #define BEEPER_PIN         -1
118
   #define BTN_EN2          -1
121
   #define BTN_EN2          -1
119
   #define BTN_ENC          -1
122
   #define BTN_ENC          -1
120
 
123
 
121
-  #define SD_DETECT_PIN    -1  // Minitronics doesn't use this
124
+  #define SD_DETECT_PIN    -1 // Minitronics doesn't use this
122
 #endif
125
 #endif

+ 6
- 0
Marlin/pins_MKS_13.h Переглянути файл

35
 
35
 
36
 #define BOARD_NAME "MKS > v1.3"
36
 #define BOARD_NAME "MKS > v1.3"
37
 
37
 
38
+//
39
+// Heaters / Fans
40
+//
38
 // Power outputs EFBF or EFBE
41
 // Power outputs EFBF or EFBE
39
 #define MOSFET_D_PIN 7
42
 #define MOSFET_D_PIN 7
40
 
43
 
41
 #include "pins_RAMPS.h"
44
 #include "pins_RAMPS.h"
42
 
45
 
46
+//
47
+// LCD / Controller
48
+//
43
 #if ENABLED(VIKI2) || ENABLED(miniVIKI)
49
 #if ENABLED(VIKI2) || ENABLED(miniVIKI)
44
   /**
50
   /**
45
    * VIKI2 Has two groups of wires with...
51
    * VIKI2 Has two groups of wires with...

+ 3
- 0
Marlin/pins_MKS_BASE.h Переглянути файл

30
 
30
 
31
 #define BOARD_NAME "MKS BASE 1.0"
31
 #define BOARD_NAME "MKS BASE 1.0"
32
 
32
 
33
+//
34
+// Heaters / Fans
35
+//
33
 // Power outputs EFBF or EFBE
36
 // Power outputs EFBF or EFBE
34
 #define MOSFET_D_PIN 7
37
 #define MOSFET_D_PIN 7
35
 
38
 

+ 32
- 16
Marlin/pins_OMCA.h Переглянути файл

57
 
57
 
58
 #define BOARD_NAME         "Final OMCA"
58
 #define BOARD_NAME         "Final OMCA"
59
 
59
 
60
+//
61
+// Limit Switches
62
+//
63
+#define X_STOP_PIN         0
64
+#define Y_STOP_PIN         1
65
+#define Z_STOP_PIN         2
66
+
67
+//
68
+// Steppers
69
+//
60
 #define X_STEP_PIN         26
70
 #define X_STEP_PIN         26
61
 #define X_DIR_PIN          25
71
 #define X_DIR_PIN          25
62
 #define X_ENABLE_PIN       10
72
 #define X_ENABLE_PIN       10
63
-#define X_STOP_PIN         0
64
 
73
 
65
 #define Y_STEP_PIN         28
74
 #define Y_STEP_PIN         28
66
 #define Y_DIR_PIN          27
75
 #define Y_DIR_PIN          27
67
 #define Y_ENABLE_PIN       10
76
 #define Y_ENABLE_PIN       10
68
-#define Y_STOP_PIN         1
69
 
77
 
70
 #define Z_STEP_PIN         23
78
 #define Z_STEP_PIN         23
71
 #define Z_DIR_PIN          22
79
 #define Z_DIR_PIN          22
72
 #define Z_ENABLE_PIN       10
80
 #define Z_ENABLE_PIN       10
73
-#define Z_STOP_PIN         2
74
 
81
 
75
 #define E0_STEP_PIN        24
82
 #define E0_STEP_PIN        24
76
 #define E0_DIR_PIN         21
83
 #define E0_DIR_PIN         21
77
 #define E0_ENABLE_PIN      10
84
 #define E0_ENABLE_PIN      10
78
 
85
 
79
-// future proofing
80
-#define __FS  20
81
-#define __FD  19
82
-#define __GS  18
83
-#define __GD  13
84
-
85
-#define UNUSED_PWM         14 // PWM on LEFT connector
86
-
87
 #define E1_STEP_PIN        -1 // 21
86
 #define E1_STEP_PIN        -1 // 21
88
 #define E1_DIR_PIN         -1 // 20
87
 #define E1_DIR_PIN         -1 // 20
89
 #define E1_ENABLE_PIN      -1 // 19
88
 #define E1_ENABLE_PIN      -1 // 19
92
 #define E2_DIR_PIN         -1 // 20
91
 #define E2_DIR_PIN         -1 // 20
93
 #define E2_ENABLE_PIN      -1 // 18
92
 #define E2_ENABLE_PIN      -1 // 18
94
 
93
 
95
-#define SDSS               11
96
-#define FAN_PIN            14 // PWM on MIDDLE connector
94
+//
95
+// Temperature Sensors
96
+//
97
+#define TEMP_0_PIN          0   // Analog Input
98
+#define TEMP_1_PIN          1   // Analog Input
99
+#define TEMP_BED_PIN        2   // Analog Input (1,2 or I2C)
97
 
100
 
101
+//
102
+// Heaters / Fans
103
+//
98
 #define HEATER_0_PIN        3 // DONE PWM on RIGHT connector
104
 #define HEATER_0_PIN        3 // DONE PWM on RIGHT connector
99
 #define HEATER_BED_PIN      4
105
 #define HEATER_BED_PIN      4
100
 
106
 
101
-#define TEMP_0_PIN          0   // Analog Input
102
-#define TEMP_1_PIN          1   // Analog Input
103
-#define TEMP_BED_PIN        2   // Analog Input (1,2 or I2C)
107
+#define FAN_PIN            14 // PWM on MIDDLE connector
108
+
109
+//
110
+// Misc. Functions
111
+//
112
+#define SDSS               11
104
 
113
 
105
 #define I2C_SCL            16
114
 #define I2C_SCL            16
106
 #define I2C_SDA            17
115
 #define I2C_SDA            17
107
 
116
 
117
+// future proofing
118
+#define __FS  20
119
+#define __FD  19
120
+#define __GS  18
121
+#define __GD  13
122
+
123
+#define UNUSED_PWM         14 // PWM on LEFT connector

+ 4
- 0
Marlin/pins_OMCA_A.h Переглянути файл

99
 // Heaters / Fans
99
 // Heaters / Fans
100
 //
100
 //
101
 #define HEATER_0_PIN        4
101
 #define HEATER_0_PIN        4
102
+
102
 #define FAN_PIN             3
103
 #define FAN_PIN             3
103
 
104
 
105
+//
106
+// Misc. Functions
107
+//
104
 #define SDSS               11
108
 #define SDSS               11
105
 
109
 
106
 /*  Unused (1) (2) (3) 4 5 6 7 8 9 10 11 12 13 (14) (15) (16) 17 (18) (19) (20) (21) (22) (23) 24 (25) (26) (27) 28 (29) (30) (31)  */
110
 /*  Unused (1) (2) (3) 4 5 6 7 8 9 10 11 12 13 (14) (15) (16) 17 (18) (19) (20) (21) (22) (23) 24 (25) (26) (27) 28 (29) (30) (31)  */

+ 45
- 30
Marlin/pins_PRINTRBOARD.h Переглянути файл

43
 // Disable JTAG pins so they can be used for the Extrudrboard
43
 // Disable JTAG pins so they can be used for the Extrudrboard
44
 #define DISABLE_JTAG       true
44
 #define DISABLE_JTAG       true
45
 
45
 
46
+//
47
+// Limit Switches
48
+//
49
+#define X_STOP_PIN         35
50
+#if ENABLED(SDSUPPORT)
51
+  #define Y_STOP_PIN       37 // Move Ystop to Estop socket
52
+#else
53
+  #define Y_STOP_PIN        8 // Ystop in Ystop socket
54
+#endif
55
+#define Z_STOP_PIN         36
56
+
57
+//
58
+// Steppers
59
+//
46
 #define X_STEP_PIN          0
60
 #define X_STEP_PIN          0
47
 #define X_DIR_PIN           1
61
 #define X_DIR_PIN           1
48
 #define X_ENABLE_PIN       39
62
 #define X_ENABLE_PIN       39
59
 #define E0_DIR_PIN          7
73
 #define E0_DIR_PIN          7
60
 #define E0_ENABLE_PIN      19
74
 #define E0_ENABLE_PIN      19
61
 
75
 
62
-#define HEATER_0_PIN       21  // Extruder
76
+//
77
+// Temperature Sensors
78
+//
79
+#define TEMP_0_PIN          1   // Analog Input
80
+#define TEMP_BED_PIN        0   // Analog Input
81
+
82
+//
83
+// Heaters / Fans
84
+//
85
+#define HEATER_0_PIN       21 // Extruder
63
 #define HEATER_1_PIN       46
86
 #define HEATER_1_PIN       46
64
 #define HEATER_2_PIN       47
87
 #define HEATER_2_PIN       47
65
 #define HEATER_BED_PIN     20
88
 #define HEATER_BED_PIN     20
72
   #define FAN_PIN          16
95
   #define FAN_PIN          16
73
 #endif
96
 #endif
74
 
97
 
75
-#define X_STOP_PIN         35
76
-#if ENABLED(SDSUPPORT)
77
-  #define Y_STOP_PIN       37 // Move Ystop to Estop socket
78
-#else
79
-  #define Y_STOP_PIN        8 // Ystop in Ystop socket
80
-#endif
81
-#define Z_STOP_PIN         36
82
-
83
-#define TEMP_0_PIN          1   // Analog Input
84
-#define TEMP_BED_PIN        0   // Analog Input
85
-
86
-#define FILWIDTH_PIN        2   // Analog Input
87
-
88
-////LCD Pin Setup////
89
-
98
+//
99
+// Misc. Functions
100
+//
90
 #define SDSS               26
101
 #define SDSS               26
102
+#define FILWIDTH_PIN        2   // Analog Input
91
 
103
 
104
+//
105
+// LCD / Controller
106
+//
92
 #if ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL)
107
 #if ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL)
93
-  //we have no buzzer installed
108
+  // we have no buzzer installed
94
   #define BEEPER_PIN -1
109
   #define BEEPER_PIN -1
95
 
110
 
96
-  //LCD Pins
111
+  // LCD Pins
97
   #if ENABLED(LCD_I2C_PANELOLU2)
112
   #if ENABLED(LCD_I2C_PANELOLU2)
98
-    #define BTN_EN1 27  //RX1 - fastio.h pin mapping 27
99
-    #define BTN_EN2 26  //TX1 - fastio.h pin mapping 26
100
-    #define BTN_ENC 43 //A3 - fastio.h pin mapping 43
101
-    #define SDSS   40 //use SD card on Panelolu2 (Teensyduino pin mapping)
113
+    #define BTN_EN1 27 // RX1 - fastio.h pin mapping 27
114
+    #define BTN_EN2 26 // TX1 - fastio.h pin mapping 26
115
+    #define BTN_ENC 43 // A3 - fastio.h pin mapping 43
116
+    #define SDSS    40 // use SD card on Panelolu2 (Teensyduino pin mapping)
102
   #else
117
   #else
103
     #define BTN_EN1 16
118
     #define BTN_EN1 16
104
     #define BTN_EN2 17
119
     #define BTN_EN2 17
105
-    #define BTN_ENC 18//the click
120
+    #define BTN_ENC 18 // the click
106
   #endif // LCD_I2C_PANELOLU2
121
   #endif // LCD_I2C_PANELOLU2
107
 
122
 
108
-  //not connected to a pin
123
+  // not connected to a pin
109
   #define SD_DETECT_PIN -1
124
   #define SD_DETECT_PIN -1
110
 
125
 
111
   #define LCD_PINS_RS 9
126
   #define LCD_PINS_RS 9
118
 #endif // ULTRA_LCD && NEWPANEL
133
 #endif // ULTRA_LCD && NEWPANEL
119
 
134
 
120
 #if ENABLED(VIKI2) || ENABLED(miniVIKI)
135
 #if ENABLED(VIKI2) || ENABLED(miniVIKI)
121
-  //FastIO
136
+  // FastIO
122
   #define BEEPER_PIN 32
137
   #define BEEPER_PIN 32
123
   // Pins for DOGM SPI LCD Support
138
   // Pins for DOGM SPI LCD Support
124
-  #define DOGLCD_A0  42 //Non-FastIO
125
-  #define DOGLCD_CS  43 //Non-FastIO
139
+  #define DOGLCD_A0  42 // Non-FastIO
140
+  #define DOGLCD_CS  43 // Non-FastIO
126
   #define LCD_SCREEN_ROT_180
141
   #define LCD_SCREEN_ROT_180
127
 
142
 
128
-  //The encoder and click button (FastIO Pins)
143
+  // The encoder and click button (FastIO Pins)
129
   #define BTN_EN1 26
144
   #define BTN_EN1 26
130
   #define BTN_EN2 27
145
   #define BTN_EN2 27
131
   #define BTN_ENC 47
146
   #define BTN_ENC 47
133
   #define SDSS 45
148
   #define SDSS 45
134
   #define SD_DETECT_PIN -1 // FastIO (Manual says 72 I'm not certain cause I can't test)
149
   #define SD_DETECT_PIN -1 // FastIO (Manual says 72 I'm not certain cause I can't test)
135
 
150
 
136
-  #define STAT_LED_RED_PIN  12 //Non-FastIO
137
-  #define STAT_LED_BLUE_PIN 10 //Non-FastIO
151
+  #define STAT_LED_RED_PIN  12 // Non-FastIO
152
+  #define STAT_LED_BLUE_PIN 10 // Non-FastIO
138
 
153
 
139
 #endif
154
 #endif

+ 46
- 31
Marlin/pins_PRINTRBOARD_REVF.h Переглянути файл

38
 #define BOARD_NAME         "Printrboard Rev F"
38
 #define BOARD_NAME         "Printrboard Rev F"
39
 #define LARGE_FLASH        true
39
 #define LARGE_FLASH        true
40
 
40
 
41
+//
42
+// Limit Switches
43
+//
44
+#define X_STOP_PIN         35
45
+#define Y_STOP_PIN         12
46
+#define Z_STOP_PIN         36
47
+
48
+//
49
+// Steppers
50
+//
41
 #define X_STEP_PIN          0
51
 #define X_STEP_PIN          0
42
 #define X_DIR_PIN           1
52
 #define X_DIR_PIN           1
43
 #define X_ENABLE_PIN       39
53
 #define X_ENABLE_PIN       39
54
 #define E0_DIR_PIN          7
64
 #define E0_DIR_PIN          7
55
 #define E0_ENABLE_PIN      19
65
 #define E0_ENABLE_PIN      19
56
 
66
 
57
-#define HEATER_0_PIN       21  // Extruder
67
+// uncomment to enable an I2C based DAC like on the Printrboard REVF
68
+#define DAC_STEPPER_CURRENT
69
+// Number of channels available for DAC, For Printrboar REVF there are 4
70
+#define DAC_STEPPER_ORDER { 3, 2, 1, 0 }
71
+
72
+#define DAC_STEPPER_SENSE    0.11
73
+#define DAC_STEPPER_ADDRESS  0
74
+#define DAC_STEPPER_MAX   3520
75
+#define DAC_STEPPER_VREF     1 // internal Vref, gain 1x = 2.048V
76
+#define DAC_STEPPER_GAIN     0
77
+#define DAC_OR_ADDRESS    0x00
78
+
79
+//
80
+// Temperature Sensors
81
+//
82
+#define TEMP_0_PIN          1   // Analog Input (Extruder)
83
+#define TEMP_BED_PIN        0   // Analog Input (Bed)
84
+
85
+//
86
+// Heaters / Fans
87
+//
88
+#define HEATER_0_PIN       21 // Extruder
58
 #define HEATER_1_PIN       46
89
 #define HEATER_1_PIN       46
59
 #define HEATER_2_PIN       47
90
 #define HEATER_2_PIN       47
60
 #define HEATER_BED_PIN     20
91
 #define HEATER_BED_PIN     20
67
   #define FAN_PIN          16
98
   #define FAN_PIN          16
68
 #endif
99
 #endif
69
 
100
 
70
-#define X_STOP_PIN         35
71
-#define Y_STOP_PIN         12
72
-#define Z_STOP_PIN         36
73
-
74
-#define TEMP_0_PIN          1  // Extruder / Analog pin numbering
75
-#define TEMP_BED_PIN        0  // Bed / Analog pin numbering
76
-
77
-#define FILWIDTH_PIN        2  // ANALOG NUMBERING
78
-
79
-////LCD Pin Setup////
80
-
101
+//
102
+// Misc. Functions
103
+//
81
 #define SDSS               20 // Teensylu pin mapping
104
 #define SDSS               20 // Teensylu pin mapping
105
+#define FILWIDTH_PIN        2 // Analog Input
82
 
106
 
83
-// uncomment to enable an I2C based DAC like on the Printrboard REVF
84
-#define DAC_STEPPER_CURRENT
85
-// Number of channels available for DAC, For Printrboar REVF there are 4
86
-#define DAC_STEPPER_ORDER { 3, 2, 1, 0 }
87
-
88
-#define DAC_STEPPER_SENSE    0.11
89
-#define DAC_STEPPER_ADDRESS  0
90
-#define DAC_STEPPER_MAX   3520
91
-#define DAC_STEPPER_VREF     1 //internal Vref, gain 1x = 2.048V
92
-#define DAC_STEPPER_GAIN     0
93
-#define DAC_OR_ADDRESS    0x00
94
-
107
+//
108
+// LCD / Controller
109
+//
95
 #if ENABLED(ULTRA_LCD)
110
 #if ENABLED(ULTRA_LCD)
96
   #define BEEPER_PIN -1
111
   #define BEEPER_PIN -1
97
 
112
 
104
 
119
 
105
   #define BTN_EN1   16
120
   #define BTN_EN1   16
106
   #define BTN_EN2   17
121
   #define BTN_EN2   17
107
-  #define BTN_ENC   18//the click
122
+  #define BTN_ENC   18 // the click
108
 
123
 
109
   #define SD_DETECT_PIN -1
124
   #define SD_DETECT_PIN -1
110
 
125
 
111
-  //encoder rotation values
126
+  // encoder rotation values
112
   #define encrot0 0
127
   #define encrot0 0
113
   #define encrot1 2
128
   #define encrot1 2
114
   #define encrot2 3
129
   #define encrot2 3
116
 #endif
131
 #endif
117
 
132
 
118
 #if ENABLED(VIKI2) || ENABLED(miniVIKI)
133
 #if ENABLED(VIKI2) || ENABLED(miniVIKI)
119
-  #define BEEPER_PIN 32 //FastIO
120
-  #define DOGLCD_A0  42 //Non-FastIO
121
-  #define DOGLCD_CS  43 //Non-FastIO
134
+  #define BEEPER_PIN 32 // FastIO
135
+  #define DOGLCD_A0  42 // Non-FastIO
136
+  #define DOGLCD_CS  43 // Non-FastIO
122
   #define LCD_SCREEN_ROT_180
137
   #define LCD_SCREEN_ROT_180
123
 
138
 
124
   // (FastIO Pins)
139
   // (FastIO Pins)
129
   #define SDSS 45
144
   #define SDSS 45
130
   #define SD_DETECT_PIN -1 // FastIO (Manual says 72)
145
   #define SD_DETECT_PIN -1 // FastIO (Manual says 72)
131
 
146
 
132
-  #define STAT_LED_RED_PIN 12 //Non-FastIO
133
-  #define STAT_LED_BLUE_PIN 10 //Non-FastIO
147
+  #define STAT_LED_RED_PIN  12 // Non-FastIO
148
+  #define STAT_LED_BLUE_PIN 10 // Non-FastIO
134
 #endif
149
 #endif

+ 29
- 24
Marlin/pins_RAMBO.h Переглянути файл

56
 #define SERVO2_PIN         24 // Motor header MX3
56
 #define SERVO2_PIN         24 // Motor header MX3
57
 #define SERVO3_PIN          5 // PWM header pin 5
57
 #define SERVO3_PIN          5 // PWM header pin 5
58
 
58
 
59
+//
60
+// Z Probe (when not Z_MIN_PIN)
61
+//
62
+#ifndef Z_MIN_PROBE_PIN
63
+  #define Z_MIN_PROBE_PIN  30
64
+#endif
65
+
59
 #if ENABLED(Z_PROBE_SLED)
66
 #if ENABLED(Z_PROBE_SLED)
60
   #define SLED_PIN         -1
67
   #define SLED_PIN         -1
61
 #endif
68
 #endif
71
 #define Z_MAX_PIN          30
78
 #define Z_MAX_PIN          30
72
 
79
 
73
 //
80
 //
74
-// Z Probe (when not Z_MIN_PIN)
75
-//
76
-#ifndef Z_MIN_PROBE_PIN
77
-  #define Z_MIN_PROBE_PIN  30
78
-#endif
79
-
80
-//
81
 // Steppers
81
 // Steppers
82
 //
82
 //
83
 #define X_STEP_PIN         37
83
 #define X_STEP_PIN         37
84
 #define X_DIR_PIN          48
84
 #define X_DIR_PIN          48
85
 #define X_ENABLE_PIN       29
85
 #define X_ENABLE_PIN       29
86
-#define X_MS1_PIN          40
87
-#define X_MS2_PIN          41
88
 
86
 
89
 #define Y_STEP_PIN         36
87
 #define Y_STEP_PIN         36
90
 #define Y_DIR_PIN          49
88
 #define Y_DIR_PIN          49
91
 #define Y_ENABLE_PIN       28
89
 #define Y_ENABLE_PIN       28
92
-#define Y_MS1_PIN          69
93
-#define Y_MS2_PIN          39
94
 
90
 
95
 #define Z_STEP_PIN         35
91
 #define Z_STEP_PIN         35
96
 #define Z_DIR_PIN          47
92
 #define Z_DIR_PIN          47
97
 #define Z_ENABLE_PIN       27
93
 #define Z_ENABLE_PIN       27
98
-#define Z_MS1_PIN          68
99
-#define Z_MS2_PIN          67
100
 
94
 
101
 #define E0_STEP_PIN        34
95
 #define E0_STEP_PIN        34
102
 #define E0_DIR_PIN         43
96
 #define E0_DIR_PIN         43
103
 #define E0_ENABLE_PIN      26
97
 #define E0_ENABLE_PIN      26
104
-#define E0_MS1_PIN         65
105
-#define E0_MS2_PIN         66
106
 
98
 
107
 #define E1_STEP_PIN        33
99
 #define E1_STEP_PIN        33
108
 #define E1_DIR_PIN         42
100
 #define E1_DIR_PIN         42
109
 #define E1_ENABLE_PIN      25
101
 #define E1_ENABLE_PIN      25
102
+
103
+// Microstepping pins - Mapping not from fastio.h (?)
104
+#define X_MS1_PIN          40
105
+#define X_MS2_PIN          41
106
+#define Y_MS1_PIN          69
107
+#define Y_MS2_PIN          39
108
+#define Z_MS1_PIN          68
109
+#define Z_MS2_PIN          67
110
+#define E0_MS1_PIN         65
111
+#define E0_MS2_PIN         66
110
 #define E1_MS1_PIN         63
112
 #define E1_MS1_PIN         63
111
 #define E1_MS2_PIN         64
113
 #define E1_MS2_PIN         64
112
 
114
 
116
 //
118
 //
117
 // Temperature Sensors
119
 // Temperature Sensors
118
 //
120
 //
119
-#define TEMP_0_PIN          0
120
-#define TEMP_1_PIN          1
121
-#define TEMP_BED_PIN        2
121
+#define TEMP_0_PIN          0   // Analog Input
122
+#define TEMP_1_PIN          1   // Analog Input
123
+#define TEMP_BED_PIN        2   // Analog Input
122
 
124
 
123
 //
125
 //
124
 // Heaters / Fans
126
 // Heaters / Fans
137
 //
139
 //
138
 #define SDSS               53
140
 #define SDSS               53
139
 #define LED_PIN            13
141
 #define LED_PIN            13
140
-#define FILWIDTH_PIN        3  // ANALOG NUMBERING
142
+#define FILWIDTH_PIN        3   // Analog Input
141
 #define PS_ON_PIN           4
143
 #define PS_ON_PIN           4
142
 
144
 
145
+//
146
+// LCD / Controller
147
+//
143
 #if ENABLED(ULTRA_LCD)
148
 #if ENABLED(ULTRA_LCD)
144
 
149
 
145
   #define KILL_PIN 80
150
   #define KILL_PIN 80
155
 
160
 
156
     #if ENABLED(VIKI2) || ENABLED(miniVIKI)
161
     #if ENABLED(VIKI2) || ENABLED(miniVIKI)
157
       #define BEEPER_PIN 44
162
       #define BEEPER_PIN 44
158
-      //NB: Panucatt's Viki 2.0 wiring diagram (v1.2) indicates that the
159
-      //    beeper/buzzer is connected to pin 33; however, the pin used in the
160
-      //    diagram is actually pin 44, so this is correct.
163
+      // NB: Panucatt's Viki 2.0 wiring diagram (v1.2) indicates that the
164
+      //     beeper/buzzer is connected to pin 33; however, the pin used in the
165
+      //     diagram is actually pin 44, so this is correct.
161
 
166
 
162
       #define DOGLCD_A0  70
167
       #define DOGLCD_A0  70
163
       #define DOGLCD_CS  71
168
       #define DOGLCD_CS  71
185
 
190
 
186
     #endif // VIKI2/miniVIKI
191
     #endif // VIKI2/miniVIKI
187
 
192
 
188
-  #else //!NEWPANEL - old style panel with shift register
193
+  #else // !NEWPANEL - old style panel with shift register
189
 
194
 
190
     // No Beeper added
195
     // No Beeper added
191
     #define BEEPER_PIN 33
196
     #define BEEPER_PIN 33
192
 
197
 
193
-    //buttons are attached to a shift register
198
+    // buttons are attached to a shift register
194
     // Not wired yet
199
     // Not wired yet
195
     //#define SHIFT_CLK 38
200
     //#define SHIFT_CLK 38
196
     //#define SHIFT_LD 42
201
     //#define SHIFT_LD 42

+ 30
- 29
Marlin/pins_RAMPS.h Переглянути файл

85
   #define Z_MIN_PROBE_PIN  32
85
   #define Z_MIN_PROBE_PIN  32
86
 #endif
86
 #endif
87
 
87
 
88
+#define SLED_PIN           -1
89
+
88
 //
90
 //
89
 // Steppers
91
 // Steppers
90
 //
92
 //
111
 //
113
 //
112
 // Temperature Sensors
114
 // Temperature Sensors
113
 //
115
 //
114
-#define TEMP_0_PIN         13   // ANALOG NUMBERING
115
-#define TEMP_1_PIN         15   // ANALOG NUMBERING
116
-#define TEMP_BED_PIN       14   // ANALOG NUMBERING
116
+#define TEMP_0_PIN         13   // Analog Input
117
+#define TEMP_1_PIN         15   // Analog Input
118
+#define TEMP_BED_PIN       14   // Analog Input
117
 
119
 
118
-//
119
-// Misc. Functions
120
-//
121
-#define SDSS               53
122
-#define LED_PIN            13
123
-
124
-// Use the RAMPS 1.4 Analog input 5 on the AUX2 connector
125
-#define FILWIDTH_PIN        5 // ANALOG NUMBERING
126
-
127
-// define digital pin 4 for the filament runout sensor. Use the RAMPS 1.4 digital input 4 on the servos connector
128
-#define FIL_RUNOUT_PIN      4
129
-
130
-#define PS_ON_PIN          12
131
-#define SLED_PIN           -1
120
+// SPI for Max6675 or Max31855 Thermocouple
121
+#if DISABLED(SDSUPPORT)
122
+  #define MAX6675_SS       66 // Do not use pin 53 if there is even the remote possibility of using Display/SD card
123
+#else
124
+  #define MAX6675_SS       66 // Do not use pin 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
125
+#endif
132
 
126
 
133
 //
127
 //
134
 // Augmentation for auto-assigning RAMPS plugs
128
 // Augmentation for auto-assigning RAMPS plugs
194
 #endif
188
 #endif
195
 
189
 
196
 //
190
 //
191
+// Misc. Functions
192
+//
193
+#define SDSS               53
194
+#define LED_PIN            13
195
+
196
+// Use the RAMPS 1.4 Analog input 5 on the AUX2 connector
197
+#define FILWIDTH_PIN        5   // Analog Input
198
+
199
+// define digital pin 4 for the filament runout sensor. Use the RAMPS 1.4 digital input 4 on the servos connector
200
+#define FIL_RUNOUT_PIN      4
201
+
202
+#define PS_ON_PIN          12
203
+
204
+//
197
 // LCD / Controller
205
 // LCD / Controller
198
 //
206
 //
199
 #if ENABLED(ULTRA_LCD)
207
 #if ENABLED(ULTRA_LCD)
200
 
208
 
201
   #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
209
   #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
202
-    #define LCD_PINS_RS     49 //CS chip select /SS chip slave select
203
-    #define LCD_PINS_ENABLE 51 //SID (MOSI)
204
-    #define LCD_PINS_D4     52 //SCK (CLK) clock
210
+    #define LCD_PINS_RS     49 // CS chip select /SS chip slave select
211
+    #define LCD_PINS_ENABLE 51 // SID (MOSI)
212
+    #define LCD_PINS_D4     52 // SCK (CLK) clock
205
   #elif ENABLED(NEWPANEL) && ENABLED(PANEL_ONE)
213
   #elif ENABLED(NEWPANEL) && ENABLED(PANEL_ONE)
206
     #define LCD_PINS_RS 40
214
     #define LCD_PINS_RS 40
207
     #define LCD_PINS_ENABLE 42
215
     #define LCD_PINS_ENABLE 42
309
       //#define LCD_SCREEN_ROT_90
317
       //#define LCD_SCREEN_ROT_90
310
       //#define LCD_SCREEN_ROT_180
318
       //#define LCD_SCREEN_ROT_180
311
       //#define LCD_SCREEN_ROT_270
319
       //#define LCD_SCREEN_ROT_270
312
-      //The encoder and click button
320
+      // The encoder and click button
313
       #define BTN_EN1 40
321
       #define BTN_EN1 40
314
       #define BTN_EN2 63
322
       #define BTN_EN2 63
315
       #define BTN_ENC 59
323
       #define BTN_ENC 59
316
-      //not connected to a pin
324
+      // not connected to a pin
317
       #define SD_DETECT_PIN 49
325
       #define SD_DETECT_PIN 49
318
 
326
 
319
     #else
327
     #else
350
   #endif // NEWPANEL
358
   #endif // NEWPANEL
351
 
359
 
352
 #endif // ULTRA_LCD
360
 #endif // ULTRA_LCD
353
-
354
-// SPI for Max6675 or Max31855 Thermocouple
355
-#if DISABLED(SDSUPPORT)
356
-  #define MAX6675_SS       66 // Do not use pin 53 if there is even the remote possibility of using Display/SD card
357
-#else
358
-  #define MAX6675_SS       66 // Do not use pin 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
359
-#endif

+ 15
- 15
Marlin/pins_RAMPS_OLD.h Переглянути файл

70
 #define E0_ENABLE_PIN      30
70
 #define E0_ENABLE_PIN      30
71
 
71
 
72
 //
72
 //
73
-// Misc. Functions
74
-//
75
-#define SDPOWER            48
76
-#define SDSS               53
77
-#define LED_PIN            13
78
-
79
-//
80
 // Temperature Sensors
73
 // Temperature Sensors
81
 //
74
 //
82
-#define TEMP_0_PIN          2    // MUST USE ANALOG INPUT NUMBERING NOT DIGITAL OUTPUT NUMBERING!!!!!!!!!
83
-#define TEMP_BED_PIN        1    // MUST USE ANALOG INPUT NUMBERING NOT DIGITAL OUTPUT NUMBERING!!!!!!!!!
75
+#define TEMP_0_PIN          2   // Analog Input
76
+#define TEMP_BED_PIN        1   // Analog Input
77
+
78
+// SPI for Max6675 or Max31855 Thermocouple
79
+#if DISABLED(SDSUPPORT)
80
+  #define MAX6675_SS       66 // Do not use pin 53 if there is even the remote possibility of using Display/SD card
81
+#else
82
+  #define MAX6675_SS       66 // Do not use pin 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
83
+#endif
84
 
84
 
85
 //
85
 //
86
 // Heaters / Fans
86
 // Heaters / Fans
95
   #define FAN_PIN           9
95
   #define FAN_PIN           9
96
 #endif
96
 #endif
97
 
97
 
98
-// SPI for Max6675 or Max31855 Thermocouple
99
-#if DISABLED(SDSUPPORT)
100
-  #define MAX6675_SS       66// Do not use pin 53 if there is even the remote possibility of using Display/SD card
101
-#else
102
-  #define MAX6675_SS       66// Do not use pin 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
103
-#endif
98
+//
99
+// Misc. Functions
100
+//
101
+#define SDPOWER            48
102
+#define SDSS               53
103
+#define LED_PIN            13

+ 59
- 43
Marlin/pins_RIGIDBOARD.h Переглянути файл

26
 
26
 
27
 #define BOARD_NAME "RigidBoard"
27
 #define BOARD_NAME "RigidBoard"
28
 
28
 
29
-#define RAMPS_D10_PIN       9    // EXTRUDER 1
30
-#define MOSFET_D_PIN       12    // EXTRUDER 2 or FAN
29
+//
30
+// Z Probe (when not Z_MIN_PIN)
31
+//
31
 #ifndef Z_MIN_PROBE_PIN
32
 #ifndef Z_MIN_PROBE_PIN
32
   #define Z_MIN_PROBE_PIN  19    // Z-MAX pin J14 End Stops
33
   #define Z_MIN_PROBE_PIN  19    // Z-MAX pin J14 End Stops
33
 #endif
34
 #endif
34
 
35
 
35
 #include "pins_RAMPS.h"
36
 #include "pins_RAMPS.h"
36
 
37
 
38
+//
39
+// Steppers
40
+//
41
+// RigidBot swaps E0 / E1 plugs vs RAMPS 1.3
42
+#undef E0_STEP_PIN
43
+#undef E0_DIR_PIN
44
+#undef E0_ENABLE_PIN
45
+#define E0_STEP_PIN        36
46
+#define E0_DIR_PIN         34
47
+#define E0_ENABLE_PIN      30
48
+
49
+#undef E1_STEP_PIN
50
+#undef E1_DIR_PIN
51
+#undef E1_ENABLE_PIN
52
+#define E1_STEP_PIN        26
53
+#define E1_DIR_PIN         28
54
+#define E1_ENABLE_PIN      24
55
+
56
+#define STEPPER_RESET_PIN  41   // Stepper drivers have a reset on RigidBot
57
+
58
+//
59
+// Temperature Sensors
60
+//
37
 #undef TEMP_0_PIN
61
 #undef TEMP_0_PIN
38
 #undef TEMP_1_PIN
62
 #undef TEMP_1_PIN
39
-#define TEMP_0_PIN         14   // ANALOG NUMBERING
40
-#define TEMP_1_PIN         13   // ANALOG NUMBERING
63
+#undef TEMP_BED_PIN
64
+#define TEMP_0_PIN         14   // Analog Input
65
+#define TEMP_1_PIN         13   // Analog Input
66
+#define TEMP_BED_PIN       15   // Analog Input
41
 
67
 
42
-// LCD Panel options for the RigidBoard
68
+// SPI for Max6675 or Max31855 Thermocouple
69
+#undef MAX6675_SS
70
+#if DISABLED(SDSUPPORT)
71
+  #define MAX6675_SS       53 // Don't use pin 53 if there is even the remote possibility of using Display/SD card
72
+#else
73
+  #define MAX6675_SS       49 // Don't use pin 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
74
+#endif
75
+
76
+//
77
+// Heaters / Fans
78
+//
79
+#define RAMPS_D10_PIN       9 // EXTRUDER 1
80
+#define MOSFET_D_PIN       12 // EXTRUDER 2 or FAN
43
 
81
 
82
+#undef  HEATER_BED_PIN
83
+#define HEATER_BED_PIN     10
84
+
85
+#undef  FAN_PIN
86
+#define FAN_PIN             8 // Same as RAMPS_13_EEF
87
+
88
+//
89
+// Misc. Functions
90
+//
91
+#undef  PS_ON_PIN
92
+#define PS_ON_PIN          -1
93
+
94
+//
95
+// LCD / Controller
96
+//
97
+// LCD Panel options for the RigidBoard
44
 #if ENABLED(RIGIDBOT_PANEL)
98
 #if ENABLED(RIGIDBOT_PANEL)
45
 
99
 
46
   #undef BEEPER_PIN
100
   #undef BEEPER_PIN
77
   #define KILL_PIN 32
131
   #define KILL_PIN 32
78
 
132
 
79
 #endif
133
 #endif
80
-
81
-// SPI for Max6675 or Max31855 Thermocouple
82
-#undef MAX6675_SS
83
-#if ENABLED(SDSUPPORT)
84
-  #define MAX6675_SS       49 // Don't use pin 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
85
-#else
86
-  #define MAX6675_SS       53 // Don't use pin 53 if there is even the remote possibility of using Display/SD card
87
-#endif
88
-
89
-// RigidBot swaps E0 / E1 plugs vs RAMPS 1.3
90
-
91
-#undef E0_STEP_PIN
92
-#undef E0_DIR_PIN
93
-#undef E0_ENABLE_PIN
94
-#define E0_STEP_PIN        36
95
-#define E0_DIR_PIN         34
96
-#define E0_ENABLE_PIN      30
97
-
98
-#undef E1_STEP_PIN
99
-#undef E1_DIR_PIN
100
-#undef E1_ENABLE_PIN
101
-#define E1_STEP_PIN        26
102
-#define E1_DIR_PIN         28
103
-#define E1_ENABLE_PIN      24
104
-
105
-#undef  FAN_PIN
106
-#define FAN_PIN             8 // Same as RAMPS_13_EEF
107
-
108
-#undef  PS_ON_PIN
109
-#define PS_ON_PIN          -1
110
-
111
-#undef  HEATER_BED_PIN
112
-#define HEATER_BED_PIN     10
113
-
114
-#undef  TEMP_BED_PIN
115
-#define TEMP_BED_PIN       15   // ANALOG NUMBERING
116
-
117
-#define STEPPER_RESET_PIN  41   // Stepper drivers have a reset on RigidBot

+ 4
- 1
Marlin/pins_RIGIDBOARD_V2.h Переглянути файл

29
 #undef BOARD_NAME
29
 #undef BOARD_NAME
30
 #define BOARD_NAME "RigidBoard V2"
30
 #define BOARD_NAME "RigidBoard V2"
31
 
31
 
32
+//
33
+// Steppers
34
+//
32
 // I2C based DAC like on the Printrboard REVF
35
 // I2C based DAC like on the Printrboard REVF
33
 #define DAC_STEPPER_CURRENT
36
 #define DAC_STEPPER_CURRENT
34
 // Channels available for DAC, For Rigidboard there are 4
37
 // Channels available for DAC, For Rigidboard there are 4
35
 #define DAC_STEPPER_ORDER { 0, 1, 2, 3 }
38
 #define DAC_STEPPER_ORDER { 0, 1, 2, 3 }
36
 
39
 
37
-#define DAC_STEPPER_SENSE    0.05 //sense resistors on rigidboard stepper chips are .05 value
40
+#define DAC_STEPPER_SENSE    0.05 // sense resistors on rigidboard stepper chips are .05 value
38
 #define DAC_STEPPER_ADDRESS  0
41
 #define DAC_STEPPER_ADDRESS  0
39
 #define DAC_STEPPER_MAX   4096 // was 5000 but max allowable value is actually 4096 
42
 #define DAC_STEPPER_MAX   4096 // was 5000 but max allowable value is actually 4096 
40
 #define DAC_STEPPER_VREF     1 // internal Vref, gain 2x = 4.096V
43
 #define DAC_STEPPER_VREF     1 // internal Vref, gain 2x = 4.096V

+ 30
- 26
Marlin/pins_RUMBA.h Переглянути файл

36
 #define BOARD_NAME           "Rumba"
36
 #define BOARD_NAME           "Rumba"
37
 
37
 
38
 //
38
 //
39
+// Servos
40
+//
41
+#define SERVO0_PIN         5
42
+
43
+//
39
 // Limit Switches
44
 // Limit Switches
40
 //
45
 //
41
 #define X_MIN_PIN          37
46
 #define X_MIN_PIN          37
80
 #define E2_ENABLE_PIN      39
85
 #define E2_ENABLE_PIN      39
81
 
86
 
82
 //
87
 //
83
-// Misc. Functions
84
-//
85
-#define LED_PIN            13
86
-
87
-#define PS_ON_PIN          45
88
-#define KILL_PIN           46
89
-
90
-//
91
 // Temperature Sensors
88
 // Temperature Sensors
92
 //
89
 //
93
 #if TEMP_SENSOR_0 == -1
90
 #if TEMP_SENSOR_0 == -1
94
-  #define TEMP_0_PIN        6   // ANALOG NUMBERING - connector *K1* on RUMBA thermocouple ADD ON is used
91
+  #define TEMP_0_PIN        6   // Analog Input (connector *K1* on RUMBA thermocouple ADD ON is used)
95
 #else
92
 #else
96
-  #define TEMP_0_PIN       15   // ANALOG NUMBERING - default connector for thermistor *T0* on rumba board is used
93
+  #define TEMP_0_PIN       15   // Analog Input (default connector for thermistor *T0* on rumba board is used)
97
 #endif
94
 #endif
98
 
95
 
99
 #if TEMP_SENSOR_1 == -1
96
 #if TEMP_SENSOR_1 == -1
100
-  #define TEMP_1_PIN        5   // ANALOG NUMBERING - connector *K2* on RUMBA thermocouple ADD ON is used
97
+  #define TEMP_1_PIN        5   // Analog Input (connector *K2* on RUMBA thermocouple ADD ON is used)
101
 #else
98
 #else
102
-  #define TEMP_1_PIN       14   // ANALOG NUMBERING - default connector for thermistor *T1* on rumba board is used
99
+  #define TEMP_1_PIN       14   // Analog Input (default connector for thermistor *T1* on rumba board is used)
103
 #endif
100
 #endif
104
 
101
 
105
 #if TEMP_SENSOR_2 == -1
102
 #if TEMP_SENSOR_2 == -1
106
-  #define TEMP_2_PIN        7   // ANALOG NUMBERING - connector *K3* on RUMBA thermocouple ADD ON is used <-- this can not be used when TEMP_SENSOR_BED is defined as thermocouple
103
+  #define TEMP_2_PIN        7   // Analog Input (connector *K3* on RUMBA thermocouple ADD ON is used <-- this can not be used when TEMP_SENSOR_BED is defined as thermocouple)
104
+#else
105
+  #define TEMP_2_PIN       13   // Analog Input (default connector for thermistor *T2* on rumba board is used)
106
+#endif
107
+
108
+// optional for extruder 4 or chamber:
109
+//#define TEMP_X_PIN         12   // Analog Input (default connector for thermistor *T3* on rumba board is used)
110
+
111
+#if TEMP_SENSOR_BED == -1
112
+  #define TEMP_BED_PIN      7   // Analog Input (connector *K3* on RUMBA thermocouple ADD ON is used <-- this can not be used when TEMP_SENSOR_2 is defined as thermocouple)
107
 #else
113
 #else
108
-  #define TEMP_2_PIN       13   // ANALOG NUMBERING - default connector for thermistor *T2* on rumba board is used
114
+  #define TEMP_BED_PIN     11   // Analog Input (default connector for thermistor *THB* on rumba board is used)
109
 #endif
115
 #endif
110
 
116
 
111
 //
117
 //
120
 #define FAN_PIN             7
126
 #define FAN_PIN             7
121
 #define FAN1_PIN            8
127
 #define FAN1_PIN            8
122
 
128
 
123
-//optional for extruder 4 or chamber:
124
-// #define TEMP_X_PIN         12   // ANALOG NUMBERING - default connector for thermistor *T3* on rumba board is used
125
-
126
-#if TEMP_SENSOR_BED == -1
127
-  #define TEMP_BED_PIN      7    // ANALOG NUMBERING - connector *K3* on RUMBA thermocouple ADD ON is used <-- this can not be used when TEMP_SENSOR_2 is defined as thermocouple
128
-#else
129
-  #define TEMP_BED_PIN     11    // ANALOG NUMBERING - default connector for thermistor *THB* on rumba board is used
130
-#endif
131
-
129
+//
130
+// Misc. Functions
131
+//
132
 #define SDSS               53
132
 #define SDSS               53
133
+#define LED_PIN            13
134
+#define PS_ON_PIN          45
135
+#define KILL_PIN           46
136
+
137
+//
138
+// LCD / Controller
139
+//
133
 #define SD_DETECT_PIN      49
140
 #define SD_DETECT_PIN      49
134
 #define BEEPER_PIN         44
141
 #define BEEPER_PIN         44
135
 #define LCD_PINS_RS        19
142
 #define LCD_PINS_RS        19
141
 #define BTN_EN1            11
148
 #define BTN_EN1            11
142
 #define BTN_EN2            12
149
 #define BTN_EN2            12
143
 #define BTN_ENC            43
150
 #define BTN_ENC            43
144
-
145
-#define SERVO0_PIN         5
146
-

+ 3
- 0
Marlin/pins_SAINSMART_2IN1.h Переглянути файл

30
 
30
 
31
 #define BOARD_NAME "Sainsmart"
31
 #define BOARD_NAME "Sainsmart"
32
 
32
 
33
+//
34
+// Heaters / Fans
35
+//
33
 #define RAMPS_D10_PIN 9 // E
36
 #define RAMPS_D10_PIN 9 // E
34
 #define RAMPS_D9_PIN  7 // F PART FAN in front of board next to Extruder heat
37
 #define RAMPS_D9_PIN  7 // F PART FAN in front of board next to Extruder heat
35
      // RAMPS_D8_PIN  8 // B
38
      // RAMPS_D8_PIN  8 // B

+ 47
- 25
Marlin/pins_SANGUINOLOLU_11.h Переглянути файл

34
 
34
 
35
 #define IS_MELZI (MB(MELZI) || MB(MELZI_MAKR3D))
35
 #define IS_MELZI (MB(MELZI) || MB(MELZI_MAKR3D))
36
 
36
 
37
+//
38
+// Limit Switches
39
+//
40
+#define X_STOP_PIN         18
41
+#define Y_STOP_PIN         19
42
+#define Z_STOP_PIN         20
43
+
44
+//
45
+// Z Probe (when not Z_MIN_PIN)
46
+//
47
+#if ENABLED(Z_PROBE_SLED)
48
+  #define SLED_PIN         -1
49
+#endif
50
+
51
+//
52
+// Steppers
53
+//
37
 #define X_STEP_PIN         15
54
 #define X_STEP_PIN         15
38
 #define X_DIR_PIN          21
55
 #define X_DIR_PIN          21
39
-#define X_STOP_PIN         18
40
 
56
 
41
 #define Y_STEP_PIN         22
57
 #define Y_STEP_PIN         22
42
 #define Y_DIR_PIN          23
58
 #define Y_DIR_PIN          23
43
-#define Y_STOP_PIN         19
44
 
59
 
45
 #define Z_STEP_PIN          3
60
 #define Z_STEP_PIN          3
46
 #define Z_DIR_PIN           2
61
 #define Z_DIR_PIN           2
47
-#define Z_STOP_PIN         20
48
 
62
 
49
 #define E0_STEP_PIN         1
63
 #define E0_STEP_PIN         1
50
 #define E0_DIR_PIN          0
64
 #define E0_DIR_PIN          0
51
 
65
 
52
-#if MB(AZTEEG_X1) || MB(STB_11) || IS_MELZI
53
-  #define FAN_PIN           4 // Works for Panelolu2 too
54
-#endif
55
-
56
-#if IS_MELZI
57
-  #define LED_PIN          27 // On some broken versions of the Sanguino libraries the pin definitions are wrong, so LED_PIN needs to be 28. But you should upgrade your Sanguino libraries! See #368.
58
-#elif MB(STB_11)
59
-  #define LCD_BACKLIGHT_PIN 17 // LCD backlight LED
60
-#endif
61
-
62
-#if ENABLED(Z_PROBE_SLED)
63
-  #define SLED_PIN         -1
64
-#endif
66
+//
67
+// Temperature Sensors
68
+//
69
+#define TEMP_0_PIN          7   // Analog Input (pin 33 extruder)
70
+#define TEMP_BED_PIN        6   // Analog Input (pin 34 bed)
65
 
71
 
72
+//
73
+// Heaters / Fans
74
+//
66
 #define HEATER_0_PIN       13 // (extruder)
75
 #define HEATER_0_PIN       13 // (extruder)
67
 
76
 
68
 #if ENABLED(SANGUINOLOLU_V_1_2)
77
 #if ENABLED(SANGUINOLOLU_V_1_2)
79
 
88
 
80
 #else
89
 #else
81
 
90
 
82
-  #define HEATER_BED_PIN   14  // (bed)
91
+  #define HEATER_BED_PIN   14 // (bed)
83
   #define X_ENABLE_PIN     -1
92
   #define X_ENABLE_PIN     -1
84
   #define Y_ENABLE_PIN     -1
93
   #define Y_ENABLE_PIN     -1
85
   #define Z_ENABLE_PIN     -1
94
   #define Z_ENABLE_PIN     -1
87
 
96
 
88
 #endif
97
 #endif
89
 
98
 
90
-#define TEMP_0_PIN          7   // MUST USE ANALOG INPUT NUMBERING NOT DIGITAL OUTPUT NUMBERING!!!!!!!!! (pin 33 extruder)
91
-#define TEMP_BED_PIN        6   // MUST USE ANALOG INPUT NUMBERING NOT DIGITAL OUTPUT NUMBERING!!!!!!!!! (pin 34 bed)
92
-#define SDSS               31
99
+#if MB(AZTEEG_X1) || MB(STB_11) || IS_MELZI
100
+  #define FAN_PIN           4 // Works for Panelolu2 too
101
+#endif
93
 
102
 
103
+//
104
+// Misc. Functions
105
+//
94
 /**
106
 /**
95
  * On some broken versions of the Sanguino libraries the pin definitions are wrong,
107
  * On some broken versions of the Sanguino libraries the pin definitions are wrong,
96
  * which then needs SDSS as pin 24. But you should upgrade your Sanguino libraries! See #368.
108
  * which then needs SDSS as pin 24. But you should upgrade your Sanguino libraries! See #368.
97
  */
109
  */
98
 //#define SDSS               24
110
 //#define SDSS               24
111
+#define SDSS               31
112
+
113
+#if IS_MELZI
114
+  #define LED_PIN          27 // On some broken versions of the Sanguino libraries the pin definitions are wrong, so LED_PIN needs to be 28. But you should upgrade your Sanguino libraries! See #368.
115
+#elif MB(STB_11)
116
+  #define LCD_BACKLIGHT_PIN 17 // LCD backlight LED
117
+#endif
99
 
118
 
119
+//
120
+// LCD / Controller
121
+//
100
 #if ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL)
122
 #if ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL)
101
 
123
 
102
   // No buzzer installed
124
   // No buzzer installed
105
   // LCD Pins
127
   // LCD Pins
106
   #if ENABLED(DOGLCD)
128
   #if ENABLED(DOGLCD)
107
 
129
 
108
-    #if ENABLED(U8GLIB_ST7920) //SPI GLCD 12864 ST7920 ( like [www.digole.com] ) For Melzi V2.0
130
+    #if ENABLED(U8GLIB_ST7920) // SPI GLCD 12864 ST7920 ( like [www.digole.com] ) For Melzi V2.0
109
 
131
 
110
       #if IS_MELZI // Melzi board
132
       #if IS_MELZI // Melzi board
111
-        #define LCD_PINS_RS     30 //CS chip select /SS chip slave select
112
-        #define LCD_PINS_ENABLE 29 //SID (MOSI)
113
-        #define LCD_PINS_D4     17 //SCK (CLK) clock
133
+        #define LCD_PINS_RS     30 // CS chip select /SS chip slave select
134
+        #define LCD_PINS_ENABLE 29 // SID (MOSI)
135
+        #define LCD_PINS_D4     17 // SCK (CLK) clock
114
         // Pin 27 is taken by LED_PIN, but Melzi LED does nothing with
136
         // Pin 27 is taken by LED_PIN, but Melzi LED does nothing with
115
         // Marlin so this can be used for BEEPER_PIN. You can use this pin
137
         // Marlin so this can be used for BEEPER_PIN. You can use this pin
116
         // with M42 instead of BEEPER_PIN.
138
         // with M42 instead of BEEPER_PIN.
162
   #else
184
   #else
163
     #define BTN_ENC             16
185
     #define BTN_ENC             16
164
     #define LCD_SDSS            28 // Smart Controller SD card reader rather than the Melzi
186
     #define LCD_SDSS            28 // Smart Controller SD card reader rather than the Melzi
165
-  #endif //Panelolu2
187
+  #endif // Panelolu2
166
 
188
 
167
   #define SD_DETECT_PIN         -1
189
   #define SD_DETECT_PIN         -1
168
 
190
 

+ 34
- 11
Marlin/pins_SAV_MKI.h Переглянути файл

38
 #define USBCON 1286  // Disable MarlinSerial etc.
38
 #define USBCON 1286  // Disable MarlinSerial etc.
39
 #define LARGE_FLASH        true
39
 #define LARGE_FLASH        true
40
 
40
 
41
+//
42
+// Servos
43
+//
44
+#define SERVO0_PIN         41 // In teensy's pin definition for pinMode (in servo.cpp)
45
+
46
+//
47
+// Limit Switches
48
+//
49
+#define X_STOP_PIN         13
50
+#define Y_STOP_PIN         14
51
+//#define Z_STOP_PIN         15
52
+#define Z_STOP_PIN         36  // For inductive sensor.
53
+
54
+//
55
+// Steppers
56
+//
41
 #define X_STEP_PIN         0
57
 #define X_STEP_PIN         0
42
 #define X_DIR_PIN          1
58
 #define X_DIR_PIN          1
43
 #define X_ENABLE_PIN       39
59
 #define X_ENABLE_PIN       39
54
 #define E0_DIR_PIN         7
70
 #define E0_DIR_PIN         7
55
 #define E0_ENABLE_PIN      19
71
 #define E0_ENABLE_PIN      19
56
 
72
 
73
+//
74
+// Temperature Sensors
75
+//
76
+#define TEMP_0_PIN          7  // Analog Input (Extruder)
77
+#define TEMP_BED_PIN        6  // Analog Input (Bed)
78
+
79
+//
80
+// Heaters / Fans
81
+//
57
 #define HEATER_0_PIN       21  // Extruder
82
 #define HEATER_0_PIN       21  // Extruder
58
 #define HEATER_BED_PIN     20  // Bed
83
 #define HEATER_BED_PIN     20  // Bed
59
-#define FAN_PIN            16  // Fan   -- from Teensyduino environment.
60
-                               // For the fan and Teensyduino uses a different pin mapping.
61
-#define X_STOP_PIN         13
62
-#define Y_STOP_PIN         14
63
-//#define Z_STOP_PIN         15
64
-#define Z_STOP_PIN         36  // For inductive sensor.
65
 
84
 
66
-#define TEMP_0_PIN          7  // Extruder / Analog pin numbering
67
-#define TEMP_BED_PIN        6  // Bed / Analog pin numbering
85
+#define FAN_PIN            16  // Fan -- from Teensyduino environment.
86
+                               // For the fan and Teensyduino uses a different pin mapping.
68
 
87
 
69
-#define SDSS               20         // PB0 - 8 in marlin env.
88
+//
89
+// Misc. Functions
90
+//
91
+#define SDSS               20  // PB0 - 8 in marlin env.
70
 
92
 
71
 // Extension header pin mapping
93
 // Extension header pin mapping
72
 // ----------------------------
94
 // ----------------------------
94
 #define EXT_AUX_A4_IO             44 // Digital IO, 42 (teensy), 44 (marlin)
116
 #define EXT_AUX_A4_IO             44 // Digital IO, 42 (teensy), 44 (marlin)
95
 
117
 
96
 
118
 
119
+//
120
+// LCD / Controller
121
+//
97
 #define BEEPER_PIN         -1
122
 #define BEEPER_PIN         -1
98
 #define LCD_PINS_RS        -1
123
 #define LCD_PINS_RS        -1
99
 #define LCD_PINS_ENABLE    -1
124
 #define LCD_PINS_ENABLE    -1
116
   #define KILL_PIN           EXT_AUX_A2_IO
141
   #define KILL_PIN           EXT_AUX_A2_IO
117
   #define HOME_PIN           EXT_AUX_A4_IO
142
   #define HOME_PIN           EXT_AUX_A4_IO
118
 #endif // SAV_3DLCD || SAV_3DGLCD
143
 #endif // SAV_3DLCD || SAV_3DGLCD
119
-
120
-#define SERVO0_PIN         41 // In teensy's pin definition for pinMode (in servo.cpp)

+ 9
- 6
Marlin/pins_SETHI.h Переглянути файл

64
 //
64
 //
65
 // Temperature Sensors
65
 // Temperature Sensors
66
 //
66
 //
67
-#define TEMP_0_PIN          1
68
-#define TEMP_BED_PIN        2
67
+#define TEMP_0_PIN          1   // Analog Input
68
+#define TEMP_BED_PIN        2   // Analog Input
69
 
69
 
70
 //
70
 //
71
 // Heaters / Fans
71
 // Heaters / Fans
81
   #define FAN_PIN          31
81
   #define FAN_PIN          31
82
 #endif
82
 #endif
83
 
83
 
84
+//
85
+// Misc. Functions
86
+//
84
 #define PS_ON_PIN          15
87
 #define PS_ON_PIN          15
85
 
88
 
86
-//All these generations of Gen7 supply thermistor power
87
-//via PS_ON, so ignore bad thermistor readings
89
+// All these generations of Gen7 supply thermistor power
90
+// via PS_ON, so ignore bad thermistor readings
88
 #define BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE
91
 #define BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE
89
 
92
 
90
-//our pin for debugging.
93
+// our pin for debugging.
91
 #define DEBUG_PIN           0
94
 #define DEBUG_PIN           0
92
 
95
 
93
-//our RS485 pins
96
+// our RS485 pins
94
 #define TX_ENABLE_PIN      12
97
 #define TX_ENABLE_PIN      12
95
 #define RX_ENABLE_PIN      13
98
 #define RX_ENABLE_PIN      13

+ 36
- 18
Marlin/pins_TEENSY2.h Переглянути файл

79
 #define USBCON 1286  // Disable MarlinSerial etc.
79
 #define USBCON 1286  // Disable MarlinSerial etc.
80
 #define LARGE_FLASH        true
80
 #define LARGE_FLASH        true
81
 
81
 
82
-#define X_STEP_PIN         28 //  0 Marlin
83
-#define X_DIR_PIN          29 //  1 Marlin
82
+//
83
+// Limit Switches
84
+//
85
+#define X_STOP_PIN          2
86
+#define Y_STOP_PIN          3
87
+#define Z_STOP_PIN          4
88
+
89
+//
90
+// Steppers
91
+//
92
+#define X_STEP_PIN         28 // 0 Marlin
93
+#define X_DIR_PIN          29 // 1 Marlin
84
 #define X_ENABLE_PIN       26
94
 #define X_ENABLE_PIN       26
85
 
95
 
86
-#define Y_STEP_PIN         30 //  2 Marlin
87
-#define Y_DIR_PIN          31 //  3
88
-#define Y_ENABLE_PIN       26     // Shared w/x
96
+#define Y_STEP_PIN         30 // 2 Marlin
97
+#define Y_DIR_PIN          31 // 3
98
+#define Y_ENABLE_PIN       26 // Shared w/x
89
 
99
 
90
-#define Z_STEP_PIN         32 //  4
91
-#define Z_DIR_PIN          33 //  5
100
+#define Z_STEP_PIN         32 // 4
101
+#define Z_DIR_PIN          33 // 5
92
 #define Z_ENABLE_PIN       26 // Shared w/x
102
 #define Z_ENABLE_PIN       26 // Shared w/x
93
 
103
 
94
-#define E0_STEP_PIN        34 //  6
95
-#define E0_DIR_PIN         35 //  7
104
+#define E0_STEP_PIN        34 // 6
105
+#define E0_DIR_PIN         35 // 7
96
 #define E0_ENABLE_PIN      26 // Shared w/x
106
 #define E0_ENABLE_PIN      26 // Shared w/x
97
 
107
 
98
-#define HEATER_0_PIN       15 //  21  // Extruder
99
-#define HEATER_BED_PIN     14 // 20  // Bed
100
-#define FAN_PIN            16 // 22  // Fan
101
-
102
-#define X_STOP_PIN          2
103
-#define Y_STOP_PIN          3
104
-#define Z_STOP_PIN          4
108
+//
109
+// Temperature Sensors
110
+//
111
+#define TEMP_0_PIN          7   // Analog Input (Extruder)
112
+#define TEMP_BED_PIN        6   // Analog Input (Bed)
105
 
113
 
106
-#define TEMP_0_PIN          7 // Extruder / Analog pin numbering
107
-#define TEMP_BED_PIN        6 // Bed / Analog pin numbering
114
+//
115
+// Heaters / Fans
116
+//
117
+#define HEATER_0_PIN       15 // 21 // Extruder
118
+#define HEATER_BED_PIN     14 // 20 // Bed
119
+#define FAN_PIN            16 // 22 // Fan
108
 
120
 
121
+//
122
+// Misc. Functions
123
+//
109
 #define SDSS               20 // 8
124
 #define SDSS               20 // 8
110
 #define LED_PIN             6
125
 #define LED_PIN             6
111
 #define PS_ON_PIN          27
126
 #define PS_ON_PIN          27
112
 
127
 
128
+//
129
+// LCD / Controller
130
+//
113
 #if ENABLED(ULTIPANEL)
131
 #if ENABLED(ULTIPANEL)
114
   #define LCD_PINS_RS         8
132
   #define LCD_PINS_RS         8
115
   #define LCD_PINS_ENABLE     9
133
   #define LCD_PINS_ENABLE     9

+ 29
- 10
Marlin/pins_TEENSYLU.h Переглянути файл

40
 #define USBCON 1286  // Disable MarlinSerial etc.
40
 #define USBCON 1286  // Disable MarlinSerial etc.
41
 #define LARGE_FLASH        true
41
 #define LARGE_FLASH        true
42
 
42
 
43
+//
44
+// Limit Switches
45
+//
46
+#define X_STOP_PIN         13
47
+#define Y_STOP_PIN         14
48
+#define Z_STOP_PIN         15
49
+
50
+//
51
+// Steppers
52
+//
43
 #define X_STEP_PIN          0
53
 #define X_STEP_PIN          0
44
 #define X_DIR_PIN           1
54
 #define X_DIR_PIN           1
45
 #define X_ENABLE_PIN       39
55
 #define X_ENABLE_PIN       39
56
 #define E0_DIR_PIN          7
66
 #define E0_DIR_PIN          7
57
 #define E0_ENABLE_PIN      19
67
 #define E0_ENABLE_PIN      19
58
 
68
 
69
+//
70
+// Temperature Sensors
71
+//
72
+#define TEMP_0_PIN          7   // Analog Input (Extruder)
73
+#define TEMP_BED_PIN        6   // Analog Input (Bed)
74
+
75
+//
76
+// Heaters / Fans
77
+//
59
 #define HEATER_0_PIN       21  // Extruder
78
 #define HEATER_0_PIN       21  // Extruder
60
 #define HEATER_1_PIN       46
79
 #define HEATER_1_PIN       46
61
 #define HEATER_2_PIN       47
80
 #define HEATER_2_PIN       47
69
   #define FAN_PIN          16
88
   #define FAN_PIN          16
70
 #endif
89
 #endif
71
 
90
 
72
-#define X_STOP_PIN         13
73
-#define Y_STOP_PIN         14
74
-#define Z_STOP_PIN         15
75
-#define TEMP_0_PIN          7  // Extruder / Analog pin numbering
76
-#define TEMP_BED_PIN        6  // Bed / Analog pin numbering
77
-
91
+//
92
+// Misc. Functions
93
+//
78
 #define SDSS                8
94
 #define SDSS                8
79
 
95
 
96
+//
97
+// LCD / Controller
98
+//
80
 #if ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL)
99
 #if ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL)
81
 
100
 
82
   #define BEEPER_PIN       -1
101
   #define BEEPER_PIN       -1
83
 
102
 
84
   #if ENABLED(LCD_I2C_PANELOLU2)
103
   #if ENABLED(LCD_I2C_PANELOLU2)
85
-    #define BTN_EN1        27  //RX1 - fastio.h pin mapping 27
86
-    #define BTN_EN2        26  //TX1 - fastio.h pin mapping 26
87
-    #define BTN_ENC        43  //A3  - fastio.h pin mapping 43
88
-    #define SDSS           40  //use SD card on Panelolu2 (Teensyduino pin mapping)
104
+    #define BTN_EN1        27  // RX1 - fastio.h pin mapping 27
105
+    #define BTN_EN2        26  // TX1 - fastio.h pin mapping 26
106
+    #define BTN_ENC        43  // A3  - fastio.h pin mapping 43
107
+    #define SDSS           40  // use SD card on Panelolu2 (Teensyduino pin mapping)
89
   #endif // LCD_I2C_PANELOLU2
108
   #endif // LCD_I2C_PANELOLU2
90
 
109
 
91
   #define SD_DETECT_PIN    -1
110
   #define SD_DETECT_PIN    -1

+ 8
- 6
Marlin/pins_ULTIMAIN_2.h Переглянути файл

65
 #define MOTOR_CURRENT_PWM_XY_PIN 44
65
 #define MOTOR_CURRENT_PWM_XY_PIN 44
66
 #define MOTOR_CURRENT_PWM_Z_PIN 45
66
 #define MOTOR_CURRENT_PWM_Z_PIN 45
67
 #define MOTOR_CURRENT_PWM_E_PIN 46
67
 #define MOTOR_CURRENT_PWM_E_PIN 46
68
-//Motor current PWM conversion, PWM value = MotorCurrentSetting * 255 / range
68
+// Motor current PWM conversion, PWM value = MotorCurrentSetting * 255 / range
69
 #define MOTOR_CURRENT_PWM_RANGE 2000
69
 #define MOTOR_CURRENT_PWM_RANGE 2000
70
 #define DEFAULT_PWM_MOTOR_CURRENT  {1300, 1300, 1250}
70
 #define DEFAULT_PWM_MOTOR_CURRENT  {1300, 1300, 1250}
71
 
71
 
72
 //
72
 //
73
 // Temperature Sensors
73
 // Temperature Sensors
74
 //
74
 //
75
-#define TEMP_0_PIN          8
76
-#define TEMP_1_PIN          9
77
-#define TEMP_BED_PIN       10
75
+#define TEMP_0_PIN          8   // Analog Input
76
+#define TEMP_1_PIN          9   // Analog Input
77
+#define TEMP_BED_PIN       10   // Analog Input
78
 
78
 
79
 //
79
 //
80
 // Heaters / Fans
80
 // Heaters / Fans
86
 #define FAN_PIN             7
86
 #define FAN_PIN             7
87
 
87
 
88
 //
88
 //
89
-// SD Card
89
+// Misc. Functions
90
 //
90
 //
91
 #define SDSS               53
91
 #define SDSS               53
92
 #define SD_DETECT_PIN      39
92
 #define SD_DETECT_PIN      39
93
-
94
 #define LED_PIN             8
93
 #define LED_PIN             8
95
 #define SAFETY_TRIGGERED_PIN     28 // PIN to detect the safety circuit has triggered
94
 #define SAFETY_TRIGGERED_PIN     28 // PIN to detect the safety circuit has triggered
96
 #define MAIN_VOLTAGE_MEASURE_PIN 14 // ANALOG PIN to measure the main voltage, with a 100k - 4k7 resitor divider.
95
 #define MAIN_VOLTAGE_MEASURE_PIN 14 // ANALOG PIN to measure the main voltage, with a 100k - 4k7 resitor divider.
97
 
96
 
97
+//
98
+// LCD / Controller
99
+//
98
 #define BEEPER_PIN         18
100
 #define BEEPER_PIN         18
99
 
101
 
100
 #define LCD_PINS_RS        20
102
 #define LCD_PINS_RS        20

+ 12
- 8
Marlin/pins_ULTIMAKER.h Переглянути файл

82
 //
82
 //
83
 // Temperature Sensors
83
 // Temperature Sensors
84
 //
84
 //
85
-#define TEMP_0_PIN          8
86
-#define TEMP_1_PIN          9
87
-#define TEMP_BED_PIN       10
85
+#define TEMP_0_PIN          8   // Analog Input
86
+#define TEMP_1_PIN          9   // Analog Input
87
+#define TEMP_BED_PIN       10   // Analog Input
88
 
88
 
89
 //
89
 //
90
 // Heaters / Fans
90
 // Heaters / Fans
93
 #define HEATER_1_PIN        3
93
 #define HEATER_1_PIN        3
94
 #define HEATER_BED_PIN      4
94
 #define HEATER_BED_PIN      4
95
 
95
 
96
+#define FAN_PIN             7
97
+
98
+//
99
+// Misc. Functions
100
+//
96
 #define SDSS               53
101
 #define SDSS               53
97
 #define LED_PIN            13
102
 #define LED_PIN            13
98
-#define FAN_PIN             7
99
 #define PS_ON_PIN          12
103
 #define PS_ON_PIN          12
100
-#define SUICIDE_PIN        54  //PIN that has to be turned on right after start, to keep power flowing.
104
+#define SUICIDE_PIN        54  // PIN that has to be turned on right after start, to keep power flowing.
101
 
105
 
102
 //
106
 //
103
 // LCD / Controller
107
 // LCD / Controller
115
     #define LCD_PINS_D6 5
119
     #define LCD_PINS_D6 5
116
     #define LCD_PINS_D7 6
120
     #define LCD_PINS_D7 6
117
 
121
 
118
-    //buttons are directly attached
122
+    // buttons are directly attached
119
     #define BTN_EN1 40
123
     #define BTN_EN1 40
120
     #define BTN_EN2 42
124
     #define BTN_EN2 42
121
     #define BTN_ENC 19
125
     #define BTN_ENC 19
122
 
126
 
123
     #define SD_DETECT_PIN 38
127
     #define SD_DETECT_PIN 38
124
 
128
 
125
-  #else //!NEWPANEL - Old style panel with shift register
129
+  #else // !NEWPANEL - Old style panel with shift register
126
 
130
 
127
-    //buttons are attached to a shift register
131
+    // buttons are attached to a shift register
128
     #define SHIFT_CLK 38
132
     #define SHIFT_CLK 38
129
     #define SHIFT_LD 42
133
     #define SHIFT_LD 42
130
     #define SHIFT_OUT 40
134
     #define SHIFT_OUT 40

+ 2
- 2
Marlin/pins_ULTIMAKER_OLD.h Переглянути файл

77
 //
77
 //
78
 // Temperature Sensors
78
 // Temperature Sensors
79
 //
79
 //
80
-#define TEMP_0_PIN          8
81
-#define TEMP_1_PIN          1
80
+#define TEMP_0_PIN          8   // Analog Input
81
+#define TEMP_1_PIN          1   // Analog Input
82
 
82
 
83
 //
83
 //
84
 // Heaters / Fans
84
 // Heaters / Fans

Завантаження…
Відмінити
Зберегти