Skip to content

Commit 9e37ab2

Browse files
ellenspTracy Spiva
authored and
Tracy Spiva
committed
🔨 FILAMENT_RUNOUT_SCRIPT sanity check (MarlinFirmware#25150)
1 parent bb8b826 commit 9e37ab2

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

buildroot/share/PlatformIO/scripts/preflight-checks.py

+9
Original file line numberDiff line numberDiff line change
@@ -124,4 +124,13 @@ def rm_ofile(subdir, name):
124124
err = "ERROR: Old files fell into your Marlin folder. Remove %s and try again" % ", ".join(mixedin)
125125
raise SystemExit(err)
126126

127+
#
128+
# Check FILAMENT_RUNOUT_SCRIPT has a %c parammeter when required
129+
#
130+
if 'FILAMENT_RUNOUT_SENSOR' in env['MARLIN_FEATURES'] and 'NUM_RUNOUT_SENSORS' in env['MARLIN_FEATURES']:
131+
if env['MARLIN_FEATURES']['NUM_RUNOUT_SENSORS'].isdigit() and int(env['MARLIN_FEATURES']['NUM_RUNOUT_SENSORS']) > 1:
132+
if 'FILAMENT_RUNOUT_SCRIPT' in env['MARLIN_FEATURES'] and "%c" not in env['MARLIN_FEATURES']['FILAMENT_RUNOUT_SCRIPT']:
133+
err = "ERROR: FILAMENT_RUNOUT_SCRIPT needs a %c parameter when NUM_RUNOUT_SENSORS is > 1"
134+
raise SystemExit(err)
135+
127136
sanity_check_target()

buildroot/tests/mega2560

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ restore_configs
6161
opt_set MOTHERBOARD BOARD_AZTEEG_X3_PRO NUM_SERVOS 1 \
6262
EXTRUDERS 5 TEMP_SENSOR_1 1 TEMP_SENSOR_2 1 TEMP_SENSOR_3 1 TEMP_SENSOR_4 1 \
6363
NUM_RUNOUT_SENSORS 5 FIL_RUNOUT2_PIN 44 FIL_RUNOUT3_PIN 45 FIL_RUNOUT4_PIN 46 FIL_RUNOUT5_PIN 47 \
64-
FIL_RUNOUT3_STATE HIGH
64+
FIL_RUNOUT3_STATE HIGH FILAMENT_RUNOUT_SCRIPT '"M600 T%c"'
6565
opt_enable VIKI2 BOOT_MARLIN_LOGO_ANIMATED SDSUPPORT AUTO_REPORT_SD_STATUS \
6666
Z_PROBE_SERVO_NR Z_SERVO_ANGLES DEACTIVATE_SERVOS_AFTER_MOVE AUTO_BED_LEVELING_3POINT DEBUG_LEVELING_FEATURE \
6767
EEPROM_SETTINGS EEPROM_CHITCHAT M114_DETAIL AUTO_REPORT_POSITION \

0 commit comments

Comments
 (0)