Browse Source

If fastio.h is not messed up then Teensylu and Printrboard are actually using the same pins.

Johann Rocholl 12 years ago
parent
commit
a30007caa4
1 changed files with 38 additions and 168 deletions
  1. 38
    168
      Marlin/pins.h

+ 38
- 168
Marlin/pins.h View File

@@ -957,198 +957,68 @@
957 957
 #endif
958 958
 
959 959
 /****************************************************************************************
960
-* Teensylu 0.7 pin assingments (ATMEGA90USB)
961
-* Requires the Teensyduino software with Teensy2.0++ selected in arduino IDE!
962
-****************************************************************************************/
963
-#if MOTHERBOARD == 8
964
-#define MOTHERBOARD 8
965
-#define KNOWN_BOARD 1
966
-
967
-
968
-#define X_STEP_PIN          0  
969
-#define X_DIR_PIN           1  
970
-#define X_ENABLE_PIN       39 
971
-#define X_MIN_PIN          13 
972
-#define X_MAX_PIN          -1    
973
-
974
-#define Y_STEP_PIN          2  
975
-#define Y_DIR_PIN           3 
976
-#define Y_ENABLE_PIN       38 
977
-#define Y_MIN_PIN          14 
978
-#define Y_MAX_PIN          -1    
979
-
980
-#define Z_STEP_PIN          4
981
-#define Z_DIR_PIN           5 
982
-#define Z_ENABLE_PIN       23 
983
-#define Z_MIN_PIN          15 
984
-#define Z_MAX_PIN          -1    
985
-
986
-#define E0_STEP_PIN         6  
987
-#define E0_DIR_PIN          7 
988
-#define E0_ENABLE_PIN       19 
989
-
990
-
991
-
992
-#define HEATER_0_PIN       21  // Extruder
993
-#define HEATER_1_PIN       -1
994
-#define HEATER_2_PIN       -1
995
-#define HEATER_BED_PIN     20  // Bed
996
-#define FAN_PIN            22  // Fan   
997
-
998
-#define TEMP_0_PIN          7  // Extruder
999
-#define TEMP_1_PIN         -1
1000
-#define TEMP_2_PIN         -1
1001
-#define TEMP_BED_PIN        6  // Bed
1002
-
1003
-#define SDPOWER            -1
1004
-#define SDSS                8
1005
-#define LED_PIN            -1
1006
-#define PS_ON_PIN          -1
1007
-#define KILL_PIN           -1 
1008
-#define ALARM_PIN          -1
1009
-
1010
-#ifndef SDSUPPORT
1011
-// these pins are defined in the SD library if building with SD support  
1012
-  #define SCK_PIN           9 
1013
-  #define MISO_PIN         11 
1014
-  #define MOSI_PIN         10 
1015
-#endif
1016
-#endif
1017
-
1018
-/****************************************************************************************
1019
-* Printrboard Rev. B pin assingments (ATMEGA90USB1286)
1020
-* Requires the Teensyduino software with Teensy++ 2.0 selected in arduino IDE!
960
+* Teensylu 0.7 / Printrboard pin assignments (AT90USB1286)
961
+* Requires the Teensyduino software with Teensy++ 2.0 selected in Arduino IDE!
1021 962
   http://www.pjrc.com/teensy/teensyduino.html
1022 963
 * See http://reprap.org/wiki/Printrboard for more info
1023 964
 ****************************************************************************************/
1024
-#if MOTHERBOARD == 81
965
+#if MOTHERBOARD == 8 || MOTHERBOARD == 81
1025 966
 #undef MOTHERBOARD
1026
-#define MOTHERBOARD 8  // Disable MarlinSerial etc.
967
+#define MOTHERBOARD 8
1027 968
 #define KNOWN_BOARD 1
1028 969
 
1029 970
 #ifndef __AVR_AT90USB1286__
1030 971
 #error Oops!  Make sure you have 'Teensy++ 2.0' selected from the 'Tools -> Boards' menu.
1031 972
 #endif
1032 973
 
1033
-#define X_STEP_PIN         28
1034
-#define X_DIR_PIN          29
1035
-#define X_ENABLE_PIN       19
1036
-#define X_MIN_PIN          47
974
+#define X_STEP_PIN          0
975
+#define X_DIR_PIN           1
976
+#define X_ENABLE_PIN       39
977
+#define X_MIN_PIN          13
1037 978
 #define X_MAX_PIN          -1
1038 979
 
1039
-#define Y_STEP_PIN         30
1040
-#define Y_DIR_PIN          31
1041
-#define Y_ENABLE_PIN       18
1042
-#define Y_MIN_PIN           20
980
+#define Y_STEP_PIN          2
981
+#define Y_DIR_PIN           3
982
+#define Y_ENABLE_PIN       38
983
+#define Y_MIN_PIN          14
1043 984
 #define Y_MAX_PIN          -1
1044 985
 
1045
-#define Z_STEP_PIN         32
1046
-#define Z_DIR_PIN          33
1047
-#define Z_ENABLE_PIN       17
1048
-#define Z_MIN_PIN          36
986
+#define Z_STEP_PIN          4
987
+#define Z_DIR_PIN           5
988
+#define Z_ENABLE_PIN       23
989
+#define Z_MIN_PIN          15
1049 990
 #define Z_MAX_PIN          -1
1050 991
 
1051
-#define E0_STEP_PIN         34
1052
-#define E0_DIR_PIN          35
1053
-#define E0_ENABLE_PIN       13
992
+#define E0_STEP_PIN         6
993
+#define E0_DIR_PIN          7
994
+#define E0_ENABLE_PIN      19
1054 995
 
1055
-#define HEATER_0_PIN       15  // Extruder
996
+#define HEATER_0_PIN       21  // Extruder
1056 997
 #define HEATER_1_PIN       -1
1057 998
 #define HEATER_2_PIN       -1
1058
-#define HEATER_BED_PIN     14  // Bed
1059
-#define FAN_PIN            16  // Fan
999
+#define HEATER_BED_PIN     20  // Bed
1000
+#define FAN_PIN            22
1060 1001
 
1061
-#define TEMP_0_PIN          1  // Extruder - ANALOG PIN NUMBERING
1002
+#define TEMP_0_PIN          7  // Extruder / Analog PIN numbering
1062 1003
 #define TEMP_1_PIN         -1
1063 1004
 #define TEMP_2_PIN         -1
1064
-#define TEMP_BED_PIN        0  // Bed - ANALOG PIN NUMBERING
1005
+#define TEMP_BED_PIN        6  // Bed / Analog PIN numbering
1065 1006
 
1066 1007
 #define SDPOWER            -1
1067
-#define SDSS                26
1008
+#define SDSS                8
1068 1009
 #define LED_PIN            -1
1069 1010
 #define PS_ON_PIN          -1
1070 1011
 #define KILL_PIN           -1
1012
+#define ALARM_PIN          -1
1071 1013
 
1072 1014
 #ifndef SDSUPPORT
1073 1015
 // these pins are defined in the SD library if building with SD support
1074
-  #define SCK_PIN          21
1075
-  #define MISO_PIN         22
1076
-  #define MOSI_PIN         23
1016
+  #define SCK_PIN           9
1017
+  #define MISO_PIN         11
1018
+  #define MOSI_PIN         10
1077 1019
 #endif
1078 1020
 
1079
-#ifdef ULTRA_LCD
1080
-
1081
-  #ifdef NEWPANEL
1082
-  //arduino pin which triggers an piezzo beeper
1083
-    #define BEEPER 33			// Beeper on AUX-4
1084
-
1085
-#ifndef MCP28017_LCD
1086
-    #define LCD_PINS_RS 16
1087
-    #define LCD_PINS_ENABLE 17
1088
-    #define LCD_PINS_D4 23
1089
-    #define LCD_PINS_D5 25
1090
-    #define LCD_PINS_D6 27
1091
-    #define LCD_PINS_D7 29
1092
-#endif // MCP28017_LCD
1093
-
1094
-    //buttons are directly attached using AUX-2
1095
-    #define BTN_EN1 11 // PC1
1096
-    #define BTN_EN2 12 // PC2
1097
-#ifndef VERSAPANEL
1098
-    #define BTN_ENC 31  //the click
1099
-#endif
1100
-
1101
-    #define BLEN_C 2
1102
-    #define BLEN_B 1
1103
-    #define BLEN_A 0
1104
-
1105
-    #define SDCARDDETECT -1		// Ramps does not use this port
1106
-
1107
-      //encoder rotation values
1108
-    #define encrot0 0
1109
-    #define encrot1 2
1110
-    #define encrot2 3
1111
-    #define encrot3 1
1112
-
1113
-  #else //old style panel with shift register
1114
-    //arduino pin witch triggers an piezzo beeper
1115
-    #define BEEPER 33		No Beeper added
1116
-
1117
-    //buttons are attached to a shift register
1118
-	// Not wired this yet
1119
-    //#define SHIFT_CLK 38
1120
-    //#define SHIFT_LD 42
1121
-    //#define SHIFT_OUT 40
1122
-    //#define SHIFT_EN 17
1123
-
1124
-    #define LCD_PINS_RS 16
1125
-    #define LCD_PINS_ENABLE 17
1126
-    #define LCD_PINS_D4 23
1127
-    #define LCD_PINS_D5 25
1128
-    #define LCD_PINS_D6 27
1129
-    #define LCD_PINS_D7 29
1130
-
1131
-    //encoder rotation values
1132
-    #define encrot0 0
1133
-    #define encrot1 2
1134
-    #define encrot2 3
1135
-    #define encrot3 1
1136
-
1137
-    //bits in the shift register that carry the buttons for:
1138
-    // left up center down right red
1139
-    #define BL_LE 7
1140
-    #define BL_UP 6
1141
-    #define BL_MI 5
1142
-    #define BL_DW 4
1143
-    #define BL_RI 3
1144
-    #define BL_ST 2
1145
-
1146
-    #define BLEN_B 1
1147
-    #define BLEN_A 0
1148
-  #endif
1149
-#endif //ULTRA_LCD
1150
-
1151
-#endif
1021
+#endif  // MOTHERBOARD == 8 (Teensylu) or 81 (Printrboard)
1152 1022
 
1153 1023
 /****************************************************************************************
1154 1024
  * Brainwave 1.0 pin assignments (AT90USB646)
@@ -1185,10 +1055,10 @@
1185 1055
 #define Z_MAX_PIN          -1
1186 1056
 #define Z_ATT_PIN          16
1187 1057
 
1188
-#define E0_STEP_PIN         21
1189
-#define E0_DIR_PIN          23
1190
-#define E0_ENABLE_PIN       22
1191
-#define E0_ATT_PIN          20
1058
+#define E0_STEP_PIN        21
1059
+#define E0_DIR_PIN         23
1060
+#define E0_ENABLE_PIN      22
1061
+#define E0_ATT_PIN         20
1192 1062
 
1193 1063
 #define HEATER_0_PIN        4  // Extruder
1194 1064
 #define HEATER_1_PIN       -1
@@ -1210,12 +1080,12 @@
1210 1080
 
1211 1081
 #ifndef SDSUPPORT
1212 1082
 // these pins are defined in the SD library if building with SD support
1213
-  #define SCK_PIN          21
1214
-  #define MISO_PIN         22
1215
-  #define MOSI_PIN         23
1083
+  #define SCK_PIN           9
1084
+  #define MISO_PIN         11
1085
+  #define MOSI_PIN         10
1216 1086
 #endif
1217 1087
 
1218
-#endif
1088
+#endif  // MOTHERBOARD == 82 (Brainwave)
1219 1089
 
1220 1090
 /****************************************************************************************
1221 1091
 * Gen3+ pin assignment

Loading…
Cancel
Save