Browse Source

📝 KHz => kHz (#23512)

Keith Bennett 3 years ago
parent
commit
3e2a38b653
No account linked to committer's email address

+ 6
- 6
Marlin/Configuration_adv.h View File

561
  * FAST_PWM_FAN_FREQUENCY
561
  * FAST_PWM_FAN_FREQUENCY
562
  *   Set this to your desired frequency.
562
  *   Set this to your desired frequency.
563
  *   For AVR, if left undefined this defaults to F = F_CPU/(2*255*1)
563
  *   For AVR, if left undefined this defaults to F = F_CPU/(2*255*1)
564
- *            i.e., F = 31.4KHz on 16MHz microcontrollers or F = 39.2KHz on 20MHz microcontrollers.
564
+ *            i.e., F = 31.4kHz on 16MHz microcontrollers or F = 39.2kHz on 20MHz microcontrollers.
565
  *   For non AVR, if left undefined this defaults to F = 1Khz.
565
  *   For non AVR, if left undefined this defaults to F = 1Khz.
566
  *   This F value is only to protect the hardware from an absence of configuration
566
  *   This F value is only to protect the hardware from an absence of configuration
567
  *   and not to complete it when users are not aware that the frequency must be specifically set to support the target board.
567
  *   and not to complete it when users are not aware that the frequency must be specifically set to support the target board.
571
  *
571
  *
572
  * USE_OCR2A_AS_TOP [undefined by default]
572
  * USE_OCR2A_AS_TOP [undefined by default]
573
  *   Boards that use TIMER2 for PWM have limitations resulting in only a few possible frequencies on TIMER2:
573
  *   Boards that use TIMER2 for PWM have limitations resulting in only a few possible frequencies on TIMER2:
574
- *   16MHz MCUs: [62.5KHz, 31.4KHz (default), 7.8KHz, 3.92KHz, 1.95KHz, 977Hz, 488Hz, 244Hz, 60Hz, 122Hz, 30Hz]
575
- *   20MHz MCUs: [78.1KHz, 39.2KHz (default), 9.77KHz, 4.9KHz, 2.44KHz, 1.22KHz, 610Hz, 305Hz, 153Hz, 76Hz, 38Hz]
574
+ *   16MHz MCUs: [62.5kHz, 31.4kHz (default), 7.8kHz, 3.92kHz, 1.95kHz, 977Hz, 488Hz, 244Hz, 60Hz, 122Hz, 30Hz]
575
+ *   20MHz MCUs: [78.1kHz, 39.2kHz (default), 9.77kHz, 4.9kHz, 2.44kHz, 1.22kHz, 610Hz, 305Hz, 153Hz, 76Hz, 38Hz]
576
  *   A greater range can be achieved by enabling USE_OCR2A_AS_TOP. But note that this option blocks the use of
576
  *   A greater range can be achieved by enabling USE_OCR2A_AS_TOP. But note that this option blocks the use of
577
  *   PWM on pin OC2A. Only use this option if you don't need PWM on 0C2A. (Check your schematic.)
577
  *   PWM on pin OC2A. Only use this option if you don't need PWM on 0C2A. (Check your schematic.)
578
  *   USE_OCR2A_AS_TOP sacrifices duty cycle control resolution to achieve this broader range of frequencies.
578
  *   USE_OCR2A_AS_TOP sacrifices duty cycle control resolution to achieve this broader range of frequencies.
1179
 
1179
 
1180
 /**
1180
 /**
1181
  * Adaptive Step Smoothing increases the resolution of multi-axis moves, particularly at step frequencies
1181
  * Adaptive Step Smoothing increases the resolution of multi-axis moves, particularly at step frequencies
1182
- * below 1KHz (for AVR) or 10KHz (for ARM), where aliasing between axes in multi-axis moves causes audible
1182
+ * below 1kHz (for AVR) or 10kHz (for ARM), where aliasing between axes in multi-axis moves causes audible
1183
  * vibration and surface artifacts. The algorithm adapts to provide the best possible step smoothing at the
1183
  * vibration and surface artifacts. The algorithm adapts to provide the best possible step smoothing at the
1184
  * lowest stepping frequencies.
1184
  * lowest stepping frequencies.
1185
  */
1185
  */
3419
 
3419
 
3420
   /**
3420
   /**
3421
    * PHOTO_PULSES_US may need adjustment depending on board and camera model.
3421
    * PHOTO_PULSES_US may need adjustment depending on board and camera model.
3422
-   * Pin must be running at 48.4KHz.
3422
+   * Pin must be running at 48.4kHz.
3423
    * Be sure to use a PHOTOGRAPH_PIN which can rise and fall quick enough.
3423
    * Be sure to use a PHOTOGRAPH_PIN which can rise and fall quick enough.
3424
    * (e.g., MKS SBase temp sensor pin was too slow, so used P1.23 on J8.)
3424
    * (e.g., MKS SBase temp sensor pin was too slow, so used P1.23 on J8.)
3425
    *
3425
    *
3426
    *  Example pulse data for Nikon: https://bit.ly/2FKD0Aq
3426
    *  Example pulse data for Nikon: https://bit.ly/2FKD0Aq
3427
    *                     IR Wiring: https://git.io/JvJf7
3427
    *                     IR Wiring: https://git.io/JvJf7
3428
    */
3428
    */
3429
-  //#define PHOTO_PULSES_US { 2000, 27850, 400, 1580, 400, 3580, 400 }  // (µs) Durations for each 48.4KHz oscillation
3429
+  //#define PHOTO_PULSES_US { 2000, 27850, 400, 1580, 400, 3580, 400 }  // (µs) Durations for each 48.4kHz oscillation
3430
   #ifdef PHOTO_PULSES_US
3430
   #ifdef PHOTO_PULSES_US
3431
     #define PHOTO_PULSE_DELAY_US 13 // (µs) Approximate duration of each HIGH and LOW pulse in the oscillation
3431
     #define PHOTO_PULSE_DELAY_US 13 // (µs) Approximate duration of each HIGH and LOW pulse in the oscillation
3432
   #endif
3432
   #endif

+ 2
- 2
Marlin/src/HAL/AVR/fastio.cpp View File

245
   float count = 0;
245
   float count = 0;
246
   if (hz > 0 && (dca || dcb || dcc)) {
246
   if (hz > 0 && (dca || dcb || dcc)) {
247
     count = float(F_CPU) / hz;            // 1x prescaler, TOP for 16MHz base freq.
247
     count = float(F_CPU) / hz;            // 1x prescaler, TOP for 16MHz base freq.
248
-    uint16_t prescaler;                   // Range of 30.5Hz (65535) 64.5KHz (>31)
248
+    uint16_t prescaler;                   // Range of 30.5Hz (65535) 64.5kHz (>31)
249
 
249
 
250
          if (count >= 255. * 256.) { prescaler = 1024; SET_CS(5, PRESCALER_1024); }
250
          if (count >= 255. * 256.) { prescaler = 1024; SET_CS(5, PRESCALER_1024); }
251
     else if (count >= 255. * 64.)  { prescaler = 256;  SET_CS(5,  PRESCALER_256); }
251
     else if (count >= 255. * 64.)  { prescaler = 256;  SET_CS(5,  PRESCALER_256); }
277
     // Restore the default for Timer 5
277
     // Restore the default for Timer 5
278
     SET_WGM(5, PWM_PC_8);                 // PWM 8-bit (Phase Correct)
278
     SET_WGM(5, PWM_PC_8);                 // PWM 8-bit (Phase Correct)
279
     SET_COMS(5, NORMAL, NORMAL, NORMAL);  // Do nothing
279
     SET_COMS(5, NORMAL, NORMAL, NORMAL);  // Do nothing
280
-    SET_CS(5, PRESCALER_64);              // 16MHz / 64 = 250KHz
280
+    SET_CS(5, PRESCALER_64);              // 16MHz / 64 = 250kHz
281
     OCR5A = OCR5B = OCR5C = 0;
281
     OCR5A = OCR5B = OCR5C = 0;
282
   }
282
   }
283
   return round(count);
283
   return round(count);

+ 3
- 3
Marlin/src/HAL/DUE/HAL_SPI.cpp View File

491
    *  1 :  4 - 5 MHz
491
    *  1 :  4 - 5 MHz
492
    *  2 :  2 - 2.5 MHz
492
    *  2 :  2 - 2.5 MHz
493
    *  3 :  1 - 1.25 MHz
493
    *  3 :  1 - 1.25 MHz
494
-   *  4 :  500 - 625 KHz
495
-   *  5 :  250 - 312 KHz
496
-   *  6 :  125 - 156 KHz
494
+   *  4 :  500 - 625 kHz
495
+   *  5 :  250 - 312 kHz
496
+   *  6 :  125 - 156 kHz
497
    */
497
    */
498
   void spiInit(uint8_t spiRate) {
498
   void spiInit(uint8_t spiRate) {
499
     switch (spiRate) {
499
     switch (spiRate) {

+ 1
- 1
Marlin/src/HAL/DUE/fastio/G2_PWM.cpp View File

25
  * is NOT used to directly toggle pins. The ISR writes to the pin assigned to
25
  * is NOT used to directly toggle pins. The ISR writes to the pin assigned to
26
  * that interrupt.
26
  * that interrupt.
27
  *
27
  *
28
- * All PWMs use the same repetition rate.  The G2 needs about 10KHz min in order to
28
+ * All PWMs use the same repetition rate.  The G2 needs about 10kHz min in order to
29
  * not have obvious ripple on the Vref signals.
29
  * not have obvious ripple on the Vref signals.
30
  *
30
  *
31
  * The data structures are setup to minimize the computation done by the ISR which
31
  * The data structures are setup to minimize the computation done by the ISR which

+ 1
- 1
Marlin/src/HAL/DUE/pinsDebug.h View File

53
  *     The net result is that both the g_pinStatus[pin] array and the PIO_OSR register
53
  *     The net result is that both the g_pinStatus[pin] array and the PIO_OSR register
54
  *     needs to be looked at when determining if a pin is an input or an output.
54
  *     needs to be looked at when determining if a pin is an input or an output.
55
  *
55
  *
56
- * b) Due has only pins 6, 7, 8 & 9 enabled for PWMs.  FYI - they run at 1KHz
56
+ * b) Due has only pins 6, 7, 8 & 9 enabled for PWMs.  FYI - they run at 1kHz
57
  *
57
  *
58
  * c) NUM_DIGITAL_PINS does not include the analog pins
58
  * c) NUM_DIGITAL_PINS does not include the analog pins
59
  *
59
  *

+ 1
- 1
Marlin/src/HAL/DUE/timers.cpp View File

62
   Timer_clock1: Prescaler 2 -> 42MHz
62
   Timer_clock1: Prescaler 2 -> 42MHz
63
   Timer_clock2: Prescaler 8 -> 10.5MHz
63
   Timer_clock2: Prescaler 8 -> 10.5MHz
64
   Timer_clock3: Prescaler 32 -> 2.625MHz
64
   Timer_clock3: Prescaler 32 -> 2.625MHz
65
-  Timer_clock4: Prescaler 128 -> 656.25KHz
65
+  Timer_clock4: Prescaler 128 -> 656.25kHz
66
 */
66
 */
67
 
67
 
68
 void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) {
68
 void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) {

+ 3
- 3
Marlin/src/HAL/DUE/usb/genclk.h View File

74
 //@{
74
 //@{
75
 
75
 
76
 enum genclk_source {
76
 enum genclk_source {
77
-	GENCLK_PCK_SRC_SLCK_RC       = 0, //!< Internal 32KHz RC oscillator as PCK source clock
78
-	GENCLK_PCK_SRC_SLCK_XTAL     = 1, //!< External 32KHz crystal oscillator as PCK source clock
79
-	GENCLK_PCK_SRC_SLCK_BYPASS   = 2, //!< External 32KHz bypass oscillator as PCK source clock
77
+	GENCLK_PCK_SRC_SLCK_RC       = 0, //!< Internal 32kHz RC oscillator as PCK source clock
78
+	GENCLK_PCK_SRC_SLCK_XTAL     = 1, //!< External 32kHz crystal oscillator as PCK source clock
79
+	GENCLK_PCK_SRC_SLCK_BYPASS   = 2, //!< External 32kHz bypass oscillator as PCK source clock
80
 	GENCLK_PCK_SRC_MAINCK_4M_RC  = 3, //!< Internal 4MHz RC oscillator as PCK source clock
80
 	GENCLK_PCK_SRC_MAINCK_4M_RC  = 3, //!< Internal 4MHz RC oscillator as PCK source clock
81
 	GENCLK_PCK_SRC_MAINCK_8M_RC  = 4, //!< Internal 8MHz RC oscillator as PCK source clock
81
 	GENCLK_PCK_SRC_MAINCK_8M_RC  = 4, //!< Internal 8MHz RC oscillator as PCK source clock
82
 	GENCLK_PCK_SRC_MAINCK_12M_RC = 5, //!< Internal 12MHz RC oscillator as PCK source clock
82
 	GENCLK_PCK_SRC_MAINCK_12M_RC = 5, //!< Internal 12MHz RC oscillator as PCK source clock

+ 6
- 6
Marlin/src/HAL/DUE/usb/osc.h View File

93
 
93
 
94
 //! \name Oscillator identifiers
94
 //! \name Oscillator identifiers
95
 //@{
95
 //@{
96
-#define OSC_SLCK_32K_RC             0    //!< Internal 32KHz RC oscillator.
97
-#define OSC_SLCK_32K_XTAL           1    //!< External 32KHz crystal oscillator.
98
-#define OSC_SLCK_32K_BYPASS         2    //!< External 32KHz bypass oscillator.
96
+#define OSC_SLCK_32K_RC             0    //!< Internal 32kHz RC oscillator.
97
+#define OSC_SLCK_32K_XTAL           1    //!< External 32kHz crystal oscillator.
98
+#define OSC_SLCK_32K_BYPASS         2    //!< External 32kHz bypass oscillator.
99
 #define OSC_MAINCK_4M_RC            3    //!< Internal 4MHz RC oscillator.
99
 #define OSC_MAINCK_4M_RC            3    //!< Internal 4MHz RC oscillator.
100
 #define OSC_MAINCK_8M_RC            4    //!< Internal 8MHz RC oscillator.
100
 #define OSC_MAINCK_8M_RC            4    //!< Internal 8MHz RC oscillator.
101
 #define OSC_MAINCK_12M_RC           5    //!< Internal 12MHz RC oscillator.
101
 #define OSC_MAINCK_12M_RC           5    //!< Internal 12MHz RC oscillator.
105
 
105
 
106
 //! \name Oscillator clock speed in hertz
106
 //! \name Oscillator clock speed in hertz
107
 //@{
107
 //@{
108
-#define OSC_SLCK_32K_RC_HZ          CHIP_FREQ_SLCK_RC               //!< Internal 32KHz RC oscillator.
109
-#define OSC_SLCK_32K_XTAL_HZ        BOARD_FREQ_SLCK_XTAL            //!< External 32KHz crystal oscillator.
110
-#define OSC_SLCK_32K_BYPASS_HZ      BOARD_FREQ_SLCK_BYPASS          //!< External 32KHz bypass oscillator.
108
+#define OSC_SLCK_32K_RC_HZ          CHIP_FREQ_SLCK_RC               //!< Internal 32kHz RC oscillator.
109
+#define OSC_SLCK_32K_XTAL_HZ        BOARD_FREQ_SLCK_XTAL            //!< External 32kHz crystal oscillator.
110
+#define OSC_SLCK_32K_BYPASS_HZ      BOARD_FREQ_SLCK_BYPASS          //!< External 32kHz bypass oscillator.
111
 #define OSC_MAINCK_4M_RC_HZ         CHIP_FREQ_MAINCK_RC_4MHZ        //!< Internal 4MHz RC oscillator.
111
 #define OSC_MAINCK_4M_RC_HZ         CHIP_FREQ_MAINCK_RC_4MHZ        //!< Internal 4MHz RC oscillator.
112
 #define OSC_MAINCK_8M_RC_HZ         CHIP_FREQ_MAINCK_RC_8MHZ        //!< Internal 8MHz RC oscillator.
112
 #define OSC_MAINCK_8M_RC_HZ         CHIP_FREQ_MAINCK_RC_8MHZ        //!< Internal 8MHz RC oscillator.
113
 #define OSC_MAINCK_12M_RC_HZ        CHIP_FREQ_MAINCK_RC_12MHZ       //!< Internal 12MHz RC oscillator.
113
 #define OSC_MAINCK_12M_RC_HZ        CHIP_FREQ_MAINCK_RC_12MHZ       //!< Internal 12MHz RC oscillator.

+ 3
- 3
Marlin/src/HAL/DUE/usb/sysclk.h View File

156
 
156
 
157
 //! \name Master Clock Sources (MCK)
157
 //! \name Master Clock Sources (MCK)
158
 //@{
158
 //@{
159
-#define SYSCLK_SRC_SLCK_RC              0       //!< Internal 32KHz RC oscillator as master source clock
160
-#define SYSCLK_SRC_SLCK_XTAL            1       //!< External 32KHz crystal oscillator as master source clock
161
-#define SYSCLK_SRC_SLCK_BYPASS          2       //!< External 32KHz bypass oscillator as master source clock
159
+#define SYSCLK_SRC_SLCK_RC              0       //!< Internal 32kHz RC oscillator as master source clock
160
+#define SYSCLK_SRC_SLCK_XTAL            1       //!< External 32kHz crystal oscillator as master source clock
161
+#define SYSCLK_SRC_SLCK_BYPASS          2       //!< External 32kHz bypass oscillator as master source clock
162
 #define SYSCLK_SRC_MAINCK_4M_RC         3       //!< Internal 4MHz RC oscillator as master source clock
162
 #define SYSCLK_SRC_MAINCK_4M_RC         3       //!< Internal 4MHz RC oscillator as master source clock
163
 #define SYSCLK_SRC_MAINCK_8M_RC         4       //!< Internal 8MHz RC oscillator as master source clock
163
 #define SYSCLK_SRC_MAINCK_8M_RC         4       //!< Internal 8MHz RC oscillator as master source clock
164
 #define SYSCLK_SRC_MAINCK_12M_RC        5       //!< Internal 12MHz RC oscillator as master source clock
164
 #define SYSCLK_SRC_MAINCK_12M_RC        5       //!< Internal 12MHz RC oscillator as master source clock

+ 1
- 1
Marlin/src/HAL/DUE/watchdog.cpp View File

39
     uint32_t timeout = TERN(WATCHDOG_DURATION_8S, 8000, 4000);
39
     uint32_t timeout = TERN(WATCHDOG_DURATION_8S, 8000, 4000);
40
 
40
 
41
     // Calculate timeout value in WDT counter ticks: This assumes
41
     // Calculate timeout value in WDT counter ticks: This assumes
42
-    // the slow clock is running at 32.768 KHz watchdog
42
+    // the slow clock is running at 32.768 kHz watchdog
43
     // frequency is therefore 32768 / 128 = 256 Hz
43
     // frequency is therefore 32768 / 128 = 256 Hz
44
     timeout = (timeout << 8) / 1000;
44
     timeout = (timeout << 8) / 1000;
45
     if (timeout == 0)
45
     if (timeout == 0)

+ 1
- 1
Marlin/src/HAL/ESP32/i2s.cpp View File

176
    *
176
    *
177
    *   fwclk = fbclk / 32
177
    *   fwclk = fbclk / 32
178
    *
178
    *
179
-   *   for fwclk = 250KHz (4µS pulse time)
179
+   *   for fwclk = 250kHz (4µS pulse time)
180
    *      N = 10
180
    *      N = 10
181
    *      M = 20
181
    *      M = 20
182
    */
182
    */

+ 1
- 1
Marlin/src/HAL/LPC1768/u8g/LCD_pin_routines.c View File

26
  * These are based on the LPC1768 pinMode, digitalRead & digitalWrite routines.
26
  * These are based on the LPC1768 pinMode, digitalRead & digitalWrite routines.
27
  *
27
  *
28
  * Couldn't just call exact copies because the overhead killed the LCD update speed
28
  * Couldn't just call exact copies because the overhead killed the LCD update speed
29
- * With an intermediate level the softspi was running in the 10-20KHz range which
29
+ * With an intermediate level the softspi was running in the 10-20kHz range which
30
  * resulted in using about about 25% of the CPU's time.
30
  * resulted in using about about 25% of the CPU's time.
31
  */
31
  */
32
 
32
 

+ 1
- 1
Marlin/src/HAL/LPC1768/u8g/LCD_pin_routines.h View File

27
  * These are based on the LPC1768 pinMode, digitalRead & digitalWrite routines.
27
  * These are based on the LPC1768 pinMode, digitalRead & digitalWrite routines.
28
  *
28
  *
29
  * Couldn't just call exact copies because the overhead killed the LCD update speed
29
  * Couldn't just call exact copies because the overhead killed the LCD update speed
30
- * With an intermediate level the softspi was running in the 10-20KHz range which
30
+ * With an intermediate level the softspi was running in the 10-20kHz range which
31
  * resulted in using about about 25% of the CPU's time.
31
  * resulted in using about about 25% of the CPU's time.
32
  */
32
  */
33
 
33
 

+ 1
- 1
Marlin/src/HAL/NATIVE_SIM/u8g/LCD_pin_routines.cpp View File

26
  * These are based on the LPC1768 pinMode, digitalRead & digitalWrite routines.
26
  * These are based on the LPC1768 pinMode, digitalRead & digitalWrite routines.
27
  *
27
  *
28
  * Couldn't just call exact copies because the overhead killed the LCD update speed
28
  * Couldn't just call exact copies because the overhead killed the LCD update speed
29
- * With an intermediate level the softspi was running in the 10-20KHz range which
29
+ * With an intermediate level the softspi was running in the 10-20kHz range which
30
  * resulted in using about about 25% of the CPU's time.
30
  * resulted in using about about 25% of the CPU's time.
31
  */
31
  */
32
 
32
 

+ 1
- 1
Marlin/src/HAL/NATIVE_SIM/u8g/LCD_pin_routines.h View File

27
  * These are based on the LPC1768 pinMode, digitalRead & digitalWrite routines.
27
  * These are based on the LPC1768 pinMode, digitalRead & digitalWrite routines.
28
  *
28
  *
29
  * Couldn't just call exact copies because the overhead killed the LCD update speed
29
  * Couldn't just call exact copies because the overhead killed the LCD update speed
30
- * With an intermediate level the softspi was running in the 10-20KHz range which
30
+ * With an intermediate level the softspi was running in the 10-20kHz range which
31
  * resulted in using about about 25% of the CPU's time.
31
  * resulted in using about about 25% of the CPU's time.
32
  */
32
  */
33
 
33
 

+ 1
- 1
Marlin/src/HAL/SAMD51/timers.cpp View File

79
     rtc->MODE0.INTENCLR.reg = RTC_MODE0_INTENCLR_CMP0;
79
     rtc->MODE0.INTENCLR.reg = RTC_MODE0_INTENCLR_CMP0;
80
 
80
 
81
     // RTC clock setup
81
     // RTC clock setup
82
-    OSC32KCTRL->RTCCTRL.reg = OSC32KCTRL_RTCCTRL_RTCSEL_XOSC32K;  // External 32.768KHz oscillator
82
+    OSC32KCTRL->RTCCTRL.reg = OSC32KCTRL_RTCCTRL_RTCSEL_XOSC32K;  // External 32.768kHz oscillator
83
 
83
 
84
     // Stop timer, just in case, to be able to reconfigure it
84
     // Stop timer, just in case, to be able to reconfigure it
85
     rtc->MODE0.CTRLA.bit.ENABLE = false;
85
     rtc->MODE0.CTRLA.bit.ENABLE = false;

+ 1
- 1
Marlin/src/HAL/STM32/sdio.cpp View File

59
 /*
59
 /*
60
   SDIO_INIT_CLK_DIV is 118
60
   SDIO_INIT_CLK_DIV is 118
61
   SDIO clock frequency is 48MHz / (TRANSFER_CLOCK_DIV + 2)
61
   SDIO clock frequency is 48MHz / (TRANSFER_CLOCK_DIV + 2)
62
-  SDIO init clock frequency should not exceed 400KHz = 48MHz / (118 + 2)
62
+  SDIO init clock frequency should not exceed 400kHz = 48MHz / (118 + 2)
63
 
63
 
64
   Default TRANSFER_CLOCK_DIV is 2 (118 / 40)
64
   Default TRANSFER_CLOCK_DIV is 2 (118 / 40)
65
   Default SDIO clock frequency is 48MHz / (2 + 2) = 12 MHz
65
   Default SDIO clock frequency is 48MHz / (2 + 2) = 12 MHz

+ 1
- 1
Marlin/src/HAL/STM32/timers.h View File

48
 #define TIMER_INDEX_(T) TIMER##T##_INDEX  // TIMER#_INDEX enums (timer_index_t) depend on TIM#_BASE defines.
48
 #define TIMER_INDEX_(T) TIMER##T##_INDEX  // TIMER#_INDEX enums (timer_index_t) depend on TIM#_BASE defines.
49
 #define TIMER_INDEX(T) TIMER_INDEX_(T)    // Convert Timer ID to HardwareTimer_Handle index.
49
 #define TIMER_INDEX(T) TIMER_INDEX_(T)    // Convert Timer ID to HardwareTimer_Handle index.
50
 
50
 
51
-#define TEMP_TIMER_FREQUENCY 1000   // Temperature::isr() is expected to be called at around 1KHz
51
+#define TEMP_TIMER_FREQUENCY 1000   // Temperature::isr() is expected to be called at around 1kHz
52
 
52
 
53
 // TODO: get rid of manual rate/prescale/ticks/cycles taken for procedures in stepper.cpp
53
 // TODO: get rid of manual rate/prescale/ticks/cycles taken for procedures in stepper.cpp
54
 #define STEPPER_TIMER_RATE 2000000 // 2 Mhz
54
 #define STEPPER_TIMER_RATE 2000000 // 2 Mhz

+ 1
- 1
Marlin/src/HAL/STM32F1/timers.cpp View File

40
  * Timer_clock1: Prescaler   2 ->  36    MHz
40
  * Timer_clock1: Prescaler   2 ->  36    MHz
41
  * Timer_clock2: Prescaler   8 ->   9    MHz
41
  * Timer_clock2: Prescaler   8 ->   9    MHz
42
  * Timer_clock3: Prescaler  32 ->   2.25 MHz
42
  * Timer_clock3: Prescaler  32 ->   2.25 MHz
43
- * Timer_clock4: Prescaler 128 -> 562.5  KHz
43
+ * Timer_clock4: Prescaler 128 -> 562.5  kHz
44
  */
44
  */
45
 
45
 
46
 /**
46
 /**

+ 1
- 1
Marlin/src/HAL/TEENSY31_32/timers.h View File

41
 #define FTM0_TIMER_PRESCALE_BITS 0b011
41
 #define FTM0_TIMER_PRESCALE_BITS 0b011
42
 #define FTM1_TIMER_PRESCALE_BITS 0b010
42
 #define FTM1_TIMER_PRESCALE_BITS 0b010
43
 
43
 
44
-#define FTM0_TIMER_RATE (F_BUS / (FTM0_TIMER_PRESCALE)) // 60MHz / 8 = 7500KHz
44
+#define FTM0_TIMER_RATE (F_BUS / (FTM0_TIMER_PRESCALE)) // 60MHz / 8 = 7500kHz
45
 #define FTM1_TIMER_RATE (F_BUS / (FTM1_TIMER_PRESCALE)) // 60MHz / 4 = 15MHz
45
 #define FTM1_TIMER_RATE (F_BUS / (FTM1_TIMER_PRESCALE)) // 60MHz / 4 = 15MHz
46
 
46
 
47
 #define HAL_TIMER_RATE         (FTM0_TIMER_RATE)
47
 #define HAL_TIMER_RATE         (FTM0_TIMER_RATE)

+ 1
- 1
Marlin/src/HAL/TEENSY35_36/timers.h View File

40
 #define FTM0_TIMER_PRESCALE_BITS 0b011
40
 #define FTM0_TIMER_PRESCALE_BITS 0b011
41
 #define FTM1_TIMER_PRESCALE_BITS 0b010
41
 #define FTM1_TIMER_PRESCALE_BITS 0b010
42
 
42
 
43
-#define FTM0_TIMER_RATE (F_BUS / FTM0_TIMER_PRESCALE) // 60MHz / 8 = 7500KHz
43
+#define FTM0_TIMER_RATE (F_BUS / FTM0_TIMER_PRESCALE) // 60MHz / 8 = 7500kHz
44
 #define FTM1_TIMER_RATE (F_BUS / FTM1_TIMER_PRESCALE) // 60MHz / 4 = 15MHz
44
 #define FTM1_TIMER_RATE (F_BUS / FTM1_TIMER_PRESCALE) // 60MHz / 4 = 15MHz
45
 
45
 
46
 #define HAL_TIMER_RATE         (FTM0_TIMER_RATE)
46
 #define HAL_TIMER_RATE         (FTM0_TIMER_RATE)

+ 3
- 3
Marlin/src/HAL/shared/HAL_SPI.h View File

38
  *  1 :  4 - 5 MHz
38
  *  1 :  4 - 5 MHz
39
  *  2 :  2 - 2.5 MHz
39
  *  2 :  2 - 2.5 MHz
40
  *  3 :  1 - 1.25 MHz
40
  *  3 :  1 - 1.25 MHz
41
- *  4 :  500 - 625 KHz
42
- *  5 :  250 - 312 KHz
43
- *  6 :  125 - 156 KHz
41
+ *  4 :  500 - 625 kHz
42
+ *  5 :  250 - 312 kHz
43
+ *  6 :  125 - 156 kHz
44
  *
44
  *
45
  *  On AVR, actual speed is F_CPU/2^(1 + index).
45
  *  On AVR, actual speed is F_CPU/2^(1 + index).
46
  *  On other platforms, speed should be in range given above where possible.
46
  *  On other platforms, speed should be in range given above where possible.

+ 1
- 1
Marlin/src/feature/digipot/digipot_mcp4451.cpp View File

82
 
82
 
83
 void DigipotI2C::init() {
83
 void DigipotI2C::init() {
84
   #if MB(MKS_SBASE)
84
   #if MB(MKS_SBASE)
85
-    configure_i2c(16); // Set clock_option to 16 ensure I2C is initialized at 400KHz
85
+    configure_i2c(16); // Set clock_option to 16 ensure I2C is initialized at 400kHz
86
   #else
86
   #else
87
     Wire.begin();
87
     Wire.begin();
88
   #endif
88
   #endif

+ 1
- 1
Marlin/src/gcode/config/M672.cpp View File

53
 //  b7 b6 b5 b4 ~b4  ... hi bits, NOT last bit
53
 //  b7 b6 b5 b4 ~b4  ... hi bits, NOT last bit
54
 //  b3 b2 b1 b0 ~b0  ... lo bits, NOT last bit
54
 //  b3 b2 b1 b0 ~b0  ... lo bits, NOT last bit
55
 //
55
 //
56
-void M672_send(uint8_t b) {    // bit rate requirement: 1KHz +/- 30%
56
+void M672_send(uint8_t b) {    // bit rate requirement: 1kHz +/- 30%
57
   LOOP_L_N(bits, 14) {
57
   LOOP_L_N(bits, 14) {
58
     switch (bits) {
58
     switch (bits) {
59
       default: { OUT_WRITE(SMART_EFFECTOR_MOD_PIN, !!(b & 0x80)); b <<= 1; break; } // send bit, shift next into place
59
       default: { OUT_WRITE(SMART_EFFECTOR_MOD_PIN, !!(b & 0x80)); b <<= 1; break; } // send bit, shift next into place

+ 1
- 1
Marlin/src/gcode/control/M3-M5.cpp View File

43
  *
43
  *
44
  *  If no PWM pin is defined then M3/M4 just turns it on.
44
  *  If no PWM pin is defined then M3/M4 just turns it on.
45
  *
45
  *
46
- *  At least 12.8KHz (50Hz * 256) is needed for Spindle PWM.
46
+ *  At least 12.8kHz (50Hz * 256) is needed for Spindle PWM.
47
  *  Hardware PWM is required on AVR. ISRs are too slow.
47
  *  Hardware PWM is required on AVR. ISRs are too slow.
48
  *
48
  *
49
  * NOTE: WGM for timers 3, 4, and 5 must be either Mode 1 or Mode 5.
49
  * NOTE: WGM for timers 3, 4, and 5 must be either Mode 1 or Mode 5.

+ 2
- 2
Marlin/src/module/endstops.cpp View File

352
 
352
 
353
 } // Endstops::init
353
 } // Endstops::init
354
 
354
 
355
-// Called at ~1KHz from Temperature ISR: Poll endstop state if required
355
+// Called at ~1kHz from Temperature ISR: Poll endstop state if required
356
 void Endstops::poll() {
356
 void Endstops::poll() {
357
 
357
 
358
   TERN_(PINS_DEBUGGING, run_monitor()); // Report changes in endstop status
358
   TERN_(PINS_DEBUGGING, run_monitor()); // Report changes in endstop status
403
 void Endstops::resync() {
403
 void Endstops::resync() {
404
   if (!abort_enabled()) return;     // If endstops/probes are disabled the loop below can hang
404
   if (!abort_enabled()) return;     // If endstops/probes are disabled the loop below can hang
405
 
405
 
406
-  // Wait for Temperature ISR to run at least once (runs at 1KHz)
406
+  // Wait for Temperature ISR to run at least once (runs at 1kHz)
407
   TERN(ENDSTOP_INTERRUPTS_FEATURE, update(), safe_delay(2));
407
   TERN(ENDSTOP_INTERRUPTS_FEATURE, update(), safe_delay(2));
408
   while (TERN0(ENDSTOP_NOISE_THRESHOLD, endstop_poll_count)) safe_delay(1);
408
   while (TERN0(ENDSTOP_NOISE_THRESHOLD, endstop_poll_count)) safe_delay(1);
409
 }
409
 }

+ 1
- 1
Marlin/src/module/planner.cpp View File

2495
         if (extruder_advance_K[active_extruder] * block->e_D_ratio * block->acceleration * 2 < SQRT(block->nominal_speed_sqr) * block->e_D_ratio)
2495
         if (extruder_advance_K[active_extruder] * block->e_D_ratio * block->acceleration * 2 < SQRT(block->nominal_speed_sqr) * block->e_D_ratio)
2496
           SERIAL_ECHOLNPGM("More than 2 steps per eISR loop executed.");
2496
           SERIAL_ECHOLNPGM("More than 2 steps per eISR loop executed.");
2497
         if (block->advance_speed < 200)
2497
         if (block->advance_speed < 200)
2498
-          SERIAL_ECHOLNPGM("eISR running at > 10KHz.");
2498
+          SERIAL_ECHOLNPGM("eISR running at > 10kHz.");
2499
       #endif
2499
       #endif
2500
     }
2500
     }
2501
   #endif
2501
   #endif

+ 1
- 1
Marlin/src/module/planner.h View File

883
     static void finish_and_disable();
883
     static void finish_and_disable();
884
 
884
 
885
     // Periodic handler to manage the cleaning buffer counter
885
     // Periodic handler to manage the cleaning buffer counter
886
-    // Called from the Temperature ISR at ~1KHz
886
+    // Called from the Temperature ISR at ~1kHz
887
     static void isr() { if (cleaning_buffer_counter) --cleaning_buffer_counter; }
887
     static void isr() { if (cleaning_buffer_counter) --cleaning_buffer_counter; }
888
 
888
 
889
     /**
889
     /**

+ 3
- 3
Marlin/src/module/temperature.cpp View File

3046
 };
3046
 };
3047
 
3047
 
3048
 /**
3048
 /**
3049
- * Handle various ~1KHz tasks associated with temperature
3050
- *  - Heater PWM (~1KHz with scaler)
3049
+ * Handle various ~1kHz tasks associated with temperature
3050
+ *  - Heater PWM (~1kHz with scaler)
3051
  *  - LCD Button polling (~500Hz)
3051
  *  - LCD Button polling (~500Hz)
3052
  *  - Start / Read one ADC sensor
3052
  *  - Start / Read one ADC sensor
3053
  *  - Advance Babysteps
3053
  *  - Advance Babysteps
3549
   adc_sensor_state = next_sensor_state;
3549
   adc_sensor_state = next_sensor_state;
3550
 
3550
 
3551
   //
3551
   //
3552
-  // Additional ~1KHz Tasks
3552
+  // Additional ~1kHz Tasks
3553
   //
3553
   //
3554
 
3554
 
3555
   #if ENABLED(BABYSTEPPING) && DISABLED(INTEGRATED_BABYSTEPPING)
3555
   #if ENABLED(BABYSTEPPING) && DISABLED(INTEGRATED_BABYSTEPPING)

+ 1
- 1
buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/hal_conf_custom.h View File

118
 #endif
118
 #endif
119
 
119
 
120
 #ifndef LSE_STARTUP_TIMEOUT
120
 #ifndef LSE_STARTUP_TIMEOUT
121
-  #define LSE_STARTUP_TIMEOUT  50U       // No 32.7KHz LSE on this board, reduced to avoid delays
121
+  #define LSE_STARTUP_TIMEOUT  50U       // No 32.7kHz LSE on this board, reduced to avoid delays
122
 #endif
122
 #endif
123
 
123
 
124
 /* Tip: To avoid modifying this file each time you need to use different HSE,
124
 /* Tip: To avoid modifying this file each time you need to use different HSE,

Loading…
Cancel
Save