Browse Source

Revert "Configuration for Aurora Z605"

This reverts commit 935ee968a7.
roglio 9 years ago
parent
commit
22571ca13d
1 changed files with 20 additions and 29 deletions
  1. 20
    29
      Marlin/Configuration.h

+ 20
- 29
Marlin/Configuration.h View File

27
 #define STRING_VERSION "v1.0.2"
27
 #define STRING_VERSION "v1.0.2"
28
 #define STRING_URL "reprap.org"
28
 #define STRING_URL "reprap.org"
29
 #define STRING_VERSION_CONFIG_H __DATE__ " " __TIME__ // build date and time
29
 #define STRING_VERSION_CONFIG_H __DATE__ " " __TIME__ // build date and time
30
-#define STRING_CONFIG_H_AUTHOR "(roglio, Aurora Z605)" // Who made the changes.
30
+#define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes.
31
 #define STRING_SPLASH STRING_VERSION " - " STRING_URL // will be shown during bootup
31
 #define STRING_SPLASH STRING_VERSION " - " STRING_URL // will be shown during bootup
32
 
32
 
33
 // SERIAL_PORT selects which serial port should be used for communication with the host.
33
 // SERIAL_PORT selects which serial port should be used for communication with the host.
36
 #define SERIAL_PORT 0
36
 #define SERIAL_PORT 0
37
 
37
 
38
 // This determines the communication speed of the printer
38
 // This determines the communication speed of the printer
39
-//#define BAUDRATE 250000
40
-#define BAUDRATE 115200
39
+#define BAUDRATE 250000
41
 
40
 
42
 // This enables the serial port associated to the Bluetooth interface
41
 // This enables the serial port associated to the Bluetooth interface
43
 //#define BTENABLED              // Enable BT interface on AT90USB devices
42
 //#define BTENABLED              // Enable BT interface on AT90USB devices
45
 // The following define selects which electronics board you have.
44
 // The following define selects which electronics board you have.
46
 // Please choose the name from boards.h that matches your setup
45
 // Please choose the name from boards.h that matches your setup
47
 #ifndef MOTHERBOARD
46
 #ifndef MOTHERBOARD
48
-  #define MOTHERBOARD BOARD_MELZI_1284
47
+  #define MOTHERBOARD BOARD_ULTIMAKER
49
 #endif
48
 #endif
50
 
49
 
51
 // Define this to set a custom name for your generic Mendel,
50
 // Define this to set a custom name for your generic Mendel,
52
-#define CUSTOM_MENDEL_NAME "Aurora Z605"
51
+// #define CUSTOM_MENDEL_NAME "This Mendel"
53
 
52
 
54
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
53
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
55
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
54
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
105
 // 147 is Pt100 with 4k7 pullup
104
 // 147 is Pt100 with 4k7 pullup
106
 // 110 is Pt100 with 1k pullup (non standard)
105
 // 110 is Pt100 with 1k pullup (non standard)
107
 
106
 
108
-#define TEMP_SENSOR_0 1
107
+#define TEMP_SENSOR_0 -1
109
 #define TEMP_SENSOR_1 -1
108
 #define TEMP_SENSOR_1 -1
110
-#define TEMP_SENSOR_2 -1
111
-#define TEMP_SENSOR_BED 1
109
+#define TEMP_SENSOR_2 0
110
+#define TEMP_SENSOR_BED 0
112
 
111
 
113
 // This makes temp sensor 1 a redundant sensor for sensor 0. If the temperatures difference between these sensors is to high the print will be aborted.
112
 // This makes temp sensor 1 a redundant sensor for sensor 0. If the temperatures difference between these sensors is to high the print will be aborted.
114
 //#define TEMP_SENSOR_1_AS_REDUNDANT
113
 //#define TEMP_SENSOR_1_AS_REDUNDANT
320
 #define DISABLE_E false // For all extruders
319
 #define DISABLE_E false // For all extruders
321
 #define DISABLE_INACTIVE_EXTRUDER true //disable only inactive extruders and keep active extruder enabled
320
 #define DISABLE_INACTIVE_EXTRUDER true //disable only inactive extruders and keep active extruder enabled
322
 
321
 
323
-#define INVERT_X_DIR false    // for Mendel set to false, for Orca set to true
322
+#define INVERT_X_DIR true    // for Mendel set to false, for Orca set to true
324
 #define INVERT_Y_DIR false    // for Mendel set to true, for Orca set to false
323
 #define INVERT_Y_DIR false    // for Mendel set to true, for Orca set to false
325
-#define INVERT_Z_DIR false     // for Mendel set to false, for Orca set to true
326
-#define INVERT_E0_DIR true   // for direct drive extruder v9 set to true, for geared extruder set to false
324
+#define INVERT_Z_DIR true     // for Mendel set to false, for Orca set to true
325
+#define INVERT_E0_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
327
 #define INVERT_E1_DIR false    // for direct drive extruder v9 set to true, for geared extruder set to false
326
 #define INVERT_E1_DIR false    // for direct drive extruder v9 set to true, for geared extruder set to false
328
 #define INVERT_E2_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
327
 #define INVERT_E2_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
329
 
328
 
482
 
481
 
483
 // default settings
482
 // default settings
484
 
483
 
485
-//#define DEFAULT_AXIS_STEPS_PER_UNIT   {78.7402, 78.7402, 200.0*8/3, 760*1.1}  // default steps per unit for Ultimaker
486
-//#define DEFAULT_AXIS_STEPS_PER_UNIT   {44.3090, 22.1545, 1600, 53.5} // rigidbot values
487
-//#define DEFAULT_AXIS_STEPS_PER_UNIT   {85.3333, 85.3333, 2560, 158.8308} // geeetech values
488
-//#define DEFAULT_AXIS_STEPS_PER_UNIT   {85.3333, 85.3333, 200.0*8/3, 158.8308}
489
-#define DEFAULT_AXIS_STEPS_PER_UNIT   {98.5000, 98.5000, 397.8000, 158.8308}
490
-//#define DEFAULT_MAX_FEEDRATE          {500, 500, 5, 25}    // (mm/sec) marlin default
491
-#define DEFAULT_MAX_FEEDRATE          {400, 400, 2, 45}    // (mm/sec) geeetech values
492
-//#define DEFAULT_MAX_ACCELERATION      {9000,9000,100,10000}    // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for Skeinforge 40+, for older versions raise them a lot.
493
-#define DEFAULT_MAX_ACCELERATION      {5000,5000,50,5000}    // geeetech values
494
-
495
-//#define DEFAULT_ACCELERATION          3000    // X, Y, Z and E max acceleration in mm/s^2 for printing moves
496
-//#define DEFAULT_RETRACT_ACCELERATION  3000    // X, Y, Z and E max acceleration in mm/s^2 for retracts
497
-#define DEFAULT_ACCELERATION          1000    // geeetech values
498
-#define DEFAULT_RETRACT_ACCELERATION  2000    // geeetech values
484
+#define DEFAULT_AXIS_STEPS_PER_UNIT   {78.7402,78.7402,200.0*8/3,760*1.1}  // default steps per unit for Ultimaker
485
+#define DEFAULT_MAX_FEEDRATE          {500, 500, 5, 25}    // (mm/sec)
486
+#define DEFAULT_MAX_ACCELERATION      {9000,9000,100,10000}    // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for Skeinforge 40+, for older versions raise them a lot.
487
+
488
+#define DEFAULT_ACCELERATION          3000    // X, Y, Z and E max acceleration in mm/s^2 for printing moves
489
+#define DEFAULT_RETRACT_ACCELERATION  3000   // X, Y, Z and E max acceleration in mm/s^2 for retracts
499
 
490
 
500
 // Offset of the extruders (uncomment if using more than one and relying on firmware to position when changing).
491
 // Offset of the extruders (uncomment if using more than one and relying on firmware to position when changing).
501
 // The offset has to be X=0, Y=0 for the extruder 0 hotend (default extruder).
492
 // The offset has to be X=0, Y=0 for the extruder 0 hotend (default extruder).
534
 
525
 
535
 // Preheat Constants
526
 // Preheat Constants
536
 #define PLA_PREHEAT_HOTEND_TEMP 180
527
 #define PLA_PREHEAT_HOTEND_TEMP 180
537
-#define PLA_PREHEAT_HPB_TEMP 45
528
+#define PLA_PREHEAT_HPB_TEMP 70
538
 #define PLA_PREHEAT_FAN_SPEED 255   // Insert Value between 0 and 255
529
 #define PLA_PREHEAT_FAN_SPEED 255   // Insert Value between 0 and 255
539
 
530
 
540
-#define ABS_PREHEAT_HOTEND_TEMP 200
541
-#define ABS_PREHEAT_HPB_TEMP 70
531
+#define ABS_PREHEAT_HOTEND_TEMP 240
532
+#define ABS_PREHEAT_HPB_TEMP 100
542
 #define ABS_PREHEAT_FAN_SPEED 255   // Insert Value between 0 and 255
533
 #define ABS_PREHEAT_FAN_SPEED 255   // Insert Value between 0 and 255
543
 
534
 
544
 //LCD and SD support
535
 //LCD and SD support
570
 // http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller
561
 // http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller
571
 //
562
 //
572
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
563
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
573
-#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
564
+//#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
574
 
565
 
575
 // The RepRapWorld REPRAPWORLD_KEYPAD v1.1
566
 // The RepRapWorld REPRAPWORLD_KEYPAD v1.1
576
 // http://reprapworld.com/?products_details&products_id=202&cPath=1591_1626
567
 // http://reprapworld.com/?products_details&products_id=202&cPath=1591_1626

Loading…
Cancel
Save