Browse Source

Load balance some tests

Scott Lahteine 4 years ago
parent
commit
9b886c2ad4

+ 11
- 0
Marlin/src/pins/rambo/pins_RAMBO.h View File

@@ -72,6 +72,10 @@
72 72
   #define Z_MIN_PROBE_PIN                     30
73 73
 #endif
74 74
 
75
+#ifndef FIL_RUNOUT_PIN
76
+  #define FIL_RUNOUT_PIN                       5
77
+#endif
78
+
75 79
 //
76 80
 // Steppers
77 81
 //
@@ -154,6 +158,13 @@
154 158
 #define SPINDLE_DIR_PIN                       32
155 159
 
156 160
 //
161
+// SPI for Max6675 or Max31855 Thermocouple
162
+//
163
+#ifndef MAX6675_SS_PIN
164
+  #define MAX6675_SS_PIN                      32  // SPINDLE_DIR_PIN / STAT_LED_BLUE_PIN
165
+#endif
166
+
167
+//
157 168
 // M7/M8/M9 - Coolant Control
158 169
 //
159 170
 #define COOLANT_MIST_PIN                      22

+ 4
- 4
Marlin/src/pins/ramps/pins_RAMPS.h View File

@@ -169,11 +169,11 @@
169 169
   #define TEMP_BED_PIN                        14  // Analog Input
170 170
 #endif
171 171
 
172
+//
172 173
 // SPI for Max6675 or Max31855 Thermocouple
173
-#if DISABLED(SDSUPPORT)
174
-  #define MAX6675_SS_PIN                      66  // Don't use 53 if using Display/SD card
175
-#else
176
-  #define MAX6675_SS_PIN                      66  // Don't use 49 (SD_DETECT_PIN)
174
+//
175
+#ifndef MAX6675_SS_PIN
176
+  #define MAX6675_SS_PIN                      66  // Don't use 53 if using Display/SD card (SDSS) or 49 (SD_DETECT_PIN)
177 177
 #endif
178 178
 
179 179
 //

+ 0
- 37
buildroot/share/tests/mega2560-tests View File

@@ -13,43 +13,6 @@ set -e
13 13
 #exec_test $1 $2 "Default Configuration"
14 14
 
15 15
 #
16
-# Test 2 extruders (one MAX6675) and heated bed on basic RAMPS 1.4
17
-# Test a "Fix Mounted" Probe with Safe Homing, some arc options,
18
-# linear bed leveling, M48, leveling debug, and firmware retraction.
19
-#
20
-restore_configs
21
-opt_set MOTHERBOARD BOARD_RAMPS_14_EEB
22
-opt_set EXTRUDERS 2
23
-opt_set TEMP_SENSOR_0 -2
24
-opt_set TEMP_SENSOR_1 1
25
-opt_set TEMP_SENSOR_BED 2
26
-opt_set TEMP_SENSOR_PROBE 1
27
-opt_add TEMP_PROBE_PIN 12
28
-opt_set TEMP_SENSOR_CHAMBER 3
29
-opt_add HEATER_CHAMBER_PIN 45
30
-opt_set GRID_MAX_POINTS_X 16
31
-opt_set FANMUX0_PIN 53
32
-opt_disable USE_WATCHDOG
33
-opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER LCD_PROGRESS_BAR LCD_PROGRESS_BAR_TEST \
34
-           FIX_MOUNTED_PROBE Z_SAFE_HOMING CODEPENDENT_XY_HOMING PIDTEMPBED \
35
-           PROBING_HEATERS_OFF PROBING_FANS_OFF PROBING_STEPPERS_OFF WAIT_FOR_BED_HEATER \
36
-           EEPROM_SETTINGS SDSUPPORT SD_REPRINT_LAST_SELECTED_FILE BINARY_FILE_TRANSFER \
37
-           BLINKM PCA9632 RGB_LED RGB_LED_R_PIN RGB_LED_G_PIN RGB_LED_B_PIN LED_CONTROL_MENU \
38
-           NEOPIXEL_LED CASE_LIGHT_ENABLE CASE_LIGHT_USE_NEOPIXEL CASE_LIGHT_MENU \
39
-           PID_PARAMS_PER_HOTEND PID_AUTOTUNE_MENU PID_EDIT_MENU LCD_SHOW_E_TOTAL \
40
-           PRINTCOUNTER SERVICE_NAME_1 SERVICE_INTERVAL_1 LEVEL_BED_CORNERS \
41
-           NOZZLE_PARK_FEATURE FILAMENT_RUNOUT_SENSOR FILAMENT_RUNOUT_DISTANCE_MM \
42
-           ADVANCED_PAUSE_FEATURE FILAMENT_LOAD_UNLOAD_GCODES FILAMENT_UNLOAD_ALL_EXTRUDERS \
43
-           AUTO_BED_LEVELING_BILINEAR Z_MIN_PROBE_REPEATABILITY_TEST DISTINCT_E_FACTORS \
44
-           SKEW_CORRECTION SKEW_CORRECTION_FOR_Z SKEW_CORRECTION_GCODE \
45
-           BACKLASH_COMPENSATION BACKLASH_GCODE BAUD_RATE_GCODE BEZIER_CURVE_SUPPORT \
46
-           FWRETRACT ARC_P_CIRCLES CNC_WORKSPACE_PLANES CNC_COORDINATE_SYSTEMS \
47
-           PSU_CONTROL AUTO_POWER_CONTROL POWER_LOSS_RECOVERY POWER_LOSS_PIN POWER_LOSS_STATE \
48
-           SLOW_PWM_HEATERS THERMAL_PROTECTION_CHAMBER LIN_ADVANCE EXTRA_LIN_ADVANCE_K \
49
-           HOST_ACTION_COMMANDS HOST_PROMPT_SUPPORT PINS_DEBUGGING MAX7219_DEBUG M114_DETAIL
50
-exec_test $1 $2 "RAMPS | EXTRUDERS 2 | CHAR LCD + SD | FIX Probe | ABL-Linear | Advanced Pause | PLR | LEDs ..."
51
-
52
-#
53 16
 # Test a probeless build of AUTO_BED_LEVELING_UBL, with lots of extruders
54 17
 #
55 18
 use_example_configs AnimationExample

+ 35
- 0
buildroot/share/tests/rambo-tests View File

@@ -33,5 +33,40 @@ opt_enable USE_XMAX_PLUG USE_YMAX_PLUG USE_ZMAX_PLUG \
33 33
 opt_disable MIN_SOFTWARE_ENDSTOP_Z MAX_SOFTWARE_ENDSTOPS
34 34
 exec_test $1 $2 "Rambo CNC Configuration"
35 35
 
36
+#
37
+# Lots of options - Formerly the first Mega2560 test
38
+#
39
+restore_configs
40
+opt_set MOTHERBOARD BOARD_RAMBO
41
+opt_set EXTRUDERS 2
42
+opt_set TEMP_SENSOR_0 -2
43
+opt_set TEMP_SENSOR_1 1
44
+opt_set TEMP_SENSOR_BED 2
45
+opt_set TEMP_SENSOR_PROBE 1
46
+opt_add TEMP_PROBE_PIN 12
47
+opt_set TEMP_SENSOR_CHAMBER 3
48
+opt_add HEATER_CHAMBER_PIN 45
49
+opt_set GRID_MAX_POINTS_X 16
50
+opt_set FANMUX0_PIN 53
51
+opt_disable USE_WATCHDOG
52
+opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER LCD_PROGRESS_BAR LCD_PROGRESS_BAR_TEST \
53
+           FIX_MOUNTED_PROBE Z_SAFE_HOMING CODEPENDENT_XY_HOMING PIDTEMPBED \
54
+           PROBING_HEATERS_OFF PROBING_FANS_OFF PROBING_STEPPERS_OFF WAIT_FOR_BED_HEATER \
55
+           EEPROM_SETTINGS SDSUPPORT SD_REPRINT_LAST_SELECTED_FILE BINARY_FILE_TRANSFER \
56
+           BLINKM PCA9632 RGB_LED RGB_LED_R_PIN RGB_LED_G_PIN RGB_LED_B_PIN LED_CONTROL_MENU \
57
+           NEOPIXEL_LED CASE_LIGHT_ENABLE CASE_LIGHT_USE_NEOPIXEL CASE_LIGHT_MENU \
58
+           PID_PARAMS_PER_HOTEND PID_AUTOTUNE_MENU PID_EDIT_MENU LCD_SHOW_E_TOTAL \
59
+           PRINTCOUNTER SERVICE_NAME_1 SERVICE_INTERVAL_1 LEVEL_BED_CORNERS \
60
+           NOZZLE_PARK_FEATURE FILAMENT_RUNOUT_SENSOR FILAMENT_RUNOUT_DISTANCE_MM \
61
+           ADVANCED_PAUSE_FEATURE FILAMENT_LOAD_UNLOAD_GCODES FILAMENT_UNLOAD_ALL_EXTRUDERS \
62
+           AUTO_BED_LEVELING_BILINEAR Z_MIN_PROBE_REPEATABILITY_TEST DISTINCT_E_FACTORS \
63
+           SKEW_CORRECTION SKEW_CORRECTION_FOR_Z SKEW_CORRECTION_GCODE \
64
+           BACKLASH_COMPENSATION BACKLASH_GCODE BAUD_RATE_GCODE BEZIER_CURVE_SUPPORT \
65
+           FWRETRACT ARC_P_CIRCLES CNC_WORKSPACE_PLANES CNC_COORDINATE_SYSTEMS \
66
+           PSU_CONTROL AUTO_POWER_CONTROL POWER_LOSS_RECOVERY POWER_LOSS_PIN POWER_LOSS_STATE \
67
+           SLOW_PWM_HEATERS THERMAL_PROTECTION_CHAMBER LIN_ADVANCE EXTRA_LIN_ADVANCE_K \
68
+           HOST_ACTION_COMMANDS HOST_PROMPT_SUPPORT PINS_DEBUGGING MAX7219_DEBUG M114_DETAIL
69
+exec_test $1 $2 "RAMBO | EXTRUDERS 2 | CHAR LCD + SD | FIX Probe | ABL-Linear | Advanced Pause | PLR | LEDs ..."
70
+
36 71
 # clean up
37 72
 restore_configs

Loading…
Cancel
Save