Bläddra i källkod

Added new menu items under the prepare submenu.

Instead of a single pre-heat, now there is pre-heat ABS and PLA options
Added defines to the configuration file to adjust preheat temperatures for both
Blair Thompson 13 år sedan
förälder
incheckning
d9f2f509d5

+ 7
- 3
Marlin/Configuration.h Visa fil

@@ -26,7 +26,7 @@
26 26
 // Gen7 v1.3 = 79
27 27
 // Teensylu = 8,
28 28
 // Gen3+ =9
29
-#define MOTHERBOARD 7
29
+#define MOTHERBOARD 33
30 30
 
31 31
 //===========================================================================
32 32
 //=============================Thermal Settings  ============================
@@ -44,7 +44,7 @@
44 44
 // 6 is EPCOS 100k
45 45
 // 7 is 100k Honeywell thermistor 135-104LAG-J01
46 46
 
47
-#define TEMP_SENSOR_0 -1
47
+#define TEMP_SENSOR_0 1
48 48
 #define TEMP_SENSOR_1 0
49 49
 #define TEMP_SENSOR_2 0
50 50
 #define TEMP_SENSOR_BED 1
@@ -129,7 +129,7 @@ const bool Z_ENDSTOPS_INVERTING = false; // set to true to invert the logic of t
129 129
 
130 130
 #define INVERT_X_DIR false    // for Mendel set to false, for Orca set to true
131 131
 #define INVERT_Y_DIR true    // for Mendel set to true, for Orca set to false
132
-#define INVERT_Z_DIR false     // for Mendel set to false, for Orca set to true
132
+#define INVERT_Z_DIR true     // for Mendel set to false, for Orca set to true
133 133
 #define INVERT_E0_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
134 134
 #define INVERT_E1_DIR false    // for direct drive extruder v9 set to true, for geared extruder set to false
135 135
 #define INVERT_E2_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
@@ -194,6 +194,10 @@ const bool Z_ENDSTOPS_INVERTING = false; // set to true to invert the logic of t
194 194
   #define ULTRA_LCD
195 195
   #define LCD_WIDTH 20
196 196
   #define LCD_HEIGHT 4
197
+  #define PLA_PREHEAT_HOTEND_TEMP 180 
198
+  #define PLA_PREHEAT_HPB_TEMP 70
199
+  #define ABS_PREHEAT_HOTEND_TEMP 240
200
+  #define ABS_PREHEAT_HPB_TEMP 100
197 201
 #else //no panel but just lcd 
198 202
   #ifdef ULTRA_LCD
199 203
     #define LCD_WIDTH 16

+ 2
- 2
Marlin/Configuration_adv.h Visa fil

@@ -74,7 +74,7 @@
74 74
 #define X_HOME_RETRACT_MM 5 
75 75
 #define Y_HOME_RETRACT_MM 5 
76 76
 #define Z_HOME_RETRACT_MM 1 
77
-#define QUICK_HOME  //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially.
77
+//#define QUICK_HOME  //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially.
78 78
 
79 79
 #define AXIS_RELATIVE_MODES {false, false, false, false}
80 80
 
@@ -152,7 +152,7 @@ const int dropsegments=5; //everything with less than this number of steps will
152 152
 // You can get round this by connecting a push button or single throw switch to the pin defined as SDCARDCARDDETECT 
153 153
 // in the pins.h file.  When using a push button pulling the pin to ground this will need inverted.  This setting should
154 154
 // be commented out otherwise
155
-//#define SDCARDDETECTINVERTED 
155
+#define SDCARDDETECTINVERTED 
156 156
 
157 157
 //===========================================================================
158 158
 //=============================Buffers           ============================

Binär
Marlin/ipch/marlin-7ce658c4/marlin-4b8a948f.ipch Visa fil


+ 2
- 1
Marlin/language.h Visa fil

@@ -22,7 +22,8 @@
22 22
 	#define MSG_DISABLE_STEPPERS " Disable Steppers"
23 23
 	#define MSG_AUTO_HOME " Auto Home"
24 24
 	#define MSG_SET_ORIGIN " Set Origin"
25
-	#define MSG_PREHEAT " Preheat"
25
+	#define MSG_PREHEAT_PLA " Preheat PLA"
26
+	#define MSG_PREHEAT_ABS " Preheat ABS"
26 27
 	#define MSG_COOLDOWN " Cooldown"
27 28
 	#define MSG_EXTRUDE " Extrude"
28 29
         #define MSG_MOVE_AXIS " Move Axis      \x7E"

+ 6
- 3
Marlin/ultralcd.pde Visa fil

@@ -456,7 +456,7 @@ void MainMenu::showStatus()
456 456
   force_lcd_update=false;
457 457
 }
458 458
 
459
-enum {ItemP_exit, ItemP_autostart,ItemP_disstep,ItemP_home, ItemP_origin, ItemP_preheat, ItemP_cooldown,/*ItemP_extrude,*/ItemP_move};
459
+enum {ItemP_exit, ItemP_autostart,ItemP_disstep,ItemP_home, ItemP_origin, ItemP_preheat_pla, ItemP_preheat_abs, ItemP_cooldown,/*ItemP_extrude,*/ItemP_move};
460 460
 
461 461
 //any action must not contain a ',' character anywhere, or this breaks:
462 462
 #define MENUITEM(repaint_action, click_action) \
@@ -489,8 +489,11 @@ void MainMenu::showPrepare()
489 489
     case ItemP_origin:
490 490
       MENUITEM(  lcdprintPGM(MSG_SET_ORIGIN)  ,  BLOCK;enquecommand("G92 X0 Y0 Z0");beepshort(); ) ;
491 491
       break;
492
-    case ItemP_preheat:
493
-      MENUITEM(  lcdprintPGM(MSG_PREHEAT)  ,  BLOCK;setTargetHotend0(170);setTargetBed(70);beepshort(); ) ;
492
+    case ItemP_preheat_pla:
493
+      MENUITEM(  lcdprintPGM(MSG_PREHEAT_PLA)  ,  BLOCK;setTargetHotend0(PLA_PREHEAT_HOTEND_TEMP);setTargetBed(PLA_PREHEAT_HPB_TEMP);beepshort(); ) ;
494
+      break;
495
+    case ItemP_preheat_abs:
496
+      MENUITEM(  lcdprintPGM(MSG_PREHEAT_ABS)  ,  BLOCK;setTargetHotend0(ABS_PREHEAT_HOTEND_TEMP);setTargetBed(ABS_PREHEAT_HPB_TEMP);beepshort(); ) ;
494 497
       break;
495 498
     case ItemP_cooldown:
496 499
       MENUITEM(  lcdprintPGM(MSG_COOLDOWN)  ,  BLOCK;setTargetHotend0(0);setTargetBed(0);beepshort(); ) ;

Laddar…
Avbryt
Spara