Fix Ruby BLTouch

Marlin/Configuration.h

@@ -141,7 +141,11 @@
 
 //#define BLTOUCH      //uncomment if you use a BLTouch
   #ifdef BLTOUCH
-    #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
+    #ifdef RUBY
+    //#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
+      #else
+      #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
+    #endif
     #define Z_MIN_PROBE_REPEATABILITY_TEST
   //#define NOZZLE_TO_PROBE_OFFSET { 28, -33, 0 }         //Offset preset for this fanduct : Sidewinder X1 Waggster Mod BLTouch with improved Fan Duct  by 3dprintbeginnercom on Thingiverse: https://www.thingiverse.com/thing:3972011
   //#define NOZZLE_TO_PROBE_OFFSET { 27.25, -12.8, -2 }   //Offset preset for stock X2 and Genius Pro
@@ -1081,14 +1085,14 @@
   #endif
   #define Y_MIN_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop.
 #endif
-#if defined(BLTOUCH) || defined(TOUCH_MI_PROBE)
-  #ifdef WAGGSTER_MOD_WIRING
-    #define Z_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
+#if defined(RUBY)
+  #define Z_MIN_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop.
+  #else
+    #if defined(BLTOUCH) || defined(TOUCH_MI_PROBE)
+      #define Z_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
   #else
     #define Z_MIN_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop.
-  #endif
-#else
-  #define Z_MIN_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop.
+#endif
 #endif
 #ifdef HORNET
 #define X_MAX_ENDSTOP_INVERTING true  // Set to true to invert the logic of the endstop.
@@ -1161,7 +1165,11 @@
 #define Z_DRIVER_TYPE  drivertype
 //#define X2_DRIVER_TYPE A4988
 //#define Y2_DRIVER_TYPE A4988
+#ifndef RUBY
 #define Z2_DRIVER_TYPE drivertype
+#else
+//#define Z2_DRIVER_TYPE drivertype
+#endif
 //#define Z3_DRIVER_TYPE A4988
 //#define Z4_DRIVER_TYPE A4988
 //#define I_DRIVER_TYPE  A4988
@@ -1192,7 +1200,7 @@
  *
  * :[2,3,4,5,6,7]
  */
-#define ENDSTOP_NOISE_THRESHOLD 2
+//#define ENDSTOP_NOISE_THRESHOLD 2
 
 // Check for stuck or disconnected endstops during homing moves.
 //#define DETECT_BROKEN_ENDSTOP
@@ -1340,7 +1348,7 @@
 //#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
 
 // Force the use of the probe for Z-axis homing
-//#define USE_PROBE_FOR_Z_HOMING
+#define USE_PROBE_FOR_Z_HOMING
 
 /**
  * Z_MIN_PROBE_PIN
@@ -1573,11 +1581,11 @@
  * A total of 2 does fast/slow probes with a weighted average.
  * A total of 3 or more adds more slow probes, taking the average.
  */
-#ifdef ZMIN_SENSOR_AS_PROBE
+#ifndef RUBY
   #define MULTIPLE_PROBING 2
-  //#define EXTRA_PROBING    1
+    //#define EXTRA_PROBING    1
 #else
-  #define MULTIPLE_PROBING 2
+  //#define MULTIPLE_PROBING 2
   //#define EXTRA_PROBING    1
 #endif
 
@@ -2568,7 +2576,7 @@
  *
  * Use CRC checks and retries on the SD communication.
  */
-//#define SD_CHECK_AND_RETRY
+#define SD_CHECK_AND_RETRY
 
 /**
  * LCD Menu Items
@@ -2640,7 +2648,7 @@
 // If you have a speaker that can produce tones, enable it here.
 // By default Marlin assumes you have a buzzer with a fixed frequency.
 //
-#define SPEAKER
+//#define SPEAKER
 
 //
 // The duration and frequency for the UI feedback sound.

Marlin/Configuration_adv.h

@@ -549,7 +549,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
@@ -911,7 +911,7 @@
 
   // Safety: The probe needs time to recognize the command.
   //         Minimum command delay (ms). Enable and increase if needed.
-  #define BLTOUCH_DELAY 500
+  //#define BLTOUCH_DELAY 500
 
   /**
    * Settings for BLTOUCH Classic 1.2, 1.3 or BLTouch Smart 1.0, 2.0, 2.2, 3.0, 3.1, and most clones:
@@ -1676,8 +1676,10 @@
    *
    * :[ 'LCD', 'ONBOARD', 'CUSTOM_CABLE' ]
    */
-#ifndef MKSGENL
-    #define SDCARD_CONNECTION ONBOARD
+#if DISABLED(MKSGENL) || DISABLED(RUBY)
+  #define SDCARD_CONNECTION ONBOARD
+    #else
+    //#define SDCARD_CONNECTION ONBOARD
   #endif
 
   // Enable if SD detect is rendered useless (e.g., by using an SD extender)