thebears/marlin_skr
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Apply TERN to compact code (#17619)

Browse Source
This commit is contained in:
Scott Lahteine
2020-04-22 16:35:03 -05:00
committed by GitHub
parent 88bdd26c99
commit 6d90d1e1f5
162 changed files with 1493 additions and 3530 deletions
Download Patch File Download Diff File Expand all files Collapse all files

276
Marlin/src/gcode/gcode.h
View File

@@ -396,24 +396,18 @@ private:
#endif
);
#if ENABLED(ARC_SUPPORT)
static void G2_G3(const bool clockwise);
#endif
TERN_(ARC_SUPPORT, static void G2_G3(const bool clockwise));
static void G4();
#if ENABLED(BEZIER_CURVE_SUPPORT)
static void G5();
#endif
TERN_(BEZIER_CURVE_SUPPORT, static void G5());
#if ENABLED(FWRETRACT)
static void G10();
static void G11();
#endif
#if ENABLED(NOZZLE_CLEAN_FEATURE)
static void G12();
#endif
TERN_(NOZZLE_CLEAN_FEATURE, static void G12());
#if ENABLED(CNC_WORKSPACE_PLANES)
static void G17();
@@ -426,13 +420,9 @@ private:
static void G21();
#endif
#if ENABLED(G26_MESH_VALIDATION)
static void G26();
#endif
TERN_(G26_MESH_VALIDATION, static void G26());
#if ENABLED(NOZZLE_PARK_FEATURE)
static void G27();
#endif
TERN_(NOZZLE_PARK_FEATURE, static void G27());
static void G28();
@@ -454,22 +444,16 @@ private:
#endif
#endif
#if ENABLED(DELTA_AUTO_CALIBRATION)
static void G33();
#endif
TERN_(DELTA_AUTO_CALIBRATION, static void G33());
#if ENABLED(Z_STEPPER_AUTO_ALIGN)
static void G34();
static void M422();
#endif
#if ENABLED(G38_PROBE_TARGET)
static void G38(const int8_t subcode);
#endif
TERN_(G38_PROBE_TARGET, static void G38(const int8_t subcode));
#if HAS_MESH
static void G42();
#endif
TERN_(HAS_MESH, static void G42());
#if ENABLED(CNC_COORDINATE_SYSTEMS)
static void G53();
@@ -481,28 +465,20 @@ private:
static void G59();
#endif
#if ENABLED(PROBE_TEMP_COMPENSATION)
static void G76();
#endif
TERN_(PROBE_TEMP_COMPENSATION, static void G76());
#if SAVED_POSITIONS
static void G60();
static void G61();
#endif
#if ENABLED(GCODE_MOTION_MODES)
static void G80();
#endif
TERN_(GCODE_MOTION_MODES, static void G80());
static void G92();
#if ENABLED(CALIBRATION_GCODE)
static void G425();
#endif
TERN_(CALIBRATION_GCODE, static void G425());
#if HAS_RESUME_CONTINUE
static void M0_M1();
#endif
TERN_(HAS_RESUME_CONTINUE, static void M0_M1());
#if HAS_CUTTER
static void M3_M4(const bool is_M4);
@@ -510,22 +486,14 @@ private:
#endif
#if ENABLED(COOLANT_CONTROL)
#if ENABLED(COOLANT_MIST)
static void M7();
#endif
#if ENABLED(COOLANT_FLOOD)
static void M8();
#endif
TERN_(COOLANT_MIST, static void M7());
TERN_(COOLANT_FLOOD, static void M8());
static void M9();
#endif
#if ENABLED(EXTERNAL_CLOSED_LOOP_CONTROLLER)
static void M12();
#endif
TERN_(EXTERNAL_CLOSED_LOOP_CONTROLLER, static void M12());
#if ENABLED(EXPECTED_PRINTER_CHECK)
static void M16();
#endif
TERN_(EXPECTED_PRINTER_CHECK, static void M16());
static void M17();
@@ -549,9 +517,7 @@ private:
#if ENABLED(SDSUPPORT)
static void M32();
#if ENABLED(LONG_FILENAME_HOST_SUPPORT)
static void M33();
#endif
TERN_(LONG_FILENAME_HOST_SUPPORT, static void M33());
#if BOTH(SDCARD_SORT_ALPHA, SDSORT_GCODE)
static void M34();
#endif
@@ -559,29 +525,19 @@ private:
static void M42();
#if ENABLED(PINS_DEBUGGING)
static void M43();
#endif
TERN_(PINS_DEBUGGING, static void M43());
#if ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST)
static void M48();
#endif
TERN_(Z_MIN_PROBE_REPEATABILITY_TEST, static void M48());
#if ENABLED(LCD_SET_PROGRESS_MANUALLY)
static void M73();
#endif
TERN_(LCD_SET_PROGRESS_MANUALLY, static void M73());
static void M75();
static void M76();
static void M77();
#if ENABLED(PRINTCOUNTER)
static void M78();
#endif
TERN_(PRINTCOUNTER, static void M78());
#if ENABLED(PSU_CONTROL)
static void M80();
#endif
TERN_(PSU_CONTROL, static void M80());
static void M81();
static void M82();
@@ -589,9 +545,7 @@ private:
static void M85();
static void M92();
#if ENABLED(M100_FREE_MEMORY_WATCHER)
static void M100();
#endif
TERN_(M100_FREE_MEMORY_WATCHER, static void M100());
#if EXTRUDERS
static void M104();
@@ -609,17 +563,13 @@ private:
static void M108();
static void M112();
static void M410();
#if ENABLED(HOST_PROMPT_SUPPORT)
static void M876();
#endif
TERN_(HOST_PROMPT_SUPPORT, static void M876());
#endif
static void M110();
static void M111();
#if ENABLED(HOST_KEEPALIVE_FEATURE)
static void M113();
#endif
TERN_(HOST_KEEPALIVE_FEATURE, static void M113());
static void M114();
static void M115();
@@ -629,9 +579,7 @@ private:
static void M120();
static void M121();
#if ENABLED(PARK_HEAD_ON_PAUSE)
static void M125();
#endif
TERN_(PARK_HEAD_ON_PAUSE, static void M125());
#if ENABLED(BARICUDA)
#if HAS_HEATER_1
@@ -658,13 +606,9 @@ private:
static void M145();
#endif
#if ENABLED(TEMPERATURE_UNITS_SUPPORT)
static void M149();
#endif
TERN_(TEMPERATURE_UNITS_SUPPORT, static void M149());
#if HAS_COLOR_LEDS
static void M150();
#endif
TERN_(HAS_COLOR_LEDS, static void M150());
#if ENABLED(AUTO_REPORT_TEMPERATURES) && HAS_TEMP_SENSOR
static void M155();
@@ -673,12 +617,8 @@ private:
#if ENABLED(MIXING_EXTRUDER)
static void M163();
static void M164();
#if ENABLED(DIRECT_MIXING_IN_G1)
static void M165();
#endif
#if ENABLED(GRADIENT_MIX)
static void M166();
#endif
TERN_(DIRECT_MIXING_IN_G1, static void M165());
TERN_(GRADIENT_MIX, static void M166());
#endif
static void M200();
@@ -692,16 +632,12 @@ private:
static void M204();
static void M205();
#if HAS_M206_COMMAND
static void M206();
#endif
TERN_(HAS_M206_COMMAND, static void M206());
#if ENABLED(FWRETRACT)
static void M207();
static void M208();
#if ENABLED(FWRETRACT_AUTORETRACT)
static void M209();
#endif
TERN_(FWRETRACT_AUTORETRACT, static void M209());
#endif
static void M211();
@@ -710,9 +646,7 @@ private:
static void M217();
#endif
#if HAS_HOTEND_OFFSET
static void M218();
#endif
TERN_(HAS_HOTEND_OFFSET, static void M218());
static void M220();
@@ -722,13 +656,9 @@ private:
static void M226();
#if ENABLED(PHOTO_GCODE)
static void M240();
#endif
TERN_(PHOTO_GCODE, static void M240());
#if HAS_LCD_CONTRAST
static void M250();
#endif
TERN_(HAS_LCD_CONTRAST, static void M250());
#if ENABLED(EXPERIMENTAL_I2CBUS)
static void M260();
@@ -737,47 +667,29 @@ private:
#if HAS_SERVOS
static void M280();
#if ENABLED(EDITABLE_SERVO_ANGLES)
static void M281();
#endif
TERN_(EDITABLE_SERVO_ANGLES, static void M281());
#endif
#if ENABLED(BABYSTEPPING)
static void M290();
#endif
TERN_(BABYSTEPPING, static void M290());
#if HAS_BUZZER
static void M300();
#endif
TERN_(HAS_BUZZER, static void M300());
#if ENABLED(PIDTEMP)
static void M301();
#endif
TERN_(PIDTEMP, static void M301());
#if ENABLED(PREVENT_COLD_EXTRUSION)
static void M302();
#endif
TERN_(PREVENT_COLD_EXTRUSION, static void M302());
#if HAS_PID_HEATING
static void M303();
#endif
TERN_(HAS_PID_HEATING, static void M303());
#if ENABLED(PIDTEMPBED)
static void M304();
#endif
TERN_(PIDTEMPBED, static void M304());
#if HAS_USER_THERMISTORS
static void M305();
#endif
TERN_(HAS_USER_THERMISTORS, static void M305());
#if HAS_MICROSTEPS
static void M350();
static void M351();
#endif
#if HAS_CASE_LIGHT
static void M355();
#endif
TERN_(HAS_CASE_LIGHT, static void M355());
#if ENABLED(MORGAN_SCARA)
static bool M360();
@@ -799,9 +711,7 @@ private:
static void M402();
#endif
#if ENABLED(PRUSA_MMU2)
static void M403();
#endif
TERN_(PRUSA_MMU2, static void M403());
#if ENABLED(FILAMENT_WIDTH_SENSOR)
static void M404();
@@ -810,26 +720,18 @@ private:
static void M407();
#endif
#if HAS_FILAMENT_SENSOR
static void M412();
#endif
TERN_(HAS_FILAMENT_SENSOR, static void M412());
#if HAS_LEVELING
static void M420();
static void M421();
#endif
#if ENABLED(BACKLASH_GCODE)
static void M425();
#endif
TERN_(BACKLASH_GCODE, static void M425());
#if HAS_M206_COMMAND
static void M428();
#endif
TERN_(HAS_M206_COMMAND, static void M428());
#if ENABLED(CANCEL_OBJECTS)
static void M486();
#endif
TERN_(CANCEL_OBJECTS, static void M486());
static void M500();
static void M501();
@@ -837,34 +739,22 @@ private:
#if DISABLED(DISABLE_M503)
static void M503();
#endif
#if ENABLED(EEPROM_SETTINGS)
static void M504();
#endif
TERN_(EEPROM_SETTINGS, static void M504());
#if ENABLED(SDSUPPORT)
static void M524();
#endif
TERN_(SDSUPPORT, static void M524());
#if ENABLED(SD_ABORT_ON_ENDSTOP_HIT)
static void M540();
#endif
TERN_(SD_ABORT_ON_ENDSTOP_HIT, static void M540());
#if ENABLED(BAUD_RATE_GCODE)
static void M575();
#endif
TERN_(BAUD_RATE_GCODE, static void M575());
#if ENABLED(ADVANCED_PAUSE_FEATURE)
static void M600();
static void M603();
#endif
#if HAS_DUPLICATION_MODE
static void M605();
#endif
TERN_(HAS_DUPLICATION_MODE, static void M605());
#if IS_KINEMATIC
static void M665();
#endif
TERN_(IS_KINEMATIC, static void M665());
#if ENABLED(DELTA) || HAS_EXTRA_ENDSTOPS
static void M666();
@@ -879,17 +769,11 @@ private:
static void M702();
#endif
#if ENABLED(GCODE_MACROS)
static void M810_819();
#endif
TERN_(GCODE_MACROS, static void M810_819());
#if HAS_BED_PROBE
static void M851();
#endif
TERN_(HAS_BED_PROBE, static void M851());
#if ENABLED(SKEW_CORRECTION_GCODE)
static void M852();
#endif
TERN_(SKEW_CORRECTION_GCODE, static void M852());
#if ENABLED(I2C_POSITION_ENCODERS)
FORCE_INLINE static void M860() { I2CPEM.M860(); }
@@ -904,30 +788,20 @@ private:
FORCE_INLINE static void M869() { I2CPEM.M869(); }
#endif
#if ENABLED(PROBE_TEMP_COMPENSATION)
static void M871();
#endif
TERN_(PROBE_TEMP_COMPENSATION, static void M871());
#if ENABLED(LIN_ADVANCE)
static void M900();
#endif
TERN_(LIN_ADVANCE, static void M900());
#if HAS_TRINAMIC_CONFIG
static void M122();
static void M906();
#if HAS_STEALTHCHOP
static void M569();
#endif
TERN_(HAS_STEALTHCHOP, static void M569());
#if ENABLED(MONITOR_DRIVER_STATUS)
static void M911();
static void M912();
#endif
#if ENABLED(HYBRID_THRESHOLD)
static void M913();
#endif
#if USE_SENSORLESS
static void M914();
#endif
TERN_(HYBRID_THRESHOLD, static void M913());
TERN_(USE_SENSORLESS, static void M914());
#endif
#if HAS_L64XX
@@ -949,17 +823,11 @@ private:
#endif
#endif
#if ENABLED(SDSUPPORT)
static void M928();
#endif
TERN_(SDSUPPORT, static void M928());
#if ENABLED(MAGNETIC_PARKING_EXTRUDER)
static void M951();
#endif
TERN_(MAGNETIC_PARKING_EXTRUDER, static void M951());
#if ENABLED(PLATFORM_M997_SUPPORT)
static void M997();
#endif
TERN_(PLATFORM_M997_SUPPORT, static void M997());
static void M999();
@@ -968,17 +836,11 @@ private:
static void M1000();
#endif
#if ENABLED(SDSUPPORT)
static void M1001();
#endif
TERN_(SDSUPPORT, static void M1001());
#if ENABLED(MAX7219_GCODE)
static void M7219();
#endif
TERN_(MAX7219_GCODE, static void M7219());
#if ENABLED(CONTROLLER_FAN_EDITABLE)
static void M710();
#endif
TERN_(CONTROLLER_FAN_EDITABLE, static void M710());
static void T(const uint8_t tool_index);