浏览代码

Added gen6 deluxe.

Erik van der Zalm 13 年前
父节点
当前提交
35e57bf149
共有 2 个文件被更改,包括 17 次插入10 次删除
  1. 9
    8
      Marlin/Configuration.h
  2. 8
    2
      Marlin/pins.h

+ 9
- 8
Marlin/Configuration.h 查看文件

8
 //User specified version info of THIS file to display in [Pronterface, etc] terminal window during startup.
8
 //User specified version info of THIS file to display in [Pronterface, etc] terminal window during startup.
9
 //Implementation of an idea by Prof Braino to inform user that any changes made
9
 //Implementation of an idea by Prof Braino to inform user that any changes made
10
 //to THIS file by the user have been successfully uploaded into firmware.
10
 //to THIS file by the user have been successfully uploaded into firmware.
11
-#define STRING_VERSION_CONFIG_H "2012-02-08j" //Personal revision number for changes to THIS file.
12
-#define STRING_CONFIG_H_AUTHOR "scuba82" //Who made the changes.
11
+#define STRING_VERSION_CONFIG_H "2012-02-25" //Personal revision number for changes to THIS file.
12
+#define STRING_CONFIG_H_AUTHOR "erik" //Who made the changes.
13
 
13
 
14
 // This determines the communication speed of the printer
14
 // This determines the communication speed of the printer
15
-//#define BAUDRATE 250000
16
-#define BAUDRATE 115200
15
+#define BAUDRATE 250000
16
+//#define BAUDRATE 115200
17
 
17
 
18
 //// The following define selects which electronics board you have. Please choose the one that matches your setup
18
 //// The following define selects which electronics board you have. Please choose the one that matches your setup
19
 // Gen7 custom (Alfons3 Version) = 10 "https://github.com/Alfons3/Generation_7_Electronics"
19
 // Gen7 custom (Alfons3 Version) = 10 "https://github.com/Alfons3/Generation_7_Electronics"
22
 // MEGA/RAMPS up to 1.2 = 3
22
 // MEGA/RAMPS up to 1.2 = 3
23
 // RAMPS 1.3 = 33 (Power outputs: Extruder, Bed, Fan)
23
 // RAMPS 1.3 = 33 (Power outputs: Extruder, Bed, Fan)
24
 // RAMPS 1.3 = 34 (Power outputs: Extruder0, Extruder1, Bed)
24
 // RAMPS 1.3 = 34 (Power outputs: Extruder0, Extruder1, Bed)
25
-// Gen6 = 
25
+// Gen6 = 5
26
+// Gen6 deluxe = 51
26
 // Sanguinololu 1.2 and above = 62
27
 // Sanguinololu 1.2 and above = 62
27
 // Ultimaker = 7
28
 // Ultimaker = 7
28
 // Teensylu = 8
29
 // Teensylu = 8
29
 // Gen3+ =9
30
 // Gen3+ =9
30
-#define MOTHERBOARD 33
31
+#define MOTHERBOARD 51
31
 
32
 
32
 //===========================================================================
33
 //===========================================================================
33
 //=============================Thermal Settings  ============================
34
 //=============================Thermal Settings  ============================
186
 
187
 
187
 //LCD and SD support
188
 //LCD and SD support
188
 //#define ULTRA_LCD  //general lcd support, also 16x2
189
 //#define ULTRA_LCD  //general lcd support, also 16x2
189
-#define SDSUPPORT // Enable SD Card Support in Hardware Console
190
+//#define SDSUPPORT // Enable SD Card Support in Hardware Console
190
 
191
 
191
-#define ULTIPANEL
192
+//#define ULTIPANEL
192
 #ifdef ULTIPANEL
193
 #ifdef ULTIPANEL
193
   #define NEWPANEL  //enable this if you have a click-encoder panel
194
   #define NEWPANEL  //enable this if you have a click-encoder panel
194
   #define SDSUPPORT
195
   #define SDSUPPORT

+ 8
- 2
Marlin/pins.h 查看文件

475
 * Gen6 pin assignment
475
 * Gen6 pin assignment
476
 *
476
 *
477
 ****************************************************************************************/
477
 ****************************************************************************************/
478
-#if MOTHERBOARD == 5
478
+#if MOTHERBOARD == 5 || MOTHERBOARD == 51
479
 #define KNOWN_BOARD 1
479
 #define KNOWN_BOARD 1
480
 
480
 
481
 #ifndef __AVR_ATmega644P__
481
 #ifndef __AVR_ATmega644P__
509
     #define E0_ENABLE_PIN    3    //Added @ EJE Electronics 20100715
509
     #define E0_ENABLE_PIN    3    //Added @ EJE Electronics 20100715
510
     #define TEMP_0_PIN      5     //changed @ rkoeppl 20110410
510
     #define TEMP_0_PIN      5     //changed @ rkoeppl 20110410
511
     #define TEMP_1_PIN      -1    //changed @ rkoeppl 20110410
511
     #define TEMP_1_PIN      -1    //changed @ rkoeppl 20110410
512
+
513
+
512
     #define TEMP_2_PIN      -1    //changed @ rkoeppl 20110410
514
     #define TEMP_2_PIN      -1    //changed @ rkoeppl 20110410
513
     #define HEATER_0_PIN    14    //changed @ rkoeppl 20110410
515
     #define HEATER_0_PIN    14    //changed @ rkoeppl 20110410
514
     #define HEATER_1_PIN    -1
516
     #define HEATER_1_PIN    -1
515
     #define HEATER_2_PIN    -1
517
     #define HEATER_2_PIN    -1
518
+    #if MOTHERBOARD == 51
516
     #define HEATER_BED_PIN  -1    //changed @ rkoeppl 20110410
519
     #define HEATER_BED_PIN  -1    //changed @ rkoeppl 20110410
517
     #define TEMP_BED_PIN    -1    //changed @ rkoeppl 20110410
520
     #define TEMP_BED_PIN    -1    //changed @ rkoeppl 20110410
518
-    
521
+    #else
522
+    #define HEATER_BED_PIN   1    //changed @ rkoeppl 20110410
523
+    #define TEMP_BED_PIN     0    //changed @ rkoeppl 20110410
524
+    #endif
519
     #define SDPOWER          -1
525
     #define SDPOWER          -1
520
     #define SDSS          17
526
     #define SDSS          17
521
     #define LED_PIN         -1    //changed @ rkoeppl 20110410
527
     #define LED_PIN         -1    //changed @ rkoeppl 20110410

正在加载...
取消
保存