RFBomb
diff --git a/‎.gitignore‎
Lines changed: 0 additions & 5 deletions b/‎.gitignore‎
Lines changed: 0 additions & 5 deletions
diff --git a/‎Marlin/Configuration.h‎
Lines changed: 10 additions & 0 deletions b/‎Marlin/Configuration.h‎
Lines changed: 10 additions & 0 deletions
diff --git a/‎Marlin/Version.h‎
Lines changed: 1 addition & 1 deletion b/‎Marlin/Version.h‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎Marlin/src/HAL/AVR/fast_pwm.cpp‎
Lines changed: 34 additions & 14 deletions b/‎Marlin/src/HAL/AVR/fast_pwm.cpp‎
Lines changed: 34 additions & 14 deletions
diff --git a/‎Marlin/src/HAL/NATIVE_SIM/u8g/u8g_com_sw_spi.cpp‎
Lines changed: 1 addition & 4 deletions b/‎Marlin/src/HAL/NATIVE_SIM/u8g/u8g_com_sw_spi.cpp‎
Lines changed: 1 addition & 4 deletions
diff --git a/‎Marlin/src/HAL/STM32/fast_pwm.cpp‎
Lines changed: 26 additions & 46 deletions b/‎Marlin/src/HAL/STM32/fast_pwm.cpp‎
Lines changed: 26 additions & 46 deletions
diff --git a/‎Marlin/src/HAL/STM32F1/fast_pwm.cpp‎
Lines changed: 29 additions & 44 deletions b/‎Marlin/src/HAL/STM32F1/fast_pwm.cpp‎
Lines changed: 29 additions & 44 deletions
diff --git a/‎Marlin/src/MarlinCore.cpp‎
Lines changed: 1 addition & 20 deletions b/‎Marlin/src/MarlinCore.cpp‎
Lines changed: 1 addition & 20 deletions
@@ -168,8 +168,3 @@ __pycache__
 
 # IOLogger logs
 *_log.csv
-
-# Simulation / Native
-eeprom.dat
-imgui.ini
-platformio.ini
@@ -776,6 +776,16 @@
   #define POLAR_SEGMENTS_PER_SECOND 5
 #endif
 
+// Enable for a belt style printer with endless "Z" motion
+//#define BELTPRINTER
+
+// Enable for Polargraph Kinematics
+//#define POLARGRAPH
+#if ENABLED(POLARGRAPH)
+  #define POLARGRAPH_MAX_BELT_LEN 1035.0
+  #define POLAR_SEGMENTS_PER_SECOND 5
+#endif
+
 //===========================================================================
 //============================== Endstop Settings ===========================
 //===========================================================================
 
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-12-13"
+//#define STRING_DISTRIBUTION_DATE "2021-11-07"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
 
@@ -54,8 +54,8 @@ Timer get_pwm_timer(const pin_t pin) {
       case TIMER1A: case TIMER1B:
     #endif
                                         break;
-    #if HAS_TCCR2 || defined(TCCR2A)
-      #if HAS_TCCR2
+    #if defined(TCCR2) || defined(TCCR2A)
+      #ifdef TCCR2
         case TIMER2: {
           Timer timer = {
             /*TCCRnQ*/  { &TCCR2, nullptr, nullptr },
@@ -200,29 +200,43 @@ void set_pwm_frequency(const pin_t pin, int f_desired) {
         res = res_temp_fast;
         j = i;
         // Set the Wave Generation Mode to FAST PWM
-        if (timer.n == 2)
-          wgm = TERN(USE_OCR2A_AS_TOP, WGM2_FAST_PWM_OCR2A, WGM2_FAST_PWM);
-        else
-          wgm = WGM_FAST_PWM_ICRn;
+        if (timer.n == 2) {
+          wgm = (
+            #if ENABLED(USE_OCR2A_AS_TOP)
+              WGM2_FAST_PWM_OCR2A
+            #else
+              WGM2_FAST_PWM
+            #endif
+          );
+        }
+        else wgm = WGM_FAST_PWM_ICRn;
       }
       // If PHASE CORRECT values are closes to desired f
       else if (f_phase_diff < f_diff) {
         f = f_temp_phase_correct;
         res = res_temp_phase_correct;
         j = i;
         // Set the Wave Generation Mode to PWM PHASE CORRECT
-        if (timer.n == 2)
-          wgm = TERN(USE_OCR2A_AS_TOP, WGM2_PWM_PC_OCR2A, WGM2_FAST_PWM);
-        else
-          wgm = WGM_PWM_PC_ICRn;
+        if (timer.n == 2) {
+          wgm = (
+            #if ENABLED(USE_OCR2A_AS_TOP)
+              WGM2_PWM_PC_OCR2A
+            #else
+              WGM2_PWM_PC
+            #endif
+          );
+        }
+        else wgm = WGM_PWM_PC_ICRn;
       }
     }
   }
   _SET_WGMnQ(timer.TCCRnQ, wgm);
   _SET_CSn(timer.TCCRnQ, j);
 
   if (timer.n == 2) {
-    TERN_(USE_OCR2A_AS_TOP, _SET_OCRnQ(timer.OCRnQ, 0, res));  // Set OCR2A value (TOP) = res
+    #if ENABLED(USE_OCR2A_AS_TOP)
+      _SET_OCRnQ(timer.OCRnQ, 0, res);  // Set OCR2A value (TOP) = res
+    #endif
   }
   else
     _SET_ICRn(timer.ICRn, res);         // Set ICRn value (TOP) = res
@@ -243,9 +257,15 @@ void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255
       Timer timer = get_pwm_timer(pin);
       if (timer.n == 0) return; // Don't proceed if protected timer or not recognized
       // Set compare output mode to CLEAR -> SET or SET -> CLEAR (if inverted)
-      _SET_COMnQ(timer.TCCRnQ, timer.q TERN_(HAS_TCCR2, + (timer.q == 2)), COM_CLEAR_SET + invert); // COM20 is on bit 4 of TCCR2, so +1 for q==2
-      const uint16_t top = timer.n == 2 ? TERN(USE_OCR2A_AS_TOP, *timer.OCRnQ[0], 255) : *timer.ICRn;
-      _SET_OCRnQ(timer.OCRnQ, timer.q, uint16_t(uint32_t(v) * top / v_size)); // Scale 8/16-bit v to top value
+      _SET_COMnQ(timer.TCCRnQ, (timer.q
+          #ifdef TCCR2
+            + (timer.q == 2) // COM20 is on bit 4 of TCCR2, thus requires q + 1 in the macro
+          #endif
+        ), COM_CLEAR_SET + invert
+      );
+
+      uint16_t top = (timer.n == 2) ? TERN(USE_OCR2A_AS_TOP, *timer.OCRnQ[0], 255) : *timer.ICRn;
+      _SET_OCRnQ(timer.OCRnQ, timer.q, (v * top + v_size / 2) / v_size); // Scale 8/16-bit v to top value
     }
 
   #else
 
@@ -208,11 +208,8 @@ uint8_t u8g_com_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_pt
   }
 #endif
 
-#elif NONE(TFT_COLOR_UI, TFT_CLASSIC_UI, TFT_LVGL_UI, HAS_MARLINUI_HD44780) && HAS_MARLINUI_U8GLIB
-
+#elif !ANY(TFT_COLOR_UI, TFT_CLASSIC_UI, TFT_LVGL_UI, HAS_MARLINUI_HD44780) && HAS_MARLINUI_U8GLIB
   #include <U8glib-HAL.h>
   uint8_t u8g_com_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr) {return 0;}
-
 #endif // HAS_MARLINUI_U8GLIB && !IS_U8GLIB_ST7920
-
 #endif // __PLAT_NATIVE_SIM__
@@ -25,59 +25,39 @@
 #ifdef HAL_STM32
 
 #include "../../inc/MarlinConfig.h"
-
-// Array to support sticky frequency sets per timer
-static uint16_t timer_freq[TIMER_NUM];
+#include "timers.h"
 
 void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255*/, const bool invert/*=false*/) {
-  if (!PWM_PIN(pin)) return; // Don't proceed if no hardware timer
-  const PinName pin_name = digitalPinToPinName(pin);
-  TIM_TypeDef * const Instance = (TIM_TypeDef *)pinmap_peripheral(pin_name, PinMap_PWM);
+  if (!PWM_PIN(pin)) return;            // Don't proceed if no hardware timer
+
+  PinName pin_name = digitalPinToPinName(pin);
+  TIM_TypeDef *Instance = (TIM_TypeDef *)pinmap_peripheral(pin_name, PinMap_PWM);
+
+  uint16_t adj_val = Instance->ARR * v / v_size;
+  if (invert) adj_val = Instance->ARR - adj_val;
+  switch (get_pwm_channel(pin_name)) {
+    case TIM_CHANNEL_1: LL_TIM_OC_SetCompareCH1(Instance, adj_val); break;
+    case TIM_CHANNEL_2: LL_TIM_OC_SetCompareCH2(Instance, adj_val); break;
+    case TIM_CHANNEL_3: LL_TIM_OC_SetCompareCH3(Instance, adj_val); break;
+    case TIM_CHANNEL_4: LL_TIM_OC_SetCompareCH4(Instance, adj_val); break;
+  }
+}
 
-  const timer_index_t index = get_timer_index(Instance);
-  const bool needs_freq = (HardwareTimer_Handle[index] == nullptr);
-  if (needs_freq) // A new instance must be set to the default frequency of PWM_FREQUENCY
-    HardwareTimer_Handle[index]->__this = new HardwareTimer((TIM_TypeDef *)pinmap_peripheral(pin_name, PinMap_PWM));
+#if NEEDS_HARDWARE_PWM
 
-  HardwareTimer * const HT = (HardwareTimer *)(HardwareTimer_Handle[index]->__this);
-  const uint32_t channel = STM_PIN_CHANNEL(pinmap_function(pin_name, PinMap_PWM));
-  const TimerModes_t previousMode = HT->getMode(channel);
-  if (previousMode != TIMER_OUTPUT_COMPARE_PWM1)
-    HT->setMode(channel, TIMER_OUTPUT_COMPARE_PWM1, pin);
+  void set_pwm_frequency(const pin_t pin, int f_desired) {
+    if (!PWM_PIN(pin)) return;            // Don't proceed if no hardware timer
 
-  if (needs_freq && timer_freq[index] == 0)     // If the timer is unconfigured and no freq is set then default PWM_FREQUENCY
-    set_pwm_frequency(pin_name, PWM_FREQUENCY); // Set the frequency and save the value to the assigned index no.
+    PinName pin_name = digitalPinToPinName(pin);
+    TIM_TypeDef *Instance = (TIM_TypeDef *)pinmap_peripheral(pin_name, PinMap_PWM); // Get HAL timer instance
 
-  // Note the resolution is sticky here, the input can be upto 16 bits and that would require RESOLUTION_16B_COMPARE_FORMAT (16)
-  // If such a need were to manifest then we would need to calc the resolution based on the v_size parameter and add code for it.
-  const uint16_t value = invert ? v_size - v : v;
-  HT->setCaptureCompare(channel, value, RESOLUTION_8B_COMPARE_FORMAT); // Sets the duty, the calc is done in the library :)
-  pinmap_pinout(pin_name, PinMap_PWM); // Make sure the pin output state is set.
-  if (previousMode != TIMER_OUTPUT_COMPARE_PWM1) HT->resume();
-}
+    LOOP_S_L_N(i, 0, NUM_HARDWARE_TIMERS) // Protect used timers
+      if (timer_instance[i] && timer_instance[i]->getHandle()->Instance == Instance)
+        return;
 
-void set_pwm_frequency(const pin_t pin, int f_desired) {
-  if (!PWM_PIN(pin)) return; // Don't proceed if no hardware timer
-  const PinName pin_name = digitalPinToPinName(pin);
-  TIM_TypeDef * const Instance = (TIM_TypeDef *)pinmap_peripheral(pin_name, PinMap_PWM); // Get HAL timer instance
-  const timer_index_t index = get_timer_index(Instance);
+    pwm_start(pin_name, f_desired, 0, RESOLUTION_8B_COMPARE_FORMAT);
+  }
 
-  // Protect used timers.
-  #ifdef STEP_TIMER
-    if (index == TIMER_INDEX(STEP_TIMER)) return;
-  #endif
-  #ifdef TEMP_TIMER
-    if (index == TIMER_INDEX(TEMP_TIMER)) return;
-  #endif
-  #if defined(PULSE_TIMER) && MF_TIMER_PULSE != MF_TIMER_STEP
-    if (index == TIMER_INDEX(PULSE_TIMER)) return;
-  #endif
-
-  if (HardwareTimer_Handle[index] == nullptr) // If frequency is set before duty we need to create a handle here.
-    HardwareTimer_Handle[index]->__this = new HardwareTimer((TIM_TypeDef *)pinmap_peripheral(pin_name, PinMap_PWM));
-  HardwareTimer * const HT = (HardwareTimer *)(HardwareTimer_Handle[index]->__this);
-  HT->setOverflow(f_desired, HERTZ_FORMAT);
-  timer_freq[index] = f_desired; // Save the last frequency so duty will not set the default for this timer number.
-}
+#endif
 
 #endif // HAL_STM32
@@ -27,58 +27,43 @@
 #include "HAL.h"
 #include "timers.h"
 
-#define NR_TIMERS TERN(STM32_XL_DENSITY, 14, 8) // Maple timers, 14 for STM32_XL_DENSITY (F/G chips), 8 for HIGH density (C D E)
-
-static uint16_t timer_freq[NR_TIMERS];
-
-inline uint8_t timer_and_index_for_pin(const pin_t pin, timer_dev **timer_ptr) {
-  *timer_ptr = PIN_MAP[pin].timer_device;
-  for (uint8_t i = 0; i < NR_TIMERS; i++) if (*timer_ptr == HAL_get_timer_dev(i))
-    return i;
-  return 0;
-}
-
 void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255*/, const bool invert/*=false*/) {
   if (!PWM_PIN(pin)) return;
-
-  timer_dev *timer; UNUSED(timer);
-  if (timer_freq[timer_and_index_for_pin(pin, &timer)] == 0)
-    set_pwm_frequency(pin, PWM_FREQUENCY);
-
-  const uint8_t channel = PIN_MAP[pin].timer_channel;
-  const uint16_t duty = invert ? v_size - v : v;
-  timer_set_compare(timer, channel, duty);
-  timer_set_mode(timer, channel, TIMER_PWM); // PWM Output Mode
+  timer_dev *timer = PIN_MAP[pin].timer_device;
+  uint16_t max_val = timer->regs.bas->ARR * v / v_size;
+  if (invert) max_val = v_size - max_val;
+  pwmWrite(pin, max_val);
 }
 
-void set_pwm_frequency(const pin_t pin, int f_desired) {
-  if (!PWM_PIN(pin)) return;                    // Don't proceed if no hardware timer
+#if NEEDS_HARDWARE_PWM
 
-  timer_dev *timer; UNUSED(timer);
-  timer_freq[timer_and_index_for_pin(pin, &timer)] = f_desired;
+  void set_pwm_frequency(const pin_t pin, int f_desired) {
+    if (!PWM_PIN(pin)) return;                    // Don't proceed if no hardware timer
 
-  // Protect used timers
-  if (timer == HAL_get_timer_dev(MF_TIMER_TEMP)) return;
-  if (timer == HAL_get_timer_dev(MF_TIMER_STEP)) return;
-  #if MF_TIMER_PULSE != MF_TIMER_STEP
-    if (timer == HAL_get_timer_dev(MF_TIMER_PULSE)) return;
-  #endif
+    timer_dev *timer = PIN_MAP[pin].timer_device;
+    uint8_t channel = PIN_MAP[pin].timer_channel;
 
-  if (!(timer->regs.bas->SR & TIMER_CR1_CEN))   // Ensure the timer is enabled
-    timer_init(timer);
+    // Protect used timers
+    if (timer == get_timer_dev(TEMP_TIMER_NUM)) return;
+    if (timer == get_timer_dev(STEP_TIMER_NUM)) return;
+    #if PULSE_TIMER_NUM != STEP_TIMER_NUM
+      if (timer == get_timer_dev(PULSE_TIMER_NUM)) return;
+    #endif
 
-  const uint8_t channel = PIN_MAP[pin].timer_channel;
-  timer_set_mode(timer, channel, TIMER_PWM);
-  // Preload (resolution) cannot be equal to duty of 255 otherwise it may not result in digital off or on.
-  uint16_t preload = 254;
-  int32_t prescaler = (HAL_TIMER_RATE) / (preload + 1) / f_desired - 1;
-  if (prescaler > 65535) {                      // For low frequencies increase prescaler
-    prescaler = 65535;
-    preload = (HAL_TIMER_RATE) / (prescaler + 1) / f_desired - 1;
+    if (!(timer->regs.bas->SR & TIMER_CR1_CEN))   // Ensure the timer is enabled
+      timer_init(timer);
+
+    timer_set_mode(timer, channel, TIMER_PWM);
+    uint16_t preload = 255;                       // Lock 255 PWM resolution for high frequencies
+    int32_t prescaler = (HAL_TIMER_RATE) / (preload + 1) / f_desired - 1;
+    if (prescaler > 65535) {                      // For low frequencies increase prescaler
+      prescaler = 65535;
+      preload = (HAL_TIMER_RATE) / (prescaler + 1) / f_desired - 1;
+    }
+    if (prescaler < 0) return;                    // Too high frequency
+    timer_set_reload(timer, preload);
+    timer_set_prescaler(timer, prescaler);
   }
-  if (prescaler < 0) return;                    // Too high frequency
-  timer_set_reload(timer, preload);
-  timer_set_prescaler(timer, prescaler);
-}
 
+#endif // NEEDS_HARDWARE_PWM
 #endif // __STM32F1__
@@ -212,10 +212,6 @@
 
 #include "module/tool_change.h"
 
-#if HAS_FANCHECK
-  #include "feature/fancheck.h"
-#endif
-
 #if ENABLED(USE_CONTROLLER_FAN)
   #include "feature/controllerfan.h"
 #endif
@@ -248,10 +244,6 @@
   #include "feature/power.h"
 #endif
 
-#if ENABLED(EASYTHREED_UI)
-  #include "feature/easythreed_ui.h"
-#endif
-
 PGMSTR(M112_KILL_STR, "M112 Shutdown");
 
 MarlinState marlin_state = MF_INITIALIZING;
@@ -641,8 +633,6 @@ inline void manage_inactivity(const bool no_stepper_sleep=false) {
     #endif
   #endif
 
-  TERN_(EASYTHREED_UI, easythreed_ui.run());
-
   TERN_(USE_CONTROLLER_FAN, controllerFan.update()); // Check if fan should be turned on to cool stepper drivers down
 
   TERN_(AUTO_POWER_CONTROL, powerManager.check(!ui.on_status_screen() || printJobOngoing() || printingIsPaused()));
@@ -839,7 +829,6 @@ void idle(bool no_stepper_sleep/*=false*/) {
   #if HAS_AUTO_REPORTING
     if (!gcode.autoreport_paused) {
       TERN_(AUTO_REPORT_TEMPERATURES, thermalManager.auto_reporter.tick());
-      TERN_(AUTO_REPORT_FANS, fan_check.auto_reporter.tick());
       TERN_(AUTO_REPORT_SD_STATUS, card.auto_reporter.tick());
       TERN_(AUTO_REPORT_POSITION, position_auto_reporter.tick());
       TERN_(BUFFER_MONITORING, queue.auto_report_buffer_statistics());
@@ -1286,8 +1275,6 @@ void setup() {
     SETUP_RUN(controllerFan.setup());
   #endif
 
-  TERN_(HAS_FANCHECK, fan_check.init());
-
   // UI must be initialized before EEPROM
   // (because EEPROM code calls the UI).
 
@@ -1366,9 +1353,6 @@ void setup() {
   #endif
 
   #if HAS_BED_PROBE
-    #if PIN_EXISTS(PROBE_ENABLE)
-      OUT_WRITE(PROBE_ENABLE_PIN, LOW); // Disable
-    #endif
     SETUP_RUN(endstops.enable_z_probe(false));
   #endif
 
@@ -1575,6 +1559,7 @@ void setup() {
     HMI_Init();
     HMI_SetLanguageCache();
     HMI_StartFrame(true);
+    DWIN_StatusChanged(GET_TEXT_F(WELCOME_MSG));
   #endif
 
   #if HAS_SERVICE_INTERVALS && !HAS_DWIN_E3V2_BASIC
@@ -1612,10 +1597,6 @@ void setup() {
     SETUP_RUN(ui.check_touch_calibration());
   #endif
 
-  #if ENABLED(EASYTHREED_UI)
-    SETUP_RUN(easythreed_ui.init());
-  #endif
-
   marlin_state = MF_RUNNING;
 
   SETUP_LOG("setup() completed.");