Latest calibrations

mbronk · Dec 29, 2024 · aee9f7f · aee9f7f
1 parent 099d3e6
commit aee9f7f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
@@ -99,7 +99,7 @@
  *
  * :[2400, 9600, 19200, 38400, 57600, 115200, 250000, 500000, 1000000]
  */
-#define BAUDRATE 250000  //@@SapphirePro: Consider decreasing [250000->115200] to improve reliability
+#define BAUDRATE 115200  //@@SapphirePro: Consider decreasing [250000->115200] to improve reliability
 
 #define BAUD_RATE_GCODE     // Enable G-code M575 to set the baud rate  //@@SapphirePro
 
@@ -1308,7 +1308,7 @@
  * Override with M92 (when enabled below)
  *                                      X, Y, Z [, I [, J [, K...]]], E0 [, E1[, E2...]]
  */
-#define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 1600, 414.50 }  //@@SapphirePRO - 80.4 X/Y values come from stock FW config @https://bit.ly/3dmi29h. Calibrated stock extruder - 414,50step/mm instead of 415; TODO-recalibrate witn new extruder
+#define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 1600, 415.00 }  //@@SapphirePRO - 80.4 X/Y values come from stock FW config @https://bit.ly/3dmi29h. Calibrated stock extruder - 414,50step/mm instead of 415; TODO-recalibrate witn new extruder (was: 414.50)
 
 /**
  * Enable support for M92. Disable to save at least ~530 bytes of flash.
@@ -1320,7 +1320,7 @@
  * Override with M203
  *                                      X, Y, Z [, I [, J [, K...]]], E0 [, E1[, E2...]]
  */
-#define DEFAULT_MAX_FEEDRATE          { 300, 300, 10, 50 }  //@@SapphirePRO - stock drivers and motors / from default (update E1 to 75 since TMC?)
+#define DEFAULT_MAX_FEEDRATE          { 300, 300, 10, 60 }  //@@SapphirePRO - stock drivers and motors / from default (update E1 to 75 since TMC?) //updated to 60
 
 //#define LIMITED_MAX_FR_EDITING        // Limit edit via M203 or LCD to DEFAULT_MAX_FEEDRATE * 2
 #if ENABLED(LIMITED_MAX_FR_EDITING)
@@ -1658,7 +1658,7 @@
  *     |    [-]    |
  *     O-- FRONT --+
  */
-#define NOZZLE_TO_PROBE_OFFSET { 0, -38, (-0.67) }  //@@BLTouch offset using mount by @AlloT: https://www.thingiverse.com/thing:3977061 ;
+#define NOZZLE_TO_PROBE_OFFSET { 0, -38, (-0.816) }  //@@BLTouch offset using mount by @AlloT: https://www.thingiverse.com/thing:3977061 ;
                                                   // Z-offset calibration manual: https://letsprint3d.net/guide-how-to-calibrate-an-auto-bed-leveling-sensor/
                                                   //Offset which works for ABS: -1.48
 // Enable and set to use a specific tool for probing. Disable to allow any tool.

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
@@ -890,7 +890,7 @@
 //
 
 //Spro workaround for ZMAX
-#define Z_STOP_PIN Z_MAX_PIN // Z0 endstop pin override
+// #define Z_STOP_PIN Z_MAX_PIN // Z0 endstop pin override
 
 #ifdef Z2_DRIVER_TYPE
   //#define INVERT_Z2_VS_Z_DIR        // Z2 direction signal is the opposite of Z
@@ -1213,14 +1213,14 @@
 //https://marlinfw.org/docs/gcode/M593.html
 #define INPUT_SHAPING_X
 #define INPUT_SHAPING_Y
-#define INPUT_SHAPING_Z
+// #define INPUT_SHAPING_Z
 #if ANY(INPUT_SHAPING_X, INPUT_SHAPING_Y, INPUT_SHAPING_Z)
   #if ENABLED(INPUT_SHAPING_X)
-    #define SHAPING_FREQ_X  40.0        // (Hz) The default dominant resonant frequency on the X axis.
+    #define SHAPING_FREQ_X  37.0        // (Hz) The default dominant resonant frequency on the X axis.
     #define SHAPING_ZETA_X   0.15       // Damping ratio of the X axis (range: 0.0 = no damping to 1.0 = critical damping).
   #endif
   #if ENABLED(INPUT_SHAPING_Y)
-    #define SHAPING_FREQ_Y  40.0        // (Hz) The default dominant resonant frequency on the Y axis.
+    #define SHAPING_FREQ_Y  37.0        // (Hz) The default dominant resonant frequency on the Y axis.
     #define SHAPING_ZETA_Y   0.15       // Damping ratio of the Y axis (range: 0.0 = no damping to 1.0 = critical damping).
   #endif
   #if ENABLED(INPUT_SHAPING_Z)
@@ -1229,7 +1229,7 @@
   #endif
   //#define SHAPING_MIN_FREQ  20.0      // (Hz) By default the minimum of the shaping frequencies. Override to affect SRAM usage.
   //#define SHAPING_MAX_STEPRATE 10000  // By default the maximum total step rate of the shaped axes. Override to affect SRAM usage.
-  //#define SHAPING_MENU                // Add a menu to the LCD to set shaping parameters.
+  #define SHAPING_MENU                // Add a menu to the LCD to set shaping parameters.
 #endif
 
 // @section motion
@@ -2370,7 +2370,7 @@
   #if ENABLED(DISTINCT_E_FACTORS)
     #define ADVANCE_K { 0.22 }    // (mm) Compression length per 1mm/s extruder speed, per extruder
   #else
-    #define ADVANCE_K 0.22        // (mm) Compression length applying to all extruders //TODO: was 0.07 only?
+    #define ADVANCE_K 1.70        // (mm) Compression length applying to all extruders //TODO: was 0.07 only?
   #endif
   //#define ADVANCE_K_EXTRA       // Add a second linear advance constant, configurable with M900 L.
   //#define LA_DEBUG              // Print debug information to serial during operation. Disable for production use.
@@ -2727,7 +2727,7 @@
  */
 #define REALTIME_REPORTING_COMMANDS
 #if ENABLED(REALTIME_REPORTING_COMMANDS)
-  #define FULL_REPORT_TO_HOST_FEATURE   // Auto-report the machine status like Grbl CNC - @@consider
+  //#define FULL_REPORT_TO_HOST_FEATURE   // Auto-report the machine status like Grbl CNC - @@consider (too much S_XYZ stuff in log)
 #endif
 
 /**
@@ -3351,7 +3351,7 @@
     #define STEALTHCHOP_U
     #define STEALTHCHOP_V
     #define STEALTHCHOP_W
-    #define STEALTHCHOP_E
+    // #define STEALTHCHOP_E //Consider disable! (louder but better?)
   #endif
 
   /**