Fix

MarlinKimbra/Marlin.h

@@ -235,7 +235,7 @@ extern float home_offset[3];
 
 // Hotend offset
 #if HOTENDS > 1
-  #if DISABLED(DUAL_X_CARRIAGE)
+  #ifndef DUAL_X_CARRIAGE
     #define NUM_HOTEND_OFFSETS 2 // only in XY plane
   #else
     #define NUM_HOTEND_OFFSETS 3 // supports offsets in XYZ plane

MarlinKimbra/Marlin_main.cpp

@@ -5645,7 +5645,7 @@ inline void gcode_M503() {
       line_to_destination();
     #endif
 
-    #ifdef FILAMENT_RUNOUT_SENSOR
+    #if HAS_FILRUNOUT
       filrunoutEnqueued = false;
     #endif
 

MarlinKimbra/pins.h

@@ -3436,32 +3436,36 @@
   #define ORIG_X_STEP_PIN         58
   #define ORIG_X_DIR_PIN          57
   #define ORIG_X_ENABLE_PIN       59
-  #define X_MIN_PIN          37
-  #define X_MAX_PIN          40   //2 //Max endstops default to disabled "-1", set to commented value to enable.
+  #define X_MIN_PIN               37
+  #define X_MAX_PIN               40   //2 //Max endstops default to disabled "-1", set to commented value to enable.
 
-  #define ORIG_Y_STEP_PIN         5 // A6
+  #define ORIG_Y_STEP_PIN          5 // A6
   #define ORIG_Y_DIR_PIN          17 // A0
-  #define ORIG_Y_ENABLE_PIN       4
-  #define Y_MIN_PIN          41
-  #define Y_MAX_PIN          38   //15
+  #define ORIG_Y_ENABLE_PIN        4
+  #define Y_MIN_PIN               41
+  #define Y_MAX_PIN               38   //15
 
   #define ORIG_Z_STEP_PIN         16 // A2
   #define ORIG_Z_DIR_PIN          11 // A6
   #define ORIG_Z_ENABLE_PIN       3 // A1
-  #define Z_MIN_PIN          18
-  #define Z_MAX_PIN          19
+  #define Z_MIN_PIN               18
+  #define Z_MAX_PIN               19
+
+  #define ORIG_E0_STEP_PIN        28
+  #define ORIG_E0_DIR_PIN         27
+  #define ORIG_E0_ENABLE_PIN      29
 
-  #define ORIG_E0_STEP_PIN         28
-  #define ORIG_E0_DIR_PIN          27
-  #define ORIG_E0_ENABLE_PIN       29
+  #define ORIG_E1_STEP_PIN        25
+  #define ORIG_E1_DIR_PIN         24
+  #define ORIG_E1_ENABLE_PIN      26
 
-  #define ORIG_E1_STEP_PIN         25
-  #define ORIG_E1_DIR_PIN          24
-  #define ORIG_E1_ENABLE_PIN       26
+  #define ORIG_E2_STEP_PIN        22
+  #define ORIG_E2_DIR_PIN         60
+  #define ORIG_E2_ENABLE_PIN      23
 
-  #define ORIG_E2_STEP_PIN         22
-  #define ORIG_E2_DIR_PIN          60
-  #define ORIG_E2_ENABLE_PIN       23
+  #define ORIG_E3_STEP_PIN        54
+  #define ORIG_E3_DIR_PIN         55
+  #define ORIG_E3_ENABLE_PI       55
 
   #define SDPOWER -1
   #define SDSS 53