Browse Source

🎨 Misc. spindle/laser adjustments

Scott Lahteine 3 years ago
parent
commit
ab797a0995

+ 1
- 1
Marlin/src/HAL/AVR/inc/SanityCheck.h View File

42
   #elif NUM_SERVOS > 0 && defined(_useTimer3) && (WITHIN(SPINDLE_LASER_PWM_PIN, 2, 3) || SPINDLE_LASER_PWM_PIN == 5)
42
   #elif NUM_SERVOS > 0 && defined(_useTimer3) && (WITHIN(SPINDLE_LASER_PWM_PIN, 2, 3) || SPINDLE_LASER_PWM_PIN == 5)
43
     #error "Counter/Timer for SPINDLE_LASER_PWM_PIN is used by the servo system."
43
     #error "Counter/Timer for SPINDLE_LASER_PWM_PIN is used by the servo system."
44
   #endif
44
   #endif
45
-#elif defined(SPINDLE_LASER_FREQUENCY)
45
+#elif SPINDLE_LASER_FREQUENCY
46
   #error "SPINDLE_LASER_FREQUENCY requires SPINDLE_LASER_USE_PWM."
46
   #error "SPINDLE_LASER_FREQUENCY requires SPINDLE_LASER_USE_PWM."
47
 #endif
47
 #endif
48
 
48
 

+ 3
- 7
Marlin/src/HAL/LPC1768/fast_pwm.cpp View File

30
     LPC176x::pwm_write_ratio(pin, invert ? 1.0f - (float)v / v_size : (float)v / v_size);  // map 1-254 onto PWM range
30
     LPC176x::pwm_write_ratio(pin, invert ? 1.0f - (float)v / v_size : (float)v / v_size);  // map 1-254 onto PWM range
31
 }
31
 }
32
 
32
 
33
-#if NEEDS_HARDWARE_PWM // Specific meta-flag for features that mandate PWM
34
-
35
-  void set_pwm_frequency(const pin_t pin, const uint16_t f_desired) {
36
-    LPC176x::pwm_set_frequency(pin, f_desired);
37
-  }
38
-
39
-#endif
33
+void set_pwm_frequency(const pin_t pin, const uint16_t f_desired) {
34
+  LPC176x::pwm_set_frequency(pin, f_desired);
35
+}
40
 
36
 
41
 #endif // TARGET_LPC1768
37
 #endif // TARGET_LPC1768

+ 3
- 5
Marlin/src/feature/spindle_laser.cpp View File

68
     SET_PWM(SPINDLE_LASER_PWM_PIN);
68
     SET_PWM(SPINDLE_LASER_PWM_PIN);
69
     set_pwm_duty(pin_t(SPINDLE_LASER_PWM_PIN), SPINDLE_LASER_PWM_OFF); // Set to lowest speed
69
     set_pwm_duty(pin_t(SPINDLE_LASER_PWM_PIN), SPINDLE_LASER_PWM_OFF); // Set to lowest speed
70
   #endif
70
   #endif
71
-  #if ENABLED(HAL_CAN_SET_PWM_FREQ) && defined(SPINDLE_LASER_FREQUENCY)
71
+  #if ENABLED(HAL_CAN_SET_PWM_FREQ) && SPINDLE_LASER_FREQUENCY
72
     set_pwm_frequency(pin_t(SPINDLE_LASER_PWM_PIN), SPINDLE_LASER_FREQUENCY);
72
     set_pwm_frequency(pin_t(SPINDLE_LASER_PWM_PIN), SPINDLE_LASER_FREQUENCY);
73
     TERN_(MARLIN_DEV_MODE, frequency = SPINDLE_LASER_FREQUENCY);
73
     TERN_(MARLIN_DEV_MODE, frequency = SPINDLE_LASER_FREQUENCY);
74
   #endif
74
   #endif
78
   #if ENABLED(AIR_ASSIST)
78
   #if ENABLED(AIR_ASSIST)
79
     OUT_WRITE(AIR_ASSIST_PIN, !AIR_ASSIST_ACTIVE);                    // Init Air Assist OFF
79
     OUT_WRITE(AIR_ASSIST_PIN, !AIR_ASSIST_ACTIVE);                    // Init Air Assist OFF
80
   #endif
80
   #endif
81
-  #if ENABLED(I2C_AMMETER)
82
-    ammeter.init();                                                   // Init I2C Ammeter
83
-  #endif
81
+  TERN_(I2C_AMMETER, ammeter.init());                                 // Init I2C Ammeter
84
 }
82
 }
85
 
83
 
86
 #if ENABLED(SPINDLE_LASER_USE_PWM)
84
 #if ENABLED(SPINDLE_LASER_USE_PWM)
90
    * @param ocr Power value
88
    * @param ocr Power value
91
    */
89
    */
92
   void SpindleLaser::_set_ocr(const uint8_t ocr) {
90
   void SpindleLaser::_set_ocr(const uint8_t ocr) {
93
-    #if NEEDS_HARDWARE_PWM && SPINDLE_LASER_FREQUENCY
91
+    #if ENABLED(HAL_CAN_SET_PWM_FREQ) && SPINDLE_LASER_FREQUENCY
94
       set_pwm_frequency(pin_t(SPINDLE_LASER_PWM_PIN), TERN(MARLIN_DEV_MODE, frequency, SPINDLE_LASER_FREQUENCY));
92
       set_pwm_frequency(pin_t(SPINDLE_LASER_PWM_PIN), TERN(MARLIN_DEV_MODE, frequency, SPINDLE_LASER_FREQUENCY));
95
     #endif
93
     #endif
96
     set_pwm_duty(pin_t(SPINDLE_LASER_PWM_PIN), ocr ^ SPINDLE_LASER_PWM_OFF);
94
     set_pwm_duty(pin_t(SPINDLE_LASER_PWM_PIN), ocr ^ SPINDLE_LASER_PWM_OFF);

+ 1
- 1
Marlin/src/lcd/menu/menu_spindle_laser.cpp View File

74
       ACTION_ITEM(MSG_LASER_FIRE_PULSE, cutter.test_fire_pulse);
74
       ACTION_ITEM(MSG_LASER_FIRE_PULSE, cutter.test_fire_pulse);
75
     #endif
75
     #endif
76
 
76
 
77
-    #if BOTH(MARLIN_DEV_MODE, HAL_CAN_SET_PWM_FREQ) && defined(SPINDLE_LASER_FREQUENCY)
77
+    #if BOTH(MARLIN_DEV_MODE, HAL_CAN_SET_PWM_FREQ) && SPINDLE_LASER_FREQUENCY
78
       EDIT_ITEM_FAST(CUTTER_MENU_FREQUENCY_TYPE, MSG_CUTTER_FREQUENCY, &cutter.frequency, 2000, 80000, cutter.refresh_frequency);
78
       EDIT_ITEM_FAST(CUTTER_MENU_FREQUENCY_TYPE, MSG_CUTTER_FREQUENCY, &cutter.frequency, 2000, 80000, cutter.refresh_frequency);
79
     #endif
79
     #endif
80
 
80
 

Loading…
Cancel
Save