浏览代码

Patch up Teensy 3.1/3.2 pins, tests

Scott Lahteine 5 年前
父节点
当前提交
2e27e3ba04
共有 2 个文件被更改,包括 52 次插入45 次删除
  1. 52
    43
      Marlin/src/pins/teensy3/pins_TEENSY31_32.h
  2. 0
    2
      buildroot/share/tests/teensy31-tests

+ 52
- 43
Marlin/src/pins/teensy3/pins_TEENSY31_32.h 查看文件

21
  */
21
  */
22
 #pragma once
22
 #pragma once
23
 
23
 
24
-/****************************************************************************************
24
+/**
25
-* Teensy 3.1 (MK20DX256) and Teensy 3.2 (MK20DX256) Breadboard pin assignments
25
+ * Teensy 3.1 (MK20DX256) and Teensy 3.2 (MK20DX256) Breadboard pin assignments
26
-* Requires the Teensyduino software with Teensy 3.1 or Teensy 3.2 selected in Arduino IDE!
26
+ * Requires the Teensyduino software with Teensy 3.1 or Teensy 3.2 selected in Arduino IDE!
27
-* http://www.pjrc.com/teensy/teensyduino.html
27
+ * http://www.pjrc.com/teensy/teensyduino.html
28
-****************************************************************************************/
28
+ */
29
 
29
 
30
 #if !IS_32BIT_TEENSY
30
 #if !IS_32BIT_TEENSY
31
   #error "Oops! Select 'Teensy 3.1' or 'Teensy 3.2' in 'Tools > Board.'"
31
   #error "Oops! Select 'Teensy 3.1' or 'Teensy 3.2' in 'Tools > Board.'"
32
 #endif
32
 #endif
33
 
33
 
34
-#if IS_TEENSY32
34
+#ifndef BOARD_NAME
35
   #define BOARD_NAME "Teensy3.2"
35
   #define BOARD_NAME "Teensy3.2"
36
 #endif
36
 #endif
37
 
37
 
41
 //
41
 //
42
 // Limit Switches
42
 // Limit Switches
43
 //
43
 //
44
-#define X_STOP_PIN         3
44
+#define X_STOP_PIN          3
45
-#define Y_STOP_PIN         4
45
+#define Y_STOP_PIN          4
46
-#define Z_STOP_PIN         5
46
+#define Z_STOP_PIN          5
47
 
47
 
48
 //
48
 //
49
 // Steppers
49
 // Steppers
50
 //
50
 //
51
-#define X_STEP_PIN         5
51
+#define X_STEP_PIN          5
52
-#define X_DIR_PIN          6
52
+#define X_DIR_PIN           6
53
-#define X_ENABLE_PIN       2
53
+#define X_ENABLE_PIN        2
54
 
54
 
55
-#define Y_STEP_PIN         7
55
+#define Y_STEP_PIN          7
56
-#define Y_DIR_PIN          8
56
+#define Y_DIR_PIN           8
57
-#define Y_ENABLE_PIN       2
57
+#define Y_ENABLE_PIN        2
58
 
58
 
59
-#define Z_STEP_PIN         9
59
+#define Z_STEP_PIN          9
60
 #define Z_DIR_PIN          10
60
 #define Z_DIR_PIN          10
61
-#define Z_ENABLE_PIN       2
61
+#define Z_ENABLE_PIN        2
62
 
62
 
63
 #define E0_STEP_PIN        11
63
 #define E0_STEP_PIN        11
64
 #define E0_DIR_PIN         12
64
 #define E0_DIR_PIN         12
65
-#define E0_ENABLE_PIN      2
65
+#define E0_ENABLE_PIN       2
66
 
66
 
67
-// #define E1_STEP_PIN        33
67
+//#define E1_STEP_PIN        33
68
-// #define E1_DIR_PIN         34
68
+//#define E1_DIR_PIN         34
69
-// #define E1_ENABLE_PIN      35
69
+//#define E1_ENABLE_PIN      35
70
 
70
 
71
+//
72
+// Heaters / Fans
73
+//
71
 #define HEATER_0_PIN       20
74
 #define HEATER_0_PIN       20
72
-// #define HEATER_1_PIN       36
75
+// #define HEATER_1_PIN      36
73
 #define HEATER_BED_PIN     21
76
 #define HEATER_BED_PIN     21
74
 #ifndef FAN_PIN
77
 #ifndef FAN_PIN
75
   #define FAN_PIN          22
78
   #define FAN_PIN          22
76
 #endif
79
 #endif
77
 
80
 
78
-#define TEMP_0_PIN         14   // Extruder / Analog pin numbering: 2 => A2
81
+//
79
-// #define TEMP_1_PIN          0
82
+// Temperature Sensors
80
-#define TEMP_BED_PIN       15   // Bed / Analog pin numbering
83
+//
84
+#define TEMP_0_PIN         14   // Analog Input - Extruder 2 => A2
85
+//#define TEMP_1_PIN          0   // Analog Input
86
+#define TEMP_BED_PIN       15   // Analog Input - Bed
81
 
87
 
82
-// #define SDSS               16   // 8
88
+#ifndef FILWIDTH_PIN
83
-#define LED_PIN            13
89
+  #define FILWIDTH_PIN      6   // Analog Input
84
-#define PS_ON_PIN          -1
85
-#define ALARM_PIN          -1
86
-
87
-// #define FILWIDTH_PIN        6
88
-// #define SOL1_PIN           28
89
-
90
-#if 0
91
-// Pretty sure this is obsolete!
92
-// Please use Marlin 1.1.x pins files as reference for new pins files.
93
-#ifndef SDSUPPORT
94
-  // these are defined in the SD library if building with SD support
95
-  #define SCK_PIN          13
96
-  #define MISO_PIN         12
97
-  #define MOSI_PIN         11
98
-#endif
99
 #endif
90
 #endif
91
+
92
+//
93
+// Misc. Functions
94
+//
95
+
96
+//#define SDSS               16   // 8
97
+#define LED_PIN            13
98
+
99
+//#define SOL1_PIN           28
100
+
101
+//
102
+// LCD / Controller
103
+//
104
+
105
+//#define SCK_PIN            13
106
+//#define MISO_PIN           12
107
+//#define MOSI_PIN           11
108
+
100
 /*
109
 /*
101
-#ifdef ULTRA_LCD
110
+#if HAS_SPI_LCD
102
   #define LCD_PINS_RS      40
111
   #define LCD_PINS_RS      40
103
   #define LCD_PINS_ENABLE  41
112
   #define LCD_PINS_ENABLE  41
104
   #define LCD_PINS_D4      42
113
   #define LCD_PINS_D4      42

+ 0
- 2
buildroot/share/tests/teensy31-tests 查看文件

17
 #
17
 #
18
 restore_configs
18
 restore_configs
19
 opt_set MOTHERBOARD BOARD_TEENSY31_32
19
 opt_set MOTHERBOARD BOARD_TEENSY31_32
20
-opt_set EXTRUDERS 2
21
 opt_set TEMP_SENSOR_0 1
20
 opt_set TEMP_SENSOR_0 1
22
-opt_set TEMP_SENSOR_1 5
23
 opt_set TEMP_SENSOR_BED 1
21
 opt_set TEMP_SENSOR_BED 1
24
 opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER LCD_INFO_MENU SDSUPPORT SDCARD_SORT_ALPHA \
22
 opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER LCD_INFO_MENU SDSUPPORT SDCARD_SORT_ALPHA \
25
            FILAMENT_WIDTH_SENSOR FILAMENT_LCD_DISPLAY CALIBRATION_GCODE BAUD_RATE_GCODE \
23
            FILAMENT_WIDTH_SENSOR FILAMENT_LCD_DISPLAY CALIBRATION_GCODE BAUD_RATE_GCODE \

正在加载...
取消
保存