From: Erik van der Zalm Date: Tue, 21 Feb 2012 19:26:59 +0000 (+0100) Subject: merged SBUBA82 and Justblair X-Git-Tag: iwj-success-2012-07-29~103 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=d298dd121f326cd44c8151e4d5a0be7fa3e96e20;p=marlin.git merged SBUBA82 and Justblair --- d298dd121f326cd44c8151e4d5a0be7fa3e96e20 diff --cc Marlin/Configuration.h index 4731a04,4497ec7..2b56192 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@@ -21,12 -21,9 +21,12 @@@ // Gen6 = 5, // Sanguinololu 1.2 and above = 62 // Ultimaker = 7, +// Gen7 custom (Alfons3 Version) = 77, "https://github.com/Alfons3/Generation_7_Electronics" +// Gen7 v1.1, v1.2 = 78 +// Gen7 v1.3 = 79 // Teensylu = 8, // Gen3+ =9 - #define MOTHERBOARD 77 -#define MOTHERBOARD 33 ++#define MOTHERBOARD 7 //=========================================================================== //=============================Thermal Settings ============================ @@@ -44,14 -41,14 +44,14 @@@ // 6 is EPCOS 100k // 7 is 100k Honeywell thermistor 135-104LAG-J01 - #define TEMP_SENSOR_0 6 -#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 // Actual temperature must be close to target for this long before M109 returns success - #define TEMP_RESIDENCY_TIME 30 // (seconds) + #define TEMP_RESIDENCY_TIME 10 // 30 // (seconds) 30 seconds was too long -#define TEMP_HYSTERESIS 3 // (C°) range of +/- temperatures considered "close" to the target one +#define TEMP_HYSTERESIS 3 // (C�) range of +/- temperatures considered "close" to the target one // The minimal temperature defines the temperature below which the heater will not be enabled It is used // to check that the wiring to the thermistor is not broken. @@@ -128,8 -125,8 +128,8 @@@ const bool Z_ENDSTOPS_INVERTING = false #define DISABLE_E false // For all extruders #define INVERT_X_DIR false // for Mendel set to false, for Orca set to true - #define INVERT_Y_DIR false // for Mendel set to true, for Orca set to false + #define INVERT_Y_DIR true // for Mendel set to true, for Orca set to false -#define INVERT_Z_DIR true // for Mendel set to false, for Orca set to true +#define INVERT_Z_DIR false // 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 @@@ -140,11 -137,11 +140,11 @@@ #define Y_HOME_DIR -1 #define Z_HOME_DIR -1 -#define min_software_endstops true //If true, axis won't move to coordinates less than zero. +#define min_software_endstops false //If true, axis won't move to coordinates less than zero. #define max_software_endstops true //If true, axis won't move to coordinates greater than the defined lengths below. - #define X_MAX_LENGTH 205 - #define Y_MAX_LENGTH 205 - #define Z_MAX_LENGTH 200 + #define X_MAX_LENGTH 175 + #define Y_MAX_LENGTH 185 + #define Z_MAX_LENGTH 90 //// MOVEMENT SETTINGS #define NUM_AXIS 4 // The axis order in all axis related arrays is X, Y, Z, E @@@ -152,7 -149,7 +152,7 @@@ // default settings - #define DEFAULT_AXIS_STEPS_PER_UNIT {80,80,2560,760*1.1} // default steps per unit for ultimaker -#define DEFAULT_AXIS_STEPS_PER_UNIT {80, 80, 2560,640.15} // {78.7402,78.7402,200*8/3,760*1.1} // default steps per unit for metric prusa ++#define DEFAULT_AXIS_STEPS_PER_UNIT {78.7402,78.7402,200*8/3,760*1.1} // default steps per unit for ultimaker #define DEFAULT_MAX_FEEDRATE {500, 500, 5, 45} // (mm/sec) #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. @@@ -182,6 -179,13 +182,13 @@@ //#define ULTRA_LCD //general lcd support, also 16x2 #define SDSUPPORT // Enable SD Card Support in Hardware Console -// Invert the SD card Detect Pin. ++//#define ULTIPANEL + // If you are using a RAMPS board or cheap E-bay purchased boards that do not detect when an SD card is inserted + // 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 ULTIPANEL #ifdef ULTIPANEL #define NEWPANEL //enable this if you have a click-encoder panel diff --cc Marlin/ultralcd.h index db8a131,25abb42..f7bf9c0 --- a/Marlin/ultralcd.h +++ b/Marlin/ultralcd.h @@@ -27,12 -27,15 +27,19 @@@ #define CLICKED (buttons&EN_C) #define BLOCK {blocking=millis()+blocktime;} + #if (SDCARDDETECT > -1) + { - #define CARDINSERTED (READ(SDCARDDETECT)==0) + + #ifdef SDCARDDETECTINVERTED + #define CARDINSERTED (READ(SDCARDDETECT)!=0) + + #else + #define CARDINSERTED (READ(SDCARDDETECT)==0) + } + #endif - + + #endif //SDCARDTETECTINVERTED + #else //atomatic, do not change diff --cc Marlin/ultralcd.pde index 32ef2f3,99041f0..cec1e37 --- a/Marlin/ultralcd.pde +++ b/Marlin/ultralcd.pde @@@ -476,33 -464,32 +476,33 @@@ void MainMenu::showPrepare( switch(i) { case ItemP_exit: - MENUITEM( lcdprintPGM(" Main \003") , BLOCK;status=Main_Menu;beepshort(); ) ; + MENUITEM( lcdprintPGM(MSG_MAIN) , BLOCK;status=Main_Menu;beepshort(); ) ; break; case ItemP_autostart: - MENUITEM( lcdprintPGM(" Autostart") , BLOCK;card.lastnr=0;card.setroot();card.checkautostart(true);beepshort(); ) ; + MENUITEM( lcdprintPGM(MSG_AUTOSTART) , BLOCK;card.lastnr=0;card.setroot();card.checkautostart(true);beepshort(); ) ; break; case ItemP_disstep: - MENUITEM( lcdprintPGM(" Disable Steppers") , BLOCK;enquecommand("M84");beepshort(); ) ; + MENUITEM( lcdprintPGM(MSG_DISABLE_STEPPERS) , BLOCK;enquecommand("M84");beepshort(); ) ; break; case ItemP_home: - MENUITEM( lcdprintPGM(" Auto Home") , BLOCK;enquecommand("G28 X0 Y0 Z0");beepshort(); ) ; + MENUITEM( lcdprintPGM(MSG_AUTO_HOME) , BLOCK;enquecommand("G28 X-105 Y-105 Z0");beepshort(); ) ; break; case ItemP_origin: - MENUITEM( lcdprintPGM(" Set Origin") , BLOCK;enquecommand("G92 X0 Y0 Z0");beepshort(); ) ; + MENUITEM( lcdprintPGM(MSG_SET_ORIGIN) , BLOCK;enquecommand("G92 X0 Y0 Z0");beepshort(); ) ; break; case ItemP_preheat: - MENUITEM( lcdprintPGM(" Preheat") , BLOCK;setTargetHotend0(227);setTargetBed(105);beepshort(); ) ; + MENUITEM( lcdprintPGM(MSG_PREHEAT) , BLOCK;setTargetHotend0(170);setTargetBed(70);beepshort(); ) ; break; case ItemP_cooldown: - MENUITEM( lcdprintPGM(" Cooldown") , BLOCK;setTargetHotend0(0);setTargetBed(0);beepshort(); ) ; + MENUITEM( lcdprintPGM(MSG_COOLDOWN) , BLOCK;setTargetHotend0(0);setTargetBed(0);beepshort(); ) ; break; - case ItemP_extrude: - MENUITEM( lcdprintPGM(" Extrude") , BLOCK;enquecommand("G92 E0");enquecommand("G1 F700 E50");beepshort(); ) ; +// case ItemP_extrude: + // MENUITEM( lcdprintPGM(" Extrude") , BLOCK;enquecommand("G92 E0");enquecommand("G1 F700 E50");beepshort(); ) ; + // break; + case ItemP_move: + MENUITEM( lcdprintPGM(" Move Axis \x7E") , BLOCK;status=Sub_PrepareMove;beepshort(); ); break; - - - default: + default: break; } line++;