diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index f90252db..a0a63365 100755 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -998,7 +998,7 @@ #endif #if ENABLED(KNUTWURST_MEGA_X) - #define CLASSIC_JERK + //#define CLASSIC_JERK #endif #if ENABLED(CLASSIC_JERK) @@ -1012,7 +1012,7 @@ #if ENABLED(KNUTWURST_MEGA_X) #define DEFAULT_XJERK 4.0 #define DEFAULT_YJERK 4.0 - #define DEFAULT_ZJERK 0.1 + #define DEFAULT_ZJERK 0.2 #endif diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h index 6361bace..6fbccf16 100755 --- a/Marlin/src/inc/Version.h +++ b/Marlin/src/inc/Version.h @@ -41,11 +41,11 @@ * here we define this default string as the date where the latest release * version was tagged. */ - #define CUSTOM_BUILD_VERSION "1.1.3" + #define CUSTOM_BUILD_VERSION "1.1.4-beta" #ifndef STRING_DISTRIBUTION_DATE //#define STRING_DISTRIBUTION_DATE "2020-07-09" - #define STRING_DISTRIBUTION_DATE "2020-08-16" + #define STRING_DISTRIBUTION_DATE "2020-08-23" #endif /** diff --git a/Marlin/src/lcd/anycubic_touchscreen.cpp b/Marlin/src/lcd/anycubic_touchscreen.cpp index b1e99637..3ac06a6b 100755 --- a/Marlin/src/lcd/anycubic_touchscreen.cpp +++ b/Marlin/src/lcd/anycubic_touchscreen.cpp @@ -1219,16 +1219,17 @@ void AnycubicTouchscreenClass::GetCommandFromTFT() { HARDWARE_SERIAL_PROTOCOLPGM("J02"); // J02 SD Card initilized HARDWARE_SERIAL_ENTER(); - { - if (CodeSeen('S')) - filenumber = CodeValue(); - - HARDWARE_SERIAL_PROTOCOLPGM("FN "); // Filelist start - HARDWARE_SERIAL_ENTER(); - PrintList(); - HARDWARE_SERIAL_PROTOCOLPGM("END"); // Filelist stop - HARDWARE_SERIAL_ENTER(); } + + if (CodeSeen('S')) + filenumber = CodeValue(); + + HARDWARE_SERIAL_PROTOCOLPGM("FN "); // Filelist start + HARDWARE_SERIAL_ENTER(); + PrintList(); + HARDWARE_SERIAL_PROTOCOLPGM("END"); // Filelist stop + HARDWARE_SERIAL_ENTER(); + #endif break; case 9: // A9 pause sd print diff --git a/i3_mega_envs.ini b/i3_mega_envs.ini index d1fe5cf7..5208c310 100755 --- a/i3_mega_envs.ini +++ b/i3_mega_envs.ini @@ -90,8 +90,8 @@ board_build.f_cpu = 16000000L lib_deps = ${common.lib_deps} TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip src_filter = ${common.default_src_filter} + -build_flags = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_X -DKNUTWURST_DGUS2_TFT -build_unflags = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH +build_flags = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_X +build_unflags = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH -DKNUTWURST_DGUS2_TFT @@ -102,8 +102,8 @@ board_build.f_cpu = 16000000L lib_deps = ${common.lib_deps} TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip src_filter = ${common.default_src_filter} + -build_flags = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_X -DKNUTWURST_DGUS2_TFT -DKNUTWURST_TMC -build_unflags = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_BLTOUCH +build_flags = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_X -DKNUTWURST_TMC +build_unflags = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_BLTOUCH -DKNUTWURST_DGUS2_TFT @@ -287,8 +287,8 @@ board_build.f_cpu = 16000000L lib_deps = ${common.lib_deps} TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip src_filter = ${common.default_src_filter} + -build_flags = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14_11 -DKNUTWURST_MEGA_X -DKNUTWURST_DGUS2_TFT -DKNUTWURST_BLTOUCH -build_unflags = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_TMC +build_flags = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14_11 -DKNUTWURST_MEGA_X -DKNUTWURST_BLTOUCH +build_unflags = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_TMC -DKNUTWURST_DGUS2_TFT @@ -299,5 +299,5 @@ board_build.f_cpu = 16000000L lib_deps = ${common.lib_deps} TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip src_filter = ${common.default_src_filter} + -build_flags = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14_11 -DKNUTWURST_MEGA_X -DKNUTWURST_DGUS2_TFT -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH -build_unflags = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S \ No newline at end of file +build_flags = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14_11 -DKNUTWURST_MEGA_X -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH +build_unflags = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_DGUS2_TFT \ No newline at end of file diff --git a/images/burnt_diode_closeup.jpg b/images/burnt_diode_closeup.jpg new file mode 100644 index 00000000..6b4e0cb3 Binary files /dev/null and b/images/burnt_diode_closeup.jpg differ diff --git a/images/diode_closeup.jpg b/images/diode_closeup.jpg new file mode 100644 index 00000000..7b2649e4 Binary files /dev/null and b/images/diode_closeup.jpg differ diff --git a/images/mobo_with_stepperdrivers.jpg b/images/mobo_with_stepperdrivers.jpg new file mode 100644 index 00000000..ae9dd5bd Binary files /dev/null and b/images/mobo_with_stepperdrivers.jpg differ diff --git a/images/mobo_without_stepperdrivers.jpg b/images/mobo_without_stepperdrivers.jpg new file mode 100644 index 00000000..486de3f7 Binary files /dev/null and b/images/mobo_without_stepperdrivers.jpg differ diff --git a/images/new_diode_closeup.jpg b/images/new_diode_closeup.jpg new file mode 100644 index 00000000..4302fdfd Binary files /dev/null and b/images/new_diode_closeup.jpg differ diff --git a/images/printer_open.jpg b/images/printer_open.jpg new file mode 100644 index 00000000..c095e434 Binary files /dev/null and b/images/printer_open.jpg differ diff --git a/images/stepper_closeup.jpg b/images/stepper_closeup.jpg new file mode 100644 index 00000000..eaaf3c58 Binary files /dev/null and b/images/stepper_closeup.jpg differ