Skip to content

Commit 3f90d70

Browse files
committed
Merge petrzmax changes
commit e83c490 Author: petrzmax <petrzmax@gmail.com> Date: Tue Apr 7 14:45:18 2020 +0200 SD Card volume init fix commit 7f4fd10 Merge: 1538ee9 e1fc6f7 Author: petrzmax <petrzmax@gmail.com> Date: Tue Apr 7 14:36:34 2020 +0200 Merge branch 'bugfix-2.0.x' into 2.0.x-Sapphire-Pro-Stock commit 1538ee9 Author: petrzmax <petrzmax@gmail.com> Date: Mon Mar 30 20:31:31 2020 +0200 Set settings for stock Sapphire Pro commit d36e6c1 Merge: e8b840f 747a4bb Author: petrzmax <petrzmax@gmail.com> Date: Mon Mar 30 20:05:14 2020 +0200 Merge branch 'bugfix-2.0.x' into 2.0.x-Sapphire-Pro commit e8b840f Author: petrzmax <petrzmax@gmail.com> Date: Sat Mar 28 13:42:32 2020 +0100 SPI EEprom Flash fix & Adv Pause enabled commit f597206 Merge: ffb372e 747b964 Author: petrzmax <petrzmax@gmail.com> Date: Sat Mar 28 13:16:39 2020 +0100 Merge branch 'bugfix-2.0.x' into 2.0.x-Sapphire-Pro commit ffb372e Merge: fc87e19 8752fbd Author: petrzmax <petrzmax@gmail.com> Date: Sat Mar 28 00:55:40 2020 +0100 Merge branch 'bugfix-2.0.x' into 2.0.x-Sapphire-Pro commit fc87e19 Merge: dcddbf1 54a12ee Author: petrzmax <petrzmax@gmail.com> Date: Thu Mar 26 13:29:43 2020 +0100 Merge branch 'bugfix-2.0.x' into 2.0.x-Sapphire-Pro commit dcddbf1 Merge: 2f76ba7 14daf1e Author: petrzmax <petrzmax@gmail.com> Date: Thu Mar 19 15:01:18 2020 +0100 Merge branch 'bugfix-2.0.x' into 2.0.x-Sapphire-Pro commit 2f76ba7 Author: petrzmax <petrzmax@gmail.com> Date: Wed Mar 18 19:29:25 2020 +0100 adjust stepper current commit 66dadce Merge: a3963ed 201c991 Author: petrzmax <petrzmax@gmail.com> Date: Wed Mar 11 15:02:06 2020 +0100 Merge branch 'bugfix-2.0.x' into 2.0.x-Sapphire-Pro commit a3963ed Merge: 90fe4da ab1863a Author: petrzmax <petrzmax@gmail.com> Date: Wed Mar 4 12:24:44 2020 +0100 Merge branch 'bugfix-2.0.x' into 2.0.x-Sapphire-Pro commit 90fe4da Merge: d5f4f6c 42208bc Author: petrzmax <petrzmax@gmail.com> Date: Sun Feb 16 20:50:20 2020 +0100 Merge branch 'bugfix-2.0.x' into 2.0.x-Sapphire-Pro commit d5f4f6c Merge: b226623 63dd0f2 Author: petrzmax <petrzmax@gmail.com> Date: Fri Feb 14 19:29:48 2020 +0100 Merge branch 'bugfix-2.0.x' into 2.0.x-Sapphire-Pro commit b226623 Merge: f7e4299 4a73379 Author: petrzmax <petrzmax@gmail.com> Date: Tue Feb 11 20:22:34 2020 +0100 Merge branch 'bugfix-2.0.x' into 2.0.x-Sapphire-Pro commit f7e4299 Merge: bcf9f7d 0b45493 Author: petrzmax <petrzmax@gmail.com> Date: Mon Feb 10 19:13:14 2020 +0100 Merge branch 'bugfix-2.0.x' into 2.0.x-Sapphire-Pro commit bcf9f7d Author: petrzmax <petrzmax@gmail.com> Date: Mon Feb 10 19:09:23 2020 +0100 Clean Configuration.h commit 6d69f89 Merge: 5732cf6 15b6ad4 Author: petrzmax <petrzmax@gmail.com> Date: Tue Feb 4 13:24:42 2020 +0100 Merge branch 'bugfix-2.0.x' into 2.0.x-Sapphire-Pro commit 5732cf6 Author: petrzmax <petrzmax@gmail.com> Date: Tue Feb 4 13:19:33 2020 +0100 Config updated commit 0440ae2 Merge: e28d928 c4df5cf Author: petrzmax <petrzmax@gmail.com> Date: Fri Jan 31 14:50:24 2020 +0100 Merge branch 'bugfix-2.0.x' into 2.0.x-Sapphire-Pro commit e28d928 Author: petrzmax <petrzmax@gmail.com> Date: Thu Jan 30 21:29:52 2020 +0100 Hemera calibrated & XY steps changed commit 8e64106 Author: petrzmax <petrzmax@gmail.com> Date: Thu Jan 30 18:31:07 2020 +0100 Add PT100 on 32 bit mcu temptable commit ebc6fec Merge: e57f4a9 3c9464e Author: petrzmax <petrzmax@gmail.com> Date: Thu Jan 30 11:48:18 2020 +0100 Merge branch 'bugfix-2.0.x' into 2.0.x-Sapphire-Pro commit e57f4a9 Merge: 06acb0c 131acf3 Author: petrzmax <petrzmax@gmail.com> Date: Mon Jan 27 23:44:19 2020 +0100 Merge branch 'bugfix-2.0.x' into 2.0.x-Sapphire-Pro commit 06acb0c Merge: 1e44132 e2eef12 Author: petrzmax <petrzmax@gmail.com> Date: Mon Jan 27 18:23:14 2020 +0100 Merge branch 'bugfix-2.0.x' into 2.0.x-Sapphire-Pro commit 1e44132 Author: petrzmax <petrzmax@gmail.com> Date: Mon Jan 27 18:18:38 2020 +0100 PT100 - new PID's commit 5f32523 Author: petrzmax <petrzmax@gmail.com> Date: Mon Jan 27 14:46:54 2020 +0100 PT100 & Hemera setup commit aa1179c Author: petrzmax <petrzmax@gmail.com> Date: Wed Jan 22 20:55:07 2020 +0100 Tweaked to allow use of latest TMC lib commit f8f4be8 Author: petrzmax <petrzmax@gmail.com> Date: Tue Jan 21 20:12:41 2020 +0100 TMC2209 SPI connection set commit 38413dc Merge: 7c15cbd b7f86bf Author: petrzmax <petrzmax@gmail.com> Date: Tue Jan 21 11:27:34 2020 +0100 Merge branch 'bugfix-2.0.x' into 2.0.x-Sapphire-Pro commit 7c15cbd Author: petrzmax <petrzmax@gmail.com> Date: Tue Jan 21 11:26:16 2020 +0100 Added SPI pins for TMC's commit 53741b2 Author: petrzmax <petrzmax@gmail.com> Date: Mon Jan 20 22:27:38 2020 +0100 Appropriate upscaler was set commit 644bfb2 Merge: d2aea39 97b5a5f Author: petrzmax <petrzmax@gmail.com> Date: Mon Jan 20 21:31:16 2020 +0100 Merge bugfix-2.0.x changes & revert original TFT upscaler commit d2aea39 Author: petrzmax <petrzmax@gmail.com> Date: Mon Jan 20 21:04:35 2020 +0100 Updated config files commit e35c892 Author: petrzmax <petrzmax@gmail.com> Date: Tue Jan 14 16:39:53 2020 +0100 Junction Deviation adjusted commit 0677dc6 Author: petrzmax <petrzmax@gmail.com> Date: Tue Jan 7 18:04:20 2020 +0100 Some config adjustments commit 7ea52fb Author: petrzmax <petrzmax@gmail.com> Date: Mon Jan 6 18:11:35 2020 +0100 Updated Configuration_adv.h commit 8c5b4ef Author: petrzmax <petrzmax@gmail.com> Date: Mon Dec 30 17:34:15 2019 +0100 Tweaked encoder settings commit 8852892 Merge: 1387145 16787c9 Author: petrzmax <petrzmax@gmail.com> Date: Mon Dec 30 17:14:56 2019 +0100 Merge remote-tracking branch 'origin/bugfix-2.0.x' into 2.0.x-Sapphire-Pro commit 1387145 Author: petrzmax <petrzmax@gmail.com> Date: Mon Dec 30 17:03:35 2019 +0100 Restore original M250.cpp commit dc64a33 Author: petrzmax <petrzmax@gmail.com> Date: Mon Dec 30 15:32:28 2019 +0100 Add my config files commit d707766 Author: sobieh <sobieh@users.noreply.github.com> Date: Mon Nov 18 16:58:49 2019 +0100 Eeprom in external SPI flash (MarlinFirmware#7) tested over the weekend - works great * Enable EEPROM auto init as we will probably start with invalid data in flash. * Fix XPT2046 to begin/end with it's soft spi pins when needed and to not block SPI2 and vice versa. * Added SPIFlash class to STM32F1 hal. * Added persistent_store_spi_flash and updated persistent_store_sdcard to still be default. * Added required config to pins_MKS_ROBIN_NANO.h. commit 0672e7e Author: inib <inib@users.noreply.github.com> Date: Sun Nov 10 02:27:44 2019 +0100 fix for pio core 4.1 commit 076ab60 Author: inib <inib@users.noreply.github.com> Date: Fri Nov 1 19:46:07 2019 +0100 config for "vanilla" Sapphire Pro commit 909e84e Author: inib <inib@users.noreply.github.com> Date: Fri Nov 1 19:26:51 2019 +0100 fixing octoprint connection issues commit c1fd548 Merge: 08a76af 2b31684 Author: inib <inib@users.noreply.github.com> Date: Fri Nov 1 19:24:07 2019 +0100 update to current marlin/bugfix 2.0.x commit 2b31684 Merge: c07def2 e7d9db2 Author: inib <inib@users.noreply.github.com> Date: Fri Nov 1 19:20:30 2019 +0100 Merge branch 'bugfix-2.0.x' of https://github.com/MarlinFirmware/Marlin into MarlinFirmware-bugfix-2.0.x commit c07def2 Merge: 17b02a2 35b1149 Author: inib <inib@users.noreply.github.com> Date: Wed Oct 30 23:27:10 2019 +0100 update to current 2.0.x commit 17b02a2 Author: inib <inib@users.noreply.github.com> Date: Wed Oct 30 23:19:03 2019 +0100 current config commit cf4631c Author: inib <inib@users.noreply.github.com> Date: Fri Oct 25 22:28:58 2019 +0200 temp window histerysis commit 506dfa9 Author: inib <inib@users.noreply.github.com> Date: Sun Oct 20 17:53:05 2019 +0200 new driver on extruder commit f41e7c5 Author: inib <inib@users.noreply.github.com> Date: Sat Oct 19 23:51:48 2019 +0200 hotend fan on heater2 commit 08a76af Merge: ffab812 94b9866 Author: inib <inib@users.noreply.github.com> Date: Wed Oct 16 23:10:18 2019 +0200 Merge branch 'MarlinFirmware-bugfix-2.0.x' into 2.0.X-SapphirePro-3.5TFT commit 94b9866 Merge: ffab812 0652f19 Author: inib <inib@users.noreply.github.com> Date: Wed Oct 16 23:05:58 2019 +0200 Merge branch 'bugfix-2.0.x' of https://github.com/MarlinFirmware/Marlin into MarlinFirmware-bugfix-2.0.x commit 3b2ece9 Author: inib <inib@users.noreply.github.com> Date: Wed Oct 16 22:40:37 2019 +0200 fixing chamber temperature commit 44cee4f Author: inib <inib@users.noreply.github.com> Date: Thu Oct 10 10:10:38 2019 +0200 Color presets added - new gcode in M250 commit 7a1a38f Author: inib <inib@users.noreply.github.com> Date: Mon Oct 7 01:14:42 2019 +0200 new class commit 3b6ac0d Author: inib <inib@users.noreply.github.com> Date: Sat Oct 5 15:56:45 2019 +0200 ABL Bilinear and activated Z-probing commit ffab812 Author: inib <inib@users.noreply.github.com> Date: Sat Oct 5 13:55:45 2019 +0200 small fix may_extrude_length commit 3590e81 Author: inib <inib@users.noreply.github.com> Date: Thu Oct 3 22:18:51 2019 +0200 homing backoff to clear switches commit b58dc53 Author: inib <inib@users.noreply.github.com> Date: Thu Oct 3 22:18:12 2019 +0200 config tweaks: lin advance, adv. pause, etc commit 00cfed4 Author: inib <inib@users.noreply.github.com> Date: Wed Oct 2 21:56:50 2019 +0200 upscale, enable calibrate touchUI commit 053fa69 Author: inib <inib@users.noreply.github.com> Date: Tue Oct 1 21:42:27 2019 +0200 3x upscaler hack / my Sapphire Pro config
1 parent cdbc7cc commit 3f90d70

17 files changed

+1415
-129
lines changed

Marlin/Configuration.h

+82-66
Large diffs are not rendered by default.

Marlin/Configuration_adv.h

+37-37
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@
358358
// When first starting the main fan, run it at full speed for the
359359
// given number of milliseconds. This gets the fan spinning reliably
360360
// before setting a PWM value. (Does not work with software PWM for fan on Sanguinololu)
361-
//#define FAN_KICKSTART_TIME 100
361+
#define FAN_KICKSTART_TIME 100
362362

363363
// Some coolers may require a non-zero "off" state.
364364
//#define FAN_OFF_PWM 1
@@ -594,8 +594,8 @@
594594
#define Y_HOME_BUMP_MM 5
595595
#define Z_HOME_BUMP_MM 2
596596
#define HOMING_BUMP_DIVISOR { 2, 2, 4 } // Re-Bump Speed Divisor (Divides the Homing Feedrate)
597-
//#define QUICK_HOME // If homing includes X and Y, do a diagonal move initially
598-
//#define HOMING_BACKOFF_MM { 2, 2, 2 } // (mm) Move away from the endstops after homing
597+
#define QUICK_HOME // If homing includes X and Y, do a diagonal move initially
598+
#define HOMING_BACKOFF_MM { 2, 25, 10 } // (mm) Move away from the endstops after homing
599599

600600
// When G28 is called, this option will make Y home before X
601601
//#define HOME_Y_BEFORE_X
@@ -754,7 +754,7 @@
754754
#define DEFAULT_MINIMUMFEEDRATE 0.0 // minimum feedrate
755755
#define DEFAULT_MINTRAVELFEEDRATE 0.0
756756

757-
//#define HOME_AFTER_DEACTIVATE // Require rehoming after steppers are deactivated
757+
#define HOME_AFTER_DEACTIVATE // Require rehoming after steppers are deactivated
758758

759759
// Minimum time that a segment needs to take if the buffer is emptied
760760
#define DEFAULT_MINSEGMENTTIME 20000 // (ms)
@@ -868,7 +868,7 @@
868868
* vibration and surface artifacts. The algorithm adapts to provide the best possible step smoothing at the
869869
* lowest stepping frequencies.
870870
*/
871-
//#define ADAPTIVE_STEP_SMOOTHING
871+
#define ADAPTIVE_STEP_SMOOTHING
872872

873873
/**
874874
* Custom Microstepping
@@ -949,8 +949,8 @@
949949
// Change values more rapidly when the encoder is rotated faster
950950
#define ENCODER_RATE_MULTIPLIER
951951
#if ENABLED(ENCODER_RATE_MULTIPLIER)
952-
#define ENCODER_10X_STEPS_PER_SEC 30 // (steps/s) Encoder rate for 10x speed
953-
#define ENCODER_100X_STEPS_PER_SEC 80 // (steps/s) Encoder rate for 100x speed
952+
#define ENCODER_10X_STEPS_PER_SEC 60 // (steps/s) Encoder rate for 10x speed
953+
#define ENCODER_100X_STEPS_PER_SEC 300 // (steps/s) Encoder rate for 100x speed
954954
#endif
955955

956956
// Play a beep when the feedrate is changed from the Status Screen
@@ -963,7 +963,7 @@
963963
#if HAS_LCD_MENU
964964

965965
// Include a page of printer information in the LCD Main Menu
966-
//#define LCD_INFO_MENU
966+
#define LCD_INFO_MENU
967967
#if ENABLED(LCD_INFO_MENU)
968968
//#define LCD_PRINTER_INFO_IS_BOOTSCREEN // Show bootscreen(s) instead of Printer Info pages
969969
#endif
@@ -1117,7 +1117,7 @@
11171117
#endif
11181118

11191119
// This allows hosts to request long names for files and folders with M33
1120-
//#define LONG_FILENAME_HOST_SUPPORT
1120+
#define LONG_FILENAME_HOST_SUPPORT
11211121

11221122
// Enable this option to scroll long filenames in the SD card menu
11231123
//#define SCROLL_LONG_FILENAMES
@@ -1285,7 +1285,7 @@
12851285
//#define STATUS_ALT_BED_BITMAP // Use the alternative bed bitmap
12861286
//#define STATUS_ALT_FAN_BITMAP // Use the alternative fan bitmap
12871287
//#define STATUS_FAN_FRAMES 3 // :[0,1,2,3,4] Number of fan animation frames
1288-
//#define STATUS_HEAT_PERCENT // Show heating in a progress bar
1288+
#define STATUS_HEAT_PERCENT // Show heating in a progress bar
12891289
//#define BOOT_MARLIN_LOGO_SMALL // Show a smaller Marlin logo on the Boot Screen (saving 399 bytes of flash)
12901290
//#define BOOT_MARLIN_LOGO_ANIMATED // Animated Marlin logo. Costs ~‭3260 (or ~940) bytes of PROGMEM.
12911291

@@ -1513,10 +1513,10 @@
15131513
* See https://marlinfw.org/docs/features/lin_advance.html for full instructions.
15141514
* Mention @Sebastianv650 on GitHub to alert the author of any issues.
15151515
*/
1516-
//#define LIN_ADVANCE
1516+
#define LIN_ADVANCE
15171517
#if ENABLED(LIN_ADVANCE)
15181518
//#define EXTRA_LIN_ADVANCE_K // Enable for second linear advance constants
1519-
#define LIN_ADVANCE_K 0.22 // Unit: mm compression per 1mm/s extruder speed
1519+
#define LIN_ADVANCE_K 0.0 // Unit: mm compression per 1mm/s extruder speed
15201520
//#define LA_DEBUG // If enabled, this will generate debug information output over USB.
15211521
#endif
15221522

@@ -1725,18 +1725,18 @@
17251725
// For debug-echo: 128 bytes for the optimal speed.
17261726
// Other output doesn't need to be that speedy.
17271727
// :[0, 2, 4, 8, 16, 32, 64, 128, 256]
1728-
#define TX_BUFFER_SIZE 0
1728+
#define TX_BUFFER_SIZE 32
17291729

17301730
// Host Receive Buffer Size
17311731
// Without XON/XOFF flow control (see SERIAL_XON_XOFF below) 32 bytes should be enough.
17321732
// To use flow control, set this buffer size to at least 1024 bytes.
17331733
// :[0, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048]
1734-
//#define RX_BUFFER_SIZE 1024
1734+
#define RX_BUFFER_SIZE 1024
17351735

17361736
#if RX_BUFFER_SIZE >= 1024
17371737
// Enable to have the controller send XON/XOFF control characters to
17381738
// the host to signal the RX buffer is becoming full.
1739-
//#define SERIAL_XON_XOFF
1739+
#define SERIAL_XON_XOFF
17401740
#endif
17411741

17421742
// Add M575 G-code to change the baud rate
@@ -1859,48 +1859,48 @@
18591859
* Requires NOZZLE_PARK_FEATURE.
18601860
* This feature is required for the default FILAMENT_RUNOUT_SCRIPT.
18611861
*/
1862-
//#define ADVANCED_PAUSE_FEATURE
1862+
#define ADVANCED_PAUSE_FEATURE
18631863
#if ENABLED(ADVANCED_PAUSE_FEATURE)
1864-
#define PAUSE_PARK_RETRACT_FEEDRATE 60 // (mm/s) Initial retract feedrate.
1864+
#define PAUSE_PARK_RETRACT_FEEDRATE 35 // (mm/s) Initial retract feedrate.
18651865
#define PAUSE_PARK_RETRACT_LENGTH 2 // (mm) Initial retract.
18661866
// This short retract is done immediately, before parking the nozzle.
1867-
#define FILAMENT_CHANGE_UNLOAD_FEEDRATE 10 // (mm/s) Unload filament feedrate. This can be pretty fast.
1868-
#define FILAMENT_CHANGE_UNLOAD_ACCEL 25 // (mm/s^2) Lower acceleration may allow a faster feedrate.
1869-
#define FILAMENT_CHANGE_UNLOAD_LENGTH 100 // (mm) The length of filament for a complete unload.
1867+
#define FILAMENT_CHANGE_UNLOAD_FEEDRATE 45 // (mm/s) Unload filament feedrate. This can be pretty fast.
1868+
#define FILAMENT_CHANGE_UNLOAD_ACCEL 100 // (mm/s^2) Lower acceleration may allow a faster feedrate.
1869+
#define FILAMENT_CHANGE_UNLOAD_LENGTH 580 // (mm) The length of filament for a complete unload.
18701870
// For Bowden, the full length of the tube and nozzle.
18711871
// For direct drive, the full length of the nozzle.
18721872
// Set to 0 for manual unloading.
18731873
#define FILAMENT_CHANGE_SLOW_LOAD_FEEDRATE 6 // (mm/s) Slow move when starting load.
1874-
#define FILAMENT_CHANGE_SLOW_LOAD_LENGTH 0 // (mm) Slow length, to allow time to insert material.
1874+
#define FILAMENT_CHANGE_SLOW_LOAD_LENGTH 10 // (mm) Slow length, to allow time to insert material.
18751875
// 0 to disable start loading and skip to fast load only
1876-
#define FILAMENT_CHANGE_FAST_LOAD_FEEDRATE 6 // (mm/s) Load filament feedrate. This can be pretty fast.
1877-
#define FILAMENT_CHANGE_FAST_LOAD_ACCEL 25 // (mm/s^2) Lower acceleration may allow a faster feedrate.
1878-
#define FILAMENT_CHANGE_FAST_LOAD_LENGTH 0 // (mm) Load length of filament, from extruder gear to nozzle.
1876+
#define FILAMENT_CHANGE_FAST_LOAD_FEEDRATE 45 // (mm/s) Load filament feedrate. This can be pretty fast.
1877+
#define FILAMENT_CHANGE_FAST_LOAD_ACCEL 100 // (mm/s^2) Lower acceleration may allow a faster feedrate.
1878+
#define FILAMENT_CHANGE_FAST_LOAD_LENGTH 580 // (mm) Load length of filament, from extruder gear to nozzle.
18791879
// For Bowden, the full length of the tube and nozzle.
18801880
// For direct drive, the full length of the nozzle.
1881-
//#define ADVANCED_PAUSE_CONTINUOUS_PURGE // Purge continuously up to the purge length until interrupted.
1881+
#define ADVANCED_PAUSE_CONTINUOUS_PURGE // Purge continuously up to the purge length until interrupted.
18821882
#define ADVANCED_PAUSE_PURGE_FEEDRATE 3 // (mm/s) Extrude feedrate (after loading). Should be slower than load feedrate.
18831883
#define ADVANCED_PAUSE_PURGE_LENGTH 50 // (mm) Length to extrude after loading.
18841884
// Set to 0 for manual extrusion.
18851885
// Filament can be extruded repeatedly from the Filament Change menu
18861886
// until extrusion is consistent, and to purge old filament.
18871887
#define ADVANCED_PAUSE_RESUME_PRIME 0 // (mm) Extra distance to prime nozzle after returning from park.
1888-
//#define ADVANCED_PAUSE_FANS_PAUSE // Turn off print-cooling fans while the machine is paused.
1888+
#define ADVANCED_PAUSE_FANS_PAUSE // Turn off print-cooling fans while the machine is paused.
18891889

18901890
// Filament Unload does a Retract, Delay, and Purge first:
1891-
#define FILAMENT_UNLOAD_PURGE_RETRACT 13 // (mm) Unload initial retract length.
1891+
#define FILAMENT_UNLOAD_PURGE_RETRACT 5 // (mm) Unload initial retract length.
18921892
#define FILAMENT_UNLOAD_PURGE_DELAY 5000 // (ms) Delay for the filament to cool after retract.
1893-
#define FILAMENT_UNLOAD_PURGE_LENGTH 8 // (mm) An unretract is done, then this length is purged.
1893+
#define FILAMENT_UNLOAD_PURGE_LENGTH 3 // (mm) An unretract is done, then this length is purged.
18941894
#define FILAMENT_UNLOAD_PURGE_FEEDRATE 25 // (mm/s) feedrate to purge before unload
18951895

18961896
#define PAUSE_PARK_NOZZLE_TIMEOUT 45 // (seconds) Time limit before the nozzle is turned off for safety.
18971897
#define FILAMENT_CHANGE_ALERT_BEEPS 10 // Number of alert beeps to play when a response is needed.
18981898
#define PAUSE_PARK_NO_STEPPER_TIMEOUT // Enable for XYZ steppers to stay powered on during filament change.
18991899

1900-
//#define PARK_HEAD_ON_PAUSE // Park the nozzle during pause and filament change.
1900+
#define PARK_HEAD_ON_PAUSE // Park the nozzle during pause and filament change.
19011901
//#define HOME_BEFORE_FILAMENT_CHANGE // Ensure homing has been completed prior to parking for filament change
19021902

1903-
//#define FILAMENT_LOAD_UNLOAD_GCODES // Add M701/M702 Load/Unload G-codes, plus Load/Unload in the LCD Prepare menu.
1903+
#define FILAMENT_LOAD_UNLOAD_GCODES // Add M701/M702 Load/Unload G-codes, plus Load/Unload in the LCD Prepare menu.
19041904
//#define FILAMENT_UNLOAD_ALL_EXTRUDERS // Allow M702 to unload all extruders above a minimum target temp (as set by M302)
19051905
#endif
19061906

@@ -2100,7 +2100,7 @@
21002100
#endif
21012101

21022102
#if AXIS_IS_TMC(E0)
2103-
#define E0_CURRENT 800
2103+
#define E0_CURRENT 800
21042104
#define E0_MICROSTEPS 16
21052105
#define E0_RSENSE 0.11
21062106
#define E0_CHAIN_POS -1
@@ -2198,14 +2198,14 @@
21982198
* on the same serial port, either here or in your board's pins file.
21992199
*/
22002200
#define X_SLAVE_ADDRESS 0
2201-
#define Y_SLAVE_ADDRESS 0
2202-
#define Z_SLAVE_ADDRESS 0
2201+
#define Y_SLAVE_ADDRESS 1
2202+
#define Z_SLAVE_ADDRESS 2
22032203
#define X2_SLAVE_ADDRESS 0
22042204
#define Y2_SLAVE_ADDRESS 0
22052205
#define Z2_SLAVE_ADDRESS 0
22062206
#define Z3_SLAVE_ADDRESS 0
22072207
#define Z4_SLAVE_ADDRESS 0
2208-
#define E0_SLAVE_ADDRESS 0
2208+
#define E0_SLAVE_ADDRESS 3
22092209
#define E1_SLAVE_ADDRESS 0
22102210
#define E2_SLAVE_ADDRESS 0
22112211
#define E3_SLAVE_ADDRESS 0
@@ -2245,7 +2245,7 @@
22452245
* Define you own with
22462246
* { <off_time[1..15]>, <hysteresis_end[-3..12]>, hysteresis_start[1..8] }
22472247
*/
2248-
#define CHOPPER_TIMING CHOPPER_DEFAULT_12V
2248+
#define CHOPPER_TIMING CHOPPER_DEFAULT_24V
22492249

22502250
/**
22512251
* Monitor Trinamic drivers for error conditions,
@@ -2258,7 +2258,7 @@
22582258
* M912 - Clear stepper driver overtemperature pre-warn condition flag.
22592259
* M122 - Report driver parameters (Requires TMC_DEBUG)
22602260
*/
2261-
//#define MONITOR_DRIVER_STATUS
2261+
#define MONITOR_DRIVER_STATUS
22622262

22632263
#if ENABLED(MONITOR_DRIVER_STATUS)
22642264
#define CURRENT_STEP_DOWN 50 // [mA]
@@ -2337,7 +2337,7 @@
23372337
* Enable M122 debugging command for TMC stepper drivers.
23382338
* M122 S0/1 will enable continous reporting.
23392339
*/
2340-
//#define TMC_DEBUG
2340+
#define TMC_DEBUG
23412341

23422342
/**
23432343
* You can set your own advanced settings by filling in predefined functions.

Marlin/src/HAL/STM32F1/HAL.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ const uint8_t adc_pins[] = {
100100
#if HAS_HEATED_BED
101101
TEMP_BED_PIN,
102102
#endif
103-
#if HAS_HEATED_CHAMBER
103+
#if HAS_TEMP_CHAMBER
104104
TEMP_CHAMBER_PIN,
105105
#endif
106106
#if HAS_TEMP_ADC_1
@@ -148,7 +148,7 @@ enum TEMP_PINS : char {
148148
#if HAS_HEATED_BED
149149
TEMP_BED,
150150
#endif
151-
#if HAS_HEATED_CHAMBER
151+
#if HAS_TEMP_CHAMBER
152152
TEMP_CHAMBER,
153153
#endif
154154
#if HAS_TEMP_ADC_1
@@ -332,7 +332,7 @@ void HAL_adc_start_conversion(const uint8_t adc_pin) {
332332
#if HAS_HEATED_BED
333333
case TEMP_BED_PIN: pin_index = TEMP_BED; break;
334334
#endif
335-
#if HAS_HEATED_CHAMBER
335+
#if HAS_TEMP_CHAMBER
336336
case TEMP_CHAMBER_PIN: pin_index = TEMP_CHAMBER; break;
337337
#endif
338338
#if HAS_TEMP_ADC_1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
#ifdef __STM32F1__
2+
#include "../../inc/MarlinConfig.h"
3+
4+
#if BOTH(EEPROM_SETTINGS, SPI_FLASH_EEPROM_EMULATION)
5+
6+
#include "../shared/eeprom_api.h"
7+
#include <SPI.h>
8+
#include "spi_flash.h"
9+
10+
#define SPI_FLASH_EEPROM_SIZE 0x1000 // 4K - do not change!
11+
12+
#ifndef E2END
13+
#define E2END SPI_FLASH_EEPROM_SIZE - 1
14+
#endif
15+
16+
static char __attribute__ ((aligned(4))) _eeprom_data[SPI_FLASH_EEPROM_SIZE];
17+
18+
SPIClass _spi(SPI_FLASH_DEVICE);
19+
hal::SPIFlash _flash(_spi, SPI_FLASH_CS_PIN);
20+
21+
bool PersistentStore::access_start()
22+
{
23+
_flash.begin();
24+
_flash.read_array(SPI_FLASH_EEPROM_OFFSET, _eeprom_data, SPI_FLASH_EEPROM_SIZE);
25+
_flash.end();
26+
}
27+
28+
bool PersistentStore::access_finish()
29+
{
30+
_flash.begin();
31+
_flash.erase_4K(SPI_FLASH_EEPROM_OFFSET);
32+
_flash.write_array(SPI_FLASH_EEPROM_OFFSET, _eeprom_data, SPI_FLASH_EEPROM_SIZE);
33+
_flash.end();
34+
}
35+
36+
bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, uint16_t *crc)
37+
{
38+
for (size_t i = 0; i < size; i++)
39+
{
40+
_eeprom_data[pos + i] = value[i];
41+
}
42+
crc16(crc, value, size);
43+
pos += size;
44+
return false;
45+
}
46+
47+
bool PersistentStore::read_data(int &pos, uint8_t* value, const size_t size, uint16_t *crc, const bool writing/*=true*/)
48+
{
49+
for (size_t i = 0; i < size; i++)
50+
{
51+
uint8_t c = _eeprom_data[pos + i];
52+
if (writing) value[i] = c;
53+
crc16(crc, &c, 1);
54+
}
55+
pos += size;
56+
return false;
57+
}
58+
59+
size_t PersistentStore::capacity()
60+
{
61+
return SPI_FLASH_EEPROM_SIZE;
62+
}
63+
64+
#endif
65+
#endif

0 commit comments

Comments
 (0)