diff --git a/config/examples/Elegoo/Neptune 2/Configuration.h b/config/examples/Elegoo/Neptune 2/Configuration.h index d303d11da0..d678c932f5 100644 --- a/config/examples/Elegoo/Neptune 2/Configuration.h +++ b/config/examples/Elegoo/Neptune 2/Configuration.h @@ -82,48 +82,16 @@ // MAIN CONFIGURATION SWITCHES FOR FEATURES - see README.md for more details. -#define IS_BOARD_1_3 true // True if you have the 1.3 board, false for 1.2 board -#define HAS_BLTOUCH false // Enable if you have a BlTouch, false fo no BlTouch -#define IS_2D false // True if you have a Neptuen 2d (Dual extruder) +#define IS_BOARD_1_3 true // true if you have the 1.3 board, false for 1.2 board +#define HAS_BLTOUCH false // true if you have a BlTouch or clone +#define IS_2D false // true if you have a Neptuen 2d (Dual extruder) + // Define missing pins -#define POWER_LOSS_PIN PA2 #define MT_DET_PIN_STATE LOW -/* Neptune 2 Custom Theme (adjustments for better clarity) */ -#define COLOR_GRAYER 0x8C51 // #8D8D8D - -#define COLOR_BACKGROUND COLOR_BLACK -#define COLOR_SELECTION_BG COLOR_RED -#define COLOR_WEBSITE_URL COLOR_CYAN -#define COLOR_INACTIVE COLOR_GRAYER -#define COLOR_COLD COLOR_CYAN -#define COLOR_HOTEND COLOR_ORANGE -#define COLOR_HEATED_BED COLOR_ORANGE -#define COLOR_CHAMBER COLOR_ORANGE -#define COLOR_COOLER COLOR_ORANGE -#define COLOR_FAN COLOR_CYAN -#define COLOR_AXIS_HOMED COLOR_CYAN -#define COLOR_AXIS_NOT_HOMED COLOR_YELLOW -#define COLOR_RATE_100 COLOR_VIVID_GREEN -#define COLOR_RATE_ALTERED COLOR_YELLOW -#define COLOR_PRINT_TIME COLOR_AQUA -#define COLOR_PROGRESS_FRAME COLOR_WHITE -#define COLOR_PROGRESS_BAR COLOR_CYAN -#define COLOR_PROGRESS_BG COLOR_BLACK -#define COLOR_STATUS_MESSAGE COLOR_WHITE -#define COLOR_CONTROL_ENABLED COLOR_WHITE -#define COLOR_CONTROL_DISABLED COLOR_GRAYER -#define COLOR_CONTROL_CANCEL COLOR_RED -#define COLOR_CONTROL_CONFIRM COLOR_VIVID_GREEN -#define COLOR_BUSY COLOR_SILVER -#define COLOR_MENU_TEXT COLOR_WHITE -#define COLOR_MENU_VALUE COLOR_WHITE -#define COLOR_SLIDER COLOR_WHITE -#define COLOR_SLIDER_INACTIVE COLOR_GRAYER -#define COLOR_UBL COLOR_WHITE -#define COLOR_TOUCH_CALIBRATION COLOR_WHITE -#define COLOR_KILL_SCREEN_BG COLOR_RED -#define COLOR_KILL_SCREEN_TEXT COLOR_YELLOW +// Define firmware output name +// - NOTE: only works on 1.2 board - manual remene to elegoo.bin is needed for 1.3 board +#define FIRMWARE_BIN elegoo.bin /** * *** VENDORS PLEASE READ *** @@ -202,8 +170,6 @@ // Enable the Bluetooth serial interface on AT90USB devices //#define BLUETOOTH -#define FIRMWARE_BIN elegoo.bin - // Name displayed in the LCD "Ready" message and Info menu #if IS_2D #define CUSTOM_MACHINE_NAME "Elegoo Neptune 2D" @@ -680,7 +646,7 @@ // Above this temperature the heater will be switched off. // This can protect components from overheating, but NOT from shorts and failures. // (Use MINTEMP for thermistor short/failure protection.) -#define HEATER_0_MAXTEMP 270 +#define HEATER_0_MAXTEMP 275 #define HEATER_1_MAXTEMP 275 #define HEATER_2_MAXTEMP 275 #define HEATER_3_MAXTEMP 275 @@ -688,7 +654,7 @@ #define HEATER_5_MAXTEMP 275 #define HEATER_6_MAXTEMP 275 #define HEATER_7_MAXTEMP 275 -#define BED_MAXTEMP 110 +#define BED_MAXTEMP 120 #define CHAMBER_MAXTEMP 60 /** @@ -883,7 +849,7 @@ * *** IT IS HIGHLY RECOMMENDED TO LEAVE THIS OPTION ENABLED! *** */ #define PREVENT_COLD_EXTRUSION -#define EXTRUDE_MINTEMP 170 +#define EXTRUDE_MINTEMP 180 /** * Prevent a single extrusion longer than EXTRUDE_MAXLENGTH. @@ -1093,7 +1059,7 @@ * X, Y, Z [, I [, J [, K...]]], E0 [, E1[, E2...]] */ #if IS_2D - #define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, 133, 133 } + #define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, 95, 95 } #else #define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, 133 } #endif @@ -1147,11 +1113,11 @@ * When changing speed and direction, if the difference is less than the * value set here, it may happen instantaneously. */ -//#define CLASSIC_JERK +#define CLASSIC_JERK #if ENABLED(CLASSIC_JERK) #define DEFAULT_XJERK 10.0 #define DEFAULT_YJERK 10.0 - #define DEFAULT_ZJERK 0.4 + #define DEFAULT_ZJERK 0.3 //#define DEFAULT_IJERK 0.3 //#define DEFAULT_JJERK 0.3 //#define DEFAULT_KJERK 0.3 @@ -1384,7 +1350,7 @@ #define Z_PROBE_FEEDRATE_FAST (600) // Feedrate (mm/min) for the "accurate" probe of each point -#define Z_PROBE_FEEDRATE_SLOW (300) +#define Z_PROBE_FEEDRATE_SLOW (Z_PROBE_FEEDRATE_FAST / 2) /** * Probe Activation Switch @@ -1431,7 +1397,7 @@ * A total of 2 does fast/slow probes with a weighted average. * A total of 3 or more adds more slow probes, taking the average. */ -//#define MULTIPLE_PROBING 2 +#define MULTIPLE_PROBING 2 //#define EXTRA_PROBING 1 /** @@ -1457,7 +1423,7 @@ // For M851 give a range for adjusting the Z probe offset #define Z_PROBE_OFFSET_RANGE_MIN -20 -#define Z_PROBE_OFFSET_RANGE_MAX 50 +#define Z_PROBE_OFFSET_RANGE_MAX 65 // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST @@ -1553,7 +1519,7 @@ // @section homing //#define NO_MOTION_BEFORE_HOMING // Inhibit movement until all axes have been homed. Also enable HOME_AFTER_DEACTIVATE for extra safety. -//#define HOME_AFTER_DEACTIVATE // Require rehoming after steppers are deactivated. Also enable NO_MOTION_BEFORE_HOMING for extra safety. +#define HOME_AFTER_DEACTIVATE // Require rehoming after steppers are deactivated. Also enable NO_MOTION_BEFORE_HOMING for extra safety. /** * Set Z_IDLE_HEIGHT if the Z-Axis moves on its own when steppers are disabled. @@ -1844,7 +1810,7 @@ // Beyond the probed grid, continue the implied tilt? // Default is to maintain the height of the nearest edge. - //#define EXTRAPOLATE_BEYOND_GRID + #define EXTRAPOLATE_BEYOND_GRID // // Experimental Subdivision of the grid by Catmull-Rom method. @@ -1945,7 +1911,8 @@ * Commands to execute at the end of G29 probing. * Useful to retract or move the Z probe out of the way. */ -//#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" +// Move to allow screen access +#define Z_PROBE_END_SCRIPT "G0 X113 F2400\nG0 Y113 F2400\nG0 Z10 F600" // @section homing @@ -1981,7 +1948,7 @@ #endif // Homing speeds (linear=mm/min, rotational=°/min) -#define HOMING_FEEDRATE_MM_M { (2400), (2400), (10*60) } +#define HOMING_FEEDRATE_MM_M { (50*60), (50*60), (10*60) } // Validate that endstops are triggered on homing moves #define VALIDATE_HOMING_ENDSTOPS @@ -2058,13 +2025,13 @@ * M501 - Read settings from EEPROM. (i.e., Throw away unsaved changes) * M502 - Revert settings to "factory" defaults. (Follow with M500 to init the EEPROM.) */ -#define EEPROM_SETTINGS // Persistent storage with M500 and M501 +#define EEPROM_SETTINGS // Persistent storage with M500 and M501 //#define DISABLE_M503 // Saves ~2700 bytes of flash. Disable for release! #define EEPROM_CHITCHAT // Give feedback on EEPROM commands. Disable to save PROGMEM. #define EEPROM_BOOT_SILENT // Keep M503 quiet and only give errors during first load #if ENABLED(EEPROM_SETTINGS) //#define EEPROM_AUTO_INIT // Init EEPROM automatically on any errors. - #define EEPROM_INIT_NOW // Init EEPROM on first boot after a new build. + #define EEPROM_INIT_NOW // Init EEPROM on first boot after a new build. #endif // @@ -2927,7 +2894,7 @@ // 480x320, 3.5", FSMC Display From MKS // Usually paired with MKS Robin Nano V1.2 // -#define MKS_ROBIN_TFT35 +//#define MKS_ROBIN_TFT35 // // 480x272, 4.3", FSMC Display From MKS @@ -2978,19 +2945,19 @@ // // Generic TFT with detailed options // -//#define TFT_GENERIC +#define TFT_GENERIC #if ENABLED(TFT_GENERIC) // :[ 'AUTO', 'ST7735', 'ST7789', 'ST7796', 'R61505', 'ILI9328', 'ILI9341', 'ILI9488' ] - #define TFT_DRIVER AUTO + #define TFT_DRIVER ILI9341 // Interface. Enable one of the following options: - //#define TFT_INTERFACE_FSMC + #define TFT_INTERFACE_FSMC //#define TFT_INTERFACE_SPI // TFT Resolution. Enable one of the following options: //#define TFT_RES_320x240 //#define TFT_RES_480x272 - //#define TFT_RES_480x320 + #define TFT_RES_480x320 //#define TFT_RES_1024x600 #endif diff --git a/config/examples/Elegoo/Neptune 2/Configuration_adv.h b/config/examples/Elegoo/Neptune 2/Configuration_adv.h index a0df22745b..47532fc6c8 100644 --- a/config/examples/Elegoo/Neptune 2/Configuration_adv.h +++ b/config/examples/Elegoo/Neptune 2/Configuration_adv.h @@ -311,7 +311,7 @@ * Thermal Protection parameters for the bed are just as above for hotends. */ #if ENABLED(THERMAL_PROTECTION_BED) - #define THERMAL_PROTECTION_BED_PERIOD 40 // Seconds + #define THERMAL_PROTECTION_BED_PERIOD 20 // Seconds #define THERMAL_PROTECTION_BED_HYSTERESIS 2 // Degrees Celsius /** @@ -1053,7 +1053,7 @@ #define DEFAULT_STEPPER_DEACTIVE_TIME 120 #define DISABLE_INACTIVE_X true #define DISABLE_INACTIVE_Y true -#define DISABLE_INACTIVE_Z true // Set 'false' if the nozzle could fall onto your printed part! +#define DISABLE_INACTIVE_Z false // Set 'false' if the nozzle could fall onto your printed part! #define DISABLE_INACTIVE_I true #define DISABLE_INACTIVE_J true #define DISABLE_INACTIVE_K true @@ -1763,7 +1763,7 @@ //#define STATUS_FLOWMETER_ANIM // Use multiple bitmaps to indicate coolant flow //#define STATUS_ALT_BED_BITMAP // Use the alternative bed bitmap //#define STATUS_ALT_FAN_BITMAP // Use the alternative fan bitmap - //#define STATUS_FAN_FRAMES 3 // :[0,1,2,3,4] Number of fan animation frames + #define STATUS_FAN_FRAMES 3 // :[0,1,2,3,4] Number of fan animation frames //#define STATUS_HEAT_PERCENT // Show heating in a progress bar //#define BOOT_MARLIN_LOGO_ANIMATED // Animated Marlin logo. Costs ~3260 (or ~940) bytes of PROGMEM. @@ -2588,7 +2588,7 @@ // Set to 0 for manual extrusion. // Filament can be extruded repeatedly from the Filament Change menu // until extrusion is consistent, and to purge old filament. - #define ADVANCED_PAUSE_RESUME_PRIME 10 // (mm) Extra distance to prime nozzle after returning from park. + #define ADVANCED_PAUSE_RESUME_PRIME 0 // (mm) Extra distance to prime nozzle after returning from park. #define ADVANCED_PAUSE_FANS_PAUSE // Turn off print-cooling fans while the machine is paused. // Filament Unload does a Retract, Delay, and Purge first: diff --git a/config/examples/Elegoo/Neptune 2/README.md b/config/examples/Elegoo/Neptune 2/README.md index 3aac3005f1..27081bebbb 100644 --- a/config/examples/Elegoo/Neptune 2/README.md +++ b/config/examples/Elegoo/Neptune 2/README.md @@ -6,7 +6,8 @@ Compiled binaries of configurations are available here: https://github.com/just- The configuration provided has custom switches in the `Configuration.h` file `// @section custom` to simplify the build options. This configuration supports the ZNP Robin Nano 1.2 and 1.3 Boards with only minor changes in `// @section custom` and a `default_envs` change in the `platformio.ini` file. The configuration is currently set for the 1.3 board without BLTouch, which is the most common option. -NOTE: The original Neptune 2 and 2S use the same configurations except the 2S is always a 1.2 version of the board. +NOTE: The original Neptune 2 and 2S use the same configurations except the 2S is always a 1.3 version of the board. + ## For ZNP Robin Nano 1.2 boards: - In the `Configuration.h` file, ensure `#define IS_BOARD_1_3` is set to `false`. - Update/Ensure `default_envs = mks_robin_nano35` in the `platformio.ini` file.