laser feature updates part5

ThomasToka · Jul 27, 2023 · 9583124 · 9583124
1 parent 9c9d6f3
commit 9583124
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 28 deletions.
diff --git a/Marlin/src/feature/spindle_laser.cpp b/Marlin/src/feature/spindle_laser.cpp
@@ -65,34 +65,29 @@ cutter_frequency_t SpindleLaser::frequency;                           // PWM fre
  * Init the cutter to a safe OFF state
  */
 void SpindleLaser::init() {
-  #if ENABLED(LASER_FEATURE)
-    _SET_OUTPUT(LASER_SOFT_PWM_PIN);
-    laser_device.init_device();
-  #else  
-    #if ENABLED(SPINDLE_SERVO)
-      servo[SPINDLE_SERVO_NR].move(SPINDLE_SERVO_MIN);
-    #elif PIN_EXISTS(SPINDLE_LASER_ENA)
-      OUT_WRITE(SPINDLE_LASER_ENA_PIN, !SPINDLE_LASER_ACTIVE_STATE);    // Init spindle to off
-    #endif
-    #if ENABLED(SPINDLE_CHANGE_DIR)
-      OUT_WRITE(SPINDLE_DIR_PIN, SPINDLE_INVERT_DIR);                   // Init rotation to clockwise (M3)
-    #endif
-    #if ENABLED(HAL_CAN_SET_PWM_FREQ) && SPINDLE_LASER_FREQUENCY
-      frequency = SPINDLE_LASER_FREQUENCY;
-      hal.set_pwm_frequency(pin_t(SPINDLE_LASER_PWM_PIN), SPINDLE_LASER_FREQUENCY);
-    #endif
-    #if ENABLED(SPINDLE_LASER_USE_PWM)
-      SET_PWM(SPINDLE_LASER_PWM_PIN);
-      hal.set_pwm_duty(pin_t(SPINDLE_LASER_PWM_PIN), SPINDLE_LASER_PWM_OFF); // Set to lowest speed
-    #endif
-    #if ENABLED(AIR_EVACUATION)
-      OUT_WRITE(AIR_EVACUATION_PIN, !AIR_EVACUATION_ACTIVE);            // Init Vacuum/Blower OFF
-    #endif
-    #if ENABLED(AIR_ASSIST)
-      OUT_WRITE(AIR_ASSIST_PIN, !AIR_ASSIST_ACTIVE);                    // Init Air Assist OFF
-    #endif
-    TERN_(I2C_AMMETER, ammeter.init());                                 // Init I2C Ammeter
+  #if ENABLED(SPINDLE_SERVO)
+    servo[SPINDLE_SERVO_NR].move(SPINDLE_SERVO_MIN);
+  #elif PIN_EXISTS(SPINDLE_LASER_ENA)
+    OUT_WRITE(SPINDLE_LASER_ENA_PIN, !SPINDLE_LASER_ACTIVE_STATE);    // Init spindle to off
+  #endif
+  #if ENABLED(SPINDLE_CHANGE_DIR)
+    OUT_WRITE(SPINDLE_DIR_PIN, SPINDLE_INVERT_DIR);                   // Init rotation to clockwise (M3)
+  #endif
+  #if ENABLED(HAL_CAN_SET_PWM_FREQ) && SPINDLE_LASER_FREQUENCY
+    frequency = SPINDLE_LASER_FREQUENCY;
+    hal.set_pwm_frequency(pin_t(SPINDLE_LASER_PWM_PIN), SPINDLE_LASER_FREQUENCY);
+  #endif
+  #if ENABLED(SPINDLE_LASER_USE_PWM)
+    SET_PWM(SPINDLE_LASER_PWM_PIN);
+    hal.set_pwm_duty(pin_t(SPINDLE_LASER_PWM_PIN), SPINDLE_LASER_PWM_OFF); // Set to lowest speed
+  #endif
+  #if ENABLED(AIR_EVACUATION)
+    OUT_WRITE(AIR_EVACUATION_PIN, !AIR_EVACUATION_ACTIVE);            // Init Vacuum/Blower OFF
+  #endif
+  #if ENABLED(AIR_ASSIST)
+    OUT_WRITE(AIR_ASSIST_PIN, !AIR_ASSIST_ACTIVE);                    // Init Air Assist OFF
   #endif
+  TERN_(I2C_AMMETER, ammeter.init());                                 // Init I2C Ammeter
 }
 
 #if ENABLED(SPINDLE_LASER_USE_PWM)

diff --git a/Marlin/src/feature/spindle_laser.h b/Marlin/src/feature/spindle_laser.h
@@ -499,7 +499,7 @@ class spindle_laser_soft_pwm
 	void soft_pwm_init()
 	{
     _SET_OUTPUT(LASER_SOFT_PWM_PIN);
-		laser_timer_soft_pwm_init(LASER_TIMER_FREQUENCY);
+		laser_timer_soft_pwm_init();
 	}
 
   	void laser_power_start(const uint8_t power)