Преглед изворни кода

🎨 Misc. spindle/laser adjustments

Scott Lahteine пре 3 година
родитељ
комит
ab797a0995

+ 1
- 1
Marlin/src/HAL/AVR/inc/SanityCheck.h Прегледај датотеку

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

+ 3
- 7
Marlin/src/HAL/LPC1768/fast_pwm.cpp Прегледај датотеку

@@ -30,12 +30,8 @@ void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255
30 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 37
 #endif // TARGET_LPC1768

+ 3
- 5
Marlin/src/feature/spindle_laser.cpp Прегледај датотеку

@@ -68,7 +68,7 @@ void SpindleLaser::init() {
68 68
     SET_PWM(SPINDLE_LASER_PWM_PIN);
69 69
     set_pwm_duty(pin_t(SPINDLE_LASER_PWM_PIN), SPINDLE_LASER_PWM_OFF); // Set to lowest speed
70 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 72
     set_pwm_frequency(pin_t(SPINDLE_LASER_PWM_PIN), SPINDLE_LASER_FREQUENCY);
73 73
     TERN_(MARLIN_DEV_MODE, frequency = SPINDLE_LASER_FREQUENCY);
74 74
   #endif
@@ -78,9 +78,7 @@ void SpindleLaser::init() {
78 78
   #if ENABLED(AIR_ASSIST)
79 79
     OUT_WRITE(AIR_ASSIST_PIN, !AIR_ASSIST_ACTIVE);                    // Init Air Assist OFF
80 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 84
 #if ENABLED(SPINDLE_LASER_USE_PWM)
@@ -90,7 +88,7 @@ void SpindleLaser::init() {
90 88
    * @param ocr Power value
91 89
    */
92 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 92
       set_pwm_frequency(pin_t(SPINDLE_LASER_PWM_PIN), TERN(MARLIN_DEV_MODE, frequency, SPINDLE_LASER_FREQUENCY));
95 93
     #endif
96 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 Прегледај датотеку

@@ -74,7 +74,7 @@
74 74
       ACTION_ITEM(MSG_LASER_FIRE_PULSE, cutter.test_fire_pulse);
75 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 78
       EDIT_ITEM_FAST(CUTTER_MENU_FREQUENCY_TYPE, MSG_CUTTER_FREQUENCY, &cutter.frequency, 2000, 80000, cutter.refresh_frequency);
79 79
     #endif
80 80
 

Loading…
Откажи
Сачувај