Gal bus kam įdomi mano naudojamo, savos gamybos spausdintuvo Marlin fw konfigūracija. Ši versija nėra tinkama naudoti su Diamond ekstruderiu.
Elektronika
Arduino DUE
Ramps FD 1.2v modifikuota iki 2.Av su papildoma EEPROM mikroschema
ReprapWorld Graphical LCD
A4988 variklių valdikliai
Raspberry Pi 3 Octoprint serveris
450W ATX maitinimo šaltinis, R Pi maitinamas +5V STB, DUE +5V, Ramps +12V. Octoprint junginėja maitinimo šaltinį
Platforma šildoma silikoniniu šildytuvu nuo tinklo įtampos per opto relę
Piezo daviklis z ašies kalibravimui. Daugiau informacijos apie jį čia
Ašių galiniai jutikliai – holo davikliai
Naudojamas šildytuvas termokamerai per opto relę
diff -ruN Marlin-2.0.x/Marlin/_Bootscreen.h Marlin-2.0.x.5/Marlin/_Bootscreen.h
--- Marlin-2.0.x/Marlin/_Bootscreen.h 1970-01-01 03:00:00.000000000 +0300
+++ Marlin-2.0.x.5/Marlin/_Bootscreen.h 2020-01-07 16:49:35.000000000 +0200
@@ -0,0 +1,77 @@
+/**
+ * Made with Marlin Bitmap Converter
+ * http://marlinfw.org/tools/u8glib/converter.html
+ *
+ * This bitmap from the file 'bezdzione5.bmp'
+ */
+#pragma once
+
+#define CUSTOM_BOOTSCREEN_BMPWIDTH 64
+
+
+const unsigned char custom_start_bmp[] PROGMEM = {
+ B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
+ B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
+ B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
+ B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
+ B00000000,B00000000,B00000000,B00011000,B00000000,B00000000,B00000000,B00000000,
+ B00000000,B00001111,B11000000,B00011100,B00000000,B00000000,B00000000,B00000000,
+ B00000000,B00001111,B11111000,B00011100,B00000000,B00000000,B00000000,B00000000,
+ B00000000,B00001111,B11111111,B10011110,B00000000,B00000000,B00000000,B00000000,
+ B00000000,B00001111,B11111111,B11111110,B00000000,B00000000,B00000000,B00000000,
+ B00000000,B00000111,B11111111,B11111111,B00000000,B00000000,B00000000,B00000000,
+ B00000000,B00000111,B11111111,B11111111,B10000000,B00000000,B00000000,B00000000,
+ B00000000,B00000011,B11111111,B11111111,B11000000,B00000000,B00000000,B00000000,
+ B00000000,B00000011,B11111111,B11111111,B11110000,B00000000,B00000000,B00000000,
+ B00000000,B00000111,B11111111,B11111111,B11111000,B00000000,B00000000,B00000000,
+ B00000000,B00000111,B11111111,B11111111,B11111100,B00000000,B00000000,B00000000,
+ B00000000,B00000111,B11111111,B11111111,B11111110,B00000000,B00000000,B00000000,
+ B00000000,B00001111,B11111111,B11111111,B11111110,B00000000,B00000000,B00000000,
+ B00000000,B00011111,B11111111,B11111111,B11111111,B10000000,B00000001,B10000000,
+ B00000000,B00011111,B11111111,B11111111,B11111111,B11000000,B00001111,B11000000,
+ B00000000,B00111111,B11111111,B11111111,B11111111,B11000000,B00111111,B11100000,
+ B00000001,B11111111,B11111111,B11111111,B11111111,B11000000,B11111000,B01110000,
+ B00011001,B11111111,B11111111,B11111111,B11111111,B11100001,B11111111,B11110000,
+ B00111111,B11111111,B11111111,B11111111,B11111111,B11100011,B11111101,B11111000,
+ B01100011,B11100111,B11111111,B11100001,B11111111,B11100111,B11110000,B01111000,
+ B01100001,B11000011,B11111110,B00000000,B11111111,B11111110,B01100000,B00111100,
+ B00110001,B11100011,B10000000,B00000000,B01111111,B11111000,B11100000,B00111100,
+ B00111001,B11100001,B10000000,B00000000,B00111111,B11110001,B11110000,B00011100,
+ B00011101,B11110000,B00001110,B00000000,B00111111,B11100001,B11111000,B00011100,
+ B00011111,B11111110,B00001111,B11111100,B00111111,B11100011,B10011100,B00010110,
+ B00001111,B11111110,B00000001,B11111000,B00011111,B11110011,B00000110,B00010110,
+ B00001111,B11111100,B00000000,B01110000,B00011111,B11110111,B00000010,B00010110,
+ B00000111,B11001000,B00000000,B00000000,B00011111,B11110111,B11000000,B00010110,
+ B00000111,B10000110,B00000000,B00000000,B00111111,B11111111,B11100000,B00010110,
+ B00000111,B10001111,B00000000,B00000000,B01111111,B11111111,B01110000,B00000100,
+ B00000010,B01111111,B11100000,B00000011,B11111111,B11111111,B00011000,B00000100,
+ B00000000,B01111111,B11110000,B00111111,B11111111,B11111111,B00001100,B00000100,
+ B00000000,B01100000,B11110001,B11111111,B11111111,B11111111,B00001100,B00000100,
+ B00000000,B00000000,B00000001,B11111111,B11111111,B11111111,B00001110,B00001000,
+ B00000110,B00000000,B00000001,B11111111,B11111111,B11111111,B00000110,B00001000,
+ B00001100,B00000000,B00000000,B01111111,B11111111,B11111111,B00000110,B00011000,
+ B00011100,B00000000,B00000000,B01111111,B11111111,B11111111,B00000110,B00010000,
+ B00011000,B00000000,B00000000,B01111111,B11111111,B11110111,B00000100,B00110000,
+ B00011000,B00000000,B00000000,B00111111,B11111111,B11110011,B10001100,B01100000,
+ B00011000,B00000000,B00000000,B00111111,B11111111,B11110011,B11111001,B11000000,
+ B00011000,B00000000,B00000000,B00111111,B11111111,B11110001,B11110011,B11000000,
+ B00011000,B00000000,B00000000,B00111111,B11111111,B11110000,B00000111,B10000000,
+ B00011000,B00000000,B00000000,B00111111,B11111111,B11111000,B00001100,B00000000,
+ B00011000,B00000000,B00000000,B00111111,B11111111,B11111111,B11111000,B00000000,
+ B00111111,B11000000,B00000000,B00111111,B11111111,B11100111,B11000000,B00000000,
+ B00111111,B11000000,B00000000,B00111111,B11111100,B00100000,B00000000,B00000000,
+ B00110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
+ B00110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
+ B00011000,B00000000,B00000000,B01000000,B00000000,B00000000,B00000000,B00000000,
+ B00011000,B00000000,B00000001,B11000000,B00000000,B00000000,B00000000,B00000000,
+ B00001100,B00000000,B00000001,B10000000,B00000000,B00000000,B00000000,B00000000,
+ B00001100,B00000000,B00000011,B10000000,B00000000,B00000000,B00000000,B00000000,
+ B00000110,B00000000,B00001110,B00000000,B00000000,B00000000,B00000000,B00000000,
+ B00000010,B00000000,B00011000,B00000000,B00000000,B00000000,B00000000,B00000000,
+ B00000011,B11000000,B01110000,B00000000,B00000000,B00000000,B00000000,B00000000,
+ B00000001,B11111011,B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,
+ B00000000,B00111111,B10000000,B00000000,B00000000,B00000000,B00000000,B00000000,
+ B00000000,B00011110,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
+ B00000000,B00000100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
+ B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000
+};
diff -ruN Marlin-2.0.x/Marlin/Configuration_adv.h Marlin-2.0.x.5/Marlin/Configuration_adv.h
--- Marlin-2.0.x/Marlin/Configuration_adv.h 2020-09-29 05:02:09.000000000 +0300
+++ Marlin-2.0.x.5/Marlin/Configuration_adv.h 2020-09-29 09:53:41.109033995 +0300
@@ -129,9 +129,9 @@
* Heated Chamber settings
*/
#if TEMP_SENSOR_CHAMBER
- #define CHAMBER_MINTEMP 5
- #define CHAMBER_MAXTEMP 60
- #define TEMP_CHAMBER_HYSTERESIS 1 // (°C) Temperature proximity considered "close enough" to the target
+ #define CHAMBER_MINTEMP 3
+ #define CHAMBER_MAXTEMP 70
+ #define TEMP_CHAMBER_HYSTERESIS 4 // (°C) Temperature proximity considered "close enough" to the target
//#define CHAMBER_LIMIT_SWITCHING
//#define HEATER_CHAMBER_PIN 44 // Chamber heater on/off pin
//#define HEATER_CHAMBER_INVERTING false
@@ -140,7 +140,7 @@
#if DISABLED(PIDTEMPBED)
#define BED_CHECK_INTERVAL 5000 // ms between checks in bang-bang control
#if ENABLED(BED_LIMIT_SWITCHING)
- #define BED_HYSTERESIS 2 // Only disable heating if T>target+BED_HYSTERESIS and enable heating if T>target-BED_HYSTERESIS
+ #define BED_HYSTERESIS 5 // Only disable heating if T>target+BED_HYSTERESIS and enable heating if T>target-BED_HYSTERESIS
#endif
#endif
@@ -162,11 +162,11 @@
*/
#if ENABLED(THERMAL_PROTECTION_HOTENDS)
#define THERMAL_PROTECTION_PERIOD 40 // Seconds
- #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius
+ #define THERMAL_PROTECTION_HYSTERESIS 8 // Degrees Celsius
- //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops
+ #define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops
#if BOTH(ADAPTIVE_FAN_SLOWING, PIDTEMP)
- //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303
+ #define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303
#endif
/**
@@ -203,13 +203,13 @@
* Thermal Protection parameters for the heated chamber.
*/
#if ENABLED(THERMAL_PROTECTION_CHAMBER)
- #define THERMAL_PROTECTION_CHAMBER_PERIOD 20 // Seconds
+ #define THERMAL_PROTECTION_CHAMBER_PERIOD 90 // Seconds
#define THERMAL_PROTECTION_CHAMBER_HYSTERESIS 2 // Degrees Celsius
/**
* Heated chamber watch settings (M141/M191).
*/
- #define WATCH_CHAMBER_TEMP_PERIOD 60 // Seconds
+ #define WATCH_CHAMBER_TEMP_PERIOD 90 // Seconds
#define WATCH_CHAMBER_TEMP_INCREASE 2 // Degrees Celsius
#endif
@@ -334,12 +334,12 @@
// Extruder runout prevention.
// If the machine is idle and the temperature over MINTEMP
// then extrude some filament every couple of SECONDS.
-//#define EXTRUDER_RUNOUT_PREVENT
+#define EXTRUDER_RUNOUT_PREVENT
#if ENABLED(EXTRUDER_RUNOUT_PREVENT)
#define EXTRUDER_RUNOUT_MINTEMP 190
- #define EXTRUDER_RUNOUT_SECONDS 30
+ #define EXTRUDER_RUNOUT_SECONDS 20
#define EXTRUDER_RUNOUT_SPEED 1500 // (mm/min)
- #define EXTRUDER_RUNOUT_EXTRUDE 5 // (mm)
+ #define EXTRUDER_RUNOUT_EXTRUDE 2 // (mm)
#endif
/**
@@ -370,7 +370,7 @@
* The fan turns on automatically whenever any driver is enabled and turns
* off (or reduces to idle speed) shortly after drivers are turned off.
*/
-//#define USE_CONTROLLER_FAN
+#define USE_CONTROLLER_FAN
#if ENABLED(USE_CONTROLLER_FAN)
//#define CONTROLLER_FAN_PIN -1 // Set a custom pin for the controller fan
//#define CONTROLLER_FAN_USE_Z_ONLY // With this option only the Z axis is considered
@@ -379,7 +379,7 @@
#define CONTROLLERFAN_SPEED_ACTIVE 255 // (0-255) Active speed, used when any motor is enabled
#define CONTROLLERFAN_SPEED_IDLE 0 // (0-255) Idle speed, used when motors are disabled
#define CONTROLLERFAN_IDLE_TIME 60 // (seconds) Extra time to keep the fan running after disabling motors
- //#define CONTROLLER_FAN_EDITABLE // Enable M710 configurable settings
+ #define CONTROLLER_FAN_EDITABLE // Enable M710 configurable settings
#if ENABLED(CONTROLLER_FAN_EDITABLE)
#define CONTROLLER_FAN_MENU // Enable the Controller Fan submenu
#endif
@@ -388,7 +388,7 @@
// When first starting the main fan, run it at full speed for the
// given number of milliseconds. This gets the fan spinning reliably
// before setting a PWM value. (Does not work with software PWM for fan on Sanguinololu)
-//#define FAN_KICKSTART_TIME 100
+#define FAN_KICKSTART_TIME 200
// Some coolers may require a non-zero "off" state.
//#define FAN_OFF_PWM 1
@@ -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 60
+#define FAN_MAX_PWM 255
/**
* FAST PWM FAN Settings
@@ -449,7 +449,7 @@
* Multiple extruders can be assigned to the same pin in which case
* the fan will turn on when any selected extruder is above the threshold.
*/
-#define E0_AUTO_FAN_PIN -1
+#define E0_AUTO_FAN_PIN 12
#define E1_AUTO_FAN_PIN -1
#define E2_AUTO_FAN_PIN -1
#define E3_AUTO_FAN_PIN -1
@@ -457,11 +457,11 @@
#define E5_AUTO_FAN_PIN -1
#define E6_AUTO_FAN_PIN -1
#define E7_AUTO_FAN_PIN -1
-#define CHAMBER_AUTO_FAN_PIN -1
+#define CHAMBER_AUTO_FAN_PIN 11
#define EXTRUDER_AUTO_FAN_TEMPERATURE 50
#define EXTRUDER_AUTO_FAN_SPEED 255 // 255 == full speed
-#define CHAMBER_AUTO_FAN_TEMPERATURE 30
+#define CHAMBER_AUTO_FAN_TEMPERATURE 50
#define CHAMBER_AUTO_FAN_SPEED 255
/**
@@ -478,14 +478,14 @@
/**
* M355 Case Light on-off / brightness
*/
-//#define CASE_LIGHT_ENABLE
+#define CASE_LIGHT_ENABLE
#if ENABLED(CASE_LIGHT_ENABLE)
//#define CASE_LIGHT_PIN 4 // Override the default pin if needed
#define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW
- #define CASE_LIGHT_DEFAULT_ON true // Set default power-up state on
- #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // Set default power-up brightness (0-255, requires PWM pin)
- //#define CASE_LIGHT_MAX_PWM 128 // Limit pwm
- //#define CASE_LIGHT_MENU // Add Case Light options to the LCD menu
+ #define CASE_LIGHT_DEFAULT_ON false // Set default power-up state on
+ #define CASE_LIGHT_DEFAULT_BRIGHTNESS 127 // Set default power-up brightness (0-255, requires PWM pin)
+ #define CASE_LIGHT_MAX_PWM 255 // Limit pwm
+ #define CASE_LIGHT_MENU // Add Case Light options to the LCD menu
//#define CASE_LIGHT_NO_BRIGHTNESS // Disable brightness control. Enable for non-PWM lighting.
//#define CASE_LIGHT_USE_NEOPIXEL // Use NeoPixel LED as case light, requires NEOPIXEL_LED.
#if ENABLED(CASE_LIGHT_USE_NEOPIXEL)
@@ -949,7 +949,7 @@
* vibration and surface artifacts. The algorithm adapts to provide the best possible step smoothing at the
* lowest stepping frequencies.
*/
-//#define ADAPTIVE_STEP_SMOOTHING
+#define ADAPTIVE_STEP_SMOOTHING
/**
* Custom Microstepping
@@ -1049,7 +1049,7 @@
#if HAS_LCD_MENU
// Include a page of printer information in the LCD Main Menu
- //#define LCD_INFO_MENU
+ #define LCD_INFO_MENU
#if ENABLED(LCD_INFO_MENU)
//#define LCD_PRINTER_INFO_IS_BOOTSCREEN // Show bootscreen(s) instead of Printer Info pages
#endif
@@ -1086,16 +1086,16 @@
#endif // HAS_LCD_MENU
// Scroll a longer status message into view
-//#define STATUS_MESSAGE_SCROLLING
+#define STATUS_MESSAGE_SCROLLING
// On the Info Screen, display XY with one decimal place when possible
//#define LCD_DECIMAL_SMALL_XY
// The timeout (in ms) to return to the status screen from sub-menus
-//#define LCD_TIMEOUT_TO_STATUS 15000
+#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
@@ -1171,7 +1171,7 @@
//#define POWER_LOSS_PIN 44 // Pin to detect power loss. Set to -1 to disable default pin on boards without module.
//#define POWER_LOSS_STATE HIGH // State of pin indicating power loss
//#define POWER_LOSS_PULL // Set pullup / pulldown as appropriate
- //#define POWER_LOSS_PURGE_LEN 20 // (mm) Length of filament to purge on resume
+ #define POWER_LOSS_PURGE_LEN 20 // (mm) Length of filament to purge on resume
//#define POWER_LOSS_RETRACT_LEN 10 // (mm) Length of filament to retract on fail. Requires backup power.
// Without a POWER_LOSS_PIN the following option helps reduce wear on the SD card,
@@ -1202,15 +1202,15 @@
* - SDSORT_CACHE_NAMES will retain the sorted file listing in RAM. (Expensive!)
* - SDSORT_DYNAMIC_RAM only uses RAM when the SD menu is visible. (Use with caution!)
*/
- //#define SDCARD_SORT_ALPHA
+ #define SDCARD_SORT_ALPHA
// SD Card Sorting options
#if ENABLED(SDCARD_SORT_ALPHA)
#define SDSORT_LIMIT 40 // Maximum number of sorted items (10-256). Costs 27 bytes each.
#define FOLDER_SORTING -1 // -1=above 0=none 1=below
#define SDSORT_GCODE false // Allow turning sorting on/off with LCD and M34 G-code.
- #define SDSORT_USES_RAM false // Pre-allocate a static array for faster pre-sorting.
- #define SDSORT_USES_STACK false // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
+ #define SDSORT_USES_RAM true // Pre-allocate a static array for faster pre-sorting.
+ #define SDSORT_USES_STACK true // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
#define SDSORT_CACHE_NAMES false // Keep sorted items in RAM longer for speedy performance. Most expensive option.
#define SDSORT_DYNAMIC_RAM false // Use dynamic allocation (within SD menus). Least expensive option. Set SDSORT_LIMIT before use!
#define SDSORT_CACHE_VFATS 2 // Maximum number of 13-byte VFAT entries to use for sorting.
@@ -1218,10 +1218,10 @@
#endif
// This allows hosts to request long names for files and folders with M33
- //#define LONG_FILENAME_HOST_SUPPORT
+ #define LONG_FILENAME_HOST_SUPPORT
// Enable this option to scroll long filenames in the SD card menu
- //#define SCROLL_LONG_FILENAMES
+ #define SCROLL_LONG_FILENAMES
// Leave the heaters on after Stop Print (not recommended!)
//#define SD_ABORT_NO_COOLDOWN
@@ -1243,7 +1243,7 @@
/**
* Auto-report SdCard status with M27 S<seconds>
*/
- //#define AUTO_REPORT_SD_STATUS
+ #define AUTO_REPORT_SD_STATUS
/**
* Support for USB thumb drives using an Arduino USB Host Shield or
@@ -1329,7 +1329,7 @@
*/
#if HAS_MARLINUI_U8GLIB
// Show SD percentage next to the progress bar
- //#define DOGM_SD_PERCENT
+ #define DOGM_SD_PERCENT
// Save many cycles by drawing a hollow frame or no frame on the Info Screen
//#define XYZ_NO_FRAME
@@ -1392,10 +1392,10 @@
//#define BOOT_MARLIN_LOGO_ANIMATED // Animated Marlin logo. Costs ~3260 (or ~940) bytes of PROGMEM.
// Frivolous Game Options
- //#define MARLIN_BRICKOUT
- //#define MARLIN_INVADERS
- //#define MARLIN_SNAKE
- //#define GAMES_EASTER_EGG // Add extra blank lines above the "Games" sub-menu
+ #define MARLIN_BRICKOUT
+ #define MARLIN_INVADERS
+ #define MARLIN_SNAKE
+ #define GAMES_EASTER_EGG // Add extra blank lines above the "Games" sub-menu
#endif // HAS_MARLINUI_U8GLIB
@@ -1571,18 +1571,18 @@
*
* Warning: Does not respect endstops!
*/
-//#define BABYSTEPPING
+#define BABYSTEPPING
#if ENABLED(BABYSTEPPING)
//#define INTEGRATED_BABYSTEPPING // EXPERIMENTAL integration of babystepping into the Stepper ISR
//#define BABYSTEP_WITHOUT_HOMING
- //#define BABYSTEP_ALWAYS_AVAILABLE // Allow babystepping at all times (not just during movement).
+ #define BABYSTEP_ALWAYS_AVAILABLE // Allow babystepping at all times (not just during movement).
//#define BABYSTEP_XY // Also enable X/Y Babystepping. Not supported on DELTA!
#define BABYSTEP_INVERT_Z false // Change if Z babysteps should go the other way
//#define BABYSTEP_MILLIMETER_UNITS // Specify BABYSTEP_MULTIPLICATOR_(XY|Z) in mm instead of micro-steps
#define BABYSTEP_MULTIPLICATOR_Z 1 // (steps or mm) Steps or millimeter distance for each Z babystep
#define BABYSTEP_MULTIPLICATOR_XY 1 // (steps or mm) Steps or millimeter distance for each XY babystep
- //#define DOUBLECLICK_FOR_Z_BABYSTEPPING // Double-click on the Status Screen for Z Babystepping.
+ #define DOUBLECLICK_FOR_Z_BABYSTEPPING // Double-click on the Status Screen for Z Babystepping.
#if ENABLED(DOUBLECLICK_FOR_Z_BABYSTEPPING)
#define DOUBLECLICK_MAX_INTERVAL 1250 // Maximum interval between clicks, in milliseconds.
// Note: Extra time may be added to mitigate controller latency.
@@ -1618,10 +1618,10 @@
*
* See https://marlinfw.org/docs/features/lin_advance.html for full instructions.
*/
-//#define LIN_ADVANCE
+#define LIN_ADVANCE
#if ENABLED(LIN_ADVANCE)
//#define EXTRA_LIN_ADVANCE_K // Enable for second linear advance constants
- #define LIN_ADVANCE_K 0.22 // Unit: mm compression per 1mm/s extruder speed
+ #define LIN_ADVANCE_K 0.18 // Unit: mm compression per 1mm/s extruder speed
//#define LA_DEBUG // If enabled, this will generate debug information output over USB.
//#define EXPERIMENTAL_SCURVE // Enable this option to permit S-Curve Acceleration
#endif
@@ -1754,7 +1754,7 @@
//
// G60/G61 Position Save and Return
//
-//#define SAVED_POSITIONS 1 // Each saved position slot costs 12 bytes
+#define SAVED_POSITIONS 4 // Each saved position slot costs 12 bytes
//
// G2/G3 Arc Support
@@ -1762,16 +1762,16 @@
#define ARC_SUPPORT // Disable this feature to save ~3226 bytes
#if ENABLED(ARC_SUPPORT)
#define MM_PER_ARC_SEGMENT 1 // (mm) Length (or minimum length) of each arc segment
- //#define ARC_SEGMENTS_PER_R 1 // Max segment length, MM_PER = Min
+ #define ARC_SEGMENTS_PER_R 1 // Max segment length, MM_PER = Min
#define MIN_ARC_SEGMENTS 24 // Minimum number of segments in a complete circle
- //#define ARC_SEGMENTS_PER_SEC 50 // Use feedrate to choose segment length (with MM_PER_ARC_SEGMENT as the minimum)
+ #define ARC_SEGMENTS_PER_SEC 50 // Use feedrate to choose segment length (with MM_PER_ARC_SEGMENT as the minimum)
#define N_ARC_CORRECTION 25 // Number of interpolated segments between corrections
- //#define ARC_P_CIRCLES // Enable the 'P' parameter to specify complete circles
- //#define CNC_WORKSPACE_PLANES // Allow G2/G3 to operate in XY, ZX, or YZ planes
+ #define ARC_P_CIRCLES // Enable the 'P' parameter to specify complete circles
+ #define CNC_WORKSPACE_PLANES // Allow G2/G3 to operate in XY, ZX, or YZ planes
#endif
// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
-//#define BEZIER_CURVE_SUPPORT
+#define BEZIER_CURVE_SUPPORT
/**
* Direct Stepping
@@ -1812,8 +1812,8 @@
*
* Override the default value based on the driver type set in Configuration.h.
*/
-//#define MINIMUM_STEPPER_POST_DIR_DELAY 650
-//#define MINIMUM_STEPPER_PRE_DIR_DELAY 650
+#define MINIMUM_STEPPER_POST_DIR_DELAY 300
+#define MINIMUM_STEPPER_PRE_DIR_DELAY 300
/**
* Minimum stepper driver pulse width (in µs)
@@ -1826,7 +1826,7 @@
*
* Override the default value based on the driver type set in Configuration.h.
*/
-//#define MINIMUM_STEPPER_PULSE 2
+#define MINIMUM_STEPPER_PULSE 2
/**
* Maximum stepping rate (in Hz) the stepper driver allows
@@ -1840,7 +1840,7 @@
*
* Override the default value based on the driver type set in Configuration.h.
*/
-//#define MAXIMUM_STEPPER_RATE 250000
+#define MAXIMUM_STEPPER_RATE 400000
// @section temperature
@@ -1856,18 +1856,18 @@
// The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g. 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING)
- #define BLOCK_BUFFER_SIZE 8
+ #define BLOCK_BUFFER_SIZE 128
#elif ENABLED(SDSUPPORT)
- #define BLOCK_BUFFER_SIZE 16
+ #define BLOCK_BUFFER_SIZE 128
#else
- #define BLOCK_BUFFER_SIZE 16
+ #define BLOCK_BUFFER_SIZE 128
#endif
// @section serial
// The ASCII buffer for serial input
-#define MAX_CMD_SIZE 96
-#define BUFSIZE 4
+#define MAX_CMD_SIZE 128
+#define BUFSIZE 64
// Transmission to Host Buffer Size
// To save 386 bytes of PROGMEM (and TX_BUFFER_SIZE+3 bytes of RAM) set to 0.
@@ -1876,13 +1876,13 @@
// For debug-echo: 128 bytes for the optimal speed.
// Other output doesn't need to be that speedy.
// :[0, 2, 4, 8, 16, 32, 64, 128, 256]
-#define TX_BUFFER_SIZE 0
+#define TX_BUFFER_SIZE 256
// Host Receive Buffer Size
// Without XON/XOFF flow control (see SERIAL_XON_XOFF below) 32 bytes should be enough.
// To use flow control, set this buffer size to at least 1024 bytes.
// :[0, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048]
-//#define RX_BUFFER_SIZE 1024
+#define RX_BUFFER_SIZE 2048
#if RX_BUFFER_SIZE >= 1024
// Enable to have the controller send XON/XOFF control characters to
@@ -1911,7 +1911,7 @@
* Currently handles M108, M112, M410, M876
* NOTE: Not yet implemented for all platforms.
*/
-//#define EMERGENCY_PARSER
+#define EMERGENCY_PARSER
// Bad Serial-connections can miss a received command by sending an 'ok'
// Therefore some clients abort after 30 seconds in a timeout.
@@ -1920,7 +1920,7 @@
//#define NO_TIMEOUTS 1000 // Milliseconds
// Some clients will have this feature soon. This could make the NO_TIMEOUTS unnecessary.
-//#define ADVANCED_OK
+#define ADVANCED_OK
// Printrun may have trouble receiving long strings all at once.
// This option inserts short delays between lines of serial output.
@@ -1954,23 +1954,23 @@
*
* Note that M207 / M208 / M209 settings are saved to EEPROM.
*/
-//#define FWRETRACT
+#define FWRETRACT
#if ENABLED(FWRETRACT)
#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 MIN_AUTORETRACT 0.2 // (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 0.8 // (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_FEEDRATE 40 // (mm/s) Default feedrate for retracting
#define RETRACT_ZRAISE 0 // (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
#if ENABLED(MIXING_EXTRUDER)
- //#define RETRACT_SYNC_MIXING // Retract and restore all mixing steppers simultaneously
+ #define RETRACT_SYNC_MIXING // Retract and restore all mixing steppers simultaneously
#endif
#endif
@@ -3150,7 +3150,7 @@
//#define GCODE_QUOTED_STRINGS // Support for quoted string parameters
#endif
-//#define GCODE_CASE_INSENSITIVE // Accept G-code sent to the firmware in lowercase
+#define GCODE_CASE_INSENSITIVE // Accept G-code sent to the firmware in lowercase
//#define REPETIER_GCODE_M360 // Add commands originally from Repetier FW
@@ -3160,8 +3160,8 @@
* Note that G0 feedrates should be used with care for 3D printing (if used at all).
* High feedrates may cause ringing and harm print quality.
*/
-//#define PAREN_COMMENTS // Support for parentheses-delimited comments
-//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
+#define PAREN_COMMENTS // Support for parentheses-delimited comments
+#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
// Enable and set a (default) feedrate for all G0 moves
//#define G0_FEEDRATE 3000 // (mm/min)
@@ -3228,10 +3228,10 @@
* Host Prompt Support enables Marlin to use the host for user prompts so
* filament runout and other processes can be managed from the host side.
*/
-//#define HOST_ACTION_COMMANDS
+#define HOST_ACTION_COMMANDS
#if ENABLED(HOST_ACTION_COMMANDS)
- //#define HOST_PROMPT_SUPPORT
- //#define HOST_START_MENU_ITEM // Add a menu item that tells the host to start
+ #define HOST_PROMPT_SUPPORT
+ #define HOST_START_MENU_ITEM // Add a menu item that tells the host to start
#endif
/**
diff -ruN Marlin-2.0.x/Marlin/Configuration.h Marlin-2.0.x.5/Marlin/Configuration.h
--- Marlin-2.0.x/Marlin/Configuration.h 2020-09-29 05:02:09.000000000 +0300
+++ Marlin-2.0.x.5/Marlin/Configuration.h 2020-09-29 09:42:04.219650629 +0300
@@ -70,8 +70,8 @@
// @section info
// Author info of this build printed to the host during boot and M115
-#define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes.
-//#define CUSTOM_VERSION_FILE Version.h // Path from the root directory (no quotes)
+#define STRING_CONFIG_H_AUTHOR "('V. Jurka', 'Monstras v2')" // Who made the changes.
+#define CUSTOM_VERSION_FILE Version.h // Path from the root directory (no quotes)
/**
* *** VENDORS PLEASE READ ***
@@ -88,10 +88,10 @@
#define SHOW_BOOTSCREEN
// Show the bitmap in Marlin/_Bootscreen.h on startup.
-//#define SHOW_CUSTOM_BOOTSCREEN
+#define SHOW_CUSTOM_BOOTSCREEN
// Show the bitmap in Marlin/_Statusscreen.h on the status screen.
-//#define CUSTOM_STATUS_SCREEN_IMAGE
+#define CUSTOM_STATUS_SCREEN_IMAGE
// @section machine
@@ -103,7 +103,7 @@
*
* :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
*/
-#define SERIAL_PORT 0
+#define SERIAL_PORT -1
/**
* Select a secondary serial port on the board to use for communication with the host.
@@ -127,15 +127,15 @@
// Choose the name from boards.h that matches your setup
#ifndef MOTHERBOARD
- #define MOTHERBOARD BOARD_RAMPS_14_EFB
+ #define MOTHERBOARD BOARD_RAMPS_FD_V2
#endif
// Name displayed in the LCD "Ready" message and Info menu
-//#define CUSTOM_MACHINE_NAME "3D Printer"
+#define CUSTOM_MACHINE_NAME "Monstras v2"
// Printer's unique ID, used by some programs to differentiate between machines.
-// Choose your own or use a service like https://www.uuidgenerator.net/version4
-//#define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
+// Choose your own or use a service like http://www.uuidgenerator.net/version4
+#define MACHINE_UUID "af70fb4f-2c91-49bf-a5d7-e550eeaa5fce"
// @section extruder
@@ -301,12 +301,12 @@
*/
//#define MIXING_EXTRUDER
#if ENABLED(MIXING_EXTRUDER)
- #define MIXING_STEPPERS 2 // Number of steppers in your mixing extruder
+ #define MIXING_STEPPERS 3 // Number of steppers in your mixing extruder
#define MIXING_VIRTUAL_TOOLS 16 // Use the Virtual Tool method with M163 and M164
- //#define DIRECT_MIXING_IN_G1 // Allow ABCDHI mix factors in G1 movement commands
- //#define GRADIENT_MIX // Support for gradient mixing with M166 and LCD
+ #define DIRECT_MIXING_IN_G1 // Allow ABCDHI mix factors in G1 movement commands
+ #define GRADIENT_MIX // Support for gradient mixing with M166 and LCD
#if ENABLED(GRADIENT_MIX)
- //#define GRADIENT_VTOOL // Add M166 T to use a V-tool index as a Gradient alias
+ #define GRADIENT_VTOOL // Add M166 T to use a V-tool index as a Gradient alias
#endif
#endif
@@ -424,9 +424,9 @@
#define TEMP_SENSOR_5 0
#define TEMP_SENSOR_6 0
#define TEMP_SENSOR_7 0
-#define TEMP_SENSOR_BED 0
+#define TEMP_SENSOR_BED 1
#define TEMP_SENSOR_PROBE 0
-#define TEMP_SENSOR_CHAMBER 0
+#define TEMP_SENSOR_CHAMBER 1
// Dummy thermistor constant temperature readings, for use with 998 and 999
#define DUMMY_THERMISTOR_998_VALUE 25
@@ -460,7 +460,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 275
+#define HEATER_0_MAXTEMP 310
#define HEATER_1_MAXTEMP 275
#define HEATER_2_MAXTEMP 275
#define HEATER_3_MAXTEMP 275
@@ -482,8 +482,8 @@
#define PID_K1 0.95 // Smoothing factor within any PID loop
#if ENABLED(PIDTEMP)
- //#define PID_EDIT_MENU // Add PID editing to the "Advanced Settings" menu. (~700 bytes of PROGMEM)
- //#define PID_AUTOTUNE_MENU // Add PID auto-tuning to the "Advanced Settings" menu. (~250 bytes of PROGMEM)
+ #define PID_EDIT_MENU // Add PID editing to the "Advanced Settings" menu. (~700 bytes of PROGMEM)
+ #define PID_AUTOTUNE_MENU // Add PID auto-tuning to the "Advanced Settings" menu. (~250 bytes of PROGMEM)
//#define PID_PARAMS_PER_HOTEND // Uses separate PID parameters for each extruder (useful for mismatched extruders)
// Set/get with gcode: M301 E[extruder number, 0-2]
#if ENABLED(PID_PARAMS_PER_HOTEND)
@@ -493,9 +493,9 @@
#define DEFAULT_Ki_LIST { 1.08, 1.0 }
#define DEFAULT_Kd_LIST { 114.00, 112.0 }
#else
- #define DEFAULT_Kp 22.20
- #define DEFAULT_Ki 1.08
- #define DEFAULT_Kd 114.00
+ #define DEFAULT_Kp 37.36
+ #define DEFAULT_Ki 3.38
+ #define DEFAULT_Kd 103.17
#endif
#endif // PIDTEMP
@@ -516,7 +516,7 @@
* heater. If your configuration is significantly different than this and you don't understand
* the issues involved, don't use bed PID until someone else verifies that your hardware works.
*/
-//#define PIDTEMPBED
+#define PIDTEMPBED
//#define BED_LIMIT_SWITCHING
@@ -534,9 +534,9 @@
// 120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
// from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
- #define DEFAULT_bedKp 10.00
- #define DEFAULT_bedKi .023
- #define DEFAULT_bedKd 305.4
+ #define DEFAULT_bedKp 37.42
+ #define DEFAULT_bedKi 6.41
+ #define DEFAULT_bedKd 145.68
// FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles.
#endif // PIDTEMPBED
@@ -600,7 +600,7 @@
//#define COREXY
//#define COREXZ
//#define COREYZ
-//#define COREYX
+#define COREYX
//#define COREZX
//#define COREZY
//#define MARKFORGED_XY // MarkForged. See https://reprap.org/forum/read.php?152,504042
@@ -622,7 +622,7 @@
//#define USE_ZMAX_PLUG
// Enable pullup for all endstops to prevent a floating state
-#define ENDSTOPPULLUPS
+//#define ENDSTOPPULLUPS
#if DISABLED(ENDSTOPPULLUPS)
// Disable ENDSTOPPULLUPS to set pullups individually
//#define ENDSTOPPULLUP_XMAX
@@ -648,9 +648,9 @@
#endif
// Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup).
-#define X_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
-#define Y_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
-#define Z_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
+#define X_MIN_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop.
+#define Y_MIN_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop.
+#define Z_MIN_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop.
#define X_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
#define Y_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
#define Z_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
@@ -672,17 +672,17 @@
* TMC5130, TMC5130_STANDALONE, TMC5160, TMC5160_STANDALONE
* :['A4988', 'A5984', 'DRV8825', 'LV8729', 'L6470', 'L6474', 'POWERSTEP01', 'TB6560', 'TB6600', 'TMC2100', 'TMC2130', 'TMC2130_STANDALONE', 'TMC2160', 'TMC2160_STANDALONE', 'TMC2208', 'TMC2208_STANDALONE', 'TMC2209', 'TMC2209_STANDALONE', 'TMC26X', 'TMC26X_STANDALONE', 'TMC2660', 'TMC2660_STANDALONE', 'TMC5130', 'TMC5130_STANDALONE', 'TMC5160', 'TMC5160_STANDALONE']
*/
-//#define X_DRIVER_TYPE A4988
-//#define Y_DRIVER_TYPE A4988
-//#define Z_DRIVER_TYPE A4988
+#define X_DRIVER_TYPE A4988
+#define Y_DRIVER_TYPE A4988
+#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 A4988
-//#define E1_DRIVER_TYPE A4988
-//#define E2_DRIVER_TYPE A4988
+#define E0_DRIVER_TYPE A4988
+#define E1_DRIVER_TYPE A4988
+#define E2_DRIVER_TYPE A4988
//#define E3_DRIVER_TYPE A4988
//#define E4_DRIVER_TYPE A4988
//#define E5_DRIVER_TYPE A4988
@@ -691,7 +691,7 @@
// Enable this feature if all enabled endstop pins are interrupt-capable.
// This will remove the need to poll the interrupt pins, saving many CPU cycles.
-//#define ENDSTOP_INTERRUPTS_FEATURE
+#define ENDSTOP_INTERRUPTS_FEATURE
/**
* Endstop Noise Threshold
@@ -735,18 +735,18 @@
* Override with M92
* X, Y, Z, E0 [, E1[, E2...]]
*/
-#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 4000, 500 }
+#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 1600, 415}
/**
* Default Max Feed Rate (mm/s)
* Override with M203
* X, Y, Z, E0 [, E1[, E2...]]
*/
-#define DEFAULT_MAX_FEEDRATE { 300, 300, 5, 25 }
+#define DEFAULT_MAX_FEEDRATE { 160, 160, 15, 50 }
-//#define LIMITED_MAX_FR_EDITING // Limit edit via M203 or LCD to DEFAULT_MAX_FEEDRATE * 2
+#define LIMITED_MAX_FR_EDITING // Limit edit via M203 or LCD to DEFAULT_MAX_FEEDRATE * 2
#if ENABLED(LIMITED_MAX_FR_EDITING)
- #define MAX_FEEDRATE_EDIT_VALUES { 600, 600, 10, 50 } // ...or, set your own edit limits
+ #define MAX_FEEDRATE_EDIT_VALUES { 400, 400, 20, 70 } // ...or, set your own edit limits
#endif
/**
@@ -755,9 +755,9 @@
* Override with M201
* X, Y, Z, E0 [, E1[, E2...]]
*/
-#define DEFAULT_MAX_ACCELERATION { 3000, 3000, 100, 10000 }
+#define DEFAULT_MAX_ACCELERATION { 800, 800, 100, 10000 }
-//#define LIMITED_MAX_ACCEL_EDITING // Limit edit via M201 or LCD to DEFAULT_MAX_ACCELERATION * 2
+#define LIMITED_MAX_ACCEL_EDITING // Limit edit via M201 or LCD to DEFAULT_MAX_ACCELERATION * 2
#if ENABLED(LIMITED_MAX_ACCEL_EDITING)
#define MAX_ACCEL_EDIT_VALUES { 6000, 6000, 200, 20000 } // ...or, set your own edit limits
#endif
@@ -770,9 +770,9 @@
* M204 R Retract Acceleration
* M204 T Travel Acceleration
*/
-#define DEFAULT_ACCELERATION 3000 // X, Y, Z and E acceleration for printing moves
-#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
-#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
+#define DEFAULT_ACCELERATION 500 // X, Y, Z and E acceleration for printing moves
+#define DEFAULT_RETRACT_ACCELERATION 8000 // E acceleration for retracts
+#define DEFAULT_TRAVEL_ACCELERATION 800 // X, Y, Z acceleration for travel (non printing) moves
/**
* Default Jerk limits (mm/s)
@@ -790,7 +790,7 @@
//#define TRAVEL_EXTRA_XYJERK 0.0 // Additional jerk allowance for all travel moves
- //#define LIMITED_JERK_EDITING // Limit edit via M205 or LCD to DEFAULT_aJERK * 2
+ #define LIMITED_JERK_EDITING // Limit edit via M205 or LCD to DEFAULT_aJERK * 2
#if ENABLED(LIMITED_JERK_EDITING)
#define MAX_JERK_EDIT_VALUES { 20, 20, 0.6, 10 } // ...or, set your own edit limits
#endif
@@ -835,7 +835,7 @@
* The probe replaces the Z-MIN endstop and is used for Z homing.
* (Automatically enables USE_PROBE_FOR_Z_HOMING.)
*/
-#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
+//#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
// Force the use of the probe for Z-axis homing
//#define USE_PROBE_FOR_Z_HOMING
@@ -882,7 +882,7 @@
* Use the nozzle as the probe, as with a conductive
* nozzle system or a piezo-electric smart effector.
*/
-//#define NOZZLE_AS_PROBE
+#define NOZZLE_AS_PROBE
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
@@ -980,20 +980,20 @@
* | [-] |
* O-- FRONT --+
*/
-#define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
+#define NOZZLE_TO_PROBE_OFFSET { 0, 0, 0 }
// Most probes should stay away from the edges of the bed, but
// with NOZZLE_AS_PROBE this can be negative for a wider probing area.
-#define PROBING_MARGIN 10
+#define PROBING_MARGIN -15
// X and Y axis travel speed (mm/min) between probes
-#define XY_PROBE_SPEED (133*60)
+#define XY_PROBE_SPEED (150*60)
// Feedrate (mm/min) for the first approach when double-probing (MULTIPLE_PROBING == 2)
-#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
+#define Z_PROBE_SPEED_FAST (14*60)
// Feedrate (mm/min) for the "accurate" probe of each point
-#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
+#define Z_PROBE_SPEED_SLOW (14*60)
/**
* Multiple Probing
@@ -1004,8 +1004,8 @@
* 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 EXTRA_PROBING 1
+#define MULTIPLE_PROBING 5
+#define EXTRA_PROBING 2
/**
* Z probes require clearance when deploying, stowing, and moving between
@@ -1022,11 +1022,11 @@
* But: `M851 Z+1` with a CLEARANCE of 2 => 2mm from bed to nozzle.
*/
#define Z_CLEARANCE_DEPLOY_PROBE 10 // Z Clearance for Deploy/Stow
-#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points
-#define Z_CLEARANCE_MULTI_PROBE 5 // Z Clearance between multiple probes
+#define Z_CLEARANCE_BETWEEN_PROBES 7 // Z Clearance between probe points
+#define Z_CLEARANCE_MULTI_PROBE 7 // Z Clearance between multiple probes
//#define Z_AFTER_PROBING 5 // Z position after probing is done
-#define Z_PROBE_LOW_POINT -2 // Farthest distance below the trigger-point to go before stopping
+#define Z_PROBE_LOW_POINT -15 // Farthest distance below the trigger-point to go before stopping
// For M851 give a range for adjusting the Z probe offset
#define Z_PROBE_OFFSET_RANGE_MIN -20
@@ -1048,13 +1048,13 @@
* These options are most useful for the BLTouch probe, but may also improve
* readings with inductive probes and piezo sensors.
*/
-//#define PROBING_HEATERS_OFF // Turn heaters off when probing
+#define PROBING_HEATERS_OFF // Turn heaters off when probing
#if ENABLED(PROBING_HEATERS_OFF)
//#define WAIT_FOR_BED_HEATER // Wait for bed to heat back up between probes (to improve accuracy)
#endif
-//#define PROBING_FANS_OFF // Turn fans off when probing
+#define PROBING_FANS_OFF // Turn fans off when probing
//#define PROBING_STEPPERS_OFF // Turn steppers off (unless needed to hold position) when probing
-//#define DELAY_BEFORE_PROBING 200 // (ms) To prevent vibrations from triggering piezo sensors
+#define DELAY_BEFORE_PROBING 500 // (ms) To prevent vibrations from triggering piezo sensors
// For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1
// :{ 0:'Low', 1:'High' }
@@ -1081,7 +1081,7 @@
// Invert the stepper direction. Change (or reverse the motor connector) if an axis goes the wrong way.
#define INVERT_X_DIR false
-#define INVERT_Y_DIR true
+#define INVERT_Y_DIR false
#define INVERT_Z_DIR false
// @section extruder
@@ -1116,8 +1116,8 @@
// @section machine
// The size of the print bed
-#define X_BED_SIZE 200
-#define Y_BED_SIZE 200
+#define X_BED_SIZE 320
+#define Y_BED_SIZE 320
// Travel limits (mm) after homing, corresponding to endstop positions.
#define X_MIN_POS 0
@@ -1125,7 +1125,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 320
/**
* Software Endstops
@@ -1141,7 +1141,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 constrain movement within maximum coordinate bounds
@@ -1153,7 +1153,7 @@
#endif
#if EITHER(MIN_SOFTWARE_ENDSTOPS, MAX_SOFTWARE_ENDSTOPS)
- //#define SOFT_ENDSTOPS_MENU_ITEM // Enable/Disable software endstops from the LCD
+ #define SOFT_ENDSTOPS_MENU_ITEM // Enable/Disable software endstops from the LCD
#endif
/**
@@ -1226,7 +1226,7 @@
* leveling in steps so you can manually adjust the Z height at each grid-point.
* With an LCD controller the process is guided step-by-step.
*/
-//#define AUTO_BED_LEVELING_3POINT
+#define AUTO_BED_LEVELING_3POINT
//#define AUTO_BED_LEVELING_LINEAR
//#define AUTO_BED_LEVELING_BILINEAR
//#define AUTO_BED_LEVELING_UBL
@@ -1236,14 +1236,14 @@
* Normally G28 leaves leveling disabled on completion. Enable
* this option to have G28 restore the prior leveling state.
*/
-//#define RESTORE_LEVELING_AFTER_G28
+#define RESTORE_LEVELING_AFTER_G28
/**
* Enable detailed logging of G28, G29, M48, etc.
* Turn on with the command 'M111 S32'.
* NOTE: Requires a lot of PROGMEM!
*/
-//#define DEBUG_LEVELING_FEATURE
+#define DEBUG_LEVELING_FEATURE
#if ANY(MESH_BED_LEVELING, AUTO_BED_LEVELING_BILINEAR, AUTO_BED_LEVELING_UBL)
// Gradually reduce leveling correction until a set height is reached,
@@ -1332,10 +1332,23 @@
#endif // BED_LEVELING
/**
+ * Points to probe for all 3-point Leveling procedures.
+ * Override if the automatically selected points are inadequate.
+ */
+#if EITHER(AUTO_BED_LEVELING_3POINT, AUTO_BED_LEVELING_UBL)
+ #define PROBE_PT_1_X 50
+ #define PROBE_PT_1_Y 50
+ #define PROBE_PT_2_X 300
+ #define PROBE_PT_2_Y 50
+ #define PROBE_PT_3_X 300
+ #define PROBE_PT_3_Y 300
+#endif
+
+/**
* 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.
@@ -1387,8 +1400,8 @@
#endif
// Homing speeds (mm/min)
-#define HOMING_FEEDRATE_XY (50*60)
-#define HOMING_FEEDRATE_Z (4*60)
+#define HOMING_FEEDRATE_XY (100*60)
+#define HOMING_FEEDRATE_Z (14*60)
// Validate that endstops are triggered on homing moves
#define VALIDATE_HOMING_ENDSTOPS
@@ -1465,12 +1478,12 @@
* 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 PROGMEM. 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_AUTO_INIT // Init EEPROM automatically on any errors.
#endif
//
@@ -1718,7 +1731,7 @@
* SD Card support is disabled by default. If your controller has an SD slot,
* you must uncomment the following option or it won't work.
*/
-//#define SDSUPPORT
+#define SDSUPPORT
/**
* SD CARD: SPI SPEED
@@ -1735,7 +1748,7 @@
*
* Use CRC checks and retries on the SD communication.
*/
-//#define SD_CHECK_AND_RETRY
+#define SD_CHECK_AND_RETRY
/**
* LCD Menu Items
@@ -1752,13 +1765,13 @@
// This option overrides the default number of encoder pulses needed to
// produce one step. Should be increased for high-resolution encoders.
//
-//#define ENCODER_PULSES_PER_STEP 4
+#define ENCODER_PULSES_PER_STEP 3
//
// Use this option to override the number of step signals required to
// move between next/prev menu items.
//
-//#define ENCODER_STEPS_PER_MENU_ITEM 1
+#define ENCODER_STEPS_PER_MENU_ITEM 2
/**
* Encoder Direction Options
@@ -1806,7 +1819,7 @@
// If you have a speaker that can produce tones, enable it here.
// By default Marlin assumes you have a buzzer with a fixed frequency.
//
-//#define SPEAKER
+#define SPEAKER
//
// The duration and frequency for the UI feedback sound.
@@ -1815,8 +1828,8 @@
// Note: Test audio output with the G-Code:
// M300 S<frequency Hz> P<duration ms>
//
-//#define LCD_FEEDBACK_FREQUENCY_DURATION_MS 2
-//#define LCD_FEEDBACK_FREQUENCY_HZ 5000
+#define LCD_FEEDBACK_FREQUENCY_DURATION_MS 2
+#define LCD_FEEDBACK_FREQUENCY_HZ 5000
//=============================================================================
//======================== LCD / Controller Selection =========================
@@ -1985,7 +1998,7 @@
// ReprapWorld Graphical LCD
// https://reprapworld.com/?products_details&products_id/1218
//
-//#define REPRAPWORLD_GRAPHICAL_LCD
+#define REPRAPWORLD_GRAPHICAL_LCD
//
// Activate one of these if you have a Panucatt Devices
@@ -2409,7 +2422,7 @@
// (ms) Delay before the next move will start, to give the servo time to reach its target angle.
// 300ms is a good value but you can try less delay.
// If the servo can't reach the requested position, increase it.
-#define SERVO_DELAY { 300 }
+#define SERVO_DELAY { 500 }
// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
diff -ruN Marlin-2.0.x/Marlin/src/pins/sam/pins_RAMPS_FD_V2.h Marlin-2.0.x.5/Marlin/src/pins/sam/pins_RAMPS_FD_V2.h
--- Marlin-2.0.x/Marlin/src/pins/sam/pins_RAMPS_FD_V2.h 2020-09-29 05:02:09.000000000 +0300
+++ Marlin-2.0.x.5/Marlin/src/pins/sam/pins_RAMPS_FD_V2.h 2020-09-29 09:27:40.544744129 +0300
@@ -50,3 +50,29 @@
#ifndef FILWIDTH_PIN
#define FILWIDTH_PIN 5 // Analog Input on AUX2
#endif
+
+#undef FAN_PIN
+#undef FAN1_PIN
+#undef FAN2_PIN
+#undef HEATER_0_PIN
+#undef HEATER_1_PIN
+#undef HEATER_2_PIN
+#undef HEATER_BED_PIN
+#undef TEMP_0_PIN
+#undef TEMP_1_PIN
+#undef TEMP_2_PIN
+#undef TEMP_BED_PIN
+#undef TEMP_CHAMBER_PIN
+
+
+#define FAN_PIN 2
+#define HEATER_0_PIN 8
+#define HEATER_BED_PIN 9
+#define TEMP_0_PIN 0 // Analog Input
+#define TEMP_BED_PIN 1 // Analog Input
+#define TEMP_CHAMBER_PIN 2 // Analog Input
+
+#define Z_MIN_PROBE_PIN 34 // Pin 32 is the RAMPS default
+#define HEATER_CHAMBER_PIN 6
+#define CONTROLLER_FAN_PIN 10
+#define CASE_LIGHT_PIN 7
diff -ruN Marlin-2.0.x/Marlin/_Statusscreen.h Marlin-2.0.x.5/Marlin/_Statusscreen.h
--- Marlin-2.0.x/Marlin/_Statusscreen.h 1970-01-01 03:00:00.000000000 +0300
+++ Marlin-2.0.x.5/Marlin/_Statusscreen.h 2020-01-14 09:39:11.000000000 +0200
@@ -0,0 +1,61 @@
+#pragma once
+
+/**
+ * Custom Status Screen bitmap
+ *
+ * Place this file in the root with your configuration files
+ * and enable CUSTOM_STATUS_SCREEN_IMAGE in Configuration.h.
+ *
+ * Use the Marlin Bitmap Converter to make your own:
+ * http://marlinfw.org/tools/u8glib/converter.html
+ */
+
+//
+// Status Screen Logo bitmap
+//
+#define STATUS_LOGO_Y 0
+#define STATUS_LOGO_WIDTH 24
+
+
+const unsigned char status_logo_bmp[] PROGMEM = {
+ B00000000,B00000000,B00000000,
+ B00011000,B01000000,B00000000,
+ B00001111,B00100000,B00000000,
+ B00000111,B11110000,B00000000,
+ B00001111,B11111000,B00000000,
+ B00001111,B11111100,B00110000,
+ B01111111,B11111110,B01001000,
+ B10011111,B11111110,B11010100,
+ B10010111,B11001111,B00100110,
+ B10100001,B00000111,B00110010,
+ B01101100,B01100111,B00100001,
+ B01011110,B11110111,B01011001,
+ B01000000,B00000111,B11000101,
+ B01110000,B01111111,B11000101,
+ B01111000,B00111111,B11000101,
+ B01000000,B00011111,B01001001,
+ B10000000,B00011111,B00110010,
+ B11110000,B00111111,B00000010,
+ B01000000,B00100000,B10001100,
+ B01000000,B00100000,B01110000,
+ B00100000,B01000000,B00000000,
+ B00100000,B01000000,B00000000,
+ B00011001,B10000000,B00000000,
+ B00000110,B00000000,B00000000
+};
+
+
+//
+// Use default bitmaps
+//
+#define STATUS_HOTEND_ANIM
+#define STATUS_BED_ANIM
+#define STATUS_HEATERS_XSPACE 20
+
+#if HOTENDS < 2
+ #define STATUS_HEATERS_X 32
+ #define STATUS_BED_X 54
+#else
+ #define STATUS_HEATERS_X 40
+ #define STATUS_BED_X 80
+#endif
diff -ruN Marlin-2.0.x/Marlin/Version.h Marlin-2.0.x.5/Marlin/Version.h
--- Marlin-2.0.x/Marlin/Version.h 2020-09-29 05:02:09.000000000 +0300
+++ Marlin-2.0.x.5/Marlin/Version.h 2020-09-29 09:28:51.675668934 +0300
@@ -46,7 +46,7 @@
/**
* Defines a generic printer name to be output to the LCD after booting Marlin.
*/
-//#define MACHINE_NAME "3D Printer"
+#define MACHINE_NAME "Monstras V2"
/**
* The SOURCE_CODE_URL is the location where users will find the Marlin Source
@@ -59,18 +59,18 @@
/**
* Default generic printer UUID.
*/
-//#define DEFAULT_MACHINE_UUID "cede2a2f-41a2-4748-9b12-c55c62f367ff"
+#define DEFAULT_MACHINE_UUID "af70fb4f-2c91-49bf-a5d7-e550eeaa5fce"
/**
* The WEBSITE_URL is the location where users can get more information such as
* documentation about a specific Marlin release.
*/
-//#define WEBSITE_URL "https://marlinfw.org"
+#define WEBSITE_URL "http://jurka.lt"
/**
* Set the vendor info the serial USB interface, if changable
* Currently only supported by DUE platform
*/
-//#define USB_DEVICE_VENDOR_ID 0x0000
-//#define USB_DEVICE_PRODUCT_ID 0x0000
-//#define USB_DEVICE_MANUFACTURE_NAME WEBSITE_URL
+#define USB_DEVICE_VENDOR_ID 0x6666
+#define USB_DEVICE_PRODUCT_ID 0x0002
+#define USB_DEVICE_MANUFACTURE_NAME WEBSITE_URL
diff -ruN Marlin-2.0.x/platformio.ini Marlin-2.0.x.5/platformio.ini
--- Marlin-2.0.x/platformio.ini 2020-09-29 05:02:09.000000000 +0300
+++ Marlin-2.0.x.5/platformio.ini 2020-09-29 09:54:49.987988740 +0300
@@ -18,7 +18,7 @@
[platformio]
src_dir = Marlin
boards_dir = buildroot/share/PlatformIO/boards
-default_envs = mega2560
+default_envs = DUE_USB
include_dir = Marlin
#