Browse Source

Fix Dual X,Y,Z UART pins in relation to TMC2208/9 (#14554)

Ludy 6 years ago
parent
commit
a7bb1fc322
2 changed files with 38 additions and 28 deletions
  1. 28
    20
      Marlin/src/pins/pins.h
  2. 10
    8
      buildroot/share/tests/megaatmega2560-tests

+ 28
- 20
Marlin/src/pins/pins.h View File

@@ -949,11 +949,13 @@
949 949
   #ifndef X2_MS3_PIN
950 950
     #define X2_MS3_PIN    _EPIN(E_STEPPERS, MS3)
951 951
   #endif
952
-  #ifndef X2_SERIAL_TX_PIN
953
-    #define X2_SERIAL_TX_PIN    _EPIN(E_STEPPERS, SERIAL_TX)
954
-  #endif
955
-  #ifndef X2_SERIAL_RX_PIN
956
-    #define X2_SERIAL_RX_PIN    _EPIN(E_STEPPERS, SERIAL_RX)
952
+  #if AXIS_DRIVER_TYPE_X2(TMC2208) || AXIS_DRIVER_TYPE_X2(TMC2209)
953
+    #ifndef X2_SERIAL_TX_PIN
954
+      #define X2_SERIAL_TX_PIN _EPIN(E_STEPPERS, SERIAL_TX)
955
+    #endif
956
+    #ifndef X2_SERIAL_RX_PIN
957
+      #define X2_SERIAL_RX_PIN _EPIN(E_STEPPERS, SERIAL_RX)
958
+    #endif
957 959
   #endif
958 960
   #define Y2_E_INDEX INCREMENT(E_STEPPERS)
959 961
 #else
@@ -982,11 +984,13 @@
982 984
   #ifndef Y2_MS3_PIN
983 985
     #define Y2_MS3_PIN    _EPIN(Y2_E_INDEX, MS3)
984 986
   #endif
985
-  #ifndef Y2_SERIAL_TX_PIN
986
-    #define Y2_SERIAL_TX_PIN    _EPIN(Y2_E_INDEX, SERIAL_TX)
987
-  #endif
988
-  #ifndef Y2_SERIAL_RX_PIN
989
-    #define Y2_SERIAL_RX_PIN    _EPIN(Y2_E_INDEX, SERIAL_RX)
987
+  #if AXIS_DRIVER_TYPE_Y2(TMC2208) || AXIS_DRIVER_TYPE_Y2(TMC2209)
988
+    #ifndef Y2_SERIAL_TX_PIN
989
+      #define Y2_SERIAL_TX_PIN _EPIN(Y2_E_INDEX, SERIAL_TX)
990
+    #endif
991
+    #ifndef Y2_SERIAL_RX_PIN
992
+      #define Y2_SERIAL_RX_PIN _EPIN(Y2_E_INDEX, SERIAL_RX)
993
+    #endif
990 994
   #endif
991 995
   #define Z2_E_INDEX INCREMENT(Y2_E_INDEX)
992 996
 #else
@@ -1015,11 +1019,13 @@
1015 1019
   #ifndef Z2_MS3_PIN
1016 1020
     #define Z2_MS3_PIN    _EPIN(Z2_E_INDEX, MS3)
1017 1021
   #endif
1018
-  #ifndef Z2_SERIAL_TX_PIN
1019
-    #define Z2_SERIAL_TX_PIN    _EPIN(Z2_E_INDEX, SERIAL_TX)
1020
-  #endif
1021
-  #ifndef Z2_SERIAL_RX_PIN
1022
-    #define Z2_SERIAL_RX_PIN    _EPIN(Z2_E_INDEX, SERIAL_RX)
1022
+  #if AXIS_DRIVER_TYPE_Z2(TMC2208) || AXIS_DRIVER_TYPE_Z2(TMC2209)
1023
+    #ifndef Z2_SERIAL_TX_PIN
1024
+      #define Z2_SERIAL_TX_PIN _EPIN(Z2_E_INDEX, SERIAL_TX)
1025
+    #endif
1026
+    #ifndef Z2_SERIAL_RX_PIN
1027
+      #define Z2_SERIAL_RX_PIN _EPIN(Z2_E_INDEX, SERIAL_RX)
1028
+    #endif
1023 1029
   #endif
1024 1030
   #define Z3_E_INDEX INCREMENT(Z2_E_INDEX)
1025 1031
 #else
@@ -1047,10 +1053,12 @@
1047 1053
   #ifndef Z3_MS3_PIN
1048 1054
     #define Z3_MS3_PIN    _EPIN(Z3_E_INDEX, MS3)
1049 1055
   #endif
1050
-  #ifndef Z3_SERIAL_TX_PIN
1051
-    #define Z3_SERIAL_TX_PIN    _EPIN(Z3_E_INDEX, SERIAL_TX)
1052
-  #endif
1053
-  #ifndef Z3_SERIAL_RX_PIN
1054
-    #define Z3_SERIAL_RX_PIN    _EPIN(Z3_E_INDEX, SERIAL_RX)
1056
+  #if AXIS_DRIVER_TYPE_Z3(TMC2208) || AXIS_DRIVER_TYPE_Z3(TMC2209)
1057
+    #ifndef Z3_SERIAL_TX_PIN
1058
+      #define Z3_SERIAL_TX_PIN _EPIN(Z3_E_INDEX, SERIAL_TX)
1059
+    #endif
1060
+    #ifndef Z3_SERIAL_RX_PIN
1061
+      #define Z3_SERIAL_RX_PIN _EPIN(Z3_E_INDEX, SERIAL_RX)
1062
+    #endif
1055 1063
   #endif
1056 1064
 #endif

+ 10
- 8
buildroot/share/tests/megaatmega2560-tests View File

@@ -29,17 +29,19 @@ opt_set TEMP_SENSOR_1 1
29 29
 opt_set TEMP_SENSOR_BED 2
30 30
 opt_set GRID_MAX_POINTS_X 16
31 31
 opt_set FANMUX0_PIN 53
32
-opt_enable PIDTEMPBED FIX_MOUNTED_PROBE Z_SAFE_HOMING EEPROM_SETTINGS \
33
-           REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT SD_REPRINT_LAST_SELECTED_FILE BINARY_FILE_TRANSFER \
34
-           NEOPIXEL_LED BLINKM PCA9632 RGB_LED RGB_LED_R_PIN RGB_LED_G_PIN RGB_LED_B_PIN \
35
-           NOZZLE_PARK_FEATURE FILAMENT_RUNOUT_SENSOR FILAMENT_RUNOUT_DISTANCE_MM \
32
+opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER LCD_PROGRESS_BAR LCD_PROGRESS_BAR_TEST \
33
+           PIDTEMPBED FIX_MOUNTED_PROBE Z_SAFE_HOMING CODEPENDENT_XY_HOMING \
34
+           EEPROM_SETTINGS SDSUPPORT SD_REPRINT_LAST_SELECTED_FILE BINARY_FILE_TRANSFER \
35
+           BLINKM PCA9632 RGB_LED RGB_LED_R_PIN RGB_LED_G_PIN RGB_LED_B_PIN LED_CONTROL_MENU \
36
+           NEOPIXEL_LED CASE_LIGHT_ENABLE CASE_LIGHT_USE_NEOPIXEL CASE_LIGHT_MENU \
37
+           NOZZLE_PARK_FEATURE ADVANCED_PAUSE_FEATURE FILAMENT_RUNOUT_DISTANCE_MM FILAMENT_RUNOUT_SENSOR \
36 38
            AUTO_BED_LEVELING_LINEAR Z_MIN_PROBE_REPEATABILITY_TEST DEBUG_LEVELING_FEATURE \
37 39
            SKEW_CORRECTION SKEW_CORRECTION_FOR_Z SKEW_CORRECTION_GCODE \
38
-           FWRETRACT ARC_P_CIRCLES ADVANCED_PAUSE_FEATURE CNC_WORKSPACE_PLANES CNC_COORDINATE_SYSTEMS \
40
+           BACKLASH_COMPENSATION BACKLASH_GCODE \
41
+           FWRETRACT ARC_P_CIRCLES CNC_WORKSPACE_PLANES CNC_COORDINATE_SYSTEMS \
39 42
            PSU_CONTROL AUTO_POWER_CONTROL POWER_LOSS_RECOVERY POWER_LOSS_PIN POWER_LOSS_STATE \
40
-           LCD_PROGRESS_BAR LCD_PROGRESS_BAR_TEST PINS_DEBUGGING \
41
-           MAX7219_DEBUG LED_CONTROL_MENU CASE_LIGHT_MENU CASE_LIGHT_ENABLE CASE_LIGHT_USE_NEOPIXEL CODEPENDENT_XY_HOMING BACKLASH_COMPENSATION BACKLASH_GCODE
42
-opt_enable SLOW_PWM_HEATERS THERMAL_PROTECTION_CHAMBER
43
+           SLOW_PWM_HEATERS THERMAL_PROTECTION_CHAMBER \
44
+           PINS_DEBUGGING MAX7219_DEBUG
43 45
 opt_set TEMP_SENSOR_CHAMBER 3
44 46
 opt_set HEATER_CHAMBER_PIN 45
45 47
 exec_test $1 $2 "RAMPS with 2 extruders, RepRap LCD, Linear ABL, LEDs, and many options"

Loading…
Cancel
Save