Browse Source

Enhance Teensy/RAMPS pins files

Scott Lahteine 7 years ago
parent
commit
799360c576
2 changed files with 32 additions and 16 deletions
  1. 1
    1
      Marlin/src/pins/pins_RAMPS.h
  2. 31
    15
      Marlin/src/pins/pins_TEENSY35_36.h

+ 1
- 1
Marlin/src/pins/pins_RAMPS.h View File

@@ -45,7 +45,7 @@
45 45
  */
46 46
 
47 47
 #if ENABLED(IS_REARM)
48
-  #error "Oops!  use 'pins_RAMPS_RE_ARM.h' when Re-Arm is used."
48
+  #error "Oops!  Use 'BOARD_RAMPS_RE_ARM' to build for Re-ARM."
49 49
 #endif
50 50
 
51 51
 #if !ENABLED(IS_RAMPS_SMART) && !ENABLED(IS_RAMPS_DUO) && !ENABLED(IS_RAMPS4DUE) && !ENABLED(TARGET_LPC1768)

+ 31
- 15
Marlin/src/pins/pins_TEENSY35_36.h View File

@@ -1,15 +1,33 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4
+ *
5
+ * Based on Sprinter and grbl.
6
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
7
+ *
8
+ * This program is free software: you can redistribute it and/or modify
9
+ * it under the terms of the GNU General Public License as published by
10
+ * the Free Software Foundation, either version 3 of the License, or
11
+ * (at your option) any later version.
12
+ *
13
+ * This program is distributed in the hope that it will be useful,
14
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
15
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
16
+ * GNU General Public License for more details.
17
+ *
18
+ * You should have received a copy of the GNU General Public License
19
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
20
+ *
21
+ */
22
+
1 23
 /****************************************************************************************
2 24
 * Teensy 3.5 (MK64FX512) and Teensy 3.6 (MK66FX1M0) Breadboard pin assignments
3 25
 * Requires the Teensyduino software with Teensy 3.5 or Teensy 3.6 selected in Arduino IDE!
4 26
 * http://www.pjrc.com/teensy/teensyduino.html
5
-*
6 27
 ****************************************************************************************/
7
-#if MOTHERBOARD == 841 // BOARD_TEENSY35_36
8
-#define KNOWN_BOARD 1
9
-#define AT90USB 1286  // Disable MarlinSerial etc.
10 28
 
11 29
 #if !IS_32BIT_TEENSY
12
-  #error Oops!  Make sure you have 'Teensy 3.5' or 'Teensy 3.6' selected from the 'Tools -> Boards' menu.
30
+  #error "Oops!  Make sure you have 'Teensy 3.5' or 'Teensy 3.6' selected from the 'Tools -> Boards' menu."
13 31
 #endif
14 32
 
15 33
 #if IS_TEENSY35
@@ -18,12 +36,13 @@
18 36
   #define BOARD_NAME "Teensy3.6"
19 37
 #endif
20 38
 
21
-#define LARGE_FLASH        true
39
+#define AT90USB 1286   // Disable MarlinSerial etc.
22 40
 #define USBCON //1286  // Disable MarlinSerial etc.
41
+#define LARGE_FLASH        true
23 42
 
24 43
 /*
25
-teemuatlut plan for Teensy3.5 and Teensy3.6:
26 44
 
45
+  teemuatlut plan for Teensy3.5 and Teensy3.6:
27 46
                                                      USB
28 47
                                           GND |-----#####-----| VIN 5V
29 48
       X_STEP_PIN          MOSI1   RX1       0 |     #####     | Analog GND
@@ -84,7 +103,6 @@ D8    HEATER_BED_PIN      CS1     RX4  A12 31 |   46 * * 47   | 34 A15 PWM
84 103
 
85 104
 #define HEATER_0_PIN       30
86 105
 #define HEATER_1_PIN       36
87
-#define HEATER_2_PIN       -1
88 106
 #define HEATER_BED_PIN     31
89 107
 #define FAN_PIN             2
90 108
 
@@ -93,27 +111,27 @@ D8    HEATER_BED_PIN      CS1     RX4  A12 31 |   46 * * 47   | 34 A15 PWM
93 111
 #define Z_STOP_PIN         28
94 112
 
95 113
 #define TEMP_0_PIN          2 // Extruder / Analog pin numbering: 2 => A2
96
-#define TEMP_BED_PIN        1 // Bed / Analog pin numbering
97 114
 #define TEMP_1_PIN          0
98
-#define TEMP_2_PIN         -1
115
+#define TEMP_BED_PIN        1 // Bed / Analog pin numbering
99 116
 
100
-#define SDPOWER            -1
101
-#define SD_DETECT_PIN      -1
102 117
 #define SDSS               39 // 8
103 118
 #define LED_PIN            13
104 119
 #define PS_ON_PIN           1
105
-#define KILL_PIN           -1
106 120
 #define ALARM_PIN          -1
107 121
 
108 122
 #define FILWIDTH_PIN        6
109 123
 #define SOL1_PIN           28
110 124
 
125
+#if 0
126
+// Pretty sure this is obsolete!
127
+// Please use Marlin 1.1.x pins files as reference for new pins files.
111 128
 #ifndef SDSUPPORT
112 129
   // these are defined in the SD library if building with SD support
113 130
   #define SCK_PIN          13
114 131
   #define MISO_PIN         12
115 132
   #define MOSI_PIN         11
116 133
 #endif
134
+#endif
117 135
 
118 136
 #ifdef ULTRA_LCD
119 137
   #define LCD_PINS_RS      40
@@ -126,5 +144,3 @@ D8    HEATER_BED_PIN      CS1     RX4  A12 31 |   46 * * 47   | 34 A15 PWM
126 144
   #define BTN_EN2          47
127 145
   #define BTN_ENC          48
128 146
 #endif
129
-
130
-#endif  // MOTHERBOARD == 841 (Teensy3.5 and Teensy3.6)

Loading…
Cancel
Save