Bump Version to 1.1.2 for next Release

Add Distribution Date to M115 Command
Feature: Very fast BLTouch probing
2020-08-13 09:32:14 +02:00 · 2020-08-13 08:30:26 +02:00 · 2020-08-12 22:10:23 +02:00 · 2020-08-12 20:05:09 +02:00 · 2020-08-12 16:22:55 +02:00 · 2020-08-12 14:07:00 +02:00
19 changed files with 85 additions and 67 deletions
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -43,18 +43,24 @@
 //#define ANYCUBIC_TFT_DEBUG
 //#define POWER_OUTAGE_TEST

-/*****************************************************************************************
- *                                                                                       *
- *                                                                                       *
- *   WARNING:                                                                            *
- *   THE FOLLOWING SETTINGS ARE NORMALLY SET BY PLATFORMIO!                              *
- *                                                                                       *
- *   IF YOU CHANGE THEM WITHIN THE SOURCECODE, DO NOT COMMIT                             *
- *   TO MASTER BRANCH OR BUILD WITH PLATFORMIO ENVIRONMENT!                              *
- *   OTHERWISE SOME SETTINGS MIGHT BE OVERWRITTEN AND YOU END                            *
- *   UP WITH A NON FUNCTIONING FIRMWARE!                                                 *
- *                                                                                       *
- * ***************************************************************************************/
+/*******************************************************************************************
+ **                                                                                       **
+ **                                                                                       **
+ **   WARNING:                                                                            **
+ **   THE FOLLOWING SETTINGS ARE NORMALLY SET BY PLATFORMIO!                              **
+ **                                                                                       **
+ **   IF YOU CHANGE THEM WITHIN THE SOURCECODE, DO NOT COMMIT                             **
+ **   TO MASTER BRANCH OR BUILD WITH PLATFORMIO ENVIRONMENT!                              **
+ **   OTHERWISE SOME SETTINGS MIGHT BE OVERWRITTEN AND YOU END                            **
+ **   UP WITH A NON FUNCTIONING FIRMWARE!                                                 **
+ **                                                                                       **
+ **   If you want to select a specific configuration for your                             **
+ **   printer, just open the PlatformIO tab on the left, select                           **
+ **   PROJECT TASKS and then "env:i3_MEGA*" (your desired config)                         **
+ **   From there you can build and upload your code.                                      **
+ **                                                                                       **
+ **                                                                                       **
+ *******************************************************************************************/
 

 /*
@@ -64,6 +70,9 @@
 * MEGA is the normal i3 Version without spool holder and the cassic extruder
 * MEGA_S is the S version with Titan clone extruder
 * MEGA_X is the big version with 310x310mm Bed
+ * 
+ * PLEASE READ THE WARNING ABOVE!
+ * 
 */
 //#define KNUTWURST_MEGA
 //#define KNUTWURST_MEGA_S
@@ -74,6 +83,9 @@
 * you have the "new" Mega S with the blue/yellow
 * Touchscreen display, you need to enable the
 * DGUS2 switch to get the special menu to work
+ * 
+ * PLEASE READ THE WARNING ABOVE!
+ * 
 */
 //#define KNUTWURST_DGUS2_TFT

@@ -81,6 +93,8 @@
 * Enable Support for Trinamic Stepper drivers.
 * This also inverts the X,Y,Z and Extruder motor
 * outputs/directions.
+ * 
+ * PLEASE READ THE WARNING ABOVE!
 */
 //#define KNUTWURST_TMC

@@ -90,6 +104,9 @@
 * special menu. It also removes all manual 
 * leveling features because they are not 
 * neccessary at all.
+ * 
+ * PLEASE READ THE WARNING ABOVE!
+ * 
 */
 //#define KNUTWURST_BLTOUCH // see <https://github.com/DerDominik/Marlin-AnycubicI3Mega-BLTouch/wiki/Aufbauplan_BLTouch>

@@ -98,22 +115,31 @@
 * It enabled more console output and should be
 * disabled in production. It can cause the
 * printer to stutter.
+ * 
+ * PLEASE READ THE WARNING ABOVE!
+ * 
 */
 //#define KNUTWURST_DEBUG


-/*****************************************************************************************
- *                                                                                       *
- *                                                                                       *
- *   WARNING:                                                                            *
- *   THE SETTINGS ABOVE ARE NORMALLY SET BY PLATFORMIO!                                  *
- *                                                                                       *
- *   IF YOU CHANGE THEM WITHIN THE SOURCECODE, DO NOT COMMIT                             *
- *   TO MASTER BRANCH OR BUILD WITH PLATFORMIO ENVIRONMENT!                              *
- *   OTHERWISE SOME SETTINGS MIGHT BE OVERWRITTEN AND YOU END                            *
- *   UP WITH A NON FUNCTIONING FIRMWARE!                                                 *
- *                                                                                       *
- * ***************************************************************************************/
+/*******************************************************************************************
+ **                                                                                       **
+ **                                                                                       **
+ **   WARNING:                                                                            **
+ **   THE SETTINGS ABOVE ARE NORMALLY SET BY PLATFORMIO!                                  **
+ **                                                                                       **
+ **   IF YOU CHANGE THEM WITHIN THE SOURCECODE, DO NOT COMMIT                             **
+ **   TO MASTER BRANCH OR BUILD WITH PLATFORMIO ENVIRONMENT!                              **
+ **   OTHERWISE SOME SETTINGS MIGHT BE OVERWRITTEN AND YOU END                            **
+ **   UP WITH A NON FUNCTIONING FIRMWARE!                                                 **
+ **                                                                                       **
+ **   If you want to select a specific configuration for your                             **
+ **   printer, just open the PlatformIO tab on the left, select                           **
+ **   PROJECT TASKS and then "env:i3_MEGA*" (your desired config)                         **
+ **   From there you can build and upload your code.                                      **
+ **                                                                                       **
+ **                                                                                       **
+ *******************************************************************************************/


 /*
@@ -889,11 +915,11 @@
 *                                      X, Y, Z, E0 [, E1[, E2...]]
 */
 #if ENABLED(KNUTWURST_MEGA)
-    #define DEFAULT_MAX_FEEDRATE          { 500, 500, 6, 60 }
+    #define DEFAULT_MAX_FEEDRATE          { 500, 500, 20, 60 }
 #endif

 #if ENABLED(KNUTWURST_MEGA_S)
-    #define DEFAULT_MAX_FEEDRATE          { 500, 500, 6, 30 }
+    #define DEFAULT_MAX_FEEDRATE          { 500, 500, 20, 30 }
 #endif

 #if ENABLED(KNUTWURST_MEGA_X)
@@ -1152,10 +1178,10 @@

 // 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 MIN_PROBE_EDGE 10
+#define MIN_PROBE_EDGE 30

 // X and Y axis travel speed (mm/m) between probes
-#define XY_PROBE_SPEED 3600
+#define XY_PROBE_SPEED 8000

 // Feedrate (mm/m) for the first approach when double-probing (MULTIPLE_PROBING == 2)
 #define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
@@ -1608,7 +1634,7 @@

 // Homing speeds (mm/m)
 #define HOMING_FEEDRATE_XY (50*60)
-#define HOMING_FEEDRATE_Z  (4*60)
+#define HOMING_FEEDRATE_Z  (10*60)

 // Validate that endstops are triggered on homing moves
 #define VALIDATE_HOMING_ENDSTOPS
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -681,7 +681,7 @@
   * This feature was designed for Delta's with very fast Z moves however higher speed cartesians may function
   * If the machine cannot raise the probe fast enough after a trigger, it may enter a fault state.
   */
-  //#define BLTOUCH_HS_MODE
+  #define BLTOUCH_HS_MODE

  // Safety: Enable voltage mode settings in the LCD menu.
  //#define BLTOUCH_LCD_VOLTAGE_MENU
--- a/Marlin/src/core/language.h
+++ b/Marlin/src/core/language.h
@@ -126,7 +126,7 @@
 #define STR_INVALID_E_STEPPER               "Invalid E stepper"
 #define STR_E_STEPPER_NOT_SPECIFIED         "E stepper not specified"
 #define STR_INVALID_SOLENOID                "Invalid solenoid"
-#define STR_M115_REPORT                     "FIRMWARE_NAME:Marlin " DETAILED_BUILD_VERSION " MARLIN-AI3M_VERSION:" CUSTOM_BUILD_VERSION " SOURCE_CODE_URL:" SOURCE_CODE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:" MACHINE_NAME " EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID
+#define STR_M115_REPORT                     "FIRMWARE_NAME:Marlin " DETAILED_BUILD_VERSION " KNUTWURST_AI3M_VERSION:" CUSTOM_BUILD_VERSION " DISTRIBUTION_DATE:" STRING_DISTRIBUTION_DATE " SOURCE_CODE_URL:" SOURCE_CODE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:" MACHINE_NAME " EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID
 #define STR_MARLIN_AI3M                     "Marlin-AI3M"
 #define STR_COUNT_X                         " Count X:"
 #define STR_COUNT_A                         " Count A:"
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -41,10 +41,11 @@
 * here we define this default string as the date where the latest release
 * version was tagged.
 */
- #define CUSTOM_BUILD_VERSION "1.1.1"
+ #define CUSTOM_BUILD_VERSION "1.1.2"

 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-07-09"
+  //#define STRING_DISTRIBUTION_DATE "2020-07-09"
+  #define STRING_DISTRIBUTION_DATE "2020-08-13"
 #endif

 /**
--- a/Marlin/src/lcd/anycubic_touchscreen.cpp
+++ b/Marlin/src/lcd/anycubic_touchscreen.cpp
@@ -447,7 +447,8 @@ void AnycubicTouchscreenClass::HandleSpecialMenu()
  || (strcasestr(currentTouchscreenSelection, SM_PID_HOTEND_S) != NULL))
  {
    SERIAL_ECHOLNPGM("Special Menu: PID Tune Hotend");
-    queue.inject_P(PSTR("M106 S204\nM303 E0 S210 C15 U1"));
+    queue.inject_P(PSTR("M106 S204\nG4 P500\nM303 E0 S215 C15 U1"));
+    
  }
  else if ((strcasestr(currentTouchscreenSelection, SM_PID_BED_L) != NULL)
  || (strcasestr(currentTouchscreenSelection, SM_PID_BED_S) != NULL))
@@ -538,7 +539,7 @@ void AnycubicTouchscreenClass::HandleSpecialMenu()
  || (strcasestr(currentTouchscreenSelection, SM_BLTOUCH_S) != NULL))
  {
    SERIAL_ECHOLNPGM("Special Menu: BLTouch Leveling");
-    queue.inject_P(PSTR("G28\nG29\nM500\nG90\nG1 X0 Z30 F4000\nG91"));
+    queue.inject_P(PSTR("G28\nG29\nM500\nG90\nG1 Z30 F4000\nG1 X0 F4000\nG91"));
  }
 #endif

@@ -1077,6 +1078,8 @@ void AnycubicTouchscreenClass::GetCommandFromTFT()
    
          if( (int)(strtod(&TFTcmdbuffer[TFTbufindw][TFTstrchr_pointer - TFTcmdbuffer[TFTbufindw] + 1], NULL)) != checksum)
          {
+              HARDWARE_SERIAL_ERROR_START;
+              HardwareSerial.flush();
              HARDWARE_SERIAL_ERROR_START;
              HardwareSerial.flush();
              serial3_count = 0;
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@

 ## Funktionen

- * Mesh-Bed Kalibrierung / Autokalibrierung mit BLTouch
+ * Mesh-Bed Kalibrierung / Autokalibrierung mit BLTouch [(Installations-Anleitung)](https://github.com/knutwurst/Marlin-2-0-x-Anycubic-i3-MEGA-S/wiki/BLTouch-Installation-(deutsch))
 * S-Kurven Beschleunigung
 * "Juction Deviation" statt des klassischen "Jerk" 
 * "Linear Pressure Control v1.5" aktiviert (kann mit M900 konfiguriert werden)
@@ -67,6 +67,8 @@
 * Kein Aufhängen, wenn das Filament leer ist
 * Keine "spezielle" BLTouch Firmware nötig. Hier ist alles drin
 * Konfiguration ganz einfach über Feature-Toggles
+ * Man muss keine Grundkonfiguration per GCODE machen.
+ * Man muss kein Werksreset durchführen

 ---

@@ -188,7 +190,7 @@ Für (fast) jede Kombination gibt es eine passende Firmware im Download-Bereich.

 ## Features:

- * Mesh bed calibration / Auto calibration with BLTouch
+ * Mesh bed calibration / Auto calibration with BLTouch [(see installation Manual)](https://github.com/knutwurst/Marlin-2-0-x-Anycubic-i3-MEGA-S/wiki/BLTouch-Installation-(english))
 * S-curve acceleration
 * "Juction Deviation" instead of the classic "Jerk"
 * "Linear Pressure Control v1.5" enabled (can be configured with M900)
@@ -204,6 +206,8 @@ Für (fast) jede Kombination gibt es eine passende Firmware im Download-Bereich.
 * Power outage support
 * Print bed size enlarged to 220 x 225 x 210 mm
 * Automatic slowdown in if the data is not received fast enough
+ * You don't have to do a basic configuration via GCODE.
+ * You do not have to perform a factory reset

 ### What's better in coparison to other firmwares (bug fixes):
 * Tidy special menu
--- a/deploy_firmware_files.sh
+++ b/deploy_firmware_files.sh
@@ -1,15 +1,23 @@
 #!/bin/bash

-CURRENT_VERSION="1.1.1"
+VERSION_FILE="/Users/OKoester/Documents/Arduino/Marlin-2-0-x-Anycubic-i3-MEGA-S-Master/Marlin/src/inc/Version.h"
 FIRMWARE_FOLDER="/Users/OKoester/Documents/Arduino/Marlin-2-0-x-Anycubic-i3-MEGA-S-Master/.pio/build/"
 OUTPUT_FOLDER="/Users/OKoester/Desktop/i3_FIRMWARE"

-mkdir $OUTPUT_FOLDER
+if [ -d "$OUTPUT_FOLDER" ]; then
+    echo "$OUTPUT_FOLDER already exists."
+else 
+    mkdir $OUTPUT_FOLDER
+fi
+
+CUSTOM_BUILD_VERSION=$(egrep -o "([0-9]{1,}\.)+[0-9]{1,}" $VERSION_FILE -m2 | tail -n1)
+
+echo "Knutwurst's Mega Firmware Version: $CUSTOM_BUILD_VERSION"

 cd $FIRMWARE_FOLDER
-for dir in $FIRMWARE_FOLDER/*/     # list directories in the form "/tmp/dirname/"
+for dir in $FIRMWARE_FOLDER/*/
 do
-    dir=${dir%*/}      # remove the trailing "/"
-    echo ${dir##*/}    # print everything after the final "<--/"
-    cp ${dir##*/}/firmware.hex /$OUTPUT_FOLDER/${dir##*/}_v$CURRENT_VERSION.hex
+    dir=${dir%*/}
+    echo ${dir##*/}
+    cp ${dir##*/}/firmware.hex /$OUTPUT_FOLDER/${dir##*/}_v$CUSTOM_BUILD_VERSION.hex
 done
--- a/i3_mega_envs.ini
+++ b/i3_mega_envs.ini
@@ -14,7 +14,6 @@ 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} +<src/HAL/AVR>
-#extra_scripts     = pre:build_i3_mega.py
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA
 build_unflags     = -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_X -DKNUTWURST_DGUS2_TFT -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH

@@ -27,7 +26,6 @@ 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} +<src/HAL/AVR>
-#extra_scripts     = pre:build_i3_mega_tmc.py
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA -DKNUTWURST_TMC
 build_unflags     = -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_X -DKNUTWURST_DGUS2_TFT -DKNUTWURST_BLTOUCH

@@ -42,7 +40,6 @@ 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} +<src/HAL/AVR>
-#extra_scripts     = pre:build_i3_mega_s.py
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_S
 build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_X -DKNUTWURST_DGUS2_TFT -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH

@@ -55,7 +52,6 @@ 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} +<src/HAL/AVR>
-#extra_scripts     = pre:build_i3_mega_s_dgus.py
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_S -DKNUTWURST_DGUS2_TFT
 build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_X -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH

@@ -68,7 +64,6 @@ 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} +<src/HAL/AVR>
-#extra_scripts = pre:build_i3_mega_s_dgus_tmc.py
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_S -DKNUTWURST_DGUS2_TFT -DKNUTWURST_TMC
 build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_X -DKNUTWURST_BLTOUCH

@@ -81,7 +76,6 @@ 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} +<src/HAL/AVR>
-#extra_scripts = pre:build_i3_mega_s_tmc.py
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_S -DKNUTWURST_TMC
 build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_X -DKNUTWURST_DGUS2_TFT -DKNUTWURST_BLTOUCH

@@ -96,7 +90,6 @@ 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} +<src/HAL/AVR>
-#extra_scripts = pre:build_i3_mega_s_tmc.py
 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

@@ -109,7 +102,6 @@ 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} +<src/HAL/AVR>
-#extra_scripts = pre:build_i3_mega_s_tmc.py
 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

@@ -129,7 +121,6 @@ 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} +<src/HAL/AVR>
-#extra_scripts     = pre:build_i3_mega.py
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA -DKNUTWURST_BLTOUCH
 build_unflags     = -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_X -DKNUTWURST_DGUS2_TFT -DKNUTWURST_TMC 

@@ -141,7 +132,6 @@ 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} +<src/HAL/AVR>
-#extra_scripts     = pre:build_i3_mega_tmc.py
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH
 build_unflags     = -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_X -DKNUTWURST_DGUS2_TFT 

@@ -153,7 +143,6 @@ 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} +<src/HAL/AVR>
-#extra_scripts     = pre:build_i3_mega_s.py
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_S -DKNUTWURST_BLTOUCH
 build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_X -DKNUTWURST_DGUS2_TFT -DKNUTWURST_TMC 

@@ -166,7 +155,6 @@ 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} +<src/HAL/AVR>
-#extra_scripts     = pre:build_i3_mega_s_dgus.py
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_S -DKNUTWURST_DGUS2_TFT -DKNUTWURST_BLTOUCH
 build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_X -DKNUTWURST_TMC 

@@ -179,7 +167,6 @@ 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} +<src/HAL/AVR>
-#extra_scripts = pre:build_i3_mega_s_dgus_tmc.py
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_S -DKNUTWURST_DGUS2_TFT -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH
 build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_X 

@@ -192,7 +179,6 @@ 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} +<src/HAL/AVR>
-#extra_scripts = pre:build_i3_mega_s_tmc.py
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_S -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH
 build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_X -DKNUTWURST_DGUS2_TFT

@@ -204,7 +190,6 @@ 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} +<src/HAL/AVR>
-#extra_scripts = pre:build_i3_mega_s_tmc.py
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_X -DKNUTWURST_DGUS2_TFT -DKNUTWURST_BLTOUCH
 build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_TMC 

@@ -217,7 +202,6 @@ 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} +<src/HAL/AVR>
-#extra_scripts = pre:build_i3_mega_s_tmc.py
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_X -DKNUTWURST_DGUS2_TFT -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH
 build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S 

@@ -234,7 +218,6 @@ 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} +<src/HAL/AVR>
-#extra_scripts     = pre:build_i3_mega.py
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14_11 -DKNUTWURST_MEGA -DKNUTWURST_BLTOUCH
 build_unflags     = -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_X -DKNUTWURST_DGUS2_TFT -DKNUTWURST_TMC 

@@ -246,7 +229,6 @@ 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} +<src/HAL/AVR>
-#extra_scripts     = pre:build_i3_mega_tmc.py
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14_11 -DKNUTWURST_MEGA -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH
 build_unflags     = -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_X -DKNUTWURST_DGUS2_TFT 

@@ -258,7 +240,6 @@ 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} +<src/HAL/AVR>
-#extra_scripts     = pre:build_i3_mega_s.py
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14_11 -DKNUTWURST_MEGA_S -DKNUTWURST_BLTOUCH
 build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_X -DKNUTWURST_DGUS2_TFT -DKNUTWURST_TMC 

@@ -271,7 +252,6 @@ 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} +<src/HAL/AVR>
-#extra_scripts     = pre:build_i3_mega_s_dgus.py
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14_11 -DKNUTWURST_MEGA_S -DKNUTWURST_DGUS2_TFT -DKNUTWURST_BLTOUCH
 build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_X -DKNUTWURST_TMC 

@@ -284,7 +264,6 @@ 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} +<src/HAL/AVR>
-#extra_scripts = pre:build_i3_mega_s_dgus_tmc.py
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14_11 -DKNUTWURST_MEGA_S -DKNUTWURST_DGUS2_TFT -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH
 build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_X 

@@ -297,7 +276,6 @@ 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} +<src/HAL/AVR>
-#extra_scripts = pre:build_i3_mega_s_tmc.py
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14_11 -DKNUTWURST_MEGA_S -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH
 build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_X -DKNUTWURST_DGUS2_TFT 

@@ -309,7 +287,6 @@ 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} +<src/HAL/AVR>
-#extra_scripts = pre:build_i3_mega_s_tmc.py
 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 

@@ -322,6 +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} +<src/HAL/AVR>
-#extra_scripts = pre:build_i3_mega_s_tmc.py
 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 
--- a/images/bltouch_01.jpg
+++ b/images/bltouch_01.jpg
--- a/images/bltouch_02.jpg
+++ b/images/bltouch_02.jpg
--- a/images/bltouch_03.jpg
+++ b/images/bltouch_03.jpg
--- a/images/bltouch_04.jpg
+++ b/images/bltouch_04.jpg
--- a/images/bltouch_05.jpg
+++ b/images/bltouch_05.jpg
--- a/images/bltouch_06.jpg
+++ b/images/bltouch_06.jpg
--- a/images/bltouch_07.jpg
+++ b/images/bltouch_07.jpg
--- a/images/bltouch_08.jpg
+++ b/images/bltouch_08.jpg
--- a/images/bltouch_09.jpg
+++ b/images/bltouch_09.jpg
--- a/images/bltouch_10.jpg
+++ b/images/bltouch_10.jpg
--- a/images/bltouch_wiring.jpg
+++ b/images/bltouch_wiring.jpg
Author	SHA1	Message	Date
Knutwurst	f91882400b	Bump Version to 1.1.2 for next Release	2020-08-13 09:32:14 +02:00
Knutwurst	abf7f93bda	Add Distribution Date to M115 Command	2020-08-13 08:30:26 +02:00
Knutwurst	bcc3964aed	Feature: Very fast BLTouch probing	2020-08-12 22:10:23 +02:00
Knutwurst	9c59d44e9f	DGUS2 TFT Bugfix when serial error occures	2020-08-12 20:05:09 +02:00
Knutwurst	e08673ac8d	Bugfix: Hotend Fan did not start up when starting PID tuning.	2020-08-12 16:22:55 +02:00
Oliver Köster	c1f9a5edaf	Update README.md	2020-08-12 14:07:00 +02:00
Oliver Köster	54caef61a4	Update README.md	2020-08-12 08:28:27 +02:00
Knutwurst	574357b47a	More BLTouch Images	2020-08-11 17:07:17 +02:00
Oliver Köster	9f76b31a19	Update README.md	2020-08-11 08:26:27 +02:00
Knutwurst	86ec69c1b0	Add bltouch wiring Image	2020-08-11 07:20:33 +02:00
Knutwurst	8d8d46a2b8	Add more information for developers	2020-08-11 06:50:24 +02:00
Knutwurst	b00040c25d	Improve deployment script	2020-08-10 17:14:23 +02:00