Laser Cutter Air Assist (MarlinFirmware#21753)

Night69 · Aug 31, 2021 · 9bdc769 · 9bdc769
1 parent 9be8b6f
commit 9bdc769
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 55 deletions.
diff --git a/Marlin/src/feature/spindle_laser.cpp b/Marlin/src/feature/spindle_laser.cpp
@@ -34,10 +34,6 @@
   #include "../module/servo.h"
 #endif
 
-#if ENABLED(I2C_AMMETER)
-  #include "../feature/ammeter.h"
-#endif
-
 SpindleLaser cutter;
 uint8_t SpindleLaser::power;
 #if ENABLED(LASER_FEATURE)
@@ -78,9 +74,6 @@ void SpindleLaser::init() {
   #if ENABLED(AIR_ASSIST)
     OUT_WRITE(AIR_ASSIST_PIN, !AIR_ASSIST_ACTIVE);                    // Init Air Assist OFF
   #endif
-  #if ENABLED(I2C_AMMETER)
-    ammeter.init();                                                   // Init I2C Ammeter
-  #endif
 }
 
 #if ENABLED(SPINDLE_LASER_PWM)

diff --git a/Marlin/src/gcode/control/M7-M9.cpp b/Marlin/src/gcode/control/M7-M9.cpp
@@ -20,9 +20,9 @@
  *
  */
 
-#include "../../inc/MarlinConfigPre.h"
+#include "../../inc/MarlinConfig.h"
 
-#if ANY(COOLANT_MIST, COOLANT_FLOOD, AIR_ASSIST)
+#if ENABLED(COOLANT_CONTROL)
 
 #include "../gcode.h"
 #include "../../module/planner.h"
@@ -37,41 +37,51 @@
   }
 #endif
 
-#if EITHER(COOLANT_FLOOD, AIR_ASSIST)
-
-  #if ENABLED(AIR_ASSIST)
-    #include "../../feature/spindle_laser.h"
-  #endif
-
+#if ENABLED(COOLANT_FLOOD)
   /**
-   * M8: Flood Coolant / Air Assist ON
+   * M8: Flood Coolant On
    */
   void GcodeSuite::M8() {
-    planner.synchronize();                            // Wait for move to arrive
-    #if ENABLED(COOLANT_FLOOD)
-      WRITE(COOLANT_FLOOD_PIN, !(COOLANT_FLOOD_INVERT)); // Turn on Flood coolant
-    #endif
-    #if ENABLED(AIR_ASSIST)
-      cutter.air_assist_enable();                     // Turn on Air Assist
-    #endif
+    planner.synchronize();                              // Wait for move to arrive
+    WRITE(COOLANT_FLOOD_PIN, !(COOLANT_FLOOD_INVERT));  // Turn on Flood coolant
   }
-
 #endif
 
 /**
- * M9: Coolant / Air Assist OFF
+ * M9: Coolant OFF
  */
 void GcodeSuite::M9() {
-  planner.synchronize();                              // Wait for move to arrive
+  planner.synchronize();                            // Wait for move to arrive
   #if ENABLED(COOLANT_MIST)
-    WRITE(COOLANT_MIST_PIN, COOLANT_MIST_INVERT);     // Turn off Mist coolant
+    WRITE(COOLANT_MIST_PIN, COOLANT_MIST_INVERT);   // Turn off Mist coolant
   #endif
   #if ENABLED(COOLANT_FLOOD)
-    WRITE(COOLANT_FLOOD_PIN, COOLANT_FLOOD_INVERT);   // Turn off Flood coolant
-  #endif
-  #if ENABLED(AIR_ASSIST)
-    cutter.air_assist_disable();                      // Turn off Air Assist
+    WRITE(COOLANT_FLOOD_PIN, COOLANT_FLOOD_INVERT); // Turn off Flood coolant
   #endif
 }
 
-#endif // COOLANT_MIST | COOLANT_FLOOD | AIR_ASSIST
+#endif // COOLANT_CONTROL
+
+#if ENABLED(AIR_ASSIST)
+
+#include "../gcode.h"
+#include "../../module/planner.h"
+#include "../../feature/spindle_laser.h"
+
+/**
+ * M8: Air Assist On
+ */
+void GcodeSuite::M8() {
+  planner.synchronize(); 
+  cutter.air_assist_enable();   // Turn on Air Assist pin
+}
+
+/**
+ * M9: Air Assist Off
+ */
+void GcodeSuite::M9() {
+  planner.synchronize(); 
+  cutter.air_assist_disable();  // Turn off Air Assist pin
+}
+
+#endif // AIR_ASSIST
diff --git a/buildroot/tests/mega2560 b/buildroot/tests/mega2560
@@ -16,12 +16,12 @@ set -e
 # Test a probeless build of AUTO_BED_LEVELING_UBL, with lots of extruders
 #
 use_example_configs AnimationExample
-opt_set MOTHERBOARD BOARD_AZTEEG_X3_PRO LCD_LANGUAGE fr SAVED_POSITIONS 4 DEFAULT_EJERK 10 \
+opt_set MOTHERBOARD BOARD_AZTEEG_X3_PRO LCD_LANGUAGE fr \
         EXTRUDERS 5 TEMP_SENSOR_1 1 TEMP_SENSOR_2 5 TEMP_SENSOR_3 20 TEMP_SENSOR_4 1000 TEMP_SENSOR_BED 1
 opt_enable AUTO_BED_LEVELING_UBL RESTORE_LEVELING_AFTER_G28 DEBUG_LEVELING_FEATURE G26_MESH_VALIDATION ENABLE_LEVELING_FADE_HEIGHT SKEW_CORRECTION \
            REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER LIGHTWEIGHT_UI STATUS_MESSAGE_SCROLLING SHOW_CUSTOM_BOOTSCREEN BOOT_MARLIN_LOGO_SMALL \
-           SDSUPPORT SDCARD_SORT_ALPHA USB_FLASH_DRIVE_SUPPORT AUTO_REPORT_SD_STATUS SCROLL_LONG_FILENAMES MEDIA_MENU_AT_TOP \
-           EEPROM_SETTINGS EEPROM_CHITCHAT GCODE_MACROS CUSTOM_MENU_MAIN FREEZE_FEATURE CANCEL_OBJECTS SOUND_MENU_ITEM \
+           SDSUPPORT SDCARD_SORT_ALPHA USB_FLASH_DRIVE_SUPPORT AUTO_REPORT_SD_STATUS SCROLL_LONG_FILENAMES CANCEL_OBJECTS SOUND_MENU_ITEM \
+           EEPROM_SETTINGS EEPROM_CHITCHAT GCODE_MACROS CUSTOM_MENU_MAIN \
            MULTI_NOZZLE_DUPLICATION CLASSIC_JERK LIN_ADVANCE EXTRA_LIN_ADVANCE_K QUICK_HOME \
            LCD_SET_PROGRESS_MANUALLY PRINT_PROGRESS_SHOW_DECIMALS SHOW_REMAINING_TIME \
            BABYSTEPPING BABYSTEP_XY NANODLP_Z_SYNC I2C_POSITION_ENCODERS M114_DETAIL
@@ -31,7 +31,7 @@ exec_test $1 $2 "Azteeg X3 Pro | EXTRUDERS 5 | RRDFGSC | UBL | LIN_ADVANCE ..."
 # Add a Sled Z Probe, use UBL Cartesian moves, use Japanese language
 #
 use_example_configs AnimationExample
-opt_set MOTHERBOARD BOARD_AZTEEG_X3_PRO LCD_LANGUAGE jp_kana DEFAULT_EJERK 10 \
+opt_set MOTHERBOARD BOARD_AZTEEG_X3_PRO LCD_LANGUAGE jp_kana \
         EXTRUDERS 5 TEMP_SENSOR_1 1 TEMP_SENSOR_2 5 TEMP_SENSOR_3 20 TEMP_SENSOR_4 1000 TEMP_SENSOR_BED 1
 opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER LIGHTWEIGHT_UI SHOW_CUSTOM_BOOTSCREEN BOOT_MARLIN_LOGO_SMALL \
            LCD_SET_PROGRESS_MANUALLY PRINT_PROGRESS_SHOW_DECIMALS SHOW_REMAINING_TIME STATUS_MESSAGE_SCROLLING SCROLL_LONG_FILENAMES \
@@ -56,7 +56,7 @@ opt_set MOTHERBOARD BOARD_AZTEEG_X3_PRO NUM_SERVOS 1 \
         FIL_RUNOUT3_STATE HIGH
 opt_enable VIKI2 BOOT_MARLIN_LOGO_ANIMATED SDSUPPORT AUTO_REPORT_SD_STATUS \
            Z_PROBE_SERVO_NR Z_SERVO_ANGLES DEACTIVATE_SERVOS_AFTER_MOVE AUTO_BED_LEVELING_3POINT DEBUG_LEVELING_FEATURE \
-           EEPROM_SETTINGS EEPROM_CHITCHAT M114_DETAIL AUTO_REPORT_POSITION \
+           EEPROM_SETTINGS EEPROM_CHITCHAT M114_DETAIL \
            NO_VOLUMETRICS EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES AUTOTEMP G38_PROBE_TARGET JOYSTICK \
            DIRECT_STEPPING DETECT_BROKEN_ENDSTOP \
            FILAMENT_RUNOUT_SENSOR NOZZLE_PARK_FEATURE ADVANCED_PAUSE_FEATURE Z_SAFE_HOMING FIL_RUNOUT3_PULLUP
@@ -68,12 +68,10 @@ exec_test $1 $2 "Multiple runout sensors (x5) | Distinct runout states" "$3"
 #
 restore_configs
 opt_set MOTHERBOARD BOARD_AZTEEG_X3_PRO MIXING_STEPPERS 5 LCD_LANGUAGE ru \
-        NUM_RUNOUT_SENSORS E_STEPPERS REDUNDANT_PART_COOLING_FAN 1 \
-        FIL_RUNOUT2_PIN 16 FIL_RUNOUT3_PIN 17 FIL_RUNOUT4_PIN 4 FIL_RUNOUT5_PIN 5
+        NUM_RUNOUT_SENSORS E_STEPPERS FIL_RUNOUT2_PIN 16 FIL_RUNOUT3_PIN 17 FIL_RUNOUT4_PIN 4 FIL_RUNOUT5_PIN 5
 opt_enable MIXING_EXTRUDER GRADIENT_MIX GRADIENT_VTOOL CR10_STOCKDISPLAY \
            USE_CONTROLLER_FAN CONTROLLER_FAN_EDITABLE CONTROLLER_FAN_IGNORE_Z \
            FILAMENT_RUNOUT_SENSOR ADVANCED_PAUSE_FEATURE NOZZLE_PARK_FEATURE
-opt_disable DISABLE_INACTIVE_EXTRUDER
 exec_test $1 $2 "Azteeg X3 | Mixing Extruder (x5) | Gradient Mix | Greek" "$3"
 
 #
@@ -128,7 +126,7 @@ exec_test $1 $2 "Azteeg X3 | Mixing Extruder (x5) | Gradient Mix | Greek" "$3"
 #
 # REPRAPWORLD_KEYPAD
 #
-# Can't find configuration details to get it to compile
+# Cant find configuration details to get it to compile
 #restore_configs
 #opt_enable ULTRA_LCD REPRAPWORLD_KEYPAD REPRAPWORLD_KEYPAD_MOVE_STEP
 #exec_test $1 $2 "Stuff" "$3"
@@ -173,29 +171,19 @@ exec_test $1 $2 "Azteeg X3 | Mixing Extruder (x5) | Gradient Mix | Greek" "$3"
 # Test Laser features with 12864 LCD
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_RAMPS_14_EFB EXTRUDERS 0 LCD_LANGUAGE en TEMP_SENSOR_COOLER 1 TEMP_SENSOR_1 0 SERIAL_PORT_2 2 \
-        DEFAULT_AXIS_STEPS_PER_UNIT '{ 80, 80, 400 }' \
-        DEFAULT_MAX_FEEDRATE '{ 300, 300, 5 }' \
-        DEFAULT_MAX_ACCELERATION '{ 3000, 3000, 100 }' \
-        MANUAL_FEEDRATE '{ 50*60, 50*60, 4*60 }' \
-        AXIS_RELATIVE_MODES '{ false, false, false }'
+opt_set MOTHERBOARD BOARD_RAMPS_14_EFB LCD_LANGUAGE en TEMP_SENSOR_COOLER 1 EXTRUDERS 0 TEMP_SENSOR_1 0 SERIAL_PORT_2 2
 opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER SDSUPPORT EEPROM_SETTINGS EEPROM_BOOT_SILENT EEPROM_AUTO_INIT \
-           LASER_FEATURE AIR_EVACUATION AIR_EVACUATION_PIN AIR_ASSIST AIR_ASSIST_PIN LASER_COOLANT_FLOW_METER MEATPACK_ON_SERIAL_PORT_1
+           LASER_FEATURE AIR_EVACUATION AIR_ASSIST LASER_COOLANT_FLOW_METER MEATPACK_ON_SERIAL_PORT_1
 
 exec_test $1 $2 "REPRAP MEGA2560 RAMPS | Laser Feature | Air Evacuation | Air Assist | Cooler | Flowmeter | 12864 LCD | meatpack | SERIAL_PORT_2 " "$3"
 
 #
 # Test Laser features with 44780 LCD
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_RAMPS_14_EFB EXTRUDERS 0 LCD_LANGUAGE en TEMP_SENSOR_COOLER 1 TEMP_SENSOR_1 0 \
-        DEFAULT_AXIS_STEPS_PER_UNIT '{ 80, 80, 400 }' \
-        DEFAULT_MAX_FEEDRATE '{ 300, 300, 5 }' \
-        DEFAULT_MAX_ACCELERATION '{ 3000, 3000, 100 }' \
-        MANUAL_FEEDRATE '{ 50*60, 50*60, 4*60 }' \
-        AXIS_RELATIVE_MODES '{ false, false, false }'
+opt_set MOTHERBOARD BOARD_RAMPS_14_EFB LCD_LANGUAGE en TEMP_SENSOR_COOLER 1 EXTRUDERS 0 TEMP_SENSOR_1 0
 opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT EEPROM_SETTINGS EEPROM_BOOT_SILENT EEPROM_AUTO_INIT \
-           LASER_FEATURE AIR_EVACUATION AIR_EVACUATION_PIN AIR_ASSIST AIR_ASSIST_PIN LASER_COOLANT_FLOW_METER I2C_AMMETER
+           LASER_FEATURE AIR_EVACUATION AIR_ASSIST LASER_COOLANT_FLOW_METER
 
 exec_test $1 $2 "REPRAP MEGA2560 RAMPS | Laser Feature | Air Evacuation | Air Assist | Cooler | Flowmeter | 44780 LCD " "$3"