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

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index ef0d206a87279b6ea55f8eb4b4bc2daf01bffcc4..e36751e85de9365550c79e7477732d810ea1b0da 100644 (file)
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -26,7 +26,7 @@
 // Gen7 v1.3 = 79
 // Teensylu = 8,
 // Gen3+ =9
-#define MOTHERBOARD 7
+#define MOTHERBOARD 33
 
 //===========================================================================
 //=============================Thermal Settings  ============================
@@ -44,7 +44,7 @@
 // 6 is EPCOS 100k
 // 7 is 100k Honeywell thermistor 135-104LAG-J01
 
-#define TEMP_SENSOR_0 -1
+#define TEMP_SENSOR_0 1
 #define TEMP_SENSOR_1 0
 #define TEMP_SENSOR_2 0
 #define TEMP_SENSOR_BED 1
@@ -129,7 +129,7 @@ const bool Z_ENDSTOPS_INVERTING = false; // set to true to invert the logic of t
 
 #define INVERT_X_DIR false    // for Mendel set to false, for Orca set to true
 #define INVERT_Y_DIR true    // for Mendel set to true, for Orca set to false
-#define INVERT_Z_DIR false     // for Mendel set to false, for Orca set to true
+#define INVERT_Z_DIR true     // for Mendel set to false, for Orca set to true
 #define INVERT_E0_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
 #define INVERT_E1_DIR false    // for direct drive extruder v9 set to true, for geared extruder set to false
 #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
   #define ULTRA_LCD
   #define LCD_WIDTH 20
   #define LCD_HEIGHT 4
+  #define PLA_PREHEAT_HOTEND_TEMP 180 
+  #define PLA_PREHEAT_HPB_TEMP 70
+  #define ABS_PREHEAT_HOTEND_TEMP 240
+  #define ABS_PREHEAT_HPB_TEMP 100
 #else //no panel but just lcd 
   #ifdef ULTRA_LCD
     #define LCD_WIDTH 16

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index d73962cff2c65798c9f771f90ec23614f38d3664..d47b9b262b60bc46e2fa87f819937c646f230c66 100644 (file)
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -74,7 +74,7 @@
 #define X_HOME_RETRACT_MM 5 
 #define Y_HOME_RETRACT_MM 5 
 #define Z_HOME_RETRACT_MM 1 
-#define QUICK_HOME  //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially.
+//#define QUICK_HOME  //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially.
 
 #define AXIS_RELATIVE_MODES {false, false, false, false}
 
@@ -152,7 +152,7 @@ const int dropsegments=5; //everything with less than this number of steps will
 // You can get round this by connecting a push button or single throw switch to the pin defined as SDCARDCARDDETECT 
 // in the pins.h file.  When using a push button pulling the pin to ground this will need inverted.  This setting should
 // be commented out otherwise
-//#define SDCARDDETECTINVERTED 
+#define SDCARDDETECTINVERTED 
 
 //===========================================================================
 //=============================Buffers           ============================

diff --git a/Marlin/ipch/marlin-7ce658c4/marlin-4b8a948f.ipch b/Marlin/ipch/marlin-7ce658c4/marlin-4b8a948f.ipch
deleted file mode 100644 (file)
index 2295b1f..0000000
Binary files a/Marlin/ipch/marlin-7ce658c4/marlin-4b8a948f.ipch and /dev/null differ

diff --git a/Marlin/language.h b/Marlin/language.h
index c87851401133e7f25b8534afed0577a775f8f435..6dfd7e0be1f49c4f224d0ea78a5770e85f888e45 100644 (file)
--- a/Marlin/language.h
+++ b/Marlin/language.h
@@ -22,7 +22,8 @@
        #define MSG_DISABLE_STEPPERS " Disable Steppers"
        #define MSG_AUTO_HOME " Auto Home"
        #define MSG_SET_ORIGIN " Set Origin"
-       #define MSG_PREHEAT " Preheat"
+       #define MSG_PREHEAT_PLA " Preheat PLA"
+       #define MSG_PREHEAT_ABS " Preheat ABS"
        #define MSG_COOLDOWN " Cooldown"
        #define MSG_EXTRUDE " Extrude"
         #define MSG_MOVE_AXIS " Move Axis      \x7E"

diff --git a/Marlin/ultralcd.pde b/Marlin/ultralcd.pde
index 8c5033c7da21ff3d7a301a98ee5ecdef2e116ed6..c43290738a6225eb7f8a91446ae075a35a01d6ff 100644 (file)
--- a/Marlin/ultralcd.pde
+++ b/Marlin/ultralcd.pde
@@ -456,7 +456,7 @@ void MainMenu::showStatus()
   force_lcd_update=false;
 }
 
-enum {ItemP_exit, ItemP_autostart,ItemP_disstep,ItemP_home, ItemP_origin, ItemP_preheat, ItemP_cooldown,/*ItemP_extrude,*/ItemP_move};
+enum {ItemP_exit, ItemP_autostart,ItemP_disstep,ItemP_home, ItemP_origin, ItemP_preheat_pla, ItemP_preheat_abs, ItemP_cooldown,/*ItemP_extrude,*/ItemP_move};
 
 //any action must not contain a ',' character anywhere, or this breaks:
 #define MENUITEM(repaint_action, click_action) \
@@ -489,8 +489,11 @@ void MainMenu::showPrepare()
     case ItemP_origin:
       MENUITEM(  lcdprintPGM(MSG_SET_ORIGIN)  ,  BLOCK;enquecommand("G92 X0 Y0 Z0");beepshort(); ) ;
       break;
-    case ItemP_preheat:
-      MENUITEM(  lcdprintPGM(MSG_PREHEAT)  ,  BLOCK;setTargetHotend0(170);setTargetBed(70);beepshort(); ) ;
+    case ItemP_preheat_pla:
+      MENUITEM(  lcdprintPGM(MSG_PREHEAT_PLA)  ,  BLOCK;setTargetHotend0(PLA_PREHEAT_HOTEND_TEMP);setTargetBed(PLA_PREHEAT_HPB_TEMP);beepshort(); ) ;
+      break;
+    case ItemP_preheat_abs:
+      MENUITEM(  lcdprintPGM(MSG_PREHEAT_ABS)  ,  BLOCK;setTargetHotend0(ABS_PREHEAT_HOTEND_TEMP);setTargetBed(ABS_PREHEAT_HPB_TEMP);beepshort(); ) ;
       break;
     case ItemP_cooldown:
       MENUITEM(  lcdprintPGM(MSG_COOLDOWN)  ,  BLOCK;setTargetHotend0(0);setTargetBed(0);beepshort(); ) ;