Skip to content

Commit

Permalink
Merge petrzmax changes
Browse files Browse the repository at this point in the history 
commit e83c490
Author: petrzmax <[email protected]>
Date:   Tue Apr 7 14:45:18 2020 +0200

    SD Card volume init fix

commit 7f4fd10
Merge: 1538ee9 e1fc6f7
Author: petrzmax <[email protected]>
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 <[email protected]>
Date:   Mon Mar 30 20:31:31 2020 +0200

    Set settings for stock Sapphire Pro

commit d36e6c1
Merge: e8b840f 747a4bb
Author: petrzmax <[email protected]>
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 <[email protected]>
Date:   Sat Mar 28 13:42:32 2020 +0100

    SPI EEprom Flash fix & Adv Pause enabled

commit f597206
Merge: ffb372e 747b964
Author: petrzmax <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
Date:   Wed Mar 18 19:29:25 2020 +0100

    adjust stepper current

commit 66dadce
Merge: a3963ed 201c991
Author: petrzmax <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
Date:   Mon Feb 10 19:09:23 2020 +0100

    Clean Configuration.h

commit 6d69f89
Merge: 5732cf6 15b6ad4
Author: petrzmax <[email protected]>
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 <[email protected]>
Date:   Tue Feb 4 13:19:33 2020 +0100

    Config updated

commit 0440ae2
Merge: e28d928 c4df5cf
Author: petrzmax <[email protected]>
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 <[email protected]>
Date:   Thu Jan 30 21:29:52 2020 +0100

    Hemera calibrated & XY steps changed

commit 8e64106
Author: petrzmax <[email protected]>
Date:   Thu Jan 30 18:31:07 2020 +0100

    Add PT100 on 32 bit mcu temptable

commit ebc6fec
Merge: e57f4a9 3c9464e
Author: petrzmax <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
Date:   Mon Jan 27 18:18:38 2020 +0100

    PT100 - new PID's

commit 5f32523
Author: petrzmax <[email protected]>
Date:   Mon Jan 27 14:46:54 2020 +0100

    PT100 & Hemera setup

commit aa1179c
Author: petrzmax <[email protected]>
Date:   Wed Jan 22 20:55:07 2020 +0100

    Tweaked to allow use of latest TMC lib

commit f8f4be8
Author: petrzmax <[email protected]>
Date:   Tue Jan 21 20:12:41 2020 +0100

    TMC2209 SPI connection set

commit 38413dc
Merge: 7c15cbd b7f86bf
Author: petrzmax <[email protected]>
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 <[email protected]>
Date:   Tue Jan 21 11:26:16 2020 +0100

    Added SPI pins for TMC's

commit 53741b2
Author: petrzmax <[email protected]>
Date:   Mon Jan 20 22:27:38 2020 +0100

    Appropriate upscaler was set

commit 644bfb2
Merge: d2aea39 97b5a5f
Author: petrzmax <[email protected]>
Date:   Mon Jan 20 21:31:16 2020 +0100

    Merge bugfix-2.0.x changes & revert original TFT upscaler

commit d2aea39
Author: petrzmax <[email protected]>
Date:   Mon Jan 20 21:04:35 2020 +0100

    Updated config files

commit e35c892
Author: petrzmax <[email protected]>
Date:   Tue Jan 14 16:39:53 2020 +0100

    Junction Deviation adjusted

commit 0677dc6
Author: petrzmax <[email protected]>
Date:   Tue Jan 7 18:04:20 2020 +0100

    Some config adjustments

commit 7ea52fb
Author: petrzmax <[email protected]>
Date:   Mon Jan 6 18:11:35 2020 +0100

    Updated Configuration_adv.h

commit 8c5b4ef
Author: petrzmax <[email protected]>
Date:   Mon Dec 30 17:34:15 2019 +0100

    Tweaked encoder settings

commit 8852892
Merge: 1387145 16787c9
Author: petrzmax <[email protected]>
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 <[email protected]>
Date:   Mon Dec 30 17:03:35 2019 +0100

    Restore original M250.cpp

commit dc64a33
Author: petrzmax <[email protected]>
Date:   Mon Dec 30 15:32:28 2019 +0100

    Add my config files

commit d707766
Author: sobieh <[email protected]>
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 <[email protected]>
Date:   Sun Nov 10 02:27:44 2019 +0100

    fix for pio core 4.1

commit 076ab60
Author: inib <[email protected]>
Date:   Fri Nov 1 19:46:07 2019 +0100

    config for "vanilla" Sapphire Pro

commit 909e84e
Author: inib <[email protected]>
Date:   Fri Nov 1 19:26:51 2019 +0100

    fixing octoprint connection issues

commit c1fd548
Merge: 08a76af 2b31684
Author: inib <[email protected]>
Date:   Fri Nov 1 19:24:07 2019 +0100

    update to current marlin/bugfix 2.0.x

commit 2b31684
Merge: c07def2 e7d9db2
Author: inib <[email protected]>
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 <[email protected]>
Date:   Wed Oct 30 23:27:10 2019 +0100

    update to current 2.0.x

commit 17b02a2
Author: inib <[email protected]>
Date:   Wed Oct 30 23:19:03 2019 +0100

    current config

commit cf4631c
Author: inib <[email protected]>
Date:   Fri Oct 25 22:28:58 2019 +0200

    temp window histerysis

commit 506dfa9
Author: inib <[email protected]>
Date:   Sun Oct 20 17:53:05 2019 +0200

    new driver on extruder

commit f41e7c5
Author: inib <[email protected]>
Date:   Sat Oct 19 23:51:48 2019 +0200

    hotend fan on heater2

commit 08a76af
Merge: ffab812 94b9866
Author: inib <[email protected]>
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 <[email protected]>
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 <[email protected]>
Date:   Wed Oct 16 22:40:37 2019 +0200

    fixing chamber temperature

commit 44cee4f
Author: inib <[email protected]>
Date:   Thu Oct 10 10:10:38 2019 +0200

    Color presets added - new gcode in M250

commit 7a1a38f
Author: inib <[email protected]>
Date:   Mon Oct 7 01:14:42 2019 +0200

    new class

commit 3b6ac0d
Author: inib <[email protected]>
Date:   Sat Oct 5 15:56:45 2019 +0200

    ABL Bilinear and activated Z-probing

commit ffab812
Author: inib <[email protected]>
Date:   Sat Oct 5 13:55:45 2019 +0200

    small fix may_extrude_length

commit 3590e81
Author: inib <[email protected]>
Date:   Thu Oct 3 22:18:51 2019 +0200

    homing backoff to clear switches

commit b58dc53
Author: inib <[email protected]>
Date:   Thu Oct 3 22:18:12 2019 +0200

    config tweaks: lin advance, adv. pause, etc

commit 00cfed4
Author: inib <[email protected]>
Date:   Wed Oct 2 21:56:50 2019 +0200

    upscale, enable calibrate touchUI

commit 053fa69
Author: inib <[email protected]>
Date:   Tue Oct 1 21:42:27 2019 +0200

    3x upscaler hack / my Sapphire Pro config
  • Loading branch information
@pwr235728
pwr235728 committed Apr 15, 2020
1 parent cdbc7cc commit 3f90d70
Show file tree
Hide file tree
Showing 17 changed files with 1,415 additions and 129 deletions.
148 changes: 82 additions & 66 deletions Marlin/Configuration.h
View file

Large diffs are not rendered by default.

74 changes: 37 additions & 37 deletions Marlin/Configuration_adv.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,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 100

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

// When G28 is called, this option will make Y home before X
//#define HOME_Y_BEFORE_X
Expand Down Expand Up @@ -754,7 +754,7 @@
#define DEFAULT_MINIMUMFEEDRATE 0.0 // minimum feedrate
#define DEFAULT_MINTRAVELFEEDRATE 0.0

//#define HOME_AFTER_DEACTIVATE // Require rehoming after steppers are deactivated
#define HOME_AFTER_DEACTIVATE // Require rehoming after steppers are deactivated

// Minimum time that a segment needs to take if the buffer is emptied
#define DEFAULT_MINSEGMENTTIME 20000 // (ms)
Expand Down Expand Up @@ -868,7 +868,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
Expand Down Expand Up @@ -949,8 +949,8 @@
// Change values more rapidly when the encoder is rotated faster
#define ENCODER_RATE_MULTIPLIER
#if ENABLED(ENCODER_RATE_MULTIPLIER)
#define ENCODER_10X_STEPS_PER_SEC 30 // (steps/s) Encoder rate for 10x speed
#define ENCODER_100X_STEPS_PER_SEC 80 // (steps/s) Encoder rate for 100x speed
#define ENCODER_10X_STEPS_PER_SEC 60 // (steps/s) Encoder rate for 10x speed
#define ENCODER_100X_STEPS_PER_SEC 300 // (steps/s) Encoder rate for 100x speed
#endif

// Play a beep when the feedrate is changed from the Status Screen
Expand All @@ -963,7 +963,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
Expand Down Expand Up @@ -1117,7 +1117,7 @@
#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
Expand Down Expand Up @@ -1285,7 +1285,7 @@
//#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_HEAT_PERCENT // Show heating in a progress bar
#define STATUS_HEAT_PERCENT // Show heating in a progress bar
//#define BOOT_MARLIN_LOGO_SMALL // Show a smaller Marlin logo on the Boot Screen (saving 399 bytes of flash)
//#define BOOT_MARLIN_LOGO_ANIMATED // Animated Marlin logo. Costs ~‭3260 (or ~940) bytes of PROGMEM.
Expand Down Expand Up @@ -1513,10 +1513,10 @@
* See https://marlinfw.org/docs/features/lin_advance.html for full instructions.
* Mention @Sebastianv650 on GitHub to alert the author of any issues.
*/
//#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.0 // Unit: mm compression per 1mm/s extruder speed
//#define LA_DEBUG // If enabled, this will generate debug information output over USB.
#endif

Expand Down Expand Up @@ -1725,18 +1725,18 @@
// 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 32

// 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 1024

#if RX_BUFFER_SIZE >= 1024
// Enable to have the controller send XON/XOFF control characters to
// the host to signal the RX buffer is becoming full.
//#define SERIAL_XON_XOFF
#define SERIAL_XON_XOFF
#endif

// Add M575 G-code to change the baud rate
Expand Down Expand Up @@ -1859,48 +1859,48 @@
* Requires NOZZLE_PARK_FEATURE.
* This feature is required for the default FILAMENT_RUNOUT_SCRIPT.
*/
//#define ADVANCED_PAUSE_FEATURE
#define ADVANCED_PAUSE_FEATURE
#if ENABLED(ADVANCED_PAUSE_FEATURE)
#define PAUSE_PARK_RETRACT_FEEDRATE 60 // (mm/s) Initial retract feedrate.
#define PAUSE_PARK_RETRACT_FEEDRATE 35 // (mm/s) Initial retract feedrate.
#define PAUSE_PARK_RETRACT_LENGTH 2 // (mm) Initial retract.
// This short retract is done immediately, before parking the nozzle.
#define FILAMENT_CHANGE_UNLOAD_FEEDRATE 10 // (mm/s) Unload filament feedrate. This can be pretty fast.
#define FILAMENT_CHANGE_UNLOAD_ACCEL 25 // (mm/s^2) Lower acceleration may allow a faster feedrate.
#define FILAMENT_CHANGE_UNLOAD_LENGTH 100 // (mm) The length of filament for a complete unload.
#define FILAMENT_CHANGE_UNLOAD_FEEDRATE 45 // (mm/s) Unload filament feedrate. This can be pretty fast.
#define FILAMENT_CHANGE_UNLOAD_ACCEL 100 // (mm/s^2) Lower acceleration may allow a faster feedrate.
#define FILAMENT_CHANGE_UNLOAD_LENGTH 580 // (mm) The length of filament for a complete unload.
// For Bowden, the full length of the tube and nozzle.
// For direct drive, the full length of the nozzle.
// Set to 0 for manual unloading.
#define FILAMENT_CHANGE_SLOW_LOAD_FEEDRATE 6 // (mm/s) Slow move when starting load.
#define FILAMENT_CHANGE_SLOW_LOAD_LENGTH 0 // (mm) Slow length, to allow time to insert material.
#define FILAMENT_CHANGE_SLOW_LOAD_LENGTH 10 // (mm) Slow length, to allow time to insert material.
// 0 to disable start loading and skip to fast load only
#define FILAMENT_CHANGE_FAST_LOAD_FEEDRATE 6 // (mm/s) Load filament feedrate. This can be pretty fast.
#define FILAMENT_CHANGE_FAST_LOAD_ACCEL 25 // (mm/s^2) Lower acceleration may allow a faster feedrate.
#define FILAMENT_CHANGE_FAST_LOAD_LENGTH 0 // (mm) Load length of filament, from extruder gear to nozzle.
#define FILAMENT_CHANGE_FAST_LOAD_FEEDRATE 45 // (mm/s) Load filament feedrate. This can be pretty fast.
#define FILAMENT_CHANGE_FAST_LOAD_ACCEL 100 // (mm/s^2) Lower acceleration may allow a faster feedrate.
#define FILAMENT_CHANGE_FAST_LOAD_LENGTH 580 // (mm) Load length of filament, from extruder gear to nozzle.
// For Bowden, the full length of the tube and nozzle.
// For direct drive, the full length of the nozzle.
//#define ADVANCED_PAUSE_CONTINUOUS_PURGE // Purge continuously up to the purge length until interrupted.
#define ADVANCED_PAUSE_CONTINUOUS_PURGE // Purge continuously up to the purge length until interrupted.
#define ADVANCED_PAUSE_PURGE_FEEDRATE 3 // (mm/s) Extrude feedrate (after loading). Should be slower than load feedrate.
#define ADVANCED_PAUSE_PURGE_LENGTH 50 // (mm) Length to extrude after loading.
// 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 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.
#define ADVANCED_PAUSE_FANS_PAUSE // Turn off print-cooling fans while the machine is paused.
// Filament Unload does a Retract, Delay, and Purge first:
#define FILAMENT_UNLOAD_PURGE_RETRACT 13 // (mm) Unload initial retract length.
#define FILAMENT_UNLOAD_PURGE_RETRACT 5 // (mm) Unload initial retract length.
#define FILAMENT_UNLOAD_PURGE_DELAY 5000 // (ms) Delay for the filament to cool after retract.
#define FILAMENT_UNLOAD_PURGE_LENGTH 8 // (mm) An unretract is done, then this length is purged.
#define FILAMENT_UNLOAD_PURGE_LENGTH 3 // (mm) An unretract is done, then this length is purged.
#define FILAMENT_UNLOAD_PURGE_FEEDRATE 25 // (mm/s) feedrate to purge before unload

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

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

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

Expand Down Expand Up @@ -2100,7 +2100,7 @@
#endif

#if AXIS_IS_TMC(E0)
#define E0_CURRENT 800
#define E0_CURRENT 800
#define E0_MICROSTEPS 16
#define E0_RSENSE 0.11
#define E0_CHAIN_POS -1
Expand Down Expand Up @@ -2198,14 +2198,14 @@
* on the same serial port, either here or in your board's pins file.
*/
#define X_SLAVE_ADDRESS 0
#define Y_SLAVE_ADDRESS 0
#define Z_SLAVE_ADDRESS 0
#define Y_SLAVE_ADDRESS 1
#define Z_SLAVE_ADDRESS 2
#define X2_SLAVE_ADDRESS 0
#define Y2_SLAVE_ADDRESS 0
#define Z2_SLAVE_ADDRESS 0
#define Z3_SLAVE_ADDRESS 0
#define Z4_SLAVE_ADDRESS 0
#define E0_SLAVE_ADDRESS 0
#define E0_SLAVE_ADDRESS 3
#define E1_SLAVE_ADDRESS 0
#define E2_SLAVE_ADDRESS 0
#define E3_SLAVE_ADDRESS 0
Expand Down Expand Up @@ -2245,7 +2245,7 @@
* Define you own with
* { <off_time[1..15]>, <hysteresis_end[-3..12]>, hysteresis_start[1..8] }
*/
#define CHOPPER_TIMING CHOPPER_DEFAULT_12V
#define CHOPPER_TIMING CHOPPER_DEFAULT_24V

/**
* Monitor Trinamic drivers for error conditions,
Expand All @@ -2258,7 +2258,7 @@
* M912 - Clear stepper driver overtemperature pre-warn condition flag.
* M122 - Report driver parameters (Requires TMC_DEBUG)
*/
//#define MONITOR_DRIVER_STATUS
#define MONITOR_DRIVER_STATUS

#if ENABLED(MONITOR_DRIVER_STATUS)
#define CURRENT_STEP_DOWN 50 // [mA]
Expand Down Expand Up @@ -2337,7 +2337,7 @@
* Enable M122 debugging command for TMC stepper drivers.
* M122 S0/1 will enable continous reporting.
*/
//#define TMC_DEBUG
#define TMC_DEBUG
/**
* You can set your own advanced settings by filling in predefined functions.
Expand Down
6 changes: 3 additions & 3 deletions Marlin/src/HAL/STM32F1/HAL.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ const uint8_t adc_pins[] = {
#if HAS_HEATED_BED
TEMP_BED_PIN,
#endif
#if HAS_HEATED_CHAMBER
#if HAS_TEMP_CHAMBER
TEMP_CHAMBER_PIN,
#endif
#if HAS_TEMP_ADC_1
Expand Down Expand Up @@ -148,7 +148,7 @@ enum TEMP_PINS : char {
#if HAS_HEATED_BED
TEMP_BED,
#endif
#if HAS_HEATED_CHAMBER
#if HAS_TEMP_CHAMBER
TEMP_CHAMBER,
#endif
#if HAS_TEMP_ADC_1
Expand Down Expand Up @@ -332,7 +332,7 @@ void HAL_adc_start_conversion(const uint8_t adc_pin) {
#if HAS_HEATED_BED
case TEMP_BED_PIN: pin_index = TEMP_BED; break;
#endif
#if HAS_HEATED_CHAMBER
#if HAS_TEMP_CHAMBER
case TEMP_CHAMBER_PIN: pin_index = TEMP_CHAMBER; break;
#endif
#if HAS_TEMP_ADC_1
Expand Down
65 changes: 65 additions & 0 deletions Marlin/src/HAL/STM32F1/persistent_store_spi_flash.cpp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
#ifdef __STM32F1__
#include "../../inc/MarlinConfig.h"

#if BOTH(EEPROM_SETTINGS, SPI_FLASH_EEPROM_EMULATION)

#include "../shared/eeprom_api.h"
#include <SPI.h>
#include "spi_flash.h"

#define SPI_FLASH_EEPROM_SIZE 0x1000 // 4K - do not change!

#ifndef E2END
#define E2END SPI_FLASH_EEPROM_SIZE - 1
#endif

static char __attribute__ ((aligned(4))) _eeprom_data[SPI_FLASH_EEPROM_SIZE];

SPIClass _spi(SPI_FLASH_DEVICE);
hal::SPIFlash _flash(_spi, SPI_FLASH_CS_PIN);

bool PersistentStore::access_start()
{
_flash.begin();
_flash.read_array(SPI_FLASH_EEPROM_OFFSET, _eeprom_data, SPI_FLASH_EEPROM_SIZE);
_flash.end();
}

bool PersistentStore::access_finish()
{
_flash.begin();
_flash.erase_4K(SPI_FLASH_EEPROM_OFFSET);
_flash.write_array(SPI_FLASH_EEPROM_OFFSET, _eeprom_data, SPI_FLASH_EEPROM_SIZE);
_flash.end();
}

bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, uint16_t *crc)
{
for (size_t i = 0; i < size; i++)
{
_eeprom_data[pos + i] = value[i];
}
crc16(crc, value, size);
pos += size;
return false;
}

bool PersistentStore::read_data(int &pos, uint8_t* value, const size_t size, uint16_t *crc, const bool writing/*=true*/)
{
for (size_t i = 0; i < size; i++)
{
uint8_t c = _eeprom_data[pos + i];
if (writing) value[i] = c;
crc16(crc, &c, 1);
}
pos += size;
return false;
}

size_t PersistentStore::capacity()
{
return SPI_FLASH_EEPROM_SIZE;
}

#endif
#endif
Loading

0 comments on commit 3f90d70

Please sign in to comment.