Update - optimization

Author: classicrocker883

Marlin/src/feature/bedlevel/abl/bbl.cpp

@@ -111,10 +111,12 @@ void LevelingBilinear::reset() {
  */
 void LevelingBilinear::set_grid(const xy_pos_t& _grid_spacing, const xy_pos_t& _grid_start) {
 #if ENABLED(PROUI_MESH_EDIT)
-  grid_start.x = MESH_MIN_X;
-  grid_start.y = MESH_MIN_Y;
+  UNUSED(_grid_spacing);
+  UNUSED(_grid_start);
   grid_spacing.x = MESH_X_DIST;
   grid_spacing.y = MESH_Y_DIST;
+  grid_start.x = MESH_MIN_X;
+  grid_start.y = MESH_MIN_Y;
 #else
   grid_spacing = _grid_spacing;
   grid_start = _grid_start;

Marlin/src/feature/bedlevel/ubl/ubl.h

@@ -110,8 +110,8 @@ class unified_bed_leveling {
   static bool sanity_check();
   static void smart_mesh_fill();
 
-  static void G29() __O0;                           // O0 for no optimization
-  static void smart_fill_wlsf(const float ) __O2; // O2 gives smaller code than Os on A2560
+  static void G29() __O0;                                 // O0 for no optimization
+  static void smart_fill_wlsf(const float weight_factor) __Os; // O2 gives smaller code than Os on A2560
 
   static int8_t storage_slot;
 

Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp

@@ -831,7 +831,7 @@ void unified_bed_leveling::shift_mesh_height(const float zoffs) {
         #endif
         TERN_(DWIN_LCD_PROUI, MeshViewer.DrawMeshPoint(best.pos.x, best.pos.y, measured_z);)
       }
-      SERIAL_FLUSH(); // Prevent host M105 buffer overrun.
+      DEBUG_FLUSH(); // Prevent host M105 buffer overrun.
 
     } while (best.pos.x >= 0 && --count);
 
@@ -890,7 +890,7 @@ void set_message_with_feedback(FSTR_P const fstr) {
         }
       }
     }
-    serial_delay(15);
+    DEBUG_DELAY(15);
     return false;
   }
 
@@ -1032,7 +1032,7 @@ void set_message_with_feedback(FSTR_P const fstr) {
 
       if (param.V_verbosity > 2)
         DEBUG_ECHOLNPGM("Mesh Point Measured at: ", p_float_t(z_values[lpos.x][lpos.y], 6));
-      SERIAL_FLUSH(); // Prevent host M105 buffer overrun.
+      DEBUG_FLUSH(); // Prevent host M105 buffer overrun.
     } while (location.valid());
 
     if (do_ubl_mesh_map) display_map(param.T_map_type);  // show user where we're probing
@@ -1116,7 +1116,7 @@ void set_message_with_feedback(FSTR_P const fstr) {
         marlin.idle_no_sleep();
         new_z = ui.ubl_mesh_value();
         TERN_(UBL_MESH_EDIT_MOVES_Z, motion.blocking_move_z(h_offset + new_z)); // Move the nozzle as the point is edited
-        SERIAL_FLUSH();                                   // Prevent host M105 buffer overrun.
+        DEBUG_FLUSH();                                   // Prevent host M105 buffer overrun.
       } while (!ui.button_pressed());
 
       motion.set_soft_endstop_loose(false);
@@ -1138,7 +1138,7 @@ void set_message_with_feedback(FSTR_P const fstr) {
 
       TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(location, new_z));
 
-      serial_delay(20);                                   // No switch noise
+      DEBUG_DELAY(20);                                    // No switch noise
       ui.refresh();
 
     } while (lpos.x >= 0 && --param.R_repetition > 0);
@@ -1790,7 +1790,7 @@ void unified_bed_leveling::smart_mesh_fill() {
       DEBUG_ECHOLNPGM("No Mesh Loaded.");
     else
       DEBUG_ECHOLNPGM("Mesh ", storage_slot, " Loaded.");
-    serial_delay(50);
+    DEBUG_DELAY(50);
 
     #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
       DEBUG_ECHOLN(F("Fade Height M420 Z"), p_float_t(planner.z_fade_height, 4));
@@ -1802,51 +1802,51 @@ void unified_bed_leveling::smart_mesh_fill() {
       DEBUG_ECHOLNPGM("Probe Offset M851 Z", p_float_t(probe.offset.z, 7));
     #endif
 
-    DEBUG_ECHOLNPGM("MESH_MIN_X  " STRINGIFY(MESH_MIN_X) "=", MESH_MIN_X); serial_delay(50);
-    DEBUG_ECHOLNPGM("MESH_MIN_Y  " STRINGIFY(MESH_MIN_Y) "=", MESH_MIN_Y); serial_delay(50);
-    DEBUG_ECHOLNPGM("MESH_MAX_X  " STRINGIFY(MESH_MAX_X) "=", MESH_MAX_X); serial_delay(50);
-    DEBUG_ECHOLNPGM("MESH_MAX_Y  " STRINGIFY(MESH_MAX_Y) "=", MESH_MAX_Y); serial_delay(50);
-    DEBUG_ECHOLNPGM("GRID_MAX_POINTS_X  ", GRID_MAX_POINTS_X);             serial_delay(50);
-    DEBUG_ECHOLNPGM("GRID_MAX_POINTS_Y  ", GRID_MAX_POINTS_Y);             serial_delay(50);
+    DEBUG_ECHOLNPGM("MESH_MIN_X  " STRINGIFY(MESH_MIN_X) "=", MESH_MIN_X); DEBUG_DELAY(50);
+    DEBUG_ECHOLNPGM("MESH_MIN_Y  " STRINGIFY(MESH_MIN_Y) "=", MESH_MIN_Y); DEBUG_DELAY(50);
+    DEBUG_ECHOLNPGM("MESH_MAX_X  " STRINGIFY(MESH_MAX_X) "=", MESH_MAX_X); DEBUG_DELAY(50);
+    DEBUG_ECHOLNPGM("MESH_MAX_Y  " STRINGIFY(MESH_MAX_Y) "=", MESH_MAX_Y); DEBUG_DELAY(50);
+    DEBUG_ECHOLNPGM("GRID_MAX_POINTS_X  ", GRID_MAX_POINTS_X);             DEBUG_DELAY(50);
+    DEBUG_ECHOLNPGM("GRID_MAX_POINTS_Y  ", GRID_MAX_POINTS_Y);             DEBUG_DELAY(50);
     DEBUG_ECHOLNPGM("MESH_X_DIST  ", MESH_X_DIST);
-    DEBUG_ECHOLNPGM("MESH_Y_DIST  ", MESH_Y_DIST);                         serial_delay(50);
+    DEBUG_ECHOLNPGM("MESH_Y_DIST  ", MESH_Y_DIST);                         DEBUG_DELAY(50);
 
     DEBUG_ECHOPGM("X-Axis Mesh Points at: ");
     for (uint8_t i = 0; i < GRID_MAX_POINTS_X; ++i) {
       DEBUG_ECHO(p_float_t(motion.logical_x(get_mesh_x(i)), 3), F("  "));
-      serial_delay(25);
+      DEBUG_DELAY(25);
     }
-    SERIAL_EOL();
+    DEBUG_EOL();
 
     DEBUG_ECHOPGM("Y-Axis Mesh Points at: ");
     for (uint8_t j = 0; j < GRID_MAX_POINTS_Y; ++j) {
       DEBUG_ECHO(p_float_t(motion.logical_y(get_mesh_y(j)), 3), F("  "));
-      serial_delay(25);
+      DEBUG_DELAY(25);
     }
-    SERIAL_EOL();
+    DEBUG_EOL();
 
     #if HAS_KILL
       DEBUG_ECHOLNPGM("Kill pin on :", KILL_PIN, "  state:", marlin.kill_state());
     #endif
 
-    SERIAL_EOL();
-    serial_delay(50);
+    DEBUG_EOL();
+    DEBUG_DELAY(50);
 
     DEBUG_ECHOLNPGM("ubl_state_at_invocation :", ubl_state_at_invocation, "\nubl_state_recursion_chk :", ubl_state_recursion_chk);
-    serial_delay(50);
+    DEBUG_DELAY(50);
 
     DEBUG_ECHOLNPGM("Meshes go from ", _hex_word(settings.meshes_start_index()), " to ", _hex_word(settings.meshes_end_index()));
-    serial_delay(50);
+    DEBUG_DELAY(50);
 
     DEBUG_ECHOLNPGM("sizeof(unified_bed_leveling) :  ", sizeof(unified_bed_leveling));
     DEBUG_ECHOLNPGM("z_value[][] size: ", sizeof(z_values));
-    serial_delay(25);
+    DEBUG_DELAY(25);
 
     DEBUG_ECHOLNPGM("EEPROM free for UBL: ", _hex_word(settings.meshes_end_index() - settings.meshes_start_index()));
-    serial_delay(50);
+    DEBUG_DELAY(50);
 
     DEBUG_ECHOLNPGM("EEPROM can hold ", settings.calc_num_meshes(), " meshes.\n");
-    serial_delay(25);
+    DEBUG_DELAY(25);
 
     if (!sanity_check()) {
       echo_name();
@@ -1873,9 +1873,9 @@ void unified_bed_leveling::smart_mesh_fill() {
         print_hex_byte(cccc);
         DEBUG_CHAR(' ');
       }
-      SERIAL_EOL();
+      DEBUG_EOL();
     }
-    SERIAL_EOL();
+    DEBUG_EOL();
     persistentStore.access_finish();
   }
 

Marlin/src/inc/Conditionals-2-LCD.h

@@ -923,7 +923,7 @@
   + COUNT_ENABLED(ANYCUBIC_LCD_I3MEGA, ANYCUBIC_LCD_CHIRON, ANYCUBIC_TFT35, ANYCUBIC_LCD_VYPER) \
   + DGUS_UI_IS(ORIGIN) + DGUS_UI_IS(FYSETC) + DGUS_UI_IS(HIPRECY) + DGUS_UI_IS(MKS) + DGUS_UI_IS(RELOADED) + DGUS_UI_IS(IA_CREALITY) \
   + COUNT_ENABLED(ENDER2_STOCKDISPLAY, CR10_STOCKDISPLAY) \
-  + COUNT_ENABLED(DWIN_CREALITY_LCD, DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI, DWIN_MARLINUI_PORTRAIT, DWIN_MARLINUI_LANDSCAPE, SOVOL_SV06_RTS) \
+  + COUNT_ENABLED(DWIN_LCD_PROUI, DWIN_MARLINUI_PORTRAIT, DWIN_MARLINUI_LANDSCAPE, SOVOL_SV06_RTS) \
   + COUNT_ENABLED(FYSETC_MINI_12864_X_X, FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0, FYSETC_GENERIC_12864_1_1) \
   + COUNT_ENABLED(LCD_SAINSMART_I2C_1602, LCD_SAINSMART_I2C_2004) \
   + COUNT_ENABLED(MKS_12864OLED, MKS_12864OLED_SSD1306) \

Marlin/src/inc/SanityCheck.h

@@ -417,7 +417,7 @@ static_assert(COUNT(arm) == LOGICAL_AXES, "AXIS_RELATIVE_MODES must contain " _L
  * SD File Sorting
  */
 #if ENABLED(SDCARD_SORT_ALPHA)
-  #if NONE(EXTENSIBLE_UI, HAS_MARLINUI_MENU, DWIN_CREALITY_LCD, DWIN_LCD_PROUI)
+  #if NONE(EXTENSIBLE_UI, HAS_MARLINUI_MENU, DWIN_LCD_PROUI)
     #error "SDCARD_SORT_ALPHA requires an LCD that supports it. (It doesn't apply to M20, etc.)"
   #elif SDSORT_LIMIT > 256
     #error "SDSORT_LIMIT must be 256 or smaller."
@@ -2917,19 +2917,7 @@ static_assert(NUM_SERVOS <= NUM_SERVO_PLUGS, "NUM_SERVOS (or some servo index) i
 /**
  * Ender-3 V2 controller has some limitations
  */
-#if ENABLED(DWIN_CREALITY_LCD)
-  #if !HAS_MEDIA
-    #error "DWIN_CREALITY_LCD requires SDSUPPORT to be enabled."
-  #elif ANY(PID_EDIT_MENU, PID_AUTOTUNE_MENU)
-    #error "DWIN_CREALITY_LCD does not support PID_EDIT_MENU or PID_AUTOTUNE_MENU."
-  #elif ANY(MPC_EDIT_MENU, MPC_AUTOTUNE_MENU)
-    #error "DWIN_CREALITY_LCD does not support MPC_EDIT_MENU or MPC_AUTOTUNE_MENU."
-  #elif ENABLED(LCD_BED_TRAMMING)
-    #error "DWIN_CREALITY_LCD does not support LCD_BED_TRAMMING."
-  #elif ALL(LCD_BED_LEVELING, PROBE_MANUALLY)
-    #error "DWIN_CREALITY_LCD does not support LCD_BED_LEVELING with PROBE_MANUALLY."
-  #endif
-#elif ENABLED(DWIN_LCD_PROUI)
+#if ENABLED(DWIN_LCD_PROUI)
   #if !HAS_MEDIA
     #error "DWIN_LCD_PROUI requires SDSUPPORT to be enabled."
   #elif ALL(LCD_BED_LEVELING, PROBE_MANUALLY)

Marlin/src/lcd/dwin/proui/dwin.cpp

@@ -2200,7 +2200,6 @@ void DWIN_SetDataDefaults() {
     TERN_(NOZZLE_PARK_FEATURE, PRO_data.Park_point = DEF_NOZZLE_PARK_POINT;)
     #if HAS_FILAMENT_SENSOR
       PRO_data.Runout_active_state = FIL_RUNOUT_STATE;
-      PRO_data.FilamentMotionSensor = DEF_FIL_MOTION_SENSOR;
     #endif
     PRO_data.hotend_maxtemp = HEATER_0_MAXTEMP;
     #if HAS_TOOLBAR
@@ -2686,16 +2685,13 @@ void ApplyMove() {
     void LiveRunoutActive() { ProEx.DrawRunoutActive(true); }
     void SetRunoutActive() {
       uint8_t val;
-      val = PRO_data.FilamentMotionSensor ? 2 : PRO_data.Runout_active_state ? 1 : 0;
-      SetOnClick(SetIntNoDraw, 0, 2, 0, val, ProEx.ApplyRunoutActive, LiveRunoutActive);
+      val = PRO_data.Runout_active_state ? 1 : 0;
+      SetOnClick(SetIntNoDraw, 0, 1, 0, val, ProEx.ApplyRunoutActive, LiveRunoutActive);
       ProEx.DrawRunoutActive(true);
     }
     void onDrawRunoutActive(MenuItemClass* menuitem, int8_t line) {
       onDrawMenuItem(menuitem, line);
-      if (PRO_data.FilamentMotionSensor)
-        { DWINUI::Draw_String(VALX - MENU_CHR_W, MBASE(line), GET_TEXT_F(MSG_MOTION)); }
-      else
-        { DWINUI::Draw_String(VALX + MENU_CHR_W, MBASE(line), PRO_data.Runout_active_state ? GET_TEXT_F(MSG_HIGH) : GET_TEXT_F(MSG_LOW)); }
+      DWINUI::Draw_String(VALX + MENU_CHR_W, MBASE(line), PRO_data.Runout_active_state ? GET_TEXT_F(MSG_HIGH) : GET_TEXT_F(MSG_LOW));
     }
   #endif
 

Marlin/src/lcd/dwin/proui/dwinui.cpp

@@ -244,32 +244,18 @@ void DWINUI::Draw_Button(uint8_t id, uint16_t x, uint16_t y) {
 //  x: the abscissa of the center of the circle
 //  y: ordinate of the center of the circle
 //  r: circle radius
-void DWINUI::Draw_FillCircle(uint16_t bcolor, uint16_t x, uint16_t y, uint8_t r) {
+void DWINUI::Draw_FillCircle(const uint16_t bcolor, const uint16_t x, const uint16_t y, const uint8_t r) {
+  const uint16_t r2 = sq(r);
   DWIN_Draw_Line(bcolor, x - r, y, x + r, y);
-  uint16_t b = 1;
-  while (b <= r) {
-    uint16_t a = SQRT(sq(r) - sq(b));
+
+  const uint8_t step = TERN(TJC_DISPLAY, 2, 1);
+  for (uint16_t b = step; b <= r; b += step) {
+    const uint16_t a = SQRT(r2 - sq(b));
     DWIN_Draw_Line(bcolor, x - a, y + b, x + a, y + b);
     DWIN_Draw_Line(bcolor, x - a, y - b, x + a, y - b);
-    b += TERN(TJC_DISPLAY, 2, 1);
   }
 }
 
-// Color Interpolator
-//  val : Interpolator minv..maxv
-//  minv : Minimum value
-//  maxv : Maximum value
-//  color1 : Start color
-//  color2 : End color
-uint16_t DWINUI::ColorInt(int16_t val, int16_t minv, int16_t maxv, uint16_t color1, uint16_t color2) {
-  uint8_t B, G, R;
-  const float n = (float)(val - minv) / (maxv - minv + 1);
-  R = (1.0f - n) * GetRColor(color1) + n * GetRColor(color2);
-  G = (1.0f - n) * GetGColor(color1) + n * GetGColor(color2);
-  B = (1.0f - n) * GetBColor(color1) + n * GetBColor(color2);
-  return RGB(R, G, B);
-}
-
 // Color Interpolator through Red->Orange->Yellow->Green->Blue (Pro UI)
 //  val : Interpolator minv..maxv
 //  minv : Minimum value

Marlin/src/lcd/dwin/proui/dwinui.h

@@ -560,14 +560,6 @@ namespace DWINUI {
     Draw_Checkbox(textcolor, backcolor, x, y, checked);
   }
 
-  // Color Interpolator
-  //  val : Interpolator minv..maxv
-  //  minv : Minimum value
-  //  maxv : Maximum value
-  //  color1 : Start color
-  //  color2 : End color
-  uint16_t ColorInt(int16_t val, int16_t minv, int16_t maxv, uint16_t color1, uint16_t color2);
-
   // ------------------------- Buttons ------------------------------//
 
   void Draw_Select_Box(uint16_t xpos, uint16_t ypos);
@@ -592,8 +584,8 @@ namespace DWINUI {
   //  x: abscissa of the center of the circle
   //  y: ordinate of the center of the circle
   //  r: circle radius
-  void Draw_FillCircle(uint16_t bcolor, uint16_t x, uint16_t y, uint8_t r);
-  inline void Draw_FillCircle(uint16_t bcolor, uint8_t r) {
+  void Draw_FillCircle(const uint16_t bcolor, const uint16_t x, const uint16_t y, const uint8_t r);
+  inline void Draw_FillCircle(const uint16_t bcolor, const uint8_t r) {
     Draw_FillCircle(bcolor, cursor.x, cursor.y, r);
   }
 

Marlin/src/lcd/dwin/proui/proui.h

@@ -45,7 +45,7 @@ constexpr bool DEF_INVERT_E0_DIR = INVERT_E0_DIR;
 #ifndef MULTIPLE_PROBING
   #define MULTIPLE_PROBING 2
 #endif
-#define DEF_FIL_MOTION_SENSOR ENABLED(FILAMENT_MOTION_SENSOR)
+constexpr bool DEF_FIL_MOTION_SENSOR = ENABLED(FILAMENT_MOTION_SENSOR);
 #if DISABLED(FILAMENT_RUNOUT_SENSOR) // must be defined as opposite FIL_RUNOUT_STATE in Configuration.h
   #if MOTHERBOARD == BOARD_CREALITY_V427 || MOTHERBOARD == BOARD_CREALITY_V24S1_301F4 || MOTHERBOARD == BOARD_CREALITY_V24S1_301 || MOTHERBOARD == BOARD_VOXELAB_AQUILA || MOTHERBOARD == BOARD_AQUILA_V101
     #define FIL_RUNOUT_STATE LOW

Marlin/src/module/motion.h

@@ -523,7 +523,7 @@ class Motion {
 #elif defined(XY_PROBE_FEEDRATE)
   #define XY_PROBE_FEEDRATE_MM_S MMM_TO_MMS(XY_PROBE_FEEDRATE)
 #else
-  #define XY_PROBE_FEEDRATE_MM_S MMM_TO_MMS((homing_feedrate_mm_m.x + homing_feedrate_mm_m.y) * 1.5)
+  #define XY_PROBE_FEEDRATE_MM_S MMM_TO_MMS((motion.homing_feedrate_mm_m.x + motion.homing_feedrate_mm_m.y) * 1.5)
 #endif
 
 #ifdef Z_PROBE_FEEDRATE_SLOW