diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 9d06d5377e..654a872809 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -681,13 +681,13 @@ */ #define X_DRIVER_TYPE TMC2208_STANDALONE #define Y_DRIVER_TYPE TMC2208_STANDALONE -#define Z_DRIVER_TYPE TMC2208_STANDALONE +#define Z_DRIVER_TYPE A4988 //#define X2_DRIVER_TYPE A4988 //#define Y2_DRIVER_TYPE A4988 //#define Z2_DRIVER_TYPE A4988 //#define Z3_DRIVER_TYPE A4988 //#define Z4_DRIVER_TYPE A4988 -#define E0_DRIVER_TYPE TMC2209_STANDALONE +#define E0_DRIVER_TYPE A4988 //#define E1_DRIVER_TYPE A4988 //#define E2_DRIVER_TYPE A4988 //#define E3_DRIVER_TYPE A4988 @@ -863,7 +863,7 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. */ -#define Z_MIN_PROBE_PIN BL_TOUCH_Z_PIN // Pin 32 is the RAMPS default +//#define Z_MIN_PROBE_PIN BL_TOUCH_Z_PIN // Pin 32 is the RAMPS default /** * Probe Type @@ -1041,7 +1041,7 @@ #define Z_PROBE_OFFSET_RANGE_MAX 20 // Enable the M48 repeatability test to test probe accuracy -#define Z_MIN_PROBE_REPEATABILITY_TEST +//#define Z_MIN_PROBE_REPEATABILITY_TEST // Before deploy/stow pause for user confirmation //#define PAUSE_BEFORE_DEPLOY_STOW @@ -1087,9 +1087,9 @@ // @section machine -#define ALL_DRV_2208 +//#define ALL_DRV_2208 //#define FB_4S_STOCK -//#define FB_5_STOCK +#define FB_5_STOCK #ifdef ALL_DRV_2208 #define USR_E0_DIR true @@ -1197,9 +1197,9 @@ * RAMPS-based boards use SERVO3_PIN for the first runout sensor. * For other boards you may need to define FIL_RUNOUT_PIN, FIL_RUNOUT2_PIN, etc. */ -//#define FILAMENT_RUNOUT_SENSOR +#define FILAMENT_RUNOUT_SENSOR #if ENABLED(FILAMENT_RUNOUT_SENSOR) - #define FIL_RUNOUT_ENABLED_DEFAULT true // Enable the sensor on startup. Override with M412 followed by M500. + #define FIL_RUNOUT_ENABLED_DEFAULT false // Enable the sensor on startup. Override with M412 followed by M500. #define NUM_RUNOUT_SENSORS 1 // Number of sensors, up to one per extruder. Define a FIL_RUNOUT#_PIN for each. #define FIL_RUNOUT_STATE HIGH // Pin state indicating that filament is NOT present. //#define FIL_RUNOUT_PULLUP // Use internal pullup for filament runout pins. @@ -1369,7 +1369,7 @@ * Add a bed leveling sub-menu for ABL or MBL. * Include a guided procedure if manual probing is enabled. */ -#define LCD_BED_LEVELING +//#define LCD_BED_LEVELING #if ENABLED(LCD_BED_LEVELING) #define MESH_EDIT_Z_STEP 0.025 // (mm) Step size while manually probing Z axis. diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 722c73e4a6..2137f37d97 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -405,8 +405,8 @@ * * Define one or both of these to override the default 0-255 range. */ -//#define FAN_MIN_PWM 50 -//#define FAN_MAX_PWM 128 +#define FAN_MIN_PWM 64 +#define FAN_MAX_PWM 255 /** * FAST PWM FAN Settings @@ -769,7 +769,7 @@ // // Add the G35 command to read bed corners to help adjust screws. Requires a bed probe. // -#define ASSISTED_TRAMMING +//#define ASSISTED_TRAMMING #if ENABLED(ASSISTED_TRAMMING) // Define positions for probing points, use the hotend as reference not the sensor. #define TRAMMING_POINT_XY { { 20, 20 }, { 200, 20 }, { 200, 200 }, { 20, 200 } } @@ -1095,7 +1095,7 @@ //#define LCD_TIMEOUT_TO_STATUS 15000 // Add an 'M73' G-code to set the current percentage -//#define LCD_SET_PROGRESS_MANUALLY +#define LCD_SET_PROGRESS_MANUALLY // Show the E position (filament used) during printing //#define LCD_SHOW_E_TOTAL @@ -1162,7 +1162,7 @@ * an option on the LCD screen to continue the print from the last-known * point in the file. */ - //#define POWER_LOSS_RECOVERY + #define POWER_LOSS_RECOVERY #if ENABLED(POWER_LOSS_RECOVERY) #define PLR_ENABLED_DEFAULT false // Power Loss Recovery enabled by default. (Set with 'M413 Sn' & M500) //#define BACKUP_POWER_SUPPLY // Backup power / UPS to move the steppers on power loss @@ -1484,7 +1484,7 @@ // UTF8 processing and rendering. // Unsupported characters are shown as '?'. - //#define TOUCH_UI_USE_UTF8 + #define TOUCH_UI_USE_UTF8 #if ENABLED(TOUCH_UI_USE_UTF8) // Western accents support. These accented characters use // combined bitmaps and require relatively little storage. @@ -1509,8 +1509,8 @@ #define TOUCH_UI_FIT_TEXT // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE) - //#define LCD_LANGUAGE_1 en - //#define LCD_LANGUAGE_2 fr + #define LCD_LANGUAGE_1 en + #define LCD_LANGUAGE_2 ru //#define LCD_LANGUAGE_3 de //#define LCD_LANGUAGE_4 es //#define LCD_LANGUAGE_5 it @@ -1953,21 +1953,21 @@ * * Note that M207 / M208 / M209 settings are saved to EEPROM. */ -//#define FWRETRACT +#define FWRETRACT #if ENABLED(FWRETRACT) - #define FWRETRACT_AUTORETRACT // Override slicer retractions + //#define FWRETRACT_AUTORETRACT // Override slicer retractions #if ENABLED(FWRETRACT_AUTORETRACT) #define MIN_AUTORETRACT 0.1 // (mm) Don't convert E moves under this length #define MAX_AUTORETRACT 10.0 // (mm) Don't convert E moves over this length #endif - #define RETRACT_LENGTH 3 // (mm) Default retract length (positive value) - #define RETRACT_LENGTH_SWAP 13 // (mm) Default swap retract length (positive value) - #define RETRACT_FEEDRATE 45 // (mm/s) Default feedrate for retracting - #define RETRACT_ZRAISE 0 // (mm) Default retract Z-raise + #define RETRACT_LENGTH 0.8 // (mm) Default retract length (positive value) + #define RETRACT_LENGTH_SWAP 16 // (mm) Default swap retract length (positive value) + #define RETRACT_FEEDRATE 30 // (mm/s) Default feedrate for retracting + #define RETRACT_ZRAISE 0.2 // (mm) Default retract Z-raise #define RETRACT_RECOVER_LENGTH 0 // (mm) Default additional recover length (added to retract length on recover) #define RETRACT_RECOVER_LENGTH_SWAP 0 // (mm) Default additional swap recover length (added to retract length on recover from toolchange) - #define RETRACT_RECOVER_FEEDRATE 8 // (mm/s) Default feedrate for recovering from retraction - #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // (mm/s) Default feedrate for recovering from swap retraction + #define RETRACT_RECOVER_FEEDRATE 30 // (mm/s) Default feedrate for recovering from retraction + #define RETRACT_RECOVER_FEEDRATE_SWAP 30 // (mm/s) Default feedrate for recovering from swap retraction #if ENABLED(MIXING_EXTRUDER) //#define RETRACT_SYNC_MIXING // Retract and restore all mixing steppers simultaneously #endif diff --git a/firmware/FBG5_12864/Robin_nano35.bin b/firmware/FBG5_12864/Robin_nano35.bin deleted file mode 100644 index d223ba3ba0..0000000000 Binary files a/firmware/FBG5_12864/Robin_nano35.bin and /dev/null differ diff --git a/firmware/all_drv_2208/Robin_nano35.bin b/firmware/all_drv_2208/Robin_nano35.bin deleted file mode 100644 index 681084fa54..0000000000 Binary files a/firmware/all_drv_2208/Robin_nano35.bin and /dev/null differ diff --git a/firmware/bootloader/fb_4s_bootloader.bin b/firmware/bootloader/fb_4s_bootloader.bin deleted file mode 100644 index 0ca7b1c239..0000000000 Binary files a/firmware/bootloader/fb_4s_bootloader.bin and /dev/null differ diff --git a/firmware/fb_4s/Robin_nano35.bin b/firmware/fb_4s/Robin_nano35.bin deleted file mode 100644 index 9076241ec8..0000000000 Binary files a/firmware/fb_4s/Robin_nano35.bin and /dev/null differ diff --git a/firmware/fb_5/Robin_nano35.bin b/firmware/fb_5/Robin_nano35.bin deleted file mode 100644 index 7f1c8e00ac..0000000000 Binary files a/firmware/fb_5/Robin_nano35.bin and /dev/null differ