diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 150db5fcd..5779095f1 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -74,8 +74,8 @@ // User-specified version info of this build to display in [Pronterface, etc] terminal window during // startup. Implementation of an idea by Prof Braino to inform user that any changes made to this // build by the user have been successfully uploaded into firmware. -#define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes. -#define SHOW_BOOTSCREEN +#define STRING_CONFIG_H_AUTHOR "dpavlin@rot13.org" // Who made the changes. +//#define SHOW_BOOTSCREEN #define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1 #define STRING_SPLASH_LINE2 WEBSITE_URL // will be shown during bootup in line 2 @@ -118,13 +118,14 @@ // The following define selects which electronics board you have. // Please choose the name from boards.h that matches your setup +#define MOTHERBOARD BOARD_PRINTRBOARD #ifndef MOTHERBOARD #define MOTHERBOARD BOARD_RAMPS_14_EFB #endif // Optional custom name for your RepStrap or other custom machine // Displayed in the LCD "Ready" message -//#define CUSTOM_MACHINE_NAME "3D Printer" +#define CUSTOM_MACHINE_NAME "PrintrBot" // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines) // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4) @@ -291,7 +292,7 @@ #define TEMP_SENSOR_2 0 #define TEMP_SENSOR_3 0 #define TEMP_SENSOR_4 0 -#define TEMP_SENSOR_BED 0 +#define TEMP_SENSOR_BED 7 // Dummy thermistor constant temperature readings, for use with 998 and 999 #define DUMMY_THERMISTOR_998_VALUE 25 @@ -529,14 +530,14 @@ * Override with M92 * X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]] */ -#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 4000, 500 } +#define DEFAULT_AXIS_STEPS_PER_UNIT { 62.11, 64.67, 2272.72, 536 } /** * Default Max Feed Rate (mm/s) * Override with M203 * X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]] */ -#define DEFAULT_MAX_FEEDRATE { 300, 300, 5, 25 } +#define DEFAULT_MAX_FEEDRATE { 60, 60, 2, 14 } /** * Default Max Acceleration (change/s) change = mm/s @@ -544,7 +545,7 @@ * Override with M201 * X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]] */ -#define DEFAULT_MAX_ACCELERATION { 3000, 3000, 100, 10000 } +#define DEFAULT_MAX_ACCELERATION { 2000, 2000, 30, 10000 } /** * Default Acceleration (change/s) change = mm/s @@ -620,7 +621,7 @@ * Use G29 repeatedly, adjusting the Z height at each point with movement commands * or (with LCD_BED_LEVELING) the LCD controller. */ -//#define PROBE_MANUALLY +#define PROBE_MANUALLY /** * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. @@ -748,9 +749,9 @@ // @section machine // Invert the stepper direction. Change (or reverse the motor connector) if an axis goes the wrong way. -#define INVERT_X_DIR false +#define INVERT_X_DIR true #define INVERT_Y_DIR true -#define INVERT_Z_DIR false +#define INVERT_Z_DIR true // Enable this option for Toshiba stepper drivers //#define CONFIG_STEPPERS_TOSHIBA @@ -780,8 +781,8 @@ // @section machine // The size of the print bed -#define X_BED_SIZE 200 -#define Y_BED_SIZE 200 +#define X_BED_SIZE 250 +#define Y_BED_SIZE 250 // Travel limits (mm) after homing, corresponding to endstop positions. #define X_MIN_POS 0 @@ -789,7 +790,7 @@ #define Z_MIN_POS 0 #define X_MAX_POS X_BED_SIZE #define Y_MAX_POS Y_BED_SIZE -#define Z_MAX_POS 200 +#define Z_MAX_POS 254 /** * Software Endstops @@ -805,7 +806,7 @@ #if ENABLED(MIN_SOFTWARE_ENDSTOPS) #define MIN_SOFTWARE_ENDSTOP_X #define MIN_SOFTWARE_ENDSTOP_Y - #define MIN_SOFTWARE_ENDSTOP_Z +// #define MIN_SOFTWARE_ENDSTOP_Z #endif // Max software endstops curtail movement above maximum coordinate bounds @@ -873,7 +874,7 @@ //#define AUTO_BED_LEVELING_LINEAR //#define AUTO_BED_LEVELING_BILINEAR //#define AUTO_BED_LEVELING_UBL -//#define MESH_BED_LEVELING +#define MESH_BED_LEVELING /** * Enable detailed logging of G28, G29, M48, etc. @@ -994,7 +995,7 @@ * Use the LCD controller for bed leveling * Requires MESH_BED_LEVELING or PROBE_MANUALLY */ -//#define LCD_BED_LEVELING +#define LCD_BED_LEVELING #if ENABLED(LCD_BED_LEVELING) #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. @@ -1113,7 +1114,7 @@ // M501 - reads parameters from EEPROM (if you need reset them after you changed them temporarily). // M502 - reverts to the default "factory settings". You still need to store them in EEPROM afterwards if you want to. // -//#define EEPROM_SETTINGS // Enable for M500 and M501 commands +#define EEPROM_SETTINGS // Enable for M500 and M501 commands //#define DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release! #define EEPROM_CHITCHAT // Give feedback on EEPROM commands. Disable to save PROGMEM. @@ -1330,6 +1331,7 @@ * */ //#define SDSUPPORT +/* according to pins_PRINTRBOARD.h this will also move Y STOP to E STOP */ /** * SD CARD: SPI SPEED @@ -1481,7 +1483,7 @@ // RepRapDiscount FULL GRAPHIC Smart Controller // http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller // -//#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER +#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER // // MakerLab Mini Panel with graphic diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index bcae08a0a..9080040a1 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -1358,7 +1358,7 @@ /** * M43 - display pin status, watch pins for changes, watch endstops & toggle LED, Z servo probe test, toggle pins */ -//#define PINS_DEBUGGING +#define PINS_DEBUGGING /** * Auto-report temperatures with M155 S diff --git a/Marlin/pins_PRINTRBOARD.h b/Marlin/pins_PRINTRBOARD.h index 93f4b2b69..09efe67be 100755 --- a/Marlin/pins_PRINTRBOARD.h +++ b/Marlin/pins_PRINTRBOARD.h @@ -167,3 +167,19 @@ #endif #endif // ULTRA_LCD && NEWPANEL + +// XXX dpavlin -- my pinout +#define LCD_PINS_RS 9 // E1 JP11-11 +#define LCD_PINS_ENABLE 8 // E0 JP11-10 +#define LCD_PINS_D4 7 // D7 JP11-8 +#define LCD_PINS_D5 6 // D6 JP11-7 +#define LCD_PINS_D6 5 // D5 JP11-6 +#define LCD_PINS_D7 4 // D4 JP11-5 + +#define BTN_EN1 10 // C0 JP11-12 +#define BTN_EN2 11 // C1 JP11-13 +#define BTN_ENC 12 // C2 JP11-14 + +// display delays are added to +// Marlin/ultralcd_st7920_u8glib_rrd.h + diff --git a/Marlin/ultralcd_st7920_u8glib_rrd.h b/Marlin/ultralcd_st7920_u8glib_rrd.h index 67de4611e..8d92da069 100644 --- a/Marlin/ultralcd_st7920_u8glib_rrd.h +++ b/Marlin/ultralcd_st7920_u8glib_rrd.h @@ -56,6 +56,11 @@ #define CPU_ST7920_DELAY_1 DELAY_0_NOP #define CPU_ST7920_DELAY_2 DELAY_4_NOP #define CPU_ST7920_DELAY_3 DELAY_0_NOP +#elif MB(PRINTRBOARD) + // XXX dpavlin - added delays for my cabling + #define CPU_ST7920_DELAY_1 DELAY_0_NOP + #define CPU_ST7920_DELAY_2 DELAY_3_NOP + #define CPU_ST7920_DELAY_3 DELAY_0_NOP #elif MB(RAMBO) #define CPU_ST7920_DELAY_1 DELAY_0_NOP #define CPU_ST7920_DELAY_2 DELAY_0_NOP