From d9f2f509d52995c4e0d6f52f9a8f1e7359d7b132 Mon Sep 17 00:00:00 2001 From: Blair Thompson Date: Wed, 22 Feb 2012 22:51:04 +0000 Subject: [PATCH] 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 --- Marlin/Configuration.h | 10 +++++++--- Marlin/Configuration_adv.h | 4 ++-- .../ipch/marlin-7ce658c4/marlin-4b8a948f.ipch | Bin 262144 -> 0 bytes Marlin/language.h | 3 ++- Marlin/ultralcd.pde | 9 ++++++--- 5 files changed, 17 insertions(+), 9 deletions(-) delete mode 100644 Marlin/ipch/marlin-7ce658c4/marlin-4b8a948f.ipch diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index ef0d206a87..e36751e85d 100644 --- 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 d73962cff2..d47b9b262b 100644 --- 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 index 2295b1ff94f252bc6e0baf9fdf9738eef13e70bc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 262144 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 z diff --git a/Marlin/language.h b/Marlin/language.h index c878514011..6dfd7e0be1 100644 --- 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 8c5033c7da..c43290738a 100644 --- 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(); ) ;