Skip to content

Commit

Permalink
Merge pull request #26 from th3dstudio/2.0.x-testing
Browse files Browse the repository at this point in the history
2.16 Release
  • Loading branch information
Timothy Hoogland committed Jan 5, 2021
2 parents 29df5cf + 59a44dd commit d6b2496
Show file tree
Hide file tree
Showing 157 changed files with 2,774 additions and 341 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,11 @@
// NOTE: This feature causes excessive wear on your SD card.
//#define POWER_LOSS_RECOVERY

// ARC Support Override ----------------------------
// Arc support is enabled by default on all builds but this takes up extra space. If you get compile errors due to the size being too large when enabling other options, then disable ARC_SUPPORT
// by uncommenting the DISABLE_ARC_SUPPORT line below.
//#define DISABLE_ARC_SUPPORT

//===========================================================================
// ********************** END CONFIGURATION SETTINGS *********************
//===========================================================================
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,8 @@

[platformio]
src_dir = Marlin
build_dir = .pioenvs
lib_dir = .piolib
libdeps_dir = .piolibdeps
boards_dir = buildroot/share/PlatformIO/boards
default_envs = LPC1769
default_envs = mega2560
include_dir = Marlin

#
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,11 @@
// NOTE: This feature causes excessive wear on your SD card.
//#define POWER_LOSS_RECOVERY

// ARC Support Override ----------------------------
// Arc support is enabled by default on all builds but this takes up extra space. If you get compile errors due to the size being too large when enabling other options, then disable ARC_SUPPORT
// by uncommenting the DISABLE_ARC_SUPPORT line below.
//#define DISABLE_ARC_SUPPORT

//===========================================================================
// ********************** END CONFIGURATION SETTINGS *********************
//===========================================================================
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,11 @@
// NOTE: This feature causes excessive wear on your SD card.
//#define POWER_LOSS_RECOVERY

// ARC Support Override ----------------------------
// Arc support is enabled by default on all builds but this takes up extra space. If you get compile errors due to the size being too large when enabling other options, then disable ARC_SUPPORT
// by uncommenting the DISABLE_ARC_SUPPORT line below.
//#define DISABLE_ARC_SUPPORT

//===========================================================================
// ********************** END CONFIGURATION SETTINGS *********************
//===========================================================================
Expand Down Expand Up @@ -296,8 +301,6 @@
#define DEFAULT_ZJERK 0.3
#endif

#define ENDSTOP_NOISE_THRESHOLD 2

#define DEFAULT_EJERK 5.0

#define SHOW_BOOTSCREEN
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,7 @@

// LINEAR ADVANCE ----------------------------------
// See here on how to use Linear Advance: http://marlinfw.org/docs/features/lin_advance.html
// Due to space constraints on these boards, enabling the LINEAR_ADVANCE will also disable ARC_SUPPORT automatically
//#define LINEAR_ADVANCE
// Change the K Value here or use M900 KX.XX in your starting code (recommended).
#define LINEAR_ADVANCE_K 0
Expand All @@ -250,10 +251,16 @@
// POWER LOSS RECOVERY -----------------------------
// Continue after Power-Loss feature will store the current state to the SD Card at the start of each layer
// during SD printing. If this is found at bootup it will ask you if you want to resume the print.
// Due to space constraints on these boards, enabling the POWER_LOSS_RECOVERY will also disable ARC_SUPPORT automatically
//
// NOTE: This feature causes excessive wear on your SD card.
//#define POWER_LOSS_RECOVERY

// ARC Support Override ----------------------------
// Arc support is enabled by default on all builds but this takes up extra space. If you get compile errors due to the size being too large when enabling other options, then disable ARC_SUPPORT
// by uncommenting the DISABLE_ARC_SUPPORT line below.
//#define DISABLE_ARC_SUPPORT

//===========================================================================
// ********************** END CONFIGURATION SETTINGS *********************
//===========================================================================
Expand All @@ -263,6 +270,18 @@
* Core machine settings are below. Do NOT modify these unless you understand what you are doing.
*/

/**
* Automatic Optimizations
*/

#if ENABLED(LINEAR_ADVANCE)
#define DISABLE_ARC_SUPPORT
#endif

#if ENABLED(POWER_LOSS_RECOVERY)
#define DISABLE_ARC_SUPPORT
#endif

/**
* Machine Configuration Settings
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,11 @@
// NOTE: This feature causes excessive wear on your SD card.
//#define POWER_LOSS_RECOVERY

// ARC Support Override ----------------------------
// Arc support is enabled by default on all builds but this takes up extra space. If you get compile errors due to the size being too large when enabling other options, then disable ARC_SUPPORT
// by uncommenting the DISABLE_ARC_SUPPORT line below.
//#define DISABLE_ARC_SUPPORT

//===========================================================================
// ********************** END CONFIGURATION SETTINGS *********************
//===========================================================================
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,11 @@
// NOTE: This feature causes excessive wear on your SD card.
//#define POWER_LOSS_RECOVERY

// ARC Support Override ----------------------------
// Arc support is enabled by default on all builds but this takes up extra space. If you get compile errors due to the size being too large when enabling other options, then disable ARC_SUPPORT
// by uncommenting the DISABLE_ARC_SUPPORT line below.
//#define DISABLE_ARC_SUPPORT

//===========================================================================
// ********************** END CONFIGURATION SETTINGS *********************
//===========================================================================
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@

// Other Machines -----------------------------------------------------------
//#define CR20
// The CR-20 Needs special LCD wiring with dupont jumper wires until we can release an adapter PCB.
// The diagram for wiring is in the firmware source folder called "CR20EZBoardLCDWiring.png". Dupont jumper wires will work to make the connections.

// Sovol Machines -----------------------------------------------------------
//#define SOVOL_SV01
Expand Down Expand Up @@ -83,6 +81,11 @@
// When running dual Z motors uncomment the below line. This will increase the Z motor driver current for 2x motors.
//#define DUAL_Z_MOTORS

// LCD Knob Direction
// Turning your LCD knob clockwise should move DOWN in the menus/make values increase and counter-clockwise should move UP in the menus/make values decrease
// If yours is behaving opposite then enable the REVERSE_KNOB_DIRECTION option below
//#define REVERSE_KNOB_DIRECTION

// Axis Direction Settings
// If you need to reverse the direction of a motor uncomment the below option for that axis.
// E motor settings are below in the Extruder Settings Section
Expand Down Expand Up @@ -317,6 +320,7 @@
#if ENABLED(CR10) || ENABLED(CR10_MINI) || ENABLED(CR10_S4) || ENABLED(CR10_S5) || ENABLED(CR10S) || ENABLED(CR10S_MINI) || ENABLED(CR10S_S4) || ENABLED(CR10S_S5) || ENABLED(ENDER2) || ENABLED(ENDER3) || ENABLED(ENDER5) || ENABLED(ENDER5_PLUS) || ENABLED(SOVOL_SV01) || ENABLED(CR20)

#define SERIAL_PORT -1
#define SERIAL_PORT_2 0
#define BAUDRATE 115200

#if ENABLED(CR20) || ENABLED(ENDER2)
Expand All @@ -325,6 +329,10 @@
#define CR10_STOCKDISPLAY
#endif

#if ENABLED(REVERSE_KNOB_DIRECTION) && DISABLED(ENDER5_PLUS)
#define REVERSE_ENCODER_DIRECTION
#endif

#if ENABLED(CR10S) || ENABLED(CR10S_S4) || ENABLED(CR10S_S5) || ENABLED(SOVOL_SV01)
//S models assume that you have 2x motors, filament sensor, and are using the dual adapter.
//So lets up the VREF on Z and reverse the Z axis when using the dual motor adapter and enable the filament sensor
Expand Down Expand Up @@ -466,11 +474,13 @@
#define Y_BED_SIZE 350
#define Z_MAX_POS 400
#define PRINTER_VOLTAGE_24
#define REVERSE_ENCODER_DIRECTION
#define ENDER5_NEW_LEADSCREW
#if DISABLED(REVERSE_KNOB_DIRECTION)
#define REVERSE_ENCODER_DIRECTION
#endif
#define ENDER5_NEW_LEADSCREW
#define EZOUTV2_ENABLE
#define DUAL_Z_MOTORS
#define MOUNTED_FILAMENT_SENSOR
#define MOUNTED_FILAMENT_SENSOR
#endif

#if ENABLED(SOVOL_SV01)
Expand Down
Loading

0 comments on commit d6b2496

Please sign in to comment.