浏览代码

Update on some comments, make the MOTHERBOARD list complete again.

daid303 12 年前
父节点
当前提交
ffc69537aa
共有 2 个文件被更改,包括 24 次插入19 次删除
  1. 20
    15
      Marlin/Configuration.h
  2. 4
    4
      Marlin/pins.h

+ 20
- 15
Marlin/Configuration.h 查看文件

21
 //#define BAUDRATE 115200
21
 //#define BAUDRATE 115200
22
 
22
 
23
 //// The following define selects which electronics board you have. Please choose the one that matches your setup
23
 //// The following define selects which electronics board you have. Please choose the one that matches your setup
24
-// Gen7 custom (Alfons3 Version) = 10 "https://github.com/Alfons3/Generation_7_Electronics"
25
-// Gen7 v1.1, v1.2 = 11
26
-// Gen7 v1.3 = 12
27
-// Gen7 v1.4 = 13
28
-// MEGA/RAMPS up to 1.2 = 3
29
-// RAMPS 1.3 = 33 (Power outputs: Extruder, Bed, Fan)
30
-// RAMPS 1.3 = 34 (Power outputs: Extruder0, Extruder1, Bed)
31
-// Gen6 = 5
32
-// Gen6 deluxe = 51
33
-// Sanguinololu 1.2 and above = 62
34
-// Melzi = 63
35
-// Ultimaker = 7
36
-// Teensylu = 8
37
-// Gen3+ =9
38
-// Megatronics =70
24
+// 10 = Gen7 custom (Alfons3 Version) "https://github.com/Alfons3/Generation_7_Electronics"
25
+// 11 = Gen7 v1.1, v1.2 = 11
26
+// 12 = Gen7 v1.3
27
+// 13 = Gen7 v1.4
28
+// 3  = MEGA/RAMPS up to 1.2 = 3
29
+// 33 = RAMPS 1.3 (Power outputs: Extruder, Bed, Fan)
30
+// 34 = RAMPS 1.3 (Power outputs: Extruder0, Extruder1, Bed)
31
+// 4  = Duemilanove w/ ATMega328P pin assignment
32
+// 5  = Gen6
33
+// 51 = Gen6 deluxe
34
+// 6  = Sanguinololu < 1.2
35
+// 62 = Sanguinololu 1.2 and above
36
+// 63 = Melzi
37
+// 7  = Ultimaker
38
+// 71 = Ultimaker (Older electronics. Pre 1.5.4. This is rare)
39
+// 8  = Teensylu
40
+// 9  = Gen3+
41
+// 70 = Megatronics
42
+// 90 = Alpha OMCA board
43
+// 91 = Final OMCA board
39
 
44
 
40
 #ifndef MOTHERBOARD
45
 #ifndef MOTHERBOARD
41
 #define MOTHERBOARD 7
46
 #define MOTHERBOARD 7

+ 4
- 4
Marlin/pins.h 查看文件

459
   #endif 
459
   #endif 
460
 #endif //ULTRA_LCD
460
 #endif //ULTRA_LCD
461
 
461
 
462
-#else // RAMPS_V_1_1 or RAMPS_V_1_2 as default
462
+#else // RAMPS_V_1_1 or RAMPS_V_1_2 as default (MOTHERBOARD == 3)
463
 
463
 
464
 #define X_STEP_PIN         26
464
 #define X_STEP_PIN         26
465
 #define X_DIR_PIN          28
465
 #define X_DIR_PIN          28
504
 #define TEMP_1_PIN          -1   
504
 #define TEMP_1_PIN          -1   
505
 #define TEMP_2_PIN          -1   
505
 #define TEMP_2_PIN          -1   
506
 #define TEMP_BED_PIN        1    // MUST USE ANALOG INPUT NUMBERING NOT DIGITAL OUTPUT NUMBERING!!!!!!!!!
506
 #define TEMP_BED_PIN        1    // MUST USE ANALOG INPUT NUMBERING NOT DIGITAL OUTPUT NUMBERING!!!!!!!!!
507
-#endif
507
+#endif// MOTHERBOARD == 33 || MOTHERBOARD == 34
508
 
508
 
509
 // SPI for Max6675 Thermocouple 
509
 // SPI for Max6675 Thermocouple 
510
 
510
 
518
   #define MAX6675_SS       49
518
   #define MAX6675_SS       49
519
 #endif
519
 #endif
520
 
520
 
521
-#endif
521
+#endif//MOTHERBOARD == 3 || MOTHERBOARD == 33 || MOTHERBOARD == 34
522
 
522
 
523
 /****************************************************************************************
523
 /****************************************************************************************
524
 * Duemilanove w/ ATMega328P pin assignment
524
 * Duemilanove w/ ATMega328P pin assignment
1008
 *
1008
 *
1009
 ****************************************************************************************/
1009
 ****************************************************************************************/
1010
 #if MOTHERBOARD == 9
1010
 #if MOTHERBOARD == 9
1011
-#define MOTHERBOARD 6
1011
+#define MOTHERBOARD 6   /*TODO: Figure out, Why is this done?*/
1012
 #define KNOWN_BOARD 1
1012
 #define KNOWN_BOARD 1
1013
 #ifndef __AVR_ATmega644P__
1013
 #ifndef __AVR_ATmega644P__
1014
 #ifndef __AVR_ATmega1284P__
1014
 #ifndef __AVR_ATmega1284P__

正在加载...
取消
保存