Procházet zdrojové kódy

Check NOZZLE_CLEAN_FEATURE settings (#21332)

Co-authored-by: Scott Lahteine <github@thinkyhead.com>
ellensp před 3 roky
rodič
revize
10c14bcc05
No account linked to committer's email address

+ 1
- 0
.github/workflows/test-builds.yml Zobrazit soubor

98
         # Non-working environment tests
98
         # Non-working environment tests
99
         #- at90usb1286_cdc
99
         #- at90usb1286_cdc
100
         #- STM32F103CB_malyan
100
         #- STM32F103CB_malyan
101
+        #- STM32F103RE
101
         #- mks_robin_mini
102
         #- mks_robin_mini
102
 
103
 
103
     steps:
104
     steps:

+ 15
- 0
Marlin/src/inc/SanityCheck.h Zobrazit soubor

3350
 #endif
3350
 #endif
3351
 
3351
 
3352
 /**
3352
 /**
3353
+ * Sanity check for unique start and stop values in NOZZLE_CLEAN_FEATURE
3354
+ */
3355
+#if ENABLED(NOZZLE_CLEAN_FEATURE)
3356
+  constexpr xyz_pos_t start_xyz[8] = NOZZLE_CLEAN_START_POINT,
3357
+                        end_xyz[8] = NOZZLE_CLEAN_END_POINT;
3358
+  #define _CLEAN_ASSERT(N) static_assert(N >= HOTENDS || end_xyz[N].x != start_xyz[N].x || TERN(NOZZLE_CLEAN_NO_Y, false, end_xyz[N].y != start_xyz[N].y), \
3359
+                        "NOZZLE_CLEAN Start and End must be made different on HOTEND " STRINGIFY(N))
3360
+  _CLEAN_ASSERT(0); _CLEAN_ASSERT(1);
3361
+  _CLEAN_ASSERT(2); _CLEAN_ASSERT(3);
3362
+  _CLEAN_ASSERT(4); _CLEAN_ASSERT(5);
3363
+  _CLEAN_ASSERT(6); _CLEAN_ASSERT(7);
3364
+  #undef _CLEAN_ASSERT
3365
+#endif
3366
+
3367
+/**
3353
  * Sanity check for valid stepper driver types
3368
  * Sanity check for valid stepper driver types
3354
  */
3369
  */
3355
 #define _BAD_DRIVER(A) (defined(A##_DRIVER_TYPE) && !_DRIVER_ID(A##_DRIVER_TYPE))
3370
 #define _BAD_DRIVER(A) (defined(A##_DRIVER_TYPE) && !_DRIVER_ID(A##_DRIVER_TYPE))

+ 3
- 1
buildroot/tests/LPC1768 Zobrazit soubor

34
         EXTRUDERS 2 TEMP_SENSOR_1 -1 TEMP_SENSOR_BED 5 \
34
         EXTRUDERS 2 TEMP_SENSOR_1 -1 TEMP_SENSOR_BED 5 \
35
         GRID_MAX_POINTS_X 16 \
35
         GRID_MAX_POINTS_X 16 \
36
         NOZZLE_TO_PROBE_OFFSET '{ 0, 0, 0 }' \
36
         NOZZLE_TO_PROBE_OFFSET '{ 0, 0, 0 }' \
37
-        NOZZLE_CLEAN_MIN_TEMP 170
37
+        NOZZLE_CLEAN_MIN_TEMP 170 \
38
+        NOZZLE_CLEAN_START_POINT "{ {  10, 10, 3 }, {  10, 10, 3 } }" \
39
+        NOZZLE_CLEAN_END_POINT "{ {  10, 20, 3 }, {  10, 20, 3 } }"
38
 opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER ADAPTIVE_FAN_SLOWING NO_FAN_SLOWING_IN_PID_TUNING \
40
 opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER ADAPTIVE_FAN_SLOWING NO_FAN_SLOWING_IN_PID_TUNING \
39
            FILAMENT_WIDTH_SENSOR FILAMENT_LCD_DISPLAY PID_EXTRUSION_SCALING SOUND_MENU_ITEM \
41
            FILAMENT_WIDTH_SENSOR FILAMENT_LCD_DISPLAY PID_EXTRUSION_SCALING SOUND_MENU_ITEM \
40
            NOZZLE_AS_PROBE AUTO_BED_LEVELING_BILINEAR PREHEAT_BEFORE_LEVELING G29_RETRY_AND_RECOVER Z_MIN_PROBE_REPEATABILITY_TEST DEBUG_LEVELING_FEATURE \
42
            NOZZLE_AS_PROBE AUTO_BED_LEVELING_BILINEAR PREHEAT_BEFORE_LEVELING G29_RETRY_AND_RECOVER Z_MIN_PROBE_REPEATABILITY_TEST DEBUG_LEVELING_FEATURE \

+ 3
- 1
buildroot/tests/LPC1769 Zobrazit soubor

15
 restore_configs
15
 restore_configs
16
 opt_set MOTHERBOARD BOARD_SMOOTHIEBOARD \
16
 opt_set MOTHERBOARD BOARD_SMOOTHIEBOARD \
17
         EXTRUDERS 2 TEMP_SENSOR_1 -1 TEMP_SENSOR_BED 5 \
17
         EXTRUDERS 2 TEMP_SENSOR_1 -1 TEMP_SENSOR_BED 5 \
18
-        GRID_MAX_POINTS_X 16
18
+        GRID_MAX_POINTS_X 16 \
19
+        NOZZLE_CLEAN_START_POINT "{ {  10, 10, 3 }, {  10, 10, 3 } }" \
20
+        NOZZLE_CLEAN_END_POINT "{ {  10, 20, 3 }, {  10, 20, 3 } }"
19
 opt_enable TFTGLCD_PANEL_SPI SDSUPPORT ADAPTIVE_FAN_SLOWING NO_FAN_SLOWING_IN_PID_TUNING \
21
 opt_enable TFTGLCD_PANEL_SPI SDSUPPORT ADAPTIVE_FAN_SLOWING NO_FAN_SLOWING_IN_PID_TUNING \
20
            FIX_MOUNTED_PROBE AUTO_BED_LEVELING_BILINEAR G29_RETRY_AND_RECOVER Z_MIN_PROBE_REPEATABILITY_TEST DEBUG_LEVELING_FEATURE \
22
            FIX_MOUNTED_PROBE AUTO_BED_LEVELING_BILINEAR G29_RETRY_AND_RECOVER Z_MIN_PROBE_REPEATABILITY_TEST DEBUG_LEVELING_FEATURE \
21
            BABYSTEPPING BABYSTEP_XY BABYSTEP_ZPROBE_OFFSET LEVEL_CORNERS_USE_PROBE LEVEL_CORNERS_VERIFY_RAISED \
23
            BABYSTEPPING BABYSTEP_XY BABYSTEP_ZPROBE_OFFSET LEVEL_CORNERS_USE_PROBE LEVEL_CORNERS_VERIFY_RAISED \

+ 3
- 1
buildroot/tests/STM32F103RE Zobrazit soubor

10
 # Build with the default configurations
10
 # Build with the default configurations
11
 #
11
 #
12
 restore_configs
12
 restore_configs
13
-opt_set MOTHERBOARD BOARD_STM32F103RE SERIAL_PORT -1 EXTRUDERS 2
13
+opt_set MOTHERBOARD BOARD_STM32F103RE SERIAL_PORT -1 EXTRUDERS 2 \
14
+        NOZZLE_CLEAN_START_POINT "{ {  10, 10, 3 }, {  10, 10, 3 } }" \
15
+        NOZZLE_CLEAN_END_POINT "{ {  10, 20, 3 }, {  10, 20, 3 } }"
14
 opt_enable EEPROM_SETTINGS EEPROM_CHITCHAT REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT \
16
 opt_enable EEPROM_SETTINGS EEPROM_CHITCHAT REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT \
15
            PAREN_COMMENTS GCODE_MOTION_MODES SINGLENOZZLE TOOLCHANGE_FILAMENT_SWAP TOOLCHANGE_PARK \
17
            PAREN_COMMENTS GCODE_MOTION_MODES SINGLENOZZLE TOOLCHANGE_FILAMENT_SWAP TOOLCHANGE_PARK \
16
            BAUD_RATE_GCODE GCODE_MACROS NOZZLE_PARK_FEATURE NOZZLE_CLEAN_FEATURE
18
            BAUD_RATE_GCODE GCODE_MACROS NOZZLE_PARK_FEATURE NOZZLE_CLEAN_FEATURE

+ 3
- 1
buildroot/tests/teensy35 Zobrazit soubor

17
 opt_set MOTHERBOARD BOARD_TEENSY35_36 \
17
 opt_set MOTHERBOARD BOARD_TEENSY35_36 \
18
         EXTRUDERS 2 TEMP_SENSOR_0 1 TEMP_SENSOR_1 5 TEMP_SENSOR_BED 1 \
18
         EXTRUDERS 2 TEMP_SENSOR_0 1 TEMP_SENSOR_1 5 TEMP_SENSOR_BED 1 \
19
         I2C_SLAVE_ADDRESS 63 \
19
         I2C_SLAVE_ADDRESS 63 \
20
-        GRID_MAX_POINTS_X 16
20
+        GRID_MAX_POINTS_X 16 \
21
+        NOZZLE_CLEAN_START_POINT "{ {  10, 10, 3 }, {  10, 10, 3 } }" \
22
+        NOZZLE_CLEAN_END_POINT "{ {  10, 20, 3 }, {  10, 20, 3 } }"
21
 opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER LCD_INFO_MENU SDSUPPORT SDCARD_SORT_ALPHA \
23
 opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER LCD_INFO_MENU SDSUPPORT SDCARD_SORT_ALPHA \
22
            FILAMENT_WIDTH_SENSOR FILAMENT_LCD_DISPLAY CALIBRATION_GCODE BAUD_RATE_GCODE SOUND_MENU_ITEM \
24
            FILAMENT_WIDTH_SENSOR FILAMENT_LCD_DISPLAY CALIBRATION_GCODE BAUD_RATE_GCODE SOUND_MENU_ITEM \
23
            FIX_MOUNTED_PROBE Z_SAFE_HOMING AUTO_BED_LEVELING_BILINEAR Z_MIN_PROBE_REPEATABILITY_TEST DEBUG_LEVELING_FEATURE \
25
            FIX_MOUNTED_PROBE Z_SAFE_HOMING AUTO_BED_LEVELING_BILINEAR Z_MIN_PROBE_REPEATABILITY_TEST DEBUG_LEVELING_FEATURE \

+ 3
- 1
buildroot/tests/teensy41 Zobrazit soubor

17
 opt_set MOTHERBOARD BOARD_TEENSY41 \
17
 opt_set MOTHERBOARD BOARD_TEENSY41 \
18
         EXTRUDERS 2 TEMP_SENSOR_0 1 TEMP_SENSOR_1 5 TEMP_SENSOR_BED 1 \
18
         EXTRUDERS 2 TEMP_SENSOR_0 1 TEMP_SENSOR_1 5 TEMP_SENSOR_BED 1 \
19
         I2C_SLAVE_ADDRESS 63 \
19
         I2C_SLAVE_ADDRESS 63 \
20
-        GRID_MAX_POINTS_X 16
20
+        GRID_MAX_POINTS_X 16 \
21
+        NOZZLE_CLEAN_START_POINT "{ {  10, 10, 3 }, {  10, 10, 3 } }" \
22
+        NOZZLE_CLEAN_END_POINT "{ {  10, 20, 3 }, {  10, 20, 3 } }"
21
 opt_enable EXTENSIBLE_UI LCD_INFO_MENU SDSUPPORT SDCARD_SORT_ALPHA \
23
 opt_enable EXTENSIBLE_UI LCD_INFO_MENU SDSUPPORT SDCARD_SORT_ALPHA \
22
            FILAMENT_LCD_DISPLAY CALIBRATION_GCODE BAUD_RATE_GCODE \
24
            FILAMENT_LCD_DISPLAY CALIBRATION_GCODE BAUD_RATE_GCODE \
23
            FIX_MOUNTED_PROBE Z_SAFE_HOMING AUTO_BED_LEVELING_BILINEAR Z_MIN_PROBE_REPEATABILITY_TEST DEBUG_LEVELING_FEATURE \
25
            FIX_MOUNTED_PROBE Z_SAFE_HOMING AUTO_BED_LEVELING_BILINEAR Z_MIN_PROBE_REPEATABILITY_TEST DEBUG_LEVELING_FEATURE \

Loading…
Zrušit
Uložit