From 5a5354107bfb70e8bcd76b0ab4744f6bfc6c75b8 Mon Sep 17 00:00:00 2001
From: RainMotorsports <100002265+RainMotorsports@users.noreply.github.com>
Date: Sun, 8 Jun 2025 23:18:35 -0400
Subject: [PATCH 01/86] =?UTF-8?q?=E2=9C=A8=20E3D=20BigBox=20Rumba=20board?=
=?UTF-8?q?=20(#27897)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Marlin/Makefile | 3 +-
Marlin/src/core/boards.h | 1 +
Marlin/src/pins/pins.h | 2 ++
Marlin/src/pins/ramps/pins_RUMBA_E3D.h | 33 +++++++++++++++++++
Marlin/src/pins/stm32f1/pins_CREALITY_CR4NS.h | 1 -
5 files changed, 38 insertions(+), 2 deletions(-)
create mode 100644 Marlin/src/pins/ramps/pins_RUMBA_E3D.h
diff --git a/Marlin/Makefile b/Marlin/Makefile
index 9acab53673..fb1786b6b0 100644
--- a/Marlin/Makefile
+++ b/Marlin/Makefile
@@ -338,7 +338,8 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1164)
else ifeq ($(HARDWARE_MOTHERBOARD),1165)
# XTLW MFF V2.0
else ifeq ($(HARDWARE_MOTHERBOARD),1166)
-
+# E3D Rumba BigBox
+else ifeq ($(HARDWARE_MOTHERBOARD),1167)
#
# RAMBo and derivatives
diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index adc03b657c..ab7ad6fe47 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -131,6 +131,7 @@
#define BOARD_KODAMA_BARDO 1164 // Kodama Bardo V1.x (as found in the Kodama Trinus)
#define BOARD_XTLW_MFF_V1 1165 // XTLW MFF V1.0
#define BOARD_XTLW_MFF_V2 1166 // XTLW MFF V2.0
+#define BOARD_RUMBA_E3D 1167 // E3D Rumba BigBox
//
// RAMBo and derivatives
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 4a05b72a23..d5822f444b 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -223,6 +223,8 @@
#include "ramps/pins_XTLW_MFF_V1.h" // ATmega2560 env:mega2560
#elif MB(XTLW_MFF_V2)
#include "ramps/pins_XTLW_MFF_V2.h" // ATmega2560 env:mega2560
+#elif MB(RUMBA_E3D)
+ #include "ramps/pins_RUMBA_E3D.h" // ATmega2560 env:mega2560
//
// RAMBo and derivatives
diff --git a/Marlin/src/pins/ramps/pins_RUMBA_E3D.h b/Marlin/src/pins/ramps/pins_RUMBA_E3D.h
new file mode 100644
index 0000000000..2f268eacac
--- /dev/null
+++ b/Marlin/src/pins/ramps/pins_RUMBA_E3D.h
@@ -0,0 +1,33 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2025 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ *
+ */
+#pragma once
+
+// ATmega2560
+
+#define BOARD_INFO_NAME "E3D Rumba"
+#define DEFAULT_MACHINE_NAME "E3D BigBox"
+
+// E3D uses PT100 connected to EXP3
+#define TEMP_0_PIN 10 // Analog Input
+#define TEMP_1_PIN 9 // Analog Input
+
+#include "pins_RUMBA.h"
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_CR4NS.h b/Marlin/src/pins/stm32f1/pins_CREALITY_CR4NS.h
index ce019e0039..5a4f5bfaa5 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_CR4NS.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_CR4NS.h
@@ -81,7 +81,6 @@
#define HEATER_BED_PIN PB2 // HOT BED
#define FAN1_PIN PC1 // extruder fan
-
#if HAS_TMC_UART
// Software serial
#define X_SERIAL_TX_PIN PB12
From 781d9c470e756c2bcdff18bb84e76de071f1511a Mon Sep 17 00:00:00 2001
From: thinkyhead
Date: Mon, 9 Jun 2025 06:10:43 +0000
Subject: [PATCH 02/86] [cron] Bump distribution date (2025-06-09)
---
Marlin/Version.h | 2 +-
Marlin/src/inc/Version.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Marlin/Version.h b/Marlin/Version.h
index 3f7e62e416..9f5daa27a0 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
* here we define this default string as the date where the latest release
* version was tagged.
*/
-//#define STRING_DISTRIBUTION_DATE "2025-06-05"
+//#define STRING_DISTRIBUTION_DATE "2025-06-09"
/**
* The protocol for communication to the host. Protocol indicates communication
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index c0455cbc51..16911f23ce 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
* version was tagged.
*/
#ifndef STRING_DISTRIBUTION_DATE
- #define STRING_DISTRIBUTION_DATE "2025-06-05"
+ #define STRING_DISTRIBUTION_DATE "2025-06-09"
#endif
/**
From fbee2a2ff7ae02d7c87ff991b615afe6ad59641f Mon Sep 17 00:00:00 2001
From: David Buezas
Date: Mon, 9 Jun 2025 20:26:57 +0200
Subject: [PATCH 03/86] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20SMOOTH=5FLIN=5FADVAN?=
=?UTF-8?q?CE=20+=20S=5FCURVE=5FACCELERATION=20(#27827)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Marlin/src/inc/SanityCheck.h | 2 --
Marlin/src/module/planner.h | 2 +-
Marlin/src/module/stepper.cpp | 59 +++++++++++++++++++++++++----------
Marlin/src/module/stepper.h | 7 +++++
4 files changed, 50 insertions(+), 20 deletions(-)
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 98498f4355..f3f4a97dff 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -866,8 +866,6 @@ static_assert(COUNT(arm) == LOGICAL_AXES, "AXIS_RELATIVE_MODES must contain " _L
#if ENABLED(SMOOTH_LIN_ADVANCE)
#ifndef CPU_32_BIT
#error "SMOOTH_LIN_ADVANCE requires a 32-bit CPU."
- #elif ENABLED(S_CURVE_ACCELERATION)
- #error "SMOOTH_LIN_ADVANCE is not compatible with S_CURVE_ACCELERATION."
#elif ENABLED(INPUT_SHAPING_E_SYNC) && NONE(INPUT_SHAPING_X, INPUT_SHAPING_Y)
#error "INPUT_SHAPING_E_SYNC requires INPUT_SHAPING_X or INPUT_SHAPING_Y."
#endif
diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h
index bda5720919..eb8f2ed17f 100644
--- a/Marlin/src/module/planner.h
+++ b/Marlin/src/module/planner.h
@@ -45,7 +45,7 @@
#if ENABLED(SMOOTH_LIN_ADVANCE)
#define SMOOTH_LIN_ADV_EXP_ORDER 5 // Closest to Gaussian smoothing between 3 and 7
- #define SMOOTH_LIN_ADV_INTERVAL (STEPPER_TIMER_RATE / SMOOTH_LIN_ADV_HZ) // Hz
+ #define SMOOTH_LIN_ADV_INTERVAL (STEPPER_TIMER_RATE / (SMOOTH_LIN_ADV_HZ)) // Hz
#endif
#include "motion.h"
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index fd3d3bd800..945600e4fb 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -1401,7 +1401,7 @@ void Stepper::apply_directions() {
return (r2 | (uint16_t(r3) << 8)) | (uint32_t(r4) << 16);
}
- #else
+ #else // !__AVR__
// For all the other 32bit CPUs
FORCE_INLINE void Stepper::_calc_bezier_curve_coeffs(const int32_t v0, const int32_t v1, const uint32_t av) {
@@ -1478,7 +1478,9 @@ void Stepper::apply_directions() {
#endif
}
- #endif
+
+ #endif // !__AVR__
+
#endif // S_CURVE_ACCELERATION
/**
@@ -2697,7 +2699,7 @@ hal_timer_t Stepper::block_phase_isr() {
oversampling_factor = 0;
// Decide if axis smoothing is possible
- if (stepper.adaptive_step_smoothing_enabled) {
+ if (adaptive_step_smoothing_enabled) {
uint32_t max_rate = current_block->nominal_rate; // Get the step event rate
while (max_rate < min_step_isr_frequency) { // As long as more ISRs are possible...
max_rate <<= 1; // Try to double the rate
@@ -2902,7 +2904,7 @@ hal_timer_t Stepper::block_phase_isr() {
#if ENABLED(INPUT_SHAPING_E_SYNC)
- constexpr uint16_t IS_COMPENSATION_BUFFER_SIZE = uint16_t(float(SMOOTH_LIN_ADV_HZ) / float(SHAPING_MIN_FREQ) / 2.0f + 0.5f);
+ constexpr uint16_t IS_COMPENSATION_BUFFER_SIZE = uint16_t(float(SMOOTH_LIN_ADV_HZ) / (2.0f * (SHAPING_MIN_FREQ)) + 0.5f);
typedef struct {
xy_long_t buffer[IS_COMPENSATION_BUFFER_SIZE];
@@ -2924,21 +2926,39 @@ hal_timer_t Stepper::block_phase_isr() {
DelayBuffer delayBuffer;
- xy_long_t smooth_lin_adv_lookback(const shaping_time_t stepper_ticks) {
- constexpr uint32_t ADV_TICKS_PER_STEPPER_TICKS_Q30 = (uint64_t(SMOOTH_LIN_ADV_HZ) * _BV32(30)) / STEPPER_TIMER_RATE;
- const uint16_t delay_steps = MULT_Q(30, stepper_ticks, ADV_TICKS_PER_STEPPER_TICKS_Q30);
+ xy_long_t Stepper::smooth_lin_adv_lookback(const shaping_time_t stepper_ticks) {
+ constexpr uint32_t adv_ticks_per_stepper_ticks_Q30 = (uint64_t(SMOOTH_LIN_ADV_HZ) * _BV32(30)) / (STEPPER_TIMER_RATE);
+ const uint16_t delay_steps = MULT_Q(30, stepper_ticks, adv_ticks_per_stepper_ticks_Q30);
return delayBuffer.past_item(delay_steps);
}
#endif // INPUT_SHAPING_E_SYNC
- int32_t smooth_lin_adv_lookahead(uint32_t stepper_ticks) {
+ #if ENABLED(S_CURVE_ACCELERATION)
+ int32_t Stepper::calc_bezier_curve(const int32_t v0, const int32_t v1, const uint32_t av, const uint32_t curr_step) {
+ int32_t A = bezier_A, B = bezier_B, C = bezier_C;
+ uint32_t F = bezier_F, AV = bezier_AV;
+
+ _calc_bezier_curve_coeffs(v0, v1, av);
+ uint32_t rate = _eval_bezier_curve(curr_step);
+
+ bezier_A = A; bezier_B = B; bezier_C = C; bezier_F = F; bezier_AV = AV;
+ return rate;
+ }
+ #endif
+
+ int32_t Stepper::smooth_lin_adv_lookahead(uint32_t stepper_ticks) {
for (uint8_t i = 0; block_t *block = planner.get_future_block(i); i++) {
if (block->is_sync()) continue;
if (stepper_ticks <= block->acceleration_time) {
if (!block->use_advance_lead) return 0;
- uint32_t rate = STEP_MULTIPLY(stepper_ticks, block->acceleration_rate) + block->initial_rate;
- NOMORE(rate, block->nominal_rate);
+ uint32_t rate;
+ #if ENABLED(S_CURVE_ACCELERATION)
+ rate = calc_bezier_curve(block->initial_rate, block->cruise_rate, block->acceleration_time_inverse, stepper_ticks);
+ #else
+ rate = STEP_MULTIPLY(stepper_ticks, block->acceleration_rate) + block->initial_rate;
+ NOMORE(rate, block->nominal_rate);
+ #endif
return MULT_Q(30, rate, block->e_step_ratio_q30);
}
stepper_ticks -= block->acceleration_time;
@@ -2951,13 +2971,18 @@ hal_timer_t Stepper::block_phase_isr() {
if (stepper_ticks <= block->deceleration_time) {
if (!block->use_advance_lead) return 0;
- uint32_t rate = STEP_MULTIPLY(stepper_ticks, block->acceleration_rate);
- if (rate < block->cruise_rate) {
- rate = block->cruise_rate - rate;
- NOLESS(rate, block->final_rate);
- }
- else
- rate = block->final_rate;
+ uint32_t rate;
+ #if ENABLED(S_CURVE_ACCELERATION)
+ rate = calc_bezier_curve(block->cruise_rate, block->final_rate, block->deceleration_time_inverse, stepper_ticks);
+ #else
+ rate = STEP_MULTIPLY(stepper_ticks, block->acceleration_rate);
+ if (rate < block->cruise_rate) {
+ rate = block->cruise_rate - rate;
+ NOLESS(rate, block->final_rate);
+ }
+ else
+ rate = block->final_rate;
+ #endif
return MULT_Q(30, rate, block->e_step_ratio_q30);
}
stepper_ticks -= block->deceleration_time;
diff --git a/Marlin/src/module/stepper.h b/Marlin/src/module/stepper.h
index 3083ad2973..330ff9f6b6 100644
--- a/Marlin/src/module/stepper.h
+++ b/Marlin/src/module/stepper.h
@@ -555,8 +555,15 @@ class Stepper {
// The Linear advance ISR phase
static void advance_isr();
#if ENABLED(SMOOTH_LIN_ADVANCE)
+ #if ENABLED(INPUT_SHAPING_E_SYNC)
+ static xy_long_t smooth_lin_adv_lookback(const shaping_time_t stepper_ticks);
+ #endif
+ static int32_t smooth_lin_adv_lookahead(uint32_t stepper_ticks);
static void set_la_interval(int32_t step_rate);
static hal_timer_t smooth_lin_adv_isr();
+ #if ENABLED(S_CURVE_ACCELERATION)
+ static int32_t calc_bezier_curve(const int32_t v0, const int32_t v1, const uint32_t av, const uint32_t curr_step);
+ #endif
#endif
#endif
From 348099dabba1640049b995976b5ba6e74b731136 Mon Sep 17 00:00:00 2001
From: Scott Lahteine
Date: Mon, 9 Jun 2025 13:33:07 -0500
Subject: [PATCH 04/86] =?UTF-8?q?=F0=9F=8E=A8=20MKS=20UI=20name=20adjustme?=
=?UTF-8?q?nts?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Marlin/src/lcd/extui/mks_ui/draw_about.cpp | 2 +-
.../lcd/extui/mks_ui/draw_baby_stepping.cpp | 18 +++++++--------
.../lcd/extui/mks_ui/draw_change_speed.cpp | 12 +++++-----
.../src/lcd/extui/mks_ui/draw_extrusion.cpp | 12 +++++-----
Marlin/src/lcd/extui/mks_ui/draw_fan.cpp | 12 +++++-----
.../lcd/extui/mks_ui/draw_filament_change.cpp | 8 +++----
Marlin/src/lcd/extui/mks_ui/draw_home.cpp | 14 ++++++------
Marlin/src/lcd/extui/mks_ui/draw_language.cpp | 16 +++++++-------
.../src/lcd/extui/mks_ui/draw_manuaLevel.cpp | 12 +++++-----
.../lcd/extui/mks_ui/draw_media_select.cpp | 6 ++---
Marlin/src/lcd/extui/mks_ui/draw_more.cpp | 16 +++++++-------
.../src/lcd/extui/mks_ui/draw_move_motor.cpp | 18 +++++++--------
.../src/lcd/extui/mks_ui/draw_operation.cpp | 18 +++++++--------
Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp | 12 +++++-----
.../src/lcd/extui/mks_ui/draw_print_file.cpp | 22 +++++++++----------
Marlin/src/lcd/extui/mks_ui/draw_set.cpp | 16 +++++++-------
Marlin/src/lcd/extui/mks_ui/draw_tool.cpp | 16 +++++++-------
.../extui/mks_ui/draw_touch_calibration.cpp | 2 +-
Marlin/src/lcd/extui/mks_ui/draw_ui.cpp | 4 ++--
Marlin/src/lcd/extui/mks_ui/draw_ui.h | 14 ++++++------
Marlin/src/lcd/extui/mks_ui/draw_wifi.cpp | 6 ++---
.../src/lcd/extui/mks_ui/draw_wifi_list.cpp | 4 ++--
.../lcd/extui/mks_ui/draw_z_offset_wizard.cpp | 12 +++++-----
23 files changed, 136 insertions(+), 136 deletions(-)
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_about.cpp b/Marlin/src/lcd/extui/mks_ui/draw_about.cpp
index e254523e12..7be129ebda 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_about.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_about.cpp
@@ -46,7 +46,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
void lv_draw_about() {
scr = lv_screen_create(ABOUT_UI);
- lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_A_RETURN);
+ lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_SIZE_X * 3 + INTERVAL_W * 4, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_A_RETURN);
board = lv_label_create(scr, BOARD_INFO_NAME);
lv_obj_align(board, nullptr, LV_ALIGN_CENTER, 0, -80);
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.cpp b/Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.cpp
index 1a6767dcc1..b55d79c2a1 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.cpp
@@ -114,24 +114,24 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
void lv_draw_baby_stepping() {
scr = lv_screen_create(BABYSTEP_UI);
- lv_big_button_create(scr, "F:/bmp_xAdd.bin", move_menu.x_add, INTERVAL_V, titleHeight, event_handler, ID_BABYSTEP_X_P);
- lv_big_button_create(scr, "F:/bmp_xDec.bin", move_menu.x_dec, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_BABYSTEP_X_N);
- lv_big_button_create(scr, "F:/bmp_yAdd.bin", move_menu.y_add, BTN_X_PIXEL + INTERVAL_V * 2, titleHeight, event_handler, ID_BABYSTEP_Y_P);
- lv_big_button_create(scr, "F:/bmp_yDec.bin", move_menu.y_dec, BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_BABYSTEP_Y_N);
- lv_big_button_create(scr, "F:/bmp_zAdd.bin", move_menu.z_add, BTN_X_PIXEL * 2 + INTERVAL_V * 3, titleHeight, event_handler, ID_BABYSTEP_Z_P);
- lv_big_button_create(scr, "F:/bmp_zDec.bin", move_menu.z_dec, BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_BABYSTEP_Z_N);
- buttonV = lv_imgbtn_create(scr, nullptr, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_BABYSTEP_DIST);
+ lv_big_button_create(scr, "F:/bmp_xAdd.bin", move_menu.x_add, INTERVAL_W, titleHeight, event_handler, ID_BABYSTEP_X_P);
+ lv_big_button_create(scr, "F:/bmp_xDec.bin", move_menu.x_dec, INTERVAL_W, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_BABYSTEP_X_N);
+ lv_big_button_create(scr, "F:/bmp_yAdd.bin", move_menu.y_add, BTN_SIZE_X + INTERVAL_W * 2, titleHeight, event_handler, ID_BABYSTEP_Y_P);
+ lv_big_button_create(scr, "F:/bmp_yDec.bin", move_menu.y_dec, BTN_SIZE_X + INTERVAL_W * 2, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_BABYSTEP_Y_N);
+ lv_big_button_create(scr, "F:/bmp_zAdd.bin", move_menu.z_add, BTN_SIZE_X * 2 + INTERVAL_W * 3, titleHeight, event_handler, ID_BABYSTEP_Z_P);
+ lv_big_button_create(scr, "F:/bmp_zDec.bin", move_menu.z_dec, BTN_SIZE_X * 2 + INTERVAL_W * 3, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_BABYSTEP_Z_N);
+ buttonV = lv_imgbtn_create(scr, nullptr, BTN_SIZE_X * 3 + INTERVAL_W * 4, titleHeight, event_handler, ID_BABYSTEP_DIST);
labelV = lv_label_create_empty(buttonV);
#if HAS_ROTARY_ENCODER
if (gCfgItems.encoder_enable)
lv_group_add_obj(g, buttonV);
#endif
- lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_BABYSTEP_RETURN);
+ lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_SIZE_X * 3 + INTERVAL_W * 4, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_BABYSTEP_RETURN);
disp_baby_step_dist();
- zOffsetText = lv_label_create(scr, 290, TITLE_YPOS, nullptr);
+ zOffsetText = lv_label_create(scr, 290, TITLE_POS_Y, nullptr);
disp_z_offset_value();
}
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_change_speed.cpp b/Marlin/src/lcd/extui/mks_ui/draw_change_speed.cpp
index e5d0f4244f..da0ce3c811 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_change_speed.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_change_speed.cpp
@@ -93,11 +93,11 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
void lv_draw_change_speed() {
scr = lv_screen_create(CHANGE_SPEED_UI);
// Create an Image button
- lv_big_button_create(scr, "F:/bmp_Add.bin", speed_menu.add, INTERVAL_V, titleHeight, event_handler, ID_C_ADD);
- lv_big_button_create(scr, "F:/bmp_Dec.bin", speed_menu.dec, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_C_DEC);
- buttonMov = lv_imgbtn_create(scr, nullptr, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_C_MOVE);
- buttonExt = lv_imgbtn_create(scr, nullptr, BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_C_EXT);
- buttonStep = lv_imgbtn_create(scr, nullptr, BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_C_STEP);
+ lv_big_button_create(scr, "F:/bmp_Add.bin", speed_menu.add, INTERVAL_W, titleHeight, event_handler, ID_C_ADD);
+ lv_big_button_create(scr, "F:/bmp_Dec.bin", speed_menu.dec, BTN_SIZE_X * 3 + INTERVAL_W * 4, titleHeight, event_handler, ID_C_DEC);
+ buttonMov = lv_imgbtn_create(scr, nullptr, INTERVAL_W, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_C_MOVE);
+ buttonExt = lv_imgbtn_create(scr, nullptr, BTN_SIZE_X + INTERVAL_W * 2, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_C_EXT);
+ buttonStep = lv_imgbtn_create(scr, nullptr, BTN_SIZE_X * 2 + INTERVAL_W * 3, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_C_STEP);
#if HAS_ROTARY_ENCODER
if (gCfgItems.encoder_enable) {
lv_group_add_obj(g, buttonMov);
@@ -105,7 +105,7 @@ void lv_draw_change_speed() {
lv_group_add_obj(g, buttonStep);
}
#endif
- lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_C_RETURN);
+ lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_SIZE_X * 3 + INTERVAL_W * 4, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_C_RETURN);
// Create labels on the image buttons
labelMov = lv_label_create_empty(buttonMov);
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_extrusion.cpp b/Marlin/src/lcd/extui/mks_ui/draw_extrusion.cpp
index 0cacf90f36..85d08ef197 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_extrusion.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_extrusion.cpp
@@ -114,13 +114,13 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
void lv_draw_extrusion() {
scr = lv_screen_create(EXTRUSION_UI);
// Create image buttons
- lv_obj_t *buttonAdd = lv_big_button_create(scr, "F:/bmp_in.bin", extrude_menu.in, INTERVAL_V, titleHeight, event_handler, ID_E_ADD);
+ lv_obj_t *buttonAdd = lv_big_button_create(scr, "F:/bmp_in.bin", extrude_menu.in, INTERVAL_W, titleHeight, event_handler, ID_E_ADD);
lv_obj_clear_protect(buttonAdd, LV_PROTECT_FOLLOW);
- lv_big_button_create(scr, "F:/bmp_out.bin", extrude_menu.out, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_E_DEC);
+ lv_big_button_create(scr, "F:/bmp_out.bin", extrude_menu.out, BTN_SIZE_X * 3 + INTERVAL_W * 4, titleHeight, event_handler, ID_E_DEC);
- buttonType = lv_imgbtn_create(scr, nullptr, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_E_TYPE);
- buttonStep = lv_imgbtn_create(scr, nullptr, BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_E_STEP);
- buttonSpeed = lv_imgbtn_create(scr, nullptr, BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_E_SPEED);
+ buttonType = lv_imgbtn_create(scr, nullptr, INTERVAL_W, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_E_TYPE);
+ buttonStep = lv_imgbtn_create(scr, nullptr, BTN_SIZE_X + INTERVAL_W * 2, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_E_STEP);
+ buttonSpeed = lv_imgbtn_create(scr, nullptr, BTN_SIZE_X * 2 + INTERVAL_W * 3, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_E_SPEED);
#if HAS_ROTARY_ENCODER
if (gCfgItems.encoder_enable) {
@@ -130,7 +130,7 @@ void lv_draw_extrusion() {
}
#endif
- lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_E_RETURN);
+ lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_SIZE_X * 3 + INTERVAL_W * 4, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_E_RETURN);
// Create labels on the image buttons
labelType = lv_label_create_empty(buttonType);
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_fan.cpp b/Marlin/src/lcd/extui/mks_ui/draw_fan.cpp
index 12b47d9e94..ea7469980b 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_fan.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_fan.cpp
@@ -66,13 +66,13 @@ void lv_draw_fan() {
scr = lv_screen_create(FAN_UI);
// Create an Image button
- buttonAdd = lv_big_button_create(scr, "F:/bmp_Add.bin", fan_menu.add, INTERVAL_V, titleHeight, event_handler, ID_F_ADD);
+ buttonAdd = lv_big_button_create(scr, "F:/bmp_Add.bin", fan_menu.add, INTERVAL_W, titleHeight, event_handler, ID_F_ADD);
lv_obj_clear_protect(buttonAdd, LV_PROTECT_FOLLOW);
- lv_big_button_create(scr, "F:/bmp_Dec.bin", fan_menu.dec, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_F_DEC);
- lv_big_button_create(scr, "F:/bmp_speed255.bin", fan_menu.full, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_F_HIGH);
- lv_big_button_create(scr, "F:/bmp_speed127.bin", fan_menu.half, BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_F_MID);
- lv_big_button_create(scr, "F:/bmp_speed0.bin", fan_menu.off, BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_F_OFF);
- lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_F_RETURN);
+ lv_big_button_create(scr, "F:/bmp_Dec.bin", fan_menu.dec, BTN_SIZE_X * 3 + INTERVAL_W * 4, titleHeight, event_handler, ID_F_DEC);
+ lv_big_button_create(scr, "F:/bmp_speed255.bin", fan_menu.full, INTERVAL_W, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_F_HIGH);
+ lv_big_button_create(scr, "F:/bmp_speed127.bin", fan_menu.half, BTN_SIZE_X + INTERVAL_W * 2, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_F_MID);
+ lv_big_button_create(scr, "F:/bmp_speed0.bin", fan_menu.off, BTN_SIZE_X * 2 + INTERVAL_W * 3, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_F_OFF);
+ lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_SIZE_X * 3 + INTERVAL_W * 4, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_F_RETURN);
fanText = lv_label_create_empty(scr);
lv_obj_set_style(fanText, &tft_style_label_rel);
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_filament_change.cpp b/Marlin/src/lcd/extui/mks_ui/draw_filament_change.cpp
index bd9c3ccbe7..26ed471a3a 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_filament_change.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_filament_change.cpp
@@ -109,17 +109,17 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
void lv_draw_filament_change() {
scr = lv_screen_create(FILAMENTCHANGE_UI);
// Create an Image button
- lv_obj_t *buttonIn = lv_big_button_create(scr, "F:/bmp_in.bin", filament_menu.in, INTERVAL_V, titleHeight, event_handler, ID_FILAMNT_IN);
+ lv_obj_t *buttonIn = lv_big_button_create(scr, "F:/bmp_in.bin", filament_menu.in, INTERVAL_W, titleHeight, event_handler, ID_FILAMNT_IN);
lv_obj_clear_protect(buttonIn, LV_PROTECT_FOLLOW);
- lv_big_button_create(scr, "F:/bmp_out.bin", filament_menu.out, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_FILAMNT_OUT);
+ lv_big_button_create(scr, "F:/bmp_out.bin", filament_menu.out, BTN_SIZE_X * 3 + INTERVAL_W * 4, titleHeight, event_handler, ID_FILAMNT_OUT);
- buttonType = lv_imgbtn_create(scr, nullptr, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_FILAMNT_TYPE);
+ buttonType = lv_imgbtn_create(scr, nullptr, INTERVAL_W, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_FILAMNT_TYPE);
#if HAS_ROTARY_ENCODER
if (gCfgItems.encoder_enable)
lv_group_add_obj(g, buttonType);
#endif
- lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_FILAMNT_RETURN);
+ lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_SIZE_X * 3 + INTERVAL_W * 4, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_FILAMNT_RETURN);
// Create labels on the image buttons
labelType = lv_label_create_empty(buttonType);
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_home.cpp b/Marlin/src/lcd/extui/mks_ui/draw_home.cpp
index a819fffacd..101afe6bd3 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_home.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_home.cpp
@@ -74,13 +74,13 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
void lv_draw_home() {
scr = lv_screen_create(ZERO_UI);
- lv_big_button_create(scr, "F:/bmp_zeroAll.bin", home_menu.home_all, INTERVAL_V, titleHeight, event_handler, ID_H_ALL);
- lv_big_button_create(scr, "F:/bmp_zeroX.bin", home_menu.home_x, BTN_X_PIXEL + INTERVAL_V * 2, titleHeight, event_handler, ID_H_X);
- lv_big_button_create(scr, "F:/bmp_zeroY.bin", home_menu.home_y, BTN_X_PIXEL * 2 + INTERVAL_V * 3, titleHeight, event_handler, ID_H_Y);
- lv_big_button_create(scr, "F:/bmp_zeroZ.bin", home_menu.home_z, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_H_Z);
- lv_big_button_create(scr, "F:/bmp_function1.bin", set_menu.motoroff, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_H_OFF_ALL);
- lv_big_button_create(scr, "F:/bmp_function1.bin", set_menu.motoroffXY, BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_H_OFF_XY);
- lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_H_RETURN);
+ lv_big_button_create(scr, "F:/bmp_zeroAll.bin", home_menu.home_all, INTERVAL_W, titleHeight, event_handler, ID_H_ALL);
+ lv_big_button_create(scr, "F:/bmp_zeroX.bin", home_menu.home_x, BTN_SIZE_X + INTERVAL_W * 2, titleHeight, event_handler, ID_H_X);
+ lv_big_button_create(scr, "F:/bmp_zeroY.bin", home_menu.home_y, BTN_SIZE_X * 2 + INTERVAL_W * 3, titleHeight, event_handler, ID_H_Y);
+ lv_big_button_create(scr, "F:/bmp_zeroZ.bin", home_menu.home_z, BTN_SIZE_X * 3 + INTERVAL_W * 4, titleHeight, event_handler, ID_H_Z);
+ lv_big_button_create(scr, "F:/bmp_function1.bin", set_menu.motoroff, INTERVAL_W, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_H_OFF_ALL);
+ lv_big_button_create(scr, "F:/bmp_function1.bin", set_menu.motoroffXY, BTN_SIZE_X + INTERVAL_W * 2, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_H_OFF_XY);
+ lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_SIZE_X * 3 + INTERVAL_W * 4, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_H_RETURN);
}
void lv_clear_home() {
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_language.cpp b/Marlin/src/lcd/extui/mks_ui/draw_language.cpp
index 3ef8c6a0ee..d3eba04783 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_language.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_language.cpp
@@ -187,15 +187,15 @@ static void disp_language(uint8_t language, uint8_t state) {
void lv_draw_language() {
scr = lv_screen_create(LANGUAGE_UI);
// Create image buttons
- buttonCN = lv_big_button_create(scr, "F:/bmp_simplified_cn.bin", language_menu.chinese_s, INTERVAL_V, titleHeight, event_handler, ID_CN);
+ buttonCN = lv_big_button_create(scr, "F:/bmp_simplified_cn.bin", language_menu.chinese_s, INTERVAL_W, titleHeight, event_handler, ID_CN);
lv_obj_clear_protect(buttonCN, LV_PROTECT_FOLLOW);
- buttonT_CN = lv_big_button_create(scr, "F:/bmp_traditional_cn.bin", language_menu.chinese_t, BTN_X_PIXEL + INTERVAL_V * 2, titleHeight, event_handler, ID_T_CN);
- buttonEN = lv_big_button_create(scr, "F:/bmp_english.bin", language_menu.english, BTN_X_PIXEL * 2 + INTERVAL_V * 3, titleHeight, event_handler, ID_EN);
- buttonRU = lv_big_button_create(scr, "F:/bmp_russian.bin", language_menu.russian, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_RU);
- buttonES = lv_big_button_create(scr, "F:/bmp_spanish.bin", language_menu.spanish, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_ES);
- buttonFR = lv_big_button_create(scr, "F:/bmp_french.bin", language_menu.french, BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_FR);
- buttonIT = lv_big_button_create(scr, "F:/bmp_italy.bin", language_menu.italy, BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_IT);
- lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_L_RETURN);
+ buttonT_CN = lv_big_button_create(scr, "F:/bmp_traditional_cn.bin", language_menu.chinese_t, BTN_SIZE_X + INTERVAL_W * 2, titleHeight, event_handler, ID_T_CN);
+ buttonEN = lv_big_button_create(scr, "F:/bmp_english.bin", language_menu.english, BTN_SIZE_X * 2 + INTERVAL_W * 3, titleHeight, event_handler, ID_EN);
+ buttonRU = lv_big_button_create(scr, "F:/bmp_russian.bin", language_menu.russian, BTN_SIZE_X * 3 + INTERVAL_W * 4, titleHeight, event_handler, ID_RU);
+ buttonES = lv_big_button_create(scr, "F:/bmp_spanish.bin", language_menu.spanish, INTERVAL_W, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_ES);
+ buttonFR = lv_big_button_create(scr, "F:/bmp_french.bin", language_menu.french, BTN_SIZE_X + INTERVAL_W * 2, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_FR);
+ buttonIT = lv_big_button_create(scr, "F:/bmp_italy.bin", language_menu.italy, BTN_SIZE_X * 2 + INTERVAL_W * 3, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_IT);
+ lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_SIZE_X * 3 + INTERVAL_W * 4, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_L_RETURN);
disp_language(gCfgItems.language, SELECTED);
}
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_manuaLevel.cpp b/Marlin/src/lcd/extui/mks_ui/draw_manuaLevel.cpp
index 60724aa4f3..dd28381904 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_manuaLevel.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_manuaLevel.cpp
@@ -69,13 +69,13 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
void lv_draw_manualLevel() {
scr = lv_screen_create(LEVELING_UI);
// Create an Image button
- lv_obj_t *buttonPoint1 = lv_big_button_create(scr, "F:/bmp_leveling1.bin", leveling_menu.position1, INTERVAL_V, titleHeight, event_handler, ID_M_POINT1);
+ lv_obj_t *buttonPoint1 = lv_big_button_create(scr, "F:/bmp_leveling1.bin", leveling_menu.position1, INTERVAL_W, titleHeight, event_handler, ID_M_POINT1);
lv_obj_clear_protect(buttonPoint1, LV_PROTECT_FOLLOW);
- lv_big_button_create(scr, "F:/bmp_leveling2.bin", leveling_menu.position2, BTN_X_PIXEL + INTERVAL_V * 2, titleHeight, event_handler, ID_M_POINT2);
- lv_big_button_create(scr, "F:/bmp_leveling3.bin", leveling_menu.position3, BTN_X_PIXEL * 2 + INTERVAL_V * 3, titleHeight, event_handler, ID_M_POINT3);
- lv_big_button_create(scr, "F:/bmp_leveling4.bin", leveling_menu.position4, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_M_POINT4);
- lv_big_button_create(scr, "F:/bmp_leveling5.bin", leveling_menu.position5, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_M_POINT5);
- lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_MANUAL_RETURN);
+ lv_big_button_create(scr, "F:/bmp_leveling2.bin", leveling_menu.position2, BTN_SIZE_X + INTERVAL_W * 2, titleHeight, event_handler, ID_M_POINT2);
+ lv_big_button_create(scr, "F:/bmp_leveling3.bin", leveling_menu.position3, BTN_SIZE_X * 2 + INTERVAL_W * 3, titleHeight, event_handler, ID_M_POINT3);
+ lv_big_button_create(scr, "F:/bmp_leveling4.bin", leveling_menu.position4, BTN_SIZE_X * 3 + INTERVAL_W * 4, titleHeight, event_handler, ID_M_POINT4);
+ lv_big_button_create(scr, "F:/bmp_leveling5.bin", leveling_menu.position5, INTERVAL_W, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_M_POINT5);
+ lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_SIZE_X * 3 + INTERVAL_W * 4, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_MANUAL_RETURN);
}
void lv_clear_manualLevel() {
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_media_select.cpp b/Marlin/src/lcd/extui/mks_ui/draw_media_select.cpp
index a327f2f33e..2b96ab6e12 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_media_select.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_media_select.cpp
@@ -58,9 +58,9 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
void lv_draw_media_select() {
scr = lv_screen_create(MEDIA_SELECT_UI);
- lv_big_button_create(scr, "F:/bmp_sd.bin", media_select_menu.sd_disk, INTERVAL_V, titleHeight, event_handler, ID_T_SD_DISK);
- lv_big_button_create(scr, "F:/bmp_usb_disk.bin", media_select_menu.usb_disk, BTN_X_PIXEL + INTERVAL_V * 2, titleHeight, event_handler, ID_T_USB_DISK);
- lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_T_RETURN);
+ lv_big_button_create(scr, "F:/bmp_sd.bin", media_select_menu.sd_disk, INTERVAL_W, titleHeight, event_handler, ID_T_SD_DISK);
+ lv_big_button_create(scr, "F:/bmp_usb_disk.bin", media_select_menu.usb_disk, BTN_SIZE_X + INTERVAL_W * 2, titleHeight, event_handler, ID_T_USB_DISK);
+ lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_SIZE_X * 3 + INTERVAL_W * 4, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_T_RETURN);
}
void lv_clear_media_select() {
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_more.cpp b/Marlin/src/lcd/extui/mks_ui/draw_more.cpp
index a9c1dc1ec6..864a3e1d96 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_more.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_more.cpp
@@ -91,47 +91,47 @@ void lv_draw_more() {
const bool enc_ena = TERN0(HAS_ROTARY_ENCODER, gCfgItems.encoder_enable);
- lv_obj_t *buttonGCode = lv_imgbtn_create(scr, "F:/bmp_machine_para.bin", INTERVAL_V, titleHeight, event_handler, ID_GCODE);
+ lv_obj_t *buttonGCode = lv_imgbtn_create(scr, "F:/bmp_machine_para.bin", INTERVAL_W, titleHeight, event_handler, ID_GCODE);
if (enc_ena) lv_group_add_obj(g, buttonGCode);
lv_obj_t *labelGCode = lv_label_create_empty(buttonGCode);
#if HAS_USER_ITEM(1)
- lv_obj_t *buttonCustom1 = lv_imgbtn_create(scr, "F:/bmp_custom1.bin", BTN_X_PIXEL + INTERVAL_V * 2, titleHeight, event_handler, ID_CUSTOM_1);
+ lv_obj_t *buttonCustom1 = lv_imgbtn_create(scr, "F:/bmp_custom1.bin", BTN_SIZE_X + INTERVAL_W * 2, titleHeight, event_handler, ID_CUSTOM_1);
if (enc_ena) lv_group_add_obj(g, buttonCustom1);
lv_obj_t *labelCustom1 = lv_label_create_empty(buttonCustom1);
#endif
#if HAS_USER_ITEM(2)
- lv_obj_t *buttonCustom2 = lv_imgbtn_create(scr, "F:/bmp_custom2.bin", BTN_X_PIXEL * 2 + INTERVAL_V * 3, titleHeight, event_handler, ID_CUSTOM_2);
+ lv_obj_t *buttonCustom2 = lv_imgbtn_create(scr, "F:/bmp_custom2.bin", BTN_SIZE_X * 2 + INTERVAL_W * 3, titleHeight, event_handler, ID_CUSTOM_2);
if (enc_ena) lv_group_add_obj(g, buttonCustom2);
lv_obj_t *labelCustom2 = lv_label_create_empty(buttonCustom2);
#endif
#if HAS_USER_ITEM(3)
- lv_obj_t *buttonCustom3 = lv_imgbtn_create(scr, "F:/bmp_custom3.bin", BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_CUSTOM_3);
+ lv_obj_t *buttonCustom3 = lv_imgbtn_create(scr, "F:/bmp_custom3.bin", BTN_SIZE_X * 3 + INTERVAL_W * 4, titleHeight, event_handler, ID_CUSTOM_3);
if (enc_ena) lv_group_add_obj(g, buttonCustom3);
lv_obj_t *labelCustom3 = lv_label_create_empty(buttonCustom3);
#endif
#if HAS_USER_ITEM(4)
- lv_obj_t *buttonCustom4 = lv_imgbtn_create(scr, "F:/bmp_custom4.bin", INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_CUSTOM_4);
+ lv_obj_t *buttonCustom4 = lv_imgbtn_create(scr, "F:/bmp_custom4.bin", INTERVAL_W, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_CUSTOM_4);
if (enc_ena) lv_group_add_obj(g, buttonCustom4);
lv_obj_t *labelCustom4 = lv_label_create_empty(buttonCustom4);
#endif
#if HAS_USER_ITEM(5)
- lv_obj_t *buttonCustom5 = lv_imgbtn_create(scr, "F:/bmp_custom5.bin", BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_CUSTOM_5);
+ lv_obj_t *buttonCustom5 = lv_imgbtn_create(scr, "F:/bmp_custom5.bin", BTN_SIZE_X + INTERVAL_W * 2, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_CUSTOM_5);
if (enc_ena) lv_group_add_obj(g, buttonCustom5);
lv_obj_t *labelCustom5 = lv_label_create_empty(buttonCustom5);
#endif
#if HAS_USER_ITEM(6)
- lv_obj_t *buttonCustom6 = lv_imgbtn_create(scr, "F:/bmp_custom6.bin", BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_CUSTOM_6);
+ lv_obj_t *buttonCustom6 = lv_imgbtn_create(scr, "F:/bmp_custom6.bin", BTN_SIZE_X * 2 + INTERVAL_W * 3, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_CUSTOM_6);
if (enc_ena) lv_group_add_obj(g, buttonCustom6);
lv_obj_t *labelCustom6 = lv_label_create_empty(buttonCustom6);
#endif
- lv_obj_t *buttonBack = lv_imgbtn_create(scr, "F:/bmp_return.bin", BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_M_RETURN);
+ lv_obj_t *buttonBack = lv_imgbtn_create(scr, "F:/bmp_return.bin", BTN_SIZE_X * 3 + INTERVAL_W * 4, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_M_RETURN);
if (enc_ena) lv_group_add_obj(g, buttonBack);
lv_obj_t *label_Back = lv_label_create_empty(buttonBack);
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_move_motor.cpp b/Marlin/src/lcd/extui/mks_ui/draw_move_motor.cpp
index aa9fbdcd95..84959c15a1 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_move_motor.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_move_motor.cpp
@@ -99,27 +99,27 @@ void refresh_pos(lv_task_t *) {
void lv_draw_move_motor() {
scr = lv_screen_create(MOVE_MOTOR_UI);
- lv_obj_t *buttonXI = lv_big_button_create(scr, "F:/bmp_xAdd.bin", move_menu.x_add, INTERVAL_V, titleHeight, event_handler, ID_M_X_P);
+ lv_obj_t *buttonXI = lv_big_button_create(scr, "F:/bmp_xAdd.bin", move_menu.x_add, INTERVAL_W, titleHeight, event_handler, ID_M_X_P);
lv_obj_clear_protect(buttonXI, LV_PROTECT_FOLLOW);
- lv_big_button_create(scr, "F:/bmp_xDec.bin", move_menu.x_dec, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_M_X_N);
- lv_big_button_create(scr, "F:/bmp_yAdd.bin", move_menu.y_add, BTN_X_PIXEL + INTERVAL_V * 2, titleHeight, event_handler, ID_M_Y_P);
- lv_big_button_create(scr, "F:/bmp_yDec.bin", move_menu.y_dec, BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_M_Y_N);
- lv_big_button_create(scr, "F:/bmp_zAdd.bin", move_menu.z_add, BTN_X_PIXEL * 2 + INTERVAL_V * 3, titleHeight, event_handler, ID_M_Z_P);
- lv_big_button_create(scr, "F:/bmp_zDec.bin", move_menu.z_dec, BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_M_Z_N);
+ lv_big_button_create(scr, "F:/bmp_xDec.bin", move_menu.x_dec, INTERVAL_W, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_M_X_N);
+ lv_big_button_create(scr, "F:/bmp_yAdd.bin", move_menu.y_add, BTN_SIZE_X + INTERVAL_W * 2, titleHeight, event_handler, ID_M_Y_P);
+ lv_big_button_create(scr, "F:/bmp_yDec.bin", move_menu.y_dec, BTN_SIZE_X + INTERVAL_W * 2, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_M_Y_N);
+ lv_big_button_create(scr, "F:/bmp_zAdd.bin", move_menu.z_add, BTN_SIZE_X * 2 + INTERVAL_W * 3, titleHeight, event_handler, ID_M_Z_P);
+ lv_big_button_create(scr, "F:/bmp_zDec.bin", move_menu.z_dec, BTN_SIZE_X * 2 + INTERVAL_W * 3, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_M_Z_N);
// button with image and label changed dynamically by disp_move_dist
- buttonV = lv_imgbtn_create(scr, nullptr, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_M_STEP);
+ buttonV = lv_imgbtn_create(scr, nullptr, BTN_SIZE_X * 3 + INTERVAL_W * 4, titleHeight, event_handler, ID_M_STEP);
labelV = lv_label_create_empty(buttonV);
#if HAS_ROTARY_ENCODER
if (gCfgItems.encoder_enable) lv_group_add_obj(g, buttonV);
#endif
- lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_M_RETURN);
+ lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_SIZE_X * 3 + INTERVAL_W * 4, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_M_RETURN);
// We need to patch the title to leave some space on the right for displaying the status
lv_obj_t * title = lv_obj_get_child_back(scr, nullptr);
if (title != nullptr) lv_obj_set_width(title, TFT_WIDTH - 101);
- labelP = lv_label_create(scr, TFT_WIDTH - 100, TITLE_YPOS, "Z:0.0mm");
+ labelP = lv_label_create(scr, TFT_WIDTH - 100, TITLE_POS_Y, "Z:0.0mm");
if (labelP != nullptr)
updatePosTask = lv_task_create(refresh_pos, 300, LV_TASK_PRIO_LOWEST, 0);
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_operation.cpp b/Marlin/src/lcd/extui/mks_ui/draw_operation.cpp
index bf39a52fe9..14b655e09c 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_operation.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_operation.cpp
@@ -126,10 +126,10 @@ void lv_draw_operation() {
scr = lv_screen_create(OPERATE_UI);
// Create image buttons
- lv_obj_t *buttonPreHeat = lv_imgbtn_create(scr, "F:/bmp_temp.bin", INTERVAL_V, titleHeight, event_handler, ID_O_PRE_HEAT);
- lv_obj_t *buttonFilament = lv_imgbtn_create(scr, "F:/bmp_filamentchange.bin", BTN_X_PIXEL + INTERVAL_V * 2, titleHeight, event_handler, ID_O_FILAMENT);
- lv_obj_t *buttonFan = lv_imgbtn_create(scr, "F:/bmp_fan.bin", BTN_X_PIXEL * 2 + INTERVAL_V * 3, titleHeight, event_handler, ID_O_FAN);
- buttonPowerOff = lv_imgbtn_create(scr, gCfgItems.finish_power_off ? "F:/bmp_auto_off.bin" : "F:/bmp_manual_off.bin", BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_O_POWER_OFF);
+ lv_obj_t *buttonPreHeat = lv_imgbtn_create(scr, "F:/bmp_temp.bin", INTERVAL_W, titleHeight, event_handler, ID_O_PRE_HEAT);
+ lv_obj_t *buttonFilament = lv_imgbtn_create(scr, "F:/bmp_filamentchange.bin", BTN_SIZE_X + INTERVAL_W * 2, titleHeight, event_handler, ID_O_FILAMENT);
+ lv_obj_t *buttonFan = lv_imgbtn_create(scr, "F:/bmp_fan.bin", BTN_SIZE_X * 2 + INTERVAL_W * 3, titleHeight, event_handler, ID_O_FAN);
+ buttonPowerOff = lv_imgbtn_create(scr, gCfgItems.finish_power_off ? "F:/bmp_auto_off.bin" : "F:/bmp_manual_off.bin", BTN_SIZE_X * 3 + INTERVAL_W * 4, titleHeight, event_handler, ID_O_POWER_OFF);
#if HAS_ROTARY_ENCODER
if (gCfgItems.encoder_enable) {
@@ -141,8 +141,8 @@ void lv_draw_operation() {
#endif
if (uiCfg.print_state != WORKING) {
- buttonExtrusion = lv_imgbtn_create(scr, "F:/bmp_extrude_opr.bin", INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_O_EXTRUCT);
- buttonMove = lv_imgbtn_create(scr, "F:/bmp_move_opr.bin", BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_O_MOV);
+ buttonExtrusion = lv_imgbtn_create(scr, "F:/bmp_extrude_opr.bin", INTERVAL_W, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_O_EXTRUCT);
+ buttonMove = lv_imgbtn_create(scr, "F:/bmp_move_opr.bin", BTN_SIZE_X + INTERVAL_W * 2, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_O_MOV);
#if HAS_ROTARY_ENCODER
if (gCfgItems.encoder_enable) {
lv_group_add_obj(g, buttonExtrusion);
@@ -151,8 +151,8 @@ void lv_draw_operation() {
#endif
}
else {
- buttonSpeed = lv_imgbtn_create(scr, "F:/bmp_speed.bin", INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_O_SPEED);
- buttonBabyStep = lv_imgbtn_create(scr, "F:/bmp_mov.bin", BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_O_BABY_STEP);
+ buttonSpeed = lv_imgbtn_create(scr, "F:/bmp_speed.bin", INTERVAL_W, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_O_SPEED);
+ buttonBabyStep = lv_imgbtn_create(scr, "F:/bmp_mov.bin", BTN_SIZE_X + INTERVAL_W * 2, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_O_BABY_STEP);
#if HAS_ROTARY_ENCODER
if (gCfgItems.encoder_enable) {
lv_group_add_obj(g, buttonSpeed);
@@ -161,7 +161,7 @@ void lv_draw_operation() {
#endif
}
- buttonBack = lv_imgbtn_create(scr, "F:/bmp_return.bin", BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_O_RETURN);
+ buttonBack = lv_imgbtn_create(scr, "F:/bmp_return.bin", BTN_SIZE_X * 3 + INTERVAL_W * 4, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_O_RETURN);
#if HAS_ROTARY_ENCODER
if (gCfgItems.encoder_enable) lv_group_add_obj(g, buttonBack);
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp b/Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp
index fe289d8cad..a024f050be 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp
@@ -182,8 +182,8 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
void disp_add_dec() {
// Create image buttons
- buttonAdd = lv_big_button_create(scr, "F:/bmp_Add.bin", preheat_menu.add, INTERVAL_V, titleHeight, event_handler, ID_P_ADD);
- buttonDec = lv_big_button_create(scr, "F:/bmp_Dec.bin", preheat_menu.dec, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_P_DEC);
+ buttonAdd = lv_big_button_create(scr, "F:/bmp_Add.bin", preheat_menu.add, INTERVAL_W, titleHeight, event_handler, ID_P_ADD);
+ buttonDec = lv_big_button_create(scr, "F:/bmp_Dec.bin", preheat_menu.dec, BTN_SIZE_X * 3 + INTERVAL_W * 4, titleHeight, event_handler, ID_P_DEC);
}
void lv_draw_preHeat() {
@@ -192,8 +192,8 @@ void lv_draw_preHeat() {
// Create image buttons
disp_add_dec();
- buttonType = lv_imgbtn_create(scr, nullptr, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_P_TYPE);
- buttonStep = lv_imgbtn_create(scr, nullptr, BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_P_STEP);
+ buttonType = lv_imgbtn_create(scr, nullptr, INTERVAL_W, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_P_TYPE);
+ buttonStep = lv_imgbtn_create(scr, nullptr, BTN_SIZE_X + INTERVAL_W * 2, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_P_STEP);
if (uiCfg.curTempType == 0) disp_ext_heart();
if (uiCfg.curTempType == 1) disp_ext_heart();
@@ -205,8 +205,8 @@ void lv_draw_preHeat() {
}
#endif
- lv_big_button_create(scr, "F:/bmp_speed0.bin", preheat_menu.off, BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_P_OFF);
- lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_P_RETURN);
+ lv_big_button_create(scr, "F:/bmp_speed0.bin", preheat_menu.off, BTN_SIZE_X * 2 + INTERVAL_W * 3, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_P_OFF);
+ lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_SIZE_X * 3 + INTERVAL_W * 4, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_P_RETURN);
// Create labels on the image buttons
labelType = lv_label_create_empty(buttonType);
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_print_file.cpp b/Marlin/src/lcd/extui/mks_ui/draw_print_file.cpp
index 69300ee9c9..4fbd76fccf 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_print_file.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_print_file.cpp
@@ -241,9 +241,9 @@ void disp_gcode_icon(uint8_t file_num) {
scr = lv_screen_create(PRINT_FILE_UI, "");
// Create image buttons
- buttonPageUp = lv_imgbtn_create(scr, "F:/bmp_pageUp.bin", OTHER_BTN_XPIEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_P_UP);
- buttonPageDown = lv_imgbtn_create(scr, "F:/bmp_pageDown.bin", OTHER_BTN_XPIEL * 3 + INTERVAL_V * 4, titleHeight + OTHER_BTN_YPIEL + INTERVAL_H, event_handler, ID_P_DOWN);
- buttonBack = lv_imgbtn_create(scr, "F:/bmp_back.bin", OTHER_BTN_XPIEL * 3 + INTERVAL_V * 4, titleHeight + OTHER_BTN_YPIEL * 2 + INTERVAL_H * 2, event_handler, ID_P_RETURN);
+ buttonPageUp = lv_imgbtn_create(scr, "F:/bmp_pageUp.bin", OTHER_BTN_SIZE_X * 3 + INTERVAL_W * 4, titleHeight, event_handler, ID_P_UP);
+ buttonPageDown = lv_imgbtn_create(scr, "F:/bmp_pageDown.bin", OTHER_BTN_SIZE_X * 3 + INTERVAL_W * 4, titleHeight + OTHER_BTN_SIZE_Y + INTERVAL_H, event_handler, ID_P_DOWN);
+ buttonBack = lv_imgbtn_create(scr, "F:/bmp_back.bin", OTHER_BTN_SIZE_X * 3 + INTERVAL_W * 4, titleHeight + OTHER_BTN_SIZE_Y * 2 + INTERVAL_H * 2, event_handler, ID_P_RETURN);
// Create labels on the image buttons
for (i = 0; i < FILE_BTN_CNT; i++) {
@@ -273,9 +273,9 @@ void disp_gcode_icon(uint8_t file_num) {
lv_obj_set_event_cb_mks(buttonGcode[i], event_handler, (i + 1), "", 0);
lv_imgbtn_set_src_both(buttonGcode[i], "F:/bmp_dir.bin");
if (i < 3)
- lv_obj_set_pos(buttonGcode[i], BTN_X_PIXEL * i + INTERVAL_V * (i + 1), titleHeight);
+ lv_obj_set_pos(buttonGcode[i], BTN_SIZE_X * i + INTERVAL_W * (i + 1), titleHeight);
else
- lv_obj_set_pos(buttonGcode[i], BTN_X_PIXEL * (i - 3) + INTERVAL_V * ((i - 3) + 1), BTN_Y_PIXEL + INTERVAL_H + titleHeight);
+ lv_obj_set_pos(buttonGcode[i], BTN_SIZE_X * (i - 3) + INTERVAL_W * ((i - 3) + 1), BTN_SIZE_Y + INTERVAL_H + titleHeight);
labelPageUp[i] = lv_label_create(buttonGcode[i], public_buf_m);
lv_obj_align(labelPageUp[i], buttonGcode[i], LV_ALIGN_IN_BOTTOM_MID, 0, -5);
@@ -292,7 +292,7 @@ void disp_gcode_icon(uint8_t file_num) {
lv_obj_set_event_cb_mks(buttonGcode[i], event_handler, (i + 1), test_public_buf_l, 0);
lv_imgbtn_set_src_both(buttonGcode[i], buttonGcode[i]->mks_pic_name);
if (i < 3) {
- lv_obj_set_pos(buttonGcode[i], BTN_X_PIXEL * i + INTERVAL_V * (i + 1) + FILE_PRE_PIC_X_OFFSET, titleHeight + FILE_PRE_PIC_Y_OFFSET);
+ lv_obj_set_pos(buttonGcode[i], BTN_SIZE_X * i + INTERVAL_W * (i + 1) + FILE_PRE_PIC_X_OFFSET, titleHeight + FILE_PRE_PIC_Y_OFFSET);
buttonText[i] = lv_btn_create(scr, nullptr);
//lv_obj_set_event_cb(buttonText[i], event_handler);
@@ -300,11 +300,11 @@ void disp_gcode_icon(uint8_t file_num) {
lv_obj_clear_protect(buttonText[i], LV_PROTECT_FOLLOW);
lv_btn_set_layout(buttonText[i], LV_LAYOUT_OFF);
//lv_obj_set_event_cb_mks(buttonText[i], event_handler,(i+10),"", 0);
- lv_obj_set_pos(buttonText[i], BTN_X_PIXEL * i + INTERVAL_V * (i + 1) + FILE_PRE_PIC_X_OFFSET, titleHeight + FILE_PRE_PIC_Y_OFFSET + 100);
+ lv_obj_set_pos(buttonText[i], BTN_SIZE_X * i + INTERVAL_W * (i + 1) + FILE_PRE_PIC_X_OFFSET, titleHeight + FILE_PRE_PIC_Y_OFFSET + 100);
lv_obj_set_size(buttonText[i], 100, 40);
}
else {
- lv_obj_set_pos(buttonGcode[i], BTN_X_PIXEL * (i - 3) + INTERVAL_V * ((i - 3) + 1) + FILE_PRE_PIC_X_OFFSET, BTN_Y_PIXEL + INTERVAL_H + titleHeight + FILE_PRE_PIC_Y_OFFSET);
+ lv_obj_set_pos(buttonGcode[i], BTN_SIZE_X * (i - 3) + INTERVAL_W * ((i - 3) + 1) + FILE_PRE_PIC_X_OFFSET, BTN_SIZE_Y + INTERVAL_H + titleHeight + FILE_PRE_PIC_Y_OFFSET);
buttonText[i] = lv_btn_create(scr, nullptr);
//lv_obj_set_event_cb(buttonText[i], event_handler);
@@ -312,7 +312,7 @@ void disp_gcode_icon(uint8_t file_num) {
lv_obj_clear_protect(buttonText[i], LV_PROTECT_FOLLOW);
lv_btn_set_layout(buttonText[i], LV_LAYOUT_OFF);
//lv_obj_set_event_cb_mks(buttonText[i], event_handler,(i+10),"", 0);
- lv_obj_set_pos(buttonText[i], BTN_X_PIXEL * (i - 3) + INTERVAL_V * ((i - 3) + 1) + FILE_PRE_PIC_X_OFFSET, BTN_Y_PIXEL + INTERVAL_H + titleHeight + FILE_PRE_PIC_Y_OFFSET + 100);
+ lv_obj_set_pos(buttonText[i], BTN_SIZE_X * (i - 3) + INTERVAL_W * ((i - 3) + 1) + FILE_PRE_PIC_X_OFFSET, BTN_SIZE_Y + INTERVAL_H + titleHeight + FILE_PRE_PIC_Y_OFFSET + 100);
lv_obj_set_size(buttonText[i], 100, 40);
}
labelPageUp[i] = lv_label_create(buttonText[i], public_buf_m);
@@ -322,9 +322,9 @@ void disp_gcode_icon(uint8_t file_num) {
lv_obj_set_event_cb_mks(buttonGcode[i], event_handler, (i + 1), "", 0);
lv_imgbtn_set_src_both(buttonGcode[i], "F:/bmp_file.bin");
if (i < 3)
- lv_obj_set_pos(buttonGcode[i], BTN_X_PIXEL * i + INTERVAL_V * (i + 1), titleHeight);
+ lv_obj_set_pos(buttonGcode[i], BTN_SIZE_X * i + INTERVAL_W * (i + 1), titleHeight);
else
- lv_obj_set_pos(buttonGcode[i], BTN_X_PIXEL * (i - 3) + INTERVAL_V * ((i - 3) + 1), BTN_Y_PIXEL + INTERVAL_H + titleHeight);
+ lv_obj_set_pos(buttonGcode[i], BTN_SIZE_X * (i - 3) + INTERVAL_W * ((i - 3) + 1), BTN_SIZE_Y + INTERVAL_H + titleHeight);
labelPageUp[i] = lv_label_create(buttonGcode[i], public_buf_m);
lv_obj_align(labelPageUp[i], buttonGcode[i], LV_ALIGN_IN_BOTTOM_MID, 0, -5);
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_set.cpp b/Marlin/src/lcd/extui/mks_ui/draw_set.cpp
index aadf0d98f0..f991b615f6 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_set.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_set.cpp
@@ -112,18 +112,18 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
void lv_draw_set() {
scr = lv_screen_create(SET_UI);
- lv_big_button_create(scr, "F:/bmp_eeprom_settings.bin", set_menu.eepromSet, INTERVAL_V, titleHeight, event_handler, ID_S_EEPROM_SET);
- lv_big_button_create(scr, "F:/bmp_fan.bin", set_menu.fan, BTN_X_PIXEL + INTERVAL_V * 2, titleHeight, event_handler, ID_S_FAN);
- lv_big_button_create(scr, "F:/bmp_about.bin", set_menu.about, BTN_X_PIXEL * 2 + INTERVAL_V * 3, titleHeight, event_handler, ID_S_ABOUT);
- lv_big_button_create(scr, ENABLED(HAS_SUICIDE) ? "F:/bmp_manual_off.bin" : "F:/bmp_function1.bin", set_menu.TERN(HAS_SUICIDE, shutdown, motoroff), BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_S_MOTOR_OFF);
- lv_big_button_create(scr, "F:/bmp_machine_para.bin", set_menu.machine_para, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_S_MACHINE_PARA);
+ lv_big_button_create(scr, "F:/bmp_eeprom_settings.bin", set_menu.eepromSet, INTERVAL_W, titleHeight, event_handler, ID_S_EEPROM_SET);
+ lv_big_button_create(scr, "F:/bmp_fan.bin", set_menu.fan, BTN_SIZE_X + INTERVAL_W * 2, titleHeight, event_handler, ID_S_FAN);
+ lv_big_button_create(scr, "F:/bmp_about.bin", set_menu.about, BTN_SIZE_X * 2 + INTERVAL_W * 3, titleHeight, event_handler, ID_S_ABOUT);
+ lv_big_button_create(scr, ENABLED(HAS_SUICIDE) ? "F:/bmp_manual_off.bin" : "F:/bmp_function1.bin", set_menu.TERN(HAS_SUICIDE, shutdown, motoroff), BTN_SIZE_X * 3 + INTERVAL_W * 4, titleHeight, event_handler, ID_S_MOTOR_OFF);
+ lv_big_button_create(scr, "F:/bmp_machine_para.bin", set_menu.machine_para, INTERVAL_W, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_S_MACHINE_PARA);
#if HAS_LANG_SELECT_SCREEN
- lv_big_button_create(scr, "F:/bmp_language.bin", set_menu.language, BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_S_LANGUAGE);
+ lv_big_button_create(scr, "F:/bmp_language.bin", set_menu.language, BTN_SIZE_X + INTERVAL_W * 2, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_S_LANGUAGE);
#endif
#if ENABLED(MKS_WIFI_MODULE)
- lv_big_button_create(scr, "F:/bmp_wifi.bin", set_menu.wifi, BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_S_WIFI);
+ lv_big_button_create(scr, "F:/bmp_wifi.bin", set_menu.wifi, BTN_SIZE_X * 2 + INTERVAL_W * 3, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_S_WIFI);
#endif
- lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_S_RETURN);
+ lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_SIZE_X * 3 + INTERVAL_W * 4, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_S_RETURN);
}
void lv_clear_set() {
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_tool.cpp b/Marlin/src/lcd/extui/mks_ui/draw_tool.cpp
index 66b30342b2..34df931764 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_tool.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_tool.cpp
@@ -84,14 +84,14 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
void lv_draw_tool() {
scr = lv_screen_create(TOOL_UI);
- lv_big_button_create(scr, "F:/bmp_preHeat.bin", tool_menu.preheat, INTERVAL_V, titleHeight, event_handler, ID_T_PRE_HEAT);
- lv_big_button_create(scr, "F:/bmp_extruct.bin", tool_menu.extrude, BTN_X_PIXEL + INTERVAL_V * 2, titleHeight, event_handler, ID_T_EXTRUCT);
- lv_big_button_create(scr, "F:/bmp_mov.bin", tool_menu.move, BTN_X_PIXEL * 2 + INTERVAL_V * 3, titleHeight, event_handler, ID_T_MOV);
- lv_big_button_create(scr, "F:/bmp_zero.bin", tool_menu.home, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_T_HOME);
- lv_big_button_create(scr, "F:/bmp_leveling.bin", tool_menu.TERN(AUTO_BED_LEVELING_BILINEAR, autoleveling, leveling), INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_T_LEVELING);
- lv_big_button_create(scr, "F:/bmp_filamentchange.bin", tool_menu.filament, BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_T_FILAMENT);
- lv_big_button_create(scr, "F:/bmp_more.bin", tool_menu.more, BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_T_MORE);
- lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_T_RETURN);
+ lv_big_button_create(scr, "F:/bmp_preHeat.bin", tool_menu.preheat, INTERVAL_W, titleHeight, event_handler, ID_T_PRE_HEAT);
+ lv_big_button_create(scr, "F:/bmp_extruct.bin", tool_menu.extrude, BTN_SIZE_X + INTERVAL_W * 2, titleHeight, event_handler, ID_T_EXTRUCT);
+ lv_big_button_create(scr, "F:/bmp_mov.bin", tool_menu.move, BTN_SIZE_X * 2 + INTERVAL_W * 3, titleHeight, event_handler, ID_T_MOV);
+ lv_big_button_create(scr, "F:/bmp_zero.bin", tool_menu.home, BTN_SIZE_X * 3 + INTERVAL_W * 4, titleHeight, event_handler, ID_T_HOME);
+ lv_big_button_create(scr, "F:/bmp_leveling.bin", tool_menu.TERN(AUTO_BED_LEVELING_BILINEAR, autoleveling, leveling), INTERVAL_W, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_T_LEVELING);
+ lv_big_button_create(scr, "F:/bmp_filamentchange.bin", tool_menu.filament, BTN_SIZE_X + INTERVAL_W * 2, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_T_FILAMENT);
+ lv_big_button_create(scr, "F:/bmp_more.bin", tool_menu.more, BTN_SIZE_X * 2 + INTERVAL_W * 3, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_T_MORE);
+ lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_SIZE_X * 3 + INTERVAL_W * 4, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_T_RETURN);
}
void lv_clear_tool() {
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_touch_calibration.cpp b/Marlin/src/lcd/extui/mks_ui/draw_touch_calibration.cpp
index 0fd2aa0ee9..a24d66a60d 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_touch_calibration.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_touch_calibration.cpp
@@ -86,7 +86,7 @@ void lv_update_touch_calibration_screen() {
// end calibration
str = stage == CALIBRATION_SUCCESS ? GET_TEXT(MSG_CALIBRATION_COMPLETED) : GET_TEXT(MSG_CALIBRATION_FAILED);
touch_calibration.calibration_end();
- lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_TC_RETURN);
+ lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_SIZE_X * 3 + INTERVAL_H * 4, BTN_SIZE_Y + INTERVAL_W + titleHeight, event_handler, ID_TC_RETURN);
}
// draw current message
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp b/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
index 875f2d8e72..2779db5b02 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
@@ -1144,9 +1144,9 @@ lv_obj_t* lv_screen_create(DISP_STATE newScreenType, const char *title) {
// title
lv_obj_t *titleLabel = nullptr;
if (!title)
- titleLabel = lv_label_create(scr, TITLE_XPOS, TITLE_YPOS, creat_title_text());
+ titleLabel = lv_label_create(scr, TITLE_POS_X, TITLE_POS_Y, creat_title_text());
else if (title[0] != '\0')
- titleLabel = lv_label_create(scr, TITLE_XPOS, TITLE_YPOS, title);
+ titleLabel = lv_label_create(scr, TITLE_POS_X, TITLE_POS_Y, title);
if (titleLabel)
lv_obj_set_style(titleLabel, &tft_style_label_rel);
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_ui.h b/Marlin/src/lcd/extui/mks_ui/draw_ui.h
index 33a0764d2c..316e5edca3 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_ui.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_ui.h
@@ -113,21 +113,21 @@
#define titleHeight 36 // TFT_screen.title_high
#define INTERVAL_H 2 // TFT_screen.gap_h // 2
- #define INTERVAL_V 2 // TFT_screen.gap_v // 2
- #define BTN_X_PIXEL 117 // TFT_screen.btn_x_pixel
- #define BTN_Y_PIXEL 140 // TFT_screen.btn_y_pixel
+ #define INTERVAL_W 2 // TFT_screen.gap_v // 2
+ #define BTN_SIZE_X 117 // TFT_screen.btn_x_pixel
+ #define BTN_SIZE_Y 140 // TFT_screen.btn_y_pixel
#define SIMPLE_FIRST_PAGE_GRAP 30
#define BUTTON_TEXT_Y_OFFSET -20
- #define TITLE_XPOS 3 // TFT_screen.title_xpos
- #define TITLE_YPOS 5 // TFT_screen.title_ypos
+ #define TITLE_POS_X 3 // TFT_screen.title_xpos
+ #define TITLE_POS_Y 5 // TFT_screen.title_ypos
#define FILE_BTN_CNT 6
- #define OTHER_BTN_XPIEL 117
- #define OTHER_BTN_YPIEL 92
+ #define OTHER_BTN_SIZE_X 117
+ #define OTHER_BTN_SIZE_Y 92
#define FILE_PRE_PIC_X_OFFSET 8
#define FILE_PRE_PIC_Y_OFFSET 0
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_wifi.cpp b/Marlin/src/lcd/extui/mks_ui/draw_wifi.cpp
index c12449f316..f2285c450a 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_wifi.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_wifi.cpp
@@ -71,9 +71,9 @@ void lv_draw_wifi() {
if (gCfgItems.wifi_mode_sel == STA_MODEL) {
if (gCfgItems.cloud_enable)
- buttonCloud = lv_imgbtn_create(scr, "F:/bmp_cloud.bin", BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_W_CLOUD);
+ buttonCloud = lv_imgbtn_create(scr, "F:/bmp_cloud.bin", BTN_SIZE_X + INTERVAL_W * 2, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_W_CLOUD);
- buttonReconnect = lv_imgbtn_create(scr, "F:/bmp_wifi.bin", BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_W_RECONNECT);
+ buttonReconnect = lv_imgbtn_create(scr, "F:/bmp_wifi.bin", BTN_SIZE_X * 2 + INTERVAL_W * 3, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_W_RECONNECT);
#if HAS_ROTARY_ENCODER
if (gCfgItems.cloud_enable) lv_group_add_obj(g, buttonCloud);
@@ -85,7 +85,7 @@ void lv_draw_wifi() {
}
// Create an Image button
- lv_obj_t *buttonBack = lv_imgbtn_create(scr, "F:/bmp_return.bin", BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_W_RETURN);
+ lv_obj_t *buttonBack = lv_imgbtn_create(scr, "F:/bmp_return.bin", BTN_SIZE_X * 3 + INTERVAL_W * 4, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_W_RETURN);
if (enc_ena) lv_group_add_obj(g, buttonBack);
lv_obj_t *label_Back = lv_label_create_empty(buttonBack);
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_wifi_list.cpp b/Marlin/src/lcd/extui/mks_ui/draw_wifi_list.cpp
index 6283b1dc58..56010c3583 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_wifi_list.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_wifi_list.cpp
@@ -92,8 +92,8 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
void lv_draw_wifi_list() {
scr = lv_screen_create(WIFI_LIST_UI);
- lv_obj_t *buttonDown = lv_imgbtn_create(scr, "F:/bmp_pageDown.bin", OTHER_BTN_XPIEL * 3 + INTERVAL_V * 4, titleHeight + OTHER_BTN_YPIEL + INTERVAL_H, event_handler, ID_WL_DOWN);
- lv_obj_t *buttonBack = lv_imgbtn_create(scr, "F:/bmp_back.bin", OTHER_BTN_XPIEL * 3 + INTERVAL_V * 4, titleHeight + (OTHER_BTN_YPIEL + INTERVAL_H) * 2, event_handler, ID_WL_RETURN);
+ lv_obj_t *buttonDown = lv_imgbtn_create(scr, "F:/bmp_pageDown.bin", OTHER_BTN_SIZE_X * 3 + INTERVAL_W * 4, titleHeight + OTHER_BTN_SIZE_Y + INTERVAL_H, event_handler, ID_WL_DOWN);
+ lv_obj_t *buttonBack = lv_imgbtn_create(scr, "F:/bmp_back.bin", OTHER_BTN_SIZE_X * 3 + INTERVAL_W * 4, titleHeight + (OTHER_BTN_SIZE_Y + INTERVAL_H) * 2, event_handler, ID_WL_RETURN);
for (uint8_t i = 0; i < NUMBER_OF_PAGE; i++) {
buttonWifiN[i] = lv_label_btn_create(scr, 0, NAME_BTN_Y * i + 10 + titleHeight, NAME_BTN_X, NAME_BTN_Y, event_handler, i + 1);
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_z_offset_wizard.cpp b/Marlin/src/lcd/extui/mks_ui/draw_z_offset_wizard.cpp
index cdd151322b..2ad9816e01 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_z_offset_wizard.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_z_offset_wizard.cpp
@@ -159,21 +159,21 @@ void lv_draw_z_offset_wizard() {
scr = lv_screen_create(Z_OFFSET_WIZARD_UI, machine_menu.LevelingZoffsetTitle);
- lv_obj_t *buttonXI = lv_big_button_create(scr, "F:/bmp_zAdd.bin", move_menu.z_add, INTERVAL_V, titleHeight, event_handler, ID_M_Z_P);
+ lv_obj_t *buttonXI = lv_big_button_create(scr, "F:/bmp_zAdd.bin", move_menu.z_add, INTERVAL_W, titleHeight, event_handler, ID_M_Z_P);
lv_obj_clear_protect(buttonXI, LV_PROTECT_FOLLOW);
- lv_big_button_create(scr, "F:/bmp_zDec.bin", move_menu.z_dec, INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_M_Z_N);
+ lv_big_button_create(scr, "F:/bmp_zDec.bin", move_menu.z_dec, INTERVAL_W * 3, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_M_Z_N);
// button with image and label changed dynamically by disp_move_dist
- buttonV = lv_imgbtn_create(scr, nullptr, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_M_STEP);
+ buttonV = lv_imgbtn_create(scr, nullptr, BTN_SIZE_X * 3 + INTERVAL_W * 4, titleHeight, event_handler, ID_M_STEP);
labelV = lv_label_create_empty(buttonV);
#if HAS_ROTARY_ENCODER
if (gCfgItems.encoder_enable) lv_group_add_obj(g, buttonV);
#endif
// save and back
- lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_save, BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_M_SAVE);
+ lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_save, BTN_SIZE_X * 2 + INTERVAL_W * 3, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_M_SAVE);
// cancel and back
- lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_M_RETURN);
+ lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_SIZE_X * 3 + INTERVAL_W * 4, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_M_RETURN);
// We need to patch the title to leave some space on the right for displaying the status
lv_obj_t * z_offset_ref_title = lv_obj_get_child_back(scr, nullptr);
@@ -183,7 +183,7 @@ void lv_draw_z_offset_wizard() {
// We need to patch the Z Offset to leave some space in the middle for displaying the status
lv_obj_t * title= lv_obj_get_child_back(scr, nullptr);
if (title != nullptr) lv_obj_set_width(title, TFT_WIDTH - 101);
- labelP = lv_label_create(scr, TFT_WIDTH - 100, TITLE_YPOS, "Z:0.0mm");
+ labelP = lv_label_create(scr, TFT_WIDTH - 100, TITLE_POS_Y, "Z:0.0mm");
if (labelP != nullptr)
updatePosTask = lv_task_create(refresh_wizard_pos, 300, LV_TASK_PRIO_LOWEST, 0);
From c09638f821747ff86e3db402aff8f62c7dd8abbc Mon Sep 17 00:00:00 2001
From: staff1010 <132726146+staff1010@users.noreply.github.com>
Date: Tue, 10 Jun 2025 02:37:38 +0800
Subject: [PATCH 05/86] =?UTF-8?q?=F0=9F=9A=B8=20Improve=20XPT2046=20touch,?=
=?UTF-8?q?=20MKS=20UI=20calibration=20(#27892)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Marlin/src/HAL/STM32/tft/xpt2046.h | 6 +++++-
Marlin/src/gcode/lcd/M995.cpp | 2 ++
Marlin/src/lcd/extui/mks_ui/draw_touch_calibration.cpp | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/Marlin/src/HAL/STM32/tft/xpt2046.h b/Marlin/src/HAL/STM32/tft/xpt2046.h
index 685c9441ae..f3d3e53291 100644
--- a/Marlin/src/HAL/STM32/tft/xpt2046.h
+++ b/Marlin/src/HAL/STM32/tft/xpt2046.h
@@ -49,7 +49,11 @@
#define TOUCH_INT_PIN -1
#endif
-#define XPT2046_DFR_MODE 0x00
+#if PIN_EXISTS(TOUCH_INT)
+ #define XPT2046_DFR_MODE 0x00
+#else
+ #define XPT2046_DFR_MODE 0x01
+#endif
#define XPT2046_SER_MODE 0x04
#define XPT2046_CONTROL 0x80
diff --git a/Marlin/src/gcode/lcd/M995.cpp b/Marlin/src/gcode/lcd/M995.cpp
index d5f825c0c8..2b698a5c58 100644
--- a/Marlin/src/gcode/lcd/M995.cpp
+++ b/Marlin/src/gcode/lcd/M995.cpp
@@ -28,6 +28,7 @@
#if HAS_TFT_LVGL_UI
#include "../../lcd/extui/mks_ui/draw_touch_calibration.h"
+ #include "../../lcd/extui/mks_ui/draw_ui.h"
#else
#include "../../lcd/menu/menu.h"
#endif
@@ -38,6 +39,7 @@
void GcodeSuite::M995() {
#if HAS_TFT_LVGL_UI
+ clear_cur_ui();
lv_draw_touch_calibration_screen();
#else
ui.goto_screen(touch_screen_calibration);
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_touch_calibration.cpp b/Marlin/src/lcd/extui/mks_ui/draw_touch_calibration.cpp
index a24d66a60d..25c50a2436 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_touch_calibration.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_touch_calibration.cpp
@@ -86,7 +86,7 @@ void lv_update_touch_calibration_screen() {
// end calibration
str = stage == CALIBRATION_SUCCESS ? GET_TEXT(MSG_CALIBRATION_COMPLETED) : GET_TEXT(MSG_CALIBRATION_FAILED);
touch_calibration.calibration_end();
- lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_SIZE_X * 3 + INTERVAL_H * 4, BTN_SIZE_Y + INTERVAL_W + titleHeight, event_handler, ID_TC_RETURN);
+ lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, 180, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_TC_RETURN);
}
// draw current message
From fbce32740205da4b8cafef56cadd9ddb81b37306 Mon Sep 17 00:00:00 2001
From: Scott Lahteine
Date: Sun, 8 Jun 2025 16:37:39 -0500
Subject: [PATCH 06/86] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20TMCSt?=
=?UTF-8?q?epper=20=3D>=200.8.7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ini/features.ini | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ini/features.ini b/ini/features.ini
index 69ec43f030..d2e0f9d92e 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -20,7 +20,7 @@ MARLIN_TEST_BUILD = build_src_filter=+
POSTMORTEM_DEBUGGING = build_src_filter=+ +
build_flags=-funwind-tables
MKS_WIFI_MODULE = QRCode=https://github.com/makerbase-mks/QRCode/archive/261c5a696a.zip
-HAS_TRINAMIC_CONFIG = TMCStepper=https://github.com/MarlinFirmware/TMCStepper/archive/v0.8.6.zip
+HAS_TRINAMIC_CONFIG = TMCStepper=https://github.com/MarlinFirmware/TMCStepper/archive/v0.8.7.zip
build_src_filter=+ + + + +
HAS_STEPPER_CONTROL = build_src_filter=+
HAS_T(RINAMIC_CONFIG|MC_SPI) = build_src_filter=+
From c2d586cf5f48750f8541f9f063f513e2796b3805 Mon Sep 17 00:00:00 2001
From: thinkyhead
Date: Tue, 10 Jun 2025 00:32:33 +0000
Subject: [PATCH 07/86] [cron] Bump distribution date (2025-06-10)
---
Marlin/Version.h | 2 +-
Marlin/src/inc/Version.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Marlin/Version.h b/Marlin/Version.h
index 9f5daa27a0..ac647da94a 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
* here we define this default string as the date where the latest release
* version was tagged.
*/
-//#define STRING_DISTRIBUTION_DATE "2025-06-09"
+//#define STRING_DISTRIBUTION_DATE "2025-06-10"
/**
* The protocol for communication to the host. Protocol indicates communication
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 16911f23ce..749e1a9543 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
* version was tagged.
*/
#ifndef STRING_DISTRIBUTION_DATE
- #define STRING_DISTRIBUTION_DATE "2025-06-09"
+ #define STRING_DISTRIBUTION_DATE "2025-06-10"
#endif
/**
From 68dc89cf75b72cefeee19728236bae592bd295e7 Mon Sep 17 00:00:00 2001
From: Scott Lahteine
Date: Tue, 10 Jun 2025 15:29:22 -0500
Subject: [PATCH 08/86] =?UTF-8?q?=F0=9F=8E=A8=20Align=20Bed=20PID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Marlin/Configuration.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 08216d17b8..239a91facf 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -805,8 +805,8 @@
// 120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
// from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
- #define DEFAULT_bedKp 10.00
- #define DEFAULT_bedKi .023
+ #define DEFAULT_bedKp 10.00
+ #define DEFAULT_bedKi 0.023
#define DEFAULT_bedKd 305.4
// FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles.
From 1bb1603886339853e4a3d41857ead45f9cea331a Mon Sep 17 00:00:00 2001
From: narno2202 <130909513+narno2202@users.noreply.github.com>
Date: Tue, 10 Jun 2025 22:31:02 +0200
Subject: [PATCH 09/86] =?UTF-8?q?=F0=9F=8E=A8=20FT=20Motion=20cleanup=20(#?=
=?UTF-8?q?27910)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Marlin/src/module/ft_motion.cpp | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/Marlin/src/module/ft_motion.cpp b/Marlin/src/module/ft_motion.cpp
index cb31525572..5ccc364c1d 100644
--- a/Marlin/src/module/ft_motion.cpp
+++ b/Marlin/src/module/ft_motion.cpp
@@ -441,13 +441,7 @@ void FTMotion::runoutBlock() {
const int32_t n_diff = n_to_settle_shaper - n_to_fill_batch,
n_to_fill_batch_after_settling = n_diff > 0 ? (FTM_BATCH_SIZE) - (n_diff % (FTM_BATCH_SIZE)) : -n_diff;
- const int32_t n_to_settle_and_fill_batch = n_to_settle_shaper + n_to_fill_batch_after_settling;
-
- const int32_t N_needed_to_propagate_to_stepper = PROP_BATCHES;
-
- const int32_t n_to_use = N_needed_to_propagate_to_stepper * (FTM_BATCH_SIZE) + n_to_settle_and_fill_batch;
-
- max_intervals = n_to_use;
+ max_intervals = PROP_BATCHES * (FTM_BATCH_SIZE) + n_to_settle_shaper + n_to_fill_batch_after_settling;
blockProcRdy = true;
}
From 950f492ce703ff5d545833020b208020755cd194 Mon Sep 17 00:00:00 2001
From: Andrew <18502096+classicrocker883@users.noreply.github.com>
Date: Tue, 10 Jun 2025 16:34:54 -0400
Subject: [PATCH 10/86] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20ProUI=20edit=20Lin.A?=
=?UTF-8?q?dv.K=20(#27895)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Marlin/src/lcd/e3v2/proui/dwin.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Marlin/src/lcd/e3v2/proui/dwin.cpp b/Marlin/src/lcd/e3v2/proui/dwin.cpp
index 9d857f1e3a..cf99a13529 100644
--- a/Marlin/src/lcd/e3v2/proui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/proui/dwin.cpp
@@ -2689,7 +2689,7 @@ void applyMaxAccel() { planner.set_max_acceleration(hmiValue.axis, menuData.valu
#if ENABLED(LIN_ADVANCE)
#define LA_FDIGITS 3
void applyLA_K() { planner.set_advance_k(menuData.value / POW(10, LA_FDIGITS)); }
- void setLA_K() { setPFloatOnClick(0, 10, LA_FDIGITS, applyLA_K); }
+ void setLA_K() { setFloatOnClick(0, 10, LA_FDIGITS, planner.extruder_advance_K[0], applyLA_K); }
#endif
#if HAS_X_AXIS
From cf7f5bcdee96582bbb1feac0b4edd78ed09a50b1 Mon Sep 17 00:00:00 2001
From: thinkyhead
Date: Wed, 11 Jun 2025 00:32:31 +0000
Subject: [PATCH 11/86] [cron] Bump distribution date (2025-06-11)
---
Marlin/Version.h | 2 +-
Marlin/src/inc/Version.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Marlin/Version.h b/Marlin/Version.h
index ac647da94a..5d9ae871e5 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
* here we define this default string as the date where the latest release
* version was tagged.
*/
-//#define STRING_DISTRIBUTION_DATE "2025-06-10"
+//#define STRING_DISTRIBUTION_DATE "2025-06-11"
/**
* The protocol for communication to the host. Protocol indicates communication
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 749e1a9543..ae5ce93f40 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
* version was tagged.
*/
#ifndef STRING_DISTRIBUTION_DATE
- #define STRING_DISTRIBUTION_DATE "2025-06-10"
+ #define STRING_DISTRIBUTION_DATE "2025-06-11"
#endif
/**
From 9ad9323aac3c39a7243d293cc0bab66de84f2681 Mon Sep 17 00:00:00 2001
From: Scott Lahteine
Date: Fri, 13 Jun 2025 18:10:34 -0500
Subject: [PATCH 12/86] =?UTF-8?q?=F0=9F=8E=A8=20Minor=20ternary=20style=20?=
=?UTF-8?q?tweak?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Marlin/src/module/planner.cpp | 8 ++++----
Marlin/src/module/settings.cpp | 4 +++-
Marlin/src/module/temperature.cpp | 4 ++--
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 2e2b5798b7..156ab142f9 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -1609,7 +1609,7 @@ void Planner::quick_stop() {
// Restart the block delay for the first movement - As the queue was
// forced to empty, there's no risk the ISR will touch this.
- delay_before_delivering = TERN_(FT_MOTION, ftMotion.cfg.active ? BLOCK_DELAY_NONE :) BLOCK_DELAY_FOR_1ST_MOVE;
+ delay_before_delivering = TERN0(FT_MOTION, ftMotion.cfg.active) ? BLOCK_DELAY_NONE : BLOCK_DELAY_FOR_1ST_MOVE;
TERN_(HAS_WIRED_LCD, clear_block_buffer_runtime()); // Clear the accumulated runtime
@@ -1770,7 +1770,7 @@ bool Planner::_buffer_steps(const xyze_long_t &target
// As there are no queued movements, the Stepper ISR will not touch this
// variable, so there is no risk setting this here (but it MUST be done
// before the following line!!)
- delay_before_delivering = TERN_(FT_MOTION, ftMotion.cfg.active ? BLOCK_DELAY_NONE :) BLOCK_DELAY_FOR_1ST_MOVE;
+ delay_before_delivering = TERN0(FT_MOTION, ftMotion.cfg.active) ? BLOCK_DELAY_NONE : BLOCK_DELAY_FOR_1ST_MOVE;
}
// Move buffer head
@@ -2841,7 +2841,7 @@ void Planner::buffer_sync_block(const BlockFlagBit sync_flag/*=BLOCK_BIT_SYNC_PO
// As there are no queued movements, the Stepper ISR will not touch this
// variable, so there is no risk setting this here (but it MUST be done
// before the following line!!)
- delay_before_delivering = TERN_(FT_MOTION, ftMotion.cfg.active ? BLOCK_DELAY_NONE :) BLOCK_DELAY_FOR_1ST_MOVE;
+ delay_before_delivering = TERN0(FT_MOTION, ftMotion.cfg.active) ? BLOCK_DELAY_NONE : BLOCK_DELAY_FOR_1ST_MOVE;
}
block_buffer_head = next_buffer_head;
@@ -3133,7 +3133,7 @@ bool Planner::buffer_line(const xyze_pos_t &cart, const_feedRate_t fr_mm_s
// As there are no queued movements, the Stepper ISR will not touch this
// variable, so there is no risk setting this here (but it MUST be done
// before the following line!!)
- delay_before_delivering = TERN_(FT_MOTION, ftMotion.cfg.active ? BLOCK_DELAY_NONE :) BLOCK_DELAY_FOR_1ST_MOVE;
+ delay_before_delivering = TERN0(FT_MOTION, ftMotion.cfg.active) ? BLOCK_DELAY_NONE : BLOCK_DELAY_FOR_1ST_MOVE;
}
// Move buffer head
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 0d197b2d12..fde92376fb 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -3708,6 +3708,7 @@ void MarlinSettings::reset() {
// Model predictive control
//
#if ENABLED(MPCTEMP)
+
constexpr float _mpc_heater_power[] = MPC_HEATER_POWER;
constexpr float _mpc_block_heat_capacity[] = MPC_BLOCK_HEAT_CAPACITY;
constexpr float _mpc_sensor_responsiveness[] = MPC_SENSOR_RESPONSIVENESS;
@@ -3737,7 +3738,8 @@ void MarlinSettings::reset() {
#endif
mpc.filament_heat_capacity_permm = _filament_heat_capacity_permm[e];
}
- #endif
+
+ #endif // MPCTEMP
//
// Fixed-Time Motion
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index c1684a9fe1..04431ff299 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -1383,7 +1383,7 @@ void Temperature::factory_reset() {
// If analytic tuning fails, fall back to differential tuning
if (tuning_type == AUTO && (mpc.sensor_responsiveness <= 0 || mpc.block_heat_capacity <= 0))
- tuning_type = FORCE_DIFFERENTIAL;
+ tuning_type = FORCE_DIFFERENTIAL;
if (tuning_type == FORCE_DIFFERENTIAL) {
#if ENABLED(MPC_AUTOTUNE_DEBUG)
@@ -1846,7 +1846,7 @@ void Temperature::mintemp_error(const heater_id_t heater_id OPTARG(ERR_INCLUDE_T
float ambient_xfer_coeff = mpc.ambient_xfer_coeff_fan0;
#if ENABLED(MPC_INCLUDE_FAN)
const uint8_t fan_index = TERN(SINGLEFAN, 0, ee);
- const float fan_fraction = TERN_(MPC_FAN_0_ACTIVE_HOTEND, !this_hotend ? 0.0f :) fan_speed[fan_index] * RECIPROCAL(255);
+ const float fan_fraction = TERN0(MPC_FAN_0_ACTIVE_HOTEND, !this_hotend) ? 0.0f : fan_speed[fan_index] * RECIPROCAL(255);
ambient_xfer_coeff += fan_fraction * mpc.fan255_adjustment;
#endif
From 89416a583c413e3696734a21373397f75a4b4fea Mon Sep 17 00:00:00 2001
From: tombrazier <68918209+tombrazier@users.noreply.github.com>
Date: Sat, 14 Jun 2025 01:10:03 +0100
Subject: [PATCH 13/86] =?UTF-8?q?=E2=9C=A8=20MPC=5FPTC=20(#27911)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Marlin/Configuration.h | 7 ++++++-
Marlin/src/gcode/temp/M306.cpp | 30 +++++++++++++++++++++---------
Marlin/src/inc/SanityCheck.h | 1 +
Marlin/src/module/settings.cpp | 12 ++++++++++++
Marlin/src/module/temperature.cpp | 5 +++--
Marlin/src/module/temperature.h | 4 ++++
6 files changed, 47 insertions(+), 12 deletions(-)
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 239a91facf..f6c48eae95 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -735,7 +735,12 @@
//#define MPC_AUTOTUNE_MENU // Add MPC auto-tuning to the "Advanced Settings" menu. (~350 bytes of flash)
#define MPC_MAX 255 // (0..255) Current to nozzle while MPC is active.
- #define MPC_HEATER_POWER { 40.0f } // (W) Heat cartridge powers.
+ #define MPC_HEATER_POWER { 40.0f } // (W) Nominal heat cartridge powers.
+ //#define MPC_PTC // Hotend power changes with temperature (e.g., PTC heat cartridges).
+ #if ENABLED(MPC_PTC)
+ #define MPC_HEATER_ALPHA { 0.0028f } // Temperature coefficient of resistance of the heat cartridges.
+ #define MPC_HEATER_REFTEMP { 20 } // (°C) Reference temperature for MPC_HEATER_POWER and MPC_HEATER_ALPHA.
+ #endif
#define MPC_INCLUDE_FAN // Model the fan speed?
diff --git a/Marlin/src/gcode/temp/M306.cpp b/Marlin/src/gcode/temp/M306.cpp
index 12e175420d..e0c9d935e3 100644
--- a/Marlin/src/gcode/temp/M306.cpp
+++ b/Marlin/src/gcode/temp/M306.cpp
@@ -64,9 +64,13 @@ void GcodeSuite::M306() {
case 2: tuning_type = Temperature::MPCTuningType::FORCE_ASYMPTOTIC; break;
default: tuning_type = Temperature::MPCTuningType::AUTO; break;
}
- LCD_MESSAGE(MSG_MPC_AUTOTUNE);
- thermalManager.MPC_autotune(e, tuning_type);
- ui.reset_status();
+ if (TERN0(MPC_PTC, tuning_type == Temperature::MPCTuningType::FORCE_ASYMPTOTIC))
+ SERIAL_ECHOLNPGM("Aymptotic tuning not avaiable for PTC hotends");
+ else {
+ LCD_MESSAGE(MSG_MPC_AUTOTUNE);
+ thermalManager.MPC_autotune(e, tuning_type);
+ ui.reset_status();
+ }
return;
}
#endif
@@ -74,6 +78,10 @@ void GcodeSuite::M306() {
if (parser.seen("ACFPRH")) {
MPC_t &mpc = thermalManager.temp_hotend[e].mpc;
if (parser.seenval('P')) mpc.heater_power = parser.value_float();
+ #if ENABLED(MPC_PTC)
+ if (parser.seenval('L')) mpc.heater_alpha = parser.value_float();
+ if (parser.seenval('Q')) mpc.heater_reftemp = parser.value_float();
+ #endif
if (parser.seenval('C')) mpc.block_heat_capacity = parser.value_float();
if (parser.seenval('R')) mpc.sensor_responsiveness = parser.value_float();
if (parser.seenval('A')) mpc.ambient_xfer_coeff_fan0 = parser.value_float();
@@ -94,16 +102,20 @@ void GcodeSuite::M306_report(const bool forReplay/*=true*/) {
HOTEND_LOOP() {
report_echo_start(forReplay);
MPC_t &mpc = thermalManager.temp_hotend[e].mpc;
- SERIAL_ECHOPGM(" M306 E", e,
+ SERIAL_ECHOLNPGM(" M306 E", e,
" P", p_float_t(mpc.heater_power, 2),
+ #if ENABLED(MPC_PTC)
+ " L", p_float_t(mpc.heater_alpha, 4),
+ " Q", p_float_t(mpc.heater_reftemp, 2),
+ #endif
" C", p_float_t(mpc.block_heat_capacity, 2),
" R", p_float_t(mpc.sensor_responsiveness, 4),
- " A", p_float_t(mpc.ambient_xfer_coeff_fan0, 4)
+ " A", p_float_t(mpc.ambient_xfer_coeff_fan0, 4),
+ #if ENABLED(MPC_INCLUDE_FAN)
+ " F", p_float_t(mpc.fanCoefficient(), 4),
+ #endif
+ " H", p_float_t(mpc.filament_heat_capacity_permm, 4)
);
- #if ENABLED(MPC_INCLUDE_FAN)
- SERIAL_ECHOPGM(" F", p_float_t(mpc.fanCoefficient(), 4));
- #endif
- SERIAL_ECHOLNPGM(" H", p_float_t(mpc.filament_heat_capacity_permm, 4));
}
}
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index f3f4a97dff..60b328ea67 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -1026,6 +1026,7 @@ static_assert(NUM_SERVOS <= NUM_SERVO_PLUGS, "NUM_SERVOS (or some servo index) i
#undef MPC_AUTOTUNE
#undef MPC_EDIT_MENU
#undef MPC_AUTOTUNE_MENU
+ #undef MPC_PTC
#endif
#if ENABLED(MPC_INCLUDE_FAN)
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index fde92376fb..c8e5df92b3 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -3710,6 +3710,10 @@ void MarlinSettings::reset() {
#if ENABLED(MPCTEMP)
constexpr float _mpc_heater_power[] = MPC_HEATER_POWER;
+ #if ENABLED(MPC_PTC)
+ constexpr float _mpc_heater_alpha[] = MPC_HEATER_ALPHA;
+ constexpr float _mpc_heater_reftemp[] = MPC_HEATER_REFTEMP;
+ #endif
constexpr float _mpc_block_heat_capacity[] = MPC_BLOCK_HEAT_CAPACITY;
constexpr float _mpc_sensor_responsiveness[] = MPC_SENSOR_RESPONSIVENESS;
constexpr float _mpc_ambient_xfer_coeff[] = MPC_AMBIENT_XFER_COEFF;
@@ -3719,6 +3723,10 @@ void MarlinSettings::reset() {
constexpr float _filament_heat_capacity_permm[] = FILAMENT_HEAT_CAPACITY_PERMM;
static_assert(COUNT(_mpc_heater_power) == HOTENDS, "MPC_HEATER_POWER must have HOTENDS items.");
+ #if ENABLED(MPC_PTC)
+ static_assert(COUNT(_mpc_heater_alpha) == HOTENDS, "MPC_HEATER_ALPHA must have HOTENDS items.");
+ static_assert(COUNT(_mpc_heater_reftemp) == HOTENDS, "MPC_HEATER_REFTEMP must have HOTENDS items.");
+ #endif
static_assert(COUNT(_mpc_block_heat_capacity) == HOTENDS, "MPC_BLOCK_HEAT_CAPACITY must have HOTENDS items.");
static_assert(COUNT(_mpc_sensor_responsiveness) == HOTENDS, "MPC_SENSOR_RESPONSIVENESS must have HOTENDS items.");
static_assert(COUNT(_mpc_ambient_xfer_coeff) == HOTENDS, "MPC_AMBIENT_XFER_COEFF must have HOTENDS items.");
@@ -3730,6 +3738,10 @@ void MarlinSettings::reset() {
HOTEND_LOOP() {
MPC_t &mpc = thermalManager.temp_hotend[e].mpc;
mpc.heater_power = _mpc_heater_power[e];
+ #if ENABLED(MPC_PTC)
+ mpc.heater_alpha = _mpc_heater_alpha[e];
+ mpc.heater_reftemp = _mpc_heater_reftemp[e];
+ #endif
mpc.block_heat_capacity = _mpc_block_heat_capacity[e];
mpc.sensor_responsiveness = _mpc_sensor_responsiveness[e];
mpc.ambient_xfer_coeff_fan0 = _mpc_ambient_xfer_coeff[e];
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 04431ff299..9c3dee6cdd 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -1864,7 +1864,8 @@ void Temperature::mintemp_error(const heater_id_t heater_id OPTARG(ERR_INCLUDE_T
}
// Update the modeled temperatures
- float blocktempdelta = hotend.soft_pwm_amount * mpc.heater_power * (MPC_dT / 127) / mpc.block_heat_capacity;
+ const float _heater_power = DIV_TERN(MPC_PTC, mpc.heater_power, 1.0f + mpc.heater_alpha * (hotend.modeled_block_temp - mpc.heater_reftemp));
+ float blocktempdelta = hotend.soft_pwm_amount * _heater_power * (MPC_dT / 127) / mpc.block_heat_capacity;
blocktempdelta += (hotend.modeled_ambient_temp - hotend.modeled_block_temp) * ambient_xfer_coeff * MPC_dT / mpc.block_heat_capacity;
hotend.modeled_block_temp += blocktempdelta;
@@ -1888,7 +1889,7 @@ void Temperature::mintemp_error(const heater_id_t heater_id OPTARG(ERR_INCLUDE_T
power -= (hotend.modeled_ambient_temp - hotend.modeled_block_temp) * ambient_xfer_coeff;
}
- float pid_output = power * 254.0f / mpc.heater_power + 1.0f; // Ensure correct quantization into a range of 0 to 127
+ float pid_output = power * 254.0f / _heater_power + 1.0f; // Ensure correct quantization into a range of 0 to 127
LIMIT(pid_output, 0, MPC_MAX);
/* <-- add a slash to enable
diff --git a/Marlin/src/module/temperature.h b/Marlin/src/module/temperature.h
index c96d9aba74..33b7bfb226 100644
--- a/Marlin/src/module/temperature.h
+++ b/Marlin/src/module/temperature.h
@@ -386,6 +386,10 @@ typedef struct { float p, i, d, c, f; } raw_pidcf_t;
static bool e_paused; // Pause E filament permm tracking
static int32_t e_position; // For E tracking
float heater_power; // M306 P
+ #if ENABLED(MPC_PTC)
+ float heater_alpha; // M306 L
+ float heater_reftemp; // M306 Q
+ #endif
float block_heat_capacity; // M306 C
float sensor_responsiveness; // M306 R
float ambient_xfer_coeff_fan0; // M306 A
From 54a7ce999fc7cef38a1f7e6bce47cbccbca3373d Mon Sep 17 00:00:00 2001
From: Scott Lahteine
Date: Fri, 13 Jun 2025 19:28:20 -0500
Subject: [PATCH 14/86] =?UTF-8?q?=F0=9F=8E=A8=20Update=20MPC=20sanity=20ch?=
=?UTF-8?q?ecka?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Followup to #27911
---
Marlin/src/module/settings.cpp | 27 ++++++++++++++-------------
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index c8e5df92b3..8c3fae1393 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -3710,30 +3710,31 @@ void MarlinSettings::reset() {
#if ENABLED(MPCTEMP)
constexpr float _mpc_heater_power[] = MPC_HEATER_POWER;
+ static_assert(HOTENDS == COUNT(_mpc_heater_power), "MPC_HEATER_POWER requires values for all (" STRINGIFY(HOTENDS) ") hotends.");
+
#if ENABLED(MPC_PTC)
constexpr float _mpc_heater_alpha[] = MPC_HEATER_ALPHA;
constexpr float _mpc_heater_reftemp[] = MPC_HEATER_REFTEMP;
+ static_assert(HOTENDS == COUNT(_mpc_heater_alpha), "MPC_HEATER_ALPHA requires values for all (" STRINGIFY(HOTENDS) ") hotends.");
+ static_assert(HOTENDS == COUNT(_mpc_heater_reftemp), "MPC_HEATER_REFTEMP requires values for all (" STRINGIFY(HOTENDS) ") hotends.");
#endif
+
constexpr float _mpc_block_heat_capacity[] = MPC_BLOCK_HEAT_CAPACITY;
+ static_assert(HOTENDS == COUNT(_mpc_block_heat_capacity), "MPC_BLOCK_HEAT_CAPACITY requires values for all (" STRINGIFY(HOTENDS) ") hotends.");
+
constexpr float _mpc_sensor_responsiveness[] = MPC_SENSOR_RESPONSIVENESS;
+ static_assert(HOTENDS == COUNT(_mpc_sensor_responsiveness), "MPC_SENSOR_RESPONSIVENESS requires values for all (" STRINGIFY(HOTENDS) ") hotends.");
+
constexpr float _mpc_ambient_xfer_coeff[] = MPC_AMBIENT_XFER_COEFF;
+ static_assert(HOTENDS == COUNT(_mpc_ambient_xfer_coeff), "MPC_AMBIENT_XFER_COEFF requires values for all (" STRINGIFY(HOTENDS) ") hotends.");
+
#if ENABLED(MPC_INCLUDE_FAN)
constexpr float _mpc_ambient_xfer_coeff_fan255[] = MPC_AMBIENT_XFER_COEFF_FAN255;
+ static_assert(HOTENDS == COUNT(_mpc_ambient_xfer_coeff_fan255), "MPC_AMBIENT_XFER_COEFF_FAN255 requires values for all (" STRINGIFY(HOTENDS) ") hotends.");
#endif
- constexpr float _filament_heat_capacity_permm[] = FILAMENT_HEAT_CAPACITY_PERMM;
- static_assert(COUNT(_mpc_heater_power) == HOTENDS, "MPC_HEATER_POWER must have HOTENDS items.");
- #if ENABLED(MPC_PTC)
- static_assert(COUNT(_mpc_heater_alpha) == HOTENDS, "MPC_HEATER_ALPHA must have HOTENDS items.");
- static_assert(COUNT(_mpc_heater_reftemp) == HOTENDS, "MPC_HEATER_REFTEMP must have HOTENDS items.");
- #endif
- static_assert(COUNT(_mpc_block_heat_capacity) == HOTENDS, "MPC_BLOCK_HEAT_CAPACITY must have HOTENDS items.");
- static_assert(COUNT(_mpc_sensor_responsiveness) == HOTENDS, "MPC_SENSOR_RESPONSIVENESS must have HOTENDS items.");
- static_assert(COUNT(_mpc_ambient_xfer_coeff) == HOTENDS, "MPC_AMBIENT_XFER_COEFF must have HOTENDS items.");
- #if ENABLED(MPC_INCLUDE_FAN)
- static_assert(COUNT(_mpc_ambient_xfer_coeff_fan255) == HOTENDS, "MPC_AMBIENT_XFER_COEFF_FAN255 must have HOTENDS items.");
- #endif
- static_assert(COUNT(_filament_heat_capacity_permm) == HOTENDS, "FILAMENT_HEAT_CAPACITY_PERMM must have HOTENDS items.");
+ constexpr float _filament_heat_capacity_permm[] = FILAMENT_HEAT_CAPACITY_PERMM;
+ static_assert(HOTENDS == COUNT(_filament_heat_capacity_permm), "FILAMENT_HEAT_CAPACITY_PERMM requires values for all (" STRINGIFY(HOTENDS) ") hotends.");
HOTEND_LOOP() {
MPC_t &mpc = thermalManager.temp_hotend[e].mpc;
From 7ac308fe4d87abbf1713a571e83829890d801c97 Mon Sep 17 00:00:00 2001
From: thinkyhead
Date: Sat, 14 Jun 2025 00:31:29 +0000
Subject: [PATCH 15/86] [cron] Bump distribution date (2025-06-14)
---
Marlin/Version.h | 2 +-
Marlin/src/inc/Version.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Marlin/Version.h b/Marlin/Version.h
index 5d9ae871e5..90209ec147 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
* here we define this default string as the date where the latest release
* version was tagged.
*/
-//#define STRING_DISTRIBUTION_DATE "2025-06-11"
+//#define STRING_DISTRIBUTION_DATE "2025-06-14"
/**
* The protocol for communication to the host. Protocol indicates communication
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index ae5ce93f40..607cd35bbe 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
* version was tagged.
*/
#ifndef STRING_DISTRIBUTION_DATE
- #define STRING_DISTRIBUTION_DATE "2025-06-11"
+ #define STRING_DISTRIBUTION_DATE "2025-06-14"
#endif
/**
From 1e03f696f5069bb7807a7b3ccb50fb7e44ab224e Mon Sep 17 00:00:00 2001
From: Scott Lahteine
Date: Fri, 13 Jun 2025 22:13:09 -0500
Subject: [PATCH 16/86] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20Some?=
=?UTF-8?q?=20TMC2240=20updates=20(#27901)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Marlin/Configuration.h | 4 +-
Marlin/Configuration_adv.h | 18 ++--
Marlin/src/HAL/shared/progmem.h | 2 +-
Marlin/src/core/drivers.h | 3 +-
Marlin/src/feature/tmc_util.cpp | 140 ++++++++++++++-----------
Marlin/src/module/stepper/trinamic.cpp | 119 ++++++++++++---------
docs/TMC2240_Datasheet.pdf | Bin 0 -> 1171521 bytes
7 files changed, 163 insertions(+), 123 deletions(-)
create mode 100644 docs/TMC2240_Datasheet.pdf
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index f6c48eae95..5cb5682991 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -148,9 +148,9 @@
* Options: A4988, A5984, DRV8825, LV8729, TB6560, TB6600, TMC2100,
* TMC2130, TMC2130_STANDALONE, TMC2160, TMC2160_STANDALONE,
* TMC2208, TMC2208_STANDALONE, TMC2209, TMC2209_STANDALONE,
- * TMC2240, TMC2240_STANDALONE, TMC2660, TMC2660_STANDALONE,
+ * TMC2240, TMC2660, TMC2660_STANDALONE,
* TMC5130, TMC5130_STANDALONE, TMC5160, TMC5160_STANDALONE
- * :['A4988', 'A5984', 'DRV8825', 'LV8729', 'TB6560', 'TB6600', 'TMC2100', 'TMC2130', 'TMC2130_STANDALONE', 'TMC2160', 'TMC2160_STANDALONE', 'TMC2208', 'TMC2208_STANDALONE', 'TMC2209', 'TMC2209_STANDALONE', 'TMC2240', 'TMC2240_STANDALONE', 'TMC2660', 'TMC2660_STANDALONE', 'TMC5130', 'TMC5130_STANDALONE', 'TMC5160', 'TMC5160_STANDALONE']
+ * :['A4988', 'A5984', 'DRV8825', 'LV8729', 'TB6560', 'TB6600', 'TMC2100', 'TMC2130', 'TMC2130_STANDALONE', 'TMC2160', 'TMC2160_STANDALONE', 'TMC2208', 'TMC2208_STANDALONE', 'TMC2209', 'TMC2209_STANDALONE', 'TMC2240', 'TMC2660', 'TMC2660_STANDALONE', 'TMC5130', 'TMC5130_STANDALONE', 'TMC5160', 'TMC5160_STANDALONE']
*/
#define X_DRIVER_TYPE A4988
#define Y_DRIVER_TYPE A4988
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index f7ab7abd94..ebea2a2faf 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1394,7 +1394,7 @@
* Multi-stepping sends steps in bursts to reduce MCU usage for high step-rates.
* This allows higher feedrates than the MCU could otherwise support.
*/
-#define MULTISTEPPING_LIMIT 16 //: [1, 2, 4, 8, 16, 32, 64, 128]
+#define MULTISTEPPING_LIMIT 16 // :[1, 2, 4, 8, 16, 32, 64, 128]
/**
* Adaptive Step Smoothing increases the resolution of multi-axis moves, particularly at step frequencies
@@ -3031,12 +3031,11 @@
#define INTERPOLATE true
#if HAS_DRIVER(TMC2240)
- #define TMC2240_CURRENT_RANGE 1 // RMS: { 0:'690mA', 1:'1410mA', 2:'2120mA', 3:'2110mA' }
- // PEAK:{ 0:'1A', 1:'2A', 2:'3A', 3:'3A' }
- // Determines max current. Lower is more internal current resolution. Higher runs cooler.
- #define TMC2240_Rref 12000 // ('rref', 12000, minval=12000, maxval=60000)
- #define TMC2240_SLOPE_CONTROL 0 // :{ 0:'100V/us', 1:'200V/us', 2:'400V/us', 3:'800V/us' }
- // Lower is more silent. Higher runs cooler.
+ #define TMC2240_RREF 12000 // (Ω) 12000 .. 60000. (FLY TMC2240 = 12300)
+ // Max Current. Lower for more internal resolution. Raise to run cooler.
+ #define TMC2240_CURRENT_RANGE 1 // :{ 0:'RMS=690mA PEAK=1A', 1:'RMS=1410mA PEAK=2A', 2:'RMS=2120mA PEAK=3A', 3:'RMS=2110mA PEAK=3A' }
+ // Slope Control: Lower is more silent. Higher runs cooler.
+ #define TMC2240_SLOPE_CONTROL 0 // :{ 0:'100V/µs', 1:'200V/µs', 2:'400V/µs', 3:'800V/µs' }
#endif
#if AXIS_IS_TMC_CONFIG(X)
@@ -3467,7 +3466,7 @@
* X/Y/Z_STALL_SENSITIVITY is the default stall threshold.
* Use M914 X Y Z to set the stall threshold at runtime:
*
- * Sensitivity TMC2209/2240 Others
+ * Sensitivity TMC2209 Others
* HIGHEST 255 -64 (Too sensitive => False positive)
* LOWEST 0 63 (Too insensitive => No trigger)
*
@@ -3486,7 +3485,7 @@
//#define SENSORLESS_HOMING // StallGuard capable drivers only
#if ANY(SENSORLESS_HOMING, SENSORLESS_PROBING)
- // TMC2209/2240: 0...255. TMC2130: -64...63
+ // TMC2209: 0...255. TMC2130: -64...63
#define X_STALL_SENSITIVITY 8
#define X2_STALL_SENSITIVITY X_STALL_SENSITIVITY
#define Y_STALL_SENSITIVITY 8
@@ -3503,6 +3502,7 @@
//#define W_STALL_SENSITIVITY 8
//#define SPI_ENDSTOPS // TMC2130, TMC2240, and TMC5160
//#define IMPROVE_HOMING_RELIABILITY
+ //#define PREFER_STALLGUARD4 // TMC2240
#endif
// @section tmc/config
diff --git a/Marlin/src/HAL/shared/progmem.h b/Marlin/src/HAL/shared/progmem.h
index 4cd7663df9..b3bd5c32fd 100644
--- a/Marlin/src/HAL/shared/progmem.h
+++ b/Marlin/src/HAL/shared/progmem.h
@@ -39,7 +39,7 @@
#endif
#ifndef F
class __FlashStringHelper;
-#define F(str) (reinterpret_cast(PSTR(str)))
+#define F(string_literal) (reinterpret_cast(PSTR(string_literal)))
#endif
#ifndef _SFR_BYTE
#define _SFR_BYTE(n) (n)
diff --git a/Marlin/src/core/drivers.h b/Marlin/src/core/drivers.h
index 3a53360e26..80980380a5 100644
--- a/Marlin/src/core/drivers.h
+++ b/Marlin/src/core/drivers.h
@@ -42,7 +42,6 @@
#define _TMC2209 0x2209A
#define _TMC2209_STANDALONE 0x2209B
#define _TMC2240 0x2240A
-#define _TMC2240_STANDALONE 0x2240B
#define _TMC2660 0x2660A
#define _TMC2660_STANDALONE 0x2660B
#define _TMC5130 0x5130A
@@ -108,7 +107,7 @@
#if ( HAS_DRIVER(TMC2100) \
|| HAS_DRIVER(TMC2130_STANDALONE) || HAS_DRIVER(TMC2160_STANDALONE) \
|| HAS_DRIVER(TMC2208_STANDALONE) || HAS_DRIVER(TMC2209_STANDALONE) \
- || HAS_DRIVER(TMC2240_STANDALONE) || HAS_DRIVER(TMC2660_STANDALONE) \
+ || HAS_DRIVER(TMC2660_STANDALONE) \
|| HAS_DRIVER(TMC5130_STANDALONE) || HAS_DRIVER(TMC5160_STANDALONE) )
#define HAS_TRINAMIC_STANDALONE 1
#endif
diff --git a/Marlin/src/feature/tmc_util.cpp b/Marlin/src/feature/tmc_util.cpp
index 6f53e1943c..84014e697b 100644
--- a/Marlin/src/feature/tmc_util.cpp
+++ b/Marlin/src/feature/tmc_util.cpp
@@ -83,9 +83,7 @@
#if HAS_TMCX1X0
- #if ENABLED(TMC_DEBUG)
- static uint32_t get_pwm_scale(TMC2130Stepper &st) { return st.PWM_SCALE(); }
- #endif
+ static uint32_t get_pwm_scale(TMC2130Stepper &st) { return st.PWM_SCALE(); }
static TMC_driver_data get_driver_data(TMC2130Stepper &st) {
constexpr uint8_t OT_bp = 25, OTPW_bp = 26;
@@ -144,9 +142,7 @@
#if HAS_DRIVER(TMC2240)
- #if ENABLED(TMC_DEBUG)
- static uint32_t get_pwm_scale(TMC2240Stepper &st) { return st.PWM_SCALE(); }
- #endif
+ static uint32_t get_pwm_scale(TMC2240Stepper &st) { return st.PWM_SCALE(); }
static TMC_driver_data get_driver_data(TMC2240Stepper &st) {
constexpr uint8_t OT_bp = 25, OTPW_bp = 26;
@@ -205,9 +201,7 @@
#if HAS_TMC220x
- #if ENABLED(TMC_DEBUG)
- static uint32_t get_pwm_scale(TMC2208Stepper &st) { return st.pwm_scale_sum(); }
- #endif
+ static uint32_t get_pwm_scale(TMC2208Stepper &st) { return st.pwm_scale_sum(); }
static TMC_driver_data get_driver_data(TMC2208Stepper &st) {
constexpr uint8_t OTPW_bp = 0, OT_bp = 1;
@@ -242,9 +236,7 @@
#if HAS_DRIVER(TMC2660)
- #if ENABLED(TMC_DEBUG)
- static uint32_t get_pwm_scale(TMC2660Stepper) { return 0; }
- #endif
+ static uint32_t get_pwm_scale(TMC2660Stepper) { return 0; }
static TMC_driver_data get_driver_data(TMC2660Stepper &st) {
constexpr uint8_t OT_bp = 1, OTPW_bp = 2;
@@ -383,9 +375,9 @@
else if (st.otpw_count > 0) st.otpw_count = 0;
}
- #if ENABLED(TMC_DEBUG)
- if (need_debug_reporting) report_polled_driver_data(st, data);
- #endif
+ if (need_debug_reporting) {
+ TERN_(TMC_DEBUG, report_polled_driver_data(st, data));
+ }
return should_step_down;
}
@@ -518,7 +510,7 @@
TMC_TSTEP,
TMC_TPWMTHRS,
TMC_TPWMTHRS_MMS,
- TMC_OTPW,
+ TMC_DEBUG_OTPW,
TMC_OTPW_TRIGGERED,
TMC_TOFF,
TMC_TBL,
@@ -575,7 +567,9 @@
TMC_GET_DRVCTRL,
TMC_GET_DRVSTATUS,
TMC_GET_SGCSCONF,
- TMC_GET_SMARTEN
+ TMC_GET_SMARTEN,
+ TMC_GET_SG4_THRS,
+ TMC_GET_SG4_RESULT
};
template
@@ -603,6 +597,7 @@
static void print_true_or_false(const bool tf) { SERIAL_ECHO(TRUE_FALSE(tf)); }
#if HAS_DRIVER(TMC2130) || HAS_DRIVER(TMC5130)
+ // Additional tmc_status fields for 2130/5130 and related drivers
static void _tmc_status(TMC2130Stepper &st, const TMC_debug_enum i) {
switch (i) {
case TMC_PWM_SCALE: SERIAL_ECHO(st.PWM_SCALE()); break;
@@ -614,6 +609,7 @@
}
#endif
#if HAS_TMCX1X0
+ // Additional tmc_parse_drv_status fields for 2130 and related drivers
static void _tmc_parse_drv_status(TMC2130Stepper &st, const TMC_drv_status_enum i) {
switch (i) {
case TMC_STALLGUARD: if (st.stallguard()) SERIAL_CHAR('*'); break;
@@ -626,18 +622,17 @@
#endif
#if HAS_DRIVER(TMC2160) || HAS_DRIVER(TMC5160)
+ // Additional tmc_status fields for 2160/5160 and related drivers
static void _tmc_status(TMC2160Stepper &st, const TMC_debug_enum i) {
switch (i) {
case TMC_PWM_SCALE: SERIAL_ECHO(st.PWM_SCALE()); break;
case TMC_SGT: SERIAL_ECHO(st.sgt()); break;
case TMC_STEALTHCHOP: print_true_or_false(st.en_pwm_mode()); break;
- case TMC_GLOBAL_SCALER:
- {
- const uint16_t value = st.GLOBAL_SCALER();
- SERIAL_ECHO(value ?: 256);
- SERIAL_ECHOPGM("/256");
- }
- break;
+ case TMC_GLOBAL_SCALER: {
+ const uint16_t value = st.GLOBAL_SCALER();
+ SERIAL_ECHO(value ?: 256);
+ SERIAL_ECHOPGM("/256");
+ } break;
case TMC_INTERPOLATE: print_true_or_false(st.intpol()); break;
default: break;
}
@@ -646,12 +641,16 @@
#if HAS_TMC220x
+ // Additional tmc_status fields for 2208/2224/2209 drivers
static void _tmc_status(TMC2208Stepper &st, const TMC_debug_enum i) {
switch (i) {
+ // PWM_SCALE
case TMC_PWM_SCALE_SUM: SERIAL_ECHO(st.pwm_scale_sum()); break;
case TMC_PWM_SCALE_AUTO: SERIAL_ECHO(st.pwm_scale_auto()); break;
+ // PWM_AUTO
case TMC_PWM_OFS_AUTO: SERIAL_ECHO(st.pwm_ofs_auto()); break;
case TMC_PWM_GRAD_AUTO: SERIAL_ECHO(st.pwm_grad_auto()); break;
+ // CHOPCONF
case TMC_STEALTHCHOP: print_true_or_false(st.stealth()); break;
case TMC_INTERPOLATE: print_true_or_false(st.intpol()); break;
default: break;
@@ -659,19 +658,20 @@
}
#if HAS_DRIVER(TMC2209)
+ // Additional tmc_status fields for 2209 drivers
template
static void _tmc_status(TMCMarlin &st, const TMC_debug_enum i) {
switch (i) {
case TMC_SGT: SERIAL_ECHO(st.SGTHRS()); break;
case TMC_UART_ADDR: SERIAL_ECHO(st.get_address()); break;
default:
- TMC2208Stepper *parent = &st;
- _tmc_status(*parent, i);
+ _tmc_status(static_cast(st), i);
break;
}
}
#endif
+ // Additional tmc_parse_drv_status fields for 2208/2224/2209 drivers
static void _tmc_parse_drv_status(TMC2208Stepper &st, const TMC_drv_status_enum i) {
switch (i) {
case TMC_T157: if (st.t157()) SERIAL_CHAR('*'); break;
@@ -686,10 +686,13 @@
}
#if HAS_DRIVER(TMC2209)
+ // Additional tmc_parse_drv_status fields for 2209 drivers
static void _tmc_parse_drv_status(TMC2209Stepper &st, const TMC_drv_status_enum i) {
switch (i) {
case TMC_SG_RESULT: SERIAL_ECHO(st.SG_RESULT()); break;
- default: _tmc_parse_drv_status(static_cast(st), i); break;
+ default:
+ _tmc_parse_drv_status(static_cast(st), i);
+ break;
}
}
#endif
@@ -697,13 +700,38 @@
#endif // HAS_TMC220x
#if HAS_DRIVER(TMC2240)
- static void _tmc_parse_drv_status(TMC2240Stepper, const TMC_drv_status_enum) { }
+
+ // Additional tmc_parse_drv_status fields for 2240 drivers
+ static void _tmc_parse_drv_status(TMC2240Stepper &st, const TMC_drv_status_enum i) {
+ switch (i) {
+ case TMC_S2VSA: if (st.s2vsa()) SERIAL_CHAR('*'); break;
+ case TMC_S2VSB: if (st.s2vsb()) SERIAL_CHAR('*'); break;
+ case TMC_STEALTHCHOP: print_true_or_false(st.stealth()); break;
+ case TMC_FSACTIVE: if (st.fsactive()) SERIAL_CHAR('*'); break;
+ case TMC_DRV_CS_ACTUAL: if (st.CS_ACTUAL()) SERIAL_CHAR('*'); break;
+ case TMC_STALLGUARD: if (st.stallguard()) SERIAL_CHAR('*'); break;
+ //case TMC_OT: if (st.ot()) SERIAL_CHAR('*'); break;
+ case TMC_DEBUG_OTPW: print_true_or_false(st.otpw()); break;
+ //case TMC_S2GA: if (st.s2ga()) SERIAL_CHAR('*'); break;
+ //case TMC_S2GB: if (st.s2gb()) SERIAL_CHAR('*'); break;
+ //case TMC_OLA: if (st.ola()) SERIAL_CHAR('*'); break;
+ //case TMC_OLB: if (st.olb()) SERIAL_CHAR('*'); break;
+ case TMC_SG_RESULT: SERIAL_ECHO(st.SG_RESULT()); break;
+ case TMC_STST: if (!st.stst()) SERIAL_CHAR('*'); break;
+ default: break; // other...
+ }
+ }
+
+ // Additional tmc_status fields for 2240 drivers
static void _tmc_status(TMC2240Stepper &st, const TMC_debug_enum i) {
switch (i) {
+ // PWM_SCALE
case TMC_PWM_SCALE_SUM: SERIAL_ECHO(st.pwm_scale_sum()); break;
case TMC_PWM_SCALE_AUTO: SERIAL_ECHO(st.pwm_scale_auto()); break;
+ // PWM_AUTO
case TMC_PWM_OFS_AUTO: SERIAL_ECHO(st.pwm_ofs_auto()); break;
case TMC_PWM_GRAD_AUTO: SERIAL_ECHO(st.pwm_grad_auto()); break;
+ // CHOPCONF
case TMC_STEALTHCHOP: print_true_or_false(st.stealth()); break;
case TMC_INTERPOLATE: print_true_or_false(st.intpol()); break;
case TMC_VAIN: SERIAL_ECHO(st.get_ain_voltage()); break;
@@ -714,7 +742,8 @@
default: break;
}
}
- #endif
+
+ #endif // TMC2240
#if HAS_DRIVER(TMC2660)
static void _tmc_parse_drv_status(TMC2660Stepper, const TMC_drv_status_enum) { }
@@ -750,14 +779,8 @@
case TMC_CURRENT: SERIAL_ECHO(st.getMilliamps()); break;
case TMC_RMS_CURRENT: SERIAL_ECHO(st.rms_current()); break;
case TMC_MAX_CURRENT: SERIAL_ECHO(p_float_t(st.rms_current() * 1.41, 0)); break;
- case TMC_IRUN:
- SERIAL_ECHO(st.irun());
- SERIAL_ECHOPGM("/31");
- break;
- case TMC_IHOLD:
- SERIAL_ECHO(st.ihold());
- SERIAL_ECHOPGM("/31");
- break;
+ case TMC_IRUN: SERIAL_ECHO(st.irun()); SERIAL_ECHOPGM("/31"); break;
+ case TMC_IHOLD: SERIAL_ECHO(st.ihold()); SERIAL_ECHOPGM("/31"); break;
case TMC_CS_ACTUAL: print_cs_actual(st); break;
case TMC_VSENSE: print_vsense(st); break;
case TMC_MICROSTEPS: SERIAL_ECHO(st.microsteps()); break;
@@ -769,7 +792,7 @@
if (tpwmthrs_val) SERIAL_ECHO(tpwmthrs_val); else SERIAL_CHAR('-');
} break;
#endif
- case TMC_OTPW: print_true_or_false(st.otpw()); break;
+ case TMC_DEBUG_OTPW: print_true_or_false(st.otpw()); break;
#if ENABLED(MONITOR_DRIVER_STATUS)
case TMC_OTPW_TRIGGERED: print_true_or_false(st.getOTPW()); break;
#endif
@@ -792,13 +815,10 @@
case TMC_CURRENT: SERIAL_ECHO(st.getMilliamps()); break;
case TMC_RMS_CURRENT: SERIAL_ECHO(st.rms_current()); break;
case TMC_MAX_CURRENT: SERIAL_ECHO(p_float_t(st.rms_current() * 1.41, 0)); break;
- case TMC_IRUN:
- SERIAL_ECHO(st.cs());
- SERIAL_ECHOPGM("/31");
- break;
+ case TMC_IRUN: SERIAL_ECHO(st.cs()); SERIAL_ECHOPGM("/31"); break;
case TMC_VSENSE: SERIAL_ECHO(st.vsense() ? F("1=.165") : F("0=.310")); break;
case TMC_MICROSTEPS: SERIAL_ECHO(st.microsteps()); break;
- //case TMC_OTPW: print_true_or_false(st.otpw()); break;
+ //case TMC_DEBUG_OTPW: print_true_or_false(st.otpw()); break;
//case TMC_OTPW_TRIGGERED: print_true_or_false(st.getOTPW()); break;
case TMC_SGT: SERIAL_ECHO(st.sgt()); break;
case TMC_TOFF: SERIAL_ECHO(st.toff()); break;
@@ -808,30 +828,26 @@
default: _tmc_status(st, i); break;
}
}
- #endif
+ #endif // TMC2660
template
static void tmc_parse_drv_status(TMC &st, const TMC_drv_status_enum i) {
SERIAL_CHAR('\t');
switch (i) {
- case TMC_DRV_CODES: st.printLabel(); break;
- case TMC_STST: if (!st.stst()) SERIAL_CHAR('*'); break;
- case TMC_OLB: if (st.olb()) SERIAL_CHAR('*'); break;
- case TMC_OLA: if (st.ola()) SERIAL_CHAR('*'); break;
- case TMC_S2GB: if (st.s2gb()) SERIAL_CHAR('*'); break;
- case TMC_S2GA: if (st.s2ga()) SERIAL_CHAR('*'); break;
- case TMC_DRV_OTPW: if (st.otpw()) SERIAL_CHAR('*'); break;
- case TMC_OT: if (st.ot()) SERIAL_CHAR('*'); break;
+ case TMC_DRV_CODES: st.printLabel(); break;
+ case TMC_STST: if (!st.stst()) SERIAL_CHAR('*'); break;
+ case TMC_OLB: if (st.olb()) SERIAL_CHAR('*'); break;
+ case TMC_OLA: if (st.ola()) SERIAL_CHAR('*'); break;
+ case TMC_S2GB: if (st.s2gb()) SERIAL_CHAR('*'); break;
+ case TMC_S2GA: if (st.s2ga()) SERIAL_CHAR('*'); break;
+ case TMC_DRV_OTPW: if (st.otpw()) SERIAL_CHAR('*'); break;
+ case TMC_OT: if (st.ot()) SERIAL_CHAR('*'); break;
case TMC_DRV_STATUS_HEX: {
const uint32_t drv_status = st.DRV_STATUS();
- SERIAL_CHAR('\t');
- st.printLabel();
- SERIAL_CHAR('\t');
- print_hex_long(drv_status, ':', true);
+ SERIAL_CHAR('\t'); st.printLabel(); SERIAL_CHAR('\t'); print_hex_long(drv_status, ':', true);
if (drv_status == 0xFFFFFFFF || drv_status == 0) SERIAL_ECHOPGM("\t Bad response!");
SERIAL_EOL();
- break;
- }
+ } break;
default: _tmc_parse_drv_status(st, i); break;
}
}
@@ -946,7 +962,7 @@
TMC_REPORT("tstep\t", TMC_TSTEP);
TMC_REPORT("PWM thresh.", TMC_TPWMTHRS);
TMC_REPORT("[mm/s]\t", TMC_TPWMTHRS_MMS);
- TMC_REPORT("OT prewarn", TMC_OTPW);
+ TMC_REPORT("OT prewarn", TMC_DEBUG_OTPW);
#if ENABLED(MONITOR_DRIVER_STATUS)
TMC_REPORT("triggered\n OTP\t", TMC_OTPW_TRIGGERED);
#endif
@@ -964,6 +980,7 @@
TMC_REPORT(" -start\t", TMC_HSTRT);
TMC_REPORT("Stallguard thrs", TMC_SGT);
TMC_REPORT("uStep count", TMC_MSCNT);
+
DRV_REPORT("DRVSTATUS", TMC_DRV_CODES);
#if HAS_TMCX1X0_OR_2240 || HAS_TMC220x
DRV_REPORT("sg_result", TMC_SG_RESULT);
@@ -984,10 +1001,12 @@
DRV_REPORT("150C\t", TMC_T150);
DRV_REPORT("143C\t", TMC_T143);
DRV_REPORT("120C\t", TMC_T120);
+ #endif
+ #if HAS_TMC220x || HAS_DRIVER(TMC2240)
DRV_REPORT("s2vsa\t", TMC_S2VSA);
DRV_REPORT("s2vsb\t", TMC_S2VSB);
#endif
- DRV_REPORT("Driver registers:\n",TMC_DRV_STATUS_HEX);
+ DRV_REPORT("Driver registers:\n", TMC_DRV_STATUS_HEX);
#if HAS_DRIVER(TMC2240)
TMC_REPORT("Analog in (v)", TMC_VAIN);
TMC_REPORT("Supply (v)", TMC_VSUPPLY);
@@ -1035,6 +1054,7 @@
}
SERIAL_CHAR('\t');
}
+
#endif // HAS_TRINAMIC_CONFIG
#if HAS_DRIVER(TMC2660)
diff --git a/Marlin/src/module/stepper/trinamic.cpp b/Marlin/src/module/stepper/trinamic.cpp
index 240adc9f4c..ea123c5392 100644
--- a/Marlin/src/module/stepper/trinamic.cpp
+++ b/Marlin/src/module/stepper/trinamic.cpp
@@ -32,9 +32,6 @@
#include "trinamic.h"
#include "../stepper.h"
-#include
-#include
-
enum StealthIndex : uint8_t {
LOGICAL_AXIS_LIST(STEALTH_AXIS_E, STEALTH_AXIS_X, STEALTH_AXIS_Y, STEALTH_AXIS_Z, STEALTH_AXIS_I, STEALTH_AXIS_J, STEALTH_AXIS_K, STEALTH_AXIS_U, STEALTH_AXIS_V, STEALTH_AXIS_W)
};
@@ -242,12 +239,12 @@ enum StealthIndex : uint8_t {
st.begin();
CHOPCONF_t chopconf{0};
- chopconf.tbl = 0b01;
- chopconf.toff = chop_init.toff;
+ chopconf.tbl = 0b01;
+ chopconf.toff = chop_init.toff;
chopconf.intpol = interpolate;
- chopconf.hend = chop_init.hend + 3;
- chopconf.hstrt = chop_init.hstrt - 1;
- TERN_(EDGE_STEPPING, chopconf.dedge = true);
+ chopconf.hend = chop_init.hend + 3;
+ chopconf.hstrt = chop_init.hstrt - 1;
+ chopconf.dedge = ENABLED(EDGE_STEPPING);
st.CHOPCONF(chopconf.sr);
st.rms_current(mA, hold_multiplier);
@@ -280,12 +277,12 @@ enum StealthIndex : uint8_t {
st.begin();
CHOPCONF_t chopconf{0};
- chopconf.tbl = 0b01;
- chopconf.toff = chop_init.toff;
+ chopconf.tbl = 0b01;
+ chopconf.toff = chop_init.toff;
chopconf.intpol = interpolate;
- chopconf.hend = chop_init.hend + 3;
- chopconf.hstrt = chop_init.hstrt - 1;
- TERN_(EDGE_STEPPING, chopconf.dedge = true);
+ chopconf.hend = chop_init.hend + 3;
+ chopconf.hstrt = chop_init.hstrt - 1;
+ chopconf.dedge = ENABLED(EDGE_STEPPING);
st.CHOPCONF(chopconf.sr);
st.rms_current(mA, hold_multiplier);
@@ -705,12 +702,12 @@ enum StealthIndex : uint8_t {
st.stored.stealthChop_enabled = stealth;
TMC2208_n::CHOPCONF_t chopconf{0};
- chopconf.tbl = 0b01; // blank_time = 24
- chopconf.toff = chop_init.toff;
+ chopconf.tbl = 0b01; // blank_time = 24
+ chopconf.toff = chop_init.toff;
chopconf.intpol = interpolate;
- chopconf.hend = chop_init.hend + 3;
- chopconf.hstrt = chop_init.hstrt - 1;
- TERN_(EDGE_STEPPING, chopconf.dedge = true);
+ chopconf.hend = chop_init.hend + 3;
+ chopconf.hstrt = chop_init.hstrt - 1;
+ chopconf.dedge = ENABLED(EDGE_STEPPING);
st.CHOPCONF(chopconf.sr);
st.rms_current(mA, hold_multiplier);
@@ -750,12 +747,12 @@ enum StealthIndex : uint8_t {
st.stored.stealthChop_enabled = stealth;
TMC2208_n::CHOPCONF_t chopconf{0};
- chopconf.tbl = 0b01; // blank_time = 24
- chopconf.toff = chop_init.toff;
+ chopconf.tbl = 0b01; // blank_time = 24
+ chopconf.toff = chop_init.toff;
chopconf.intpol = interpolate;
- chopconf.hend = chop_init.hend + 3;
- chopconf.hstrt = chop_init.hstrt - 1;
- TERN_(EDGE_STEPPING, chopconf.dedge = true);
+ chopconf.hend = chop_init.hend + 3;
+ chopconf.hstrt = chop_init.hstrt - 1;
+ chopconf.dedge = ENABLED(EDGE_STEPPING);
st.CHOPCONF(chopconf.sr);
st.rms_current(mA, hold_multiplier);
@@ -788,44 +785,68 @@ enum StealthIndex : uint8_t {
) {
st.begin();
- st.Rref = TMC2240_Rref;
+ st.Rref = TMC2240_RREF; // Minimum: 12000 ; FLY TMC2240: 12300
+
+ TMC2240_n::GCONF_t gconf{0};
+ gconf.en_pwm_mode = !stealth;
+ st.GCONF(gconf.sr);
+
TMC2240_n::DRV_CONF_t drv_conf{0};
drv_conf.current_range = TMC2240_CURRENT_RANGE;
drv_conf.slope_control = TMC2240_SLOPE_CONTROL;
st.DRV_CONF(drv_conf.sr);
- CHOPCONF_t chopconf{0};
- chopconf.tbl = 0b01;
- chopconf.toff = chop_init.toff;
- chopconf.intpol = interpolate;
- chopconf.hend = chop_init.hend + 3;
- chopconf.hstrt = chop_init.hstrt - 1;
- TERN_(EDGE_STEPPING, chopconf.dedge = true);
+ // Adjust based on user experience
+ TMC2240_n::CHOPCONF_t chopconf{0};
+ chopconf.toff = chop_init.toff; // 3 (3)
+ chopconf.intpol = interpolate; // true
+ chopconf.hend = chop_init.hend + 3; // 2 (-1)
+ chopconf.hstrt = chop_init.hstrt - 1; // 5 (6)
+ chopconf.TBL = 0b10; // 36 tCLK
+ chopconf.tpfd = 4; // 512 NCLK
+ chopconf.dedge = ENABLED(EDGE_STEPPING);
st.CHOPCONF(chopconf.sr);
st.rms_current(mA, hold_multiplier);
st.microsteps(microsteps);
- st.iholddelay(10);
+ st.iholddelay(6);
+ st.irundelay(4);
+
+ // (from Makerbase)
+ //st.TPOWERDOWN(10);
+
st.TPOWERDOWN(128); // ~2s until driver lowers to hold current
st.en_pwm_mode(stealth);
st.stored.stealthChop_enabled = stealth;
+ // Adjust based on user experience
TMC2240_n::PWMCONF_t pwmconf{0};
- pwmconf.pwm_lim = 12;
- pwmconf.pwm_reg = 8;
- pwmconf.pwm_autograd = true;
- pwmconf.pwm_autoscale = true;
- pwmconf.pwm_freq = 0b01;
- pwmconf.pwm_grad = 14;
- pwmconf.pwm_ofs = 36;
+ pwmconf.pwm_ofs = 29;
+ pwmconf.pwm_grad = 0;
+ pwmconf.pwm_freq = 0b00; // fPWM = 2/1024 fCLK | 16MHz clock -> 31.3kHz PWM
+ pwmconf.pwm_autograd = true;
+ pwmconf.pwm_autoscale = true;
+ pwmconf.freewheel = 0;
+ pwmconf.pwm_meas_sd_enable = false;
+ pwmconf.pwm_dis_reg_stst = false;
+ pwmconf.pwm_reg = 4;
+ pwmconf.pwm_lim = 12;
st.PWMCONF(pwmconf.sr);
TERN(HYBRID_THRESHOLD, st.set_pwm_thrs(hyb_thrs), UNUSED(hyb_thrs));
+ // (from Makerbase)
+ //st.GCONF(0x00);
+ //st.IHOLD_IRUN(0x04071f03);
+ //st.GSTAT(0x07);
+ //st.GSTAT(0x00);
+
st.diag0_pushpull(true);
+
st.GSTAT(); // Clear GSTAT
}
+
#endif // TMC2240
#if HAS_DRIVER(TMC2660)
@@ -862,12 +883,12 @@ enum StealthIndex : uint8_t {
st.begin();
CHOPCONF_t chopconf{0};
- chopconf.tbl = 0b01;
- chopconf.toff = chop_init.toff;
+ chopconf.tbl = 0b01;
+ chopconf.toff = chop_init.toff;
chopconf.intpol = interpolate;
- chopconf.hend = chop_init.hend + 3;
- chopconf.hstrt = chop_init.hstrt - 1;
- TERN_(EDGE_STEPPING, chopconf.dedge = true);
+ chopconf.hend = chop_init.hend + 3;
+ chopconf.hstrt = chop_init.hstrt - 1;
+ chopconf.dedge = ENABLED(EDGE_STEPPING);
st.CHOPCONF(chopconf.sr);
st.rms_current(mA, hold_multiplier);
@@ -900,12 +921,12 @@ enum StealthIndex : uint8_t {
st.begin();
CHOPCONF_t chopconf{0};
- chopconf.tbl = 0b01;
- chopconf.toff = chop_init.toff;
+ chopconf.tbl = 0b01;
+ chopconf.toff = chop_init.toff;
chopconf.intpol = interpolate;
- chopconf.hend = chop_init.hend + 3;
- chopconf.hstrt = chop_init.hstrt - 1;
- TERN_(EDGE_STEPPING, chopconf.dedge = true);
+ chopconf.hend = chop_init.hend + 3;
+ chopconf.hstrt = chop_init.hstrt - 1;
+ chopconf.dedge = ENABLED(EDGE_STEPPING);
st.CHOPCONF(chopconf.sr);
st.rms_current(mA, hold_multiplier);
diff --git a/docs/TMC2240_Datasheet.pdf b/docs/TMC2240_Datasheet.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..89c9cf817e671daddfbe1d376cd0cd2a4ce99cd3
GIT binary patch
literal 1171521
zcmZ_VV|X3yy8!y8NgCU>?WD17+qRv?wr$(C)ueG6+jhf~x9k1yz0W@T*wx*DDa{8vm
zj`)n9pDRGp$vQh(ncIB+&A>ztxT5If;B4rmJBmB=hjd?zQAdPK|{&^N81Jgh3zmJtNwlQ@w!)N4R2LK}GR!+ta_;eyx`cB3|
z#)h^=#*qKMo2-F_qLVcwoeVw$D=Q?Oh`EE~=aX4j=|62pCkJDFYe;w9xbaqwyT~hq=dWQ3f`cy-$2#CqHyn3A!G_M>A%)q&3Sw?{}(q1rQ3AOQv1LsD)Zw+sLq+w*bowMs|Vf^dWf8=D$bH^3dp~BP>j0tRqJGB
z9Nv>RUS`T5w^tq04_<=wg}1aSNw?_UDO3r0|8l*!riCWJ$rDGOP@lSBOuq2ZzCm`M
z-L3;mz%8w=>Lk@aMH#KVia!>>2i`VvPZow#+FbzpBg1mbTRSl1B!+%v1S%o>=2b@)
zzfd8uIQUh=co_E%X}1|n{=uu2M}!#sXF>{k!#-pL%1J51(ht%+#%Hg#&cyY(b?2F#
z*8}h^x^Il9^mE$88S`{e>ouz#moJY2Q8=rlYI^8wwh81Xzr4XP*}h>^N!PnAy7B4i
zvO<+Hg%ny;1zRC7w}w#dvpm+d53>83zD^DM>zIOr2xhd6SNX&0K%d{HNwqtW8&dH*
zC6QSxDhx#8GL^_ooWPoD``sA?2ohhRPjjo!S@mvk?0>|qSqQ=+c(d-u1h2K-#rl8n
zL%!jkIb}mx&8DTsS;h}!X@2bk?%~(uW=L-TCJc2Ud)c#`VA`QkS^Bn0as4=o5Fq!h
z5%r3U$l`mqR-7`5WjY^v#K*KK#w8Iu>+b>ekqxlz7(&~~T#%^h5>qq+9`H#hFd#ge
zy<;s%GIXa%1<^MkPYO
zLD)(8CyYTfmYEVr&(586&eYH~5uMGg$|^+@G0*vBNu9X$=mV*Sx`z&))_ir0zL#G_
zbXA55rr8UT%p!Z^`l9PyExcLRRi)lpm2IA6=(5ddr=dWi_&mCjRJ}10QExzMic}4O
zv1+D1Sj6LO$QVg`+y`cI2;6i^6w**$^k_bZ7D4raTol8xI`6#nGaLLBY9jOb!)`fuv>#P%3gT;~_H
zmgD~Bcz&&J>s58V9g9pKP#zfx>!RypMF%<8yn)T&W*^;f?ubaGam9@jdAE4kY&EJJ
zK+9#G*Y_;5&gZywEAVqE0-Xgm*No$*JiS)m73
z#i=2liE~Z8-G}o
z*=6_e8)o-t#yE(ePzbn#5HiIt@h*2QM7Zsi4W*=*s~2`x{?f8%`G(3GOyKl|nu1?E
zHTO|g_+vDZ-)miiRA39vB8h$c%Vv!#V@%c-HQThVD00AJ6@+QJ(x$=v$gQPEi%w+K
zGEd3lb}!Jj+T$}8^7B?D%Q;)v_(WTnQVpR@=UZllH6uV#t@Xh4oUpeNUZ26yE;T=hJBBZR^r~O#n@Y$O6?VruT|KCeMvsKp25!Dt
z^S_Z>l*g^Swkf4KjHVvToDelMm%2LR6-5?2gau|sAZI)(2|9#r=O1`gEfd6R2{3OM
z;R#`D-r3&}YR{fKdm*7-Ecrx^jqx86kWd2
zr=x*77=D$ZNF(&X5TjNHojL8Fq^t~~iX7$xMm$#bJ*<0uKL*A%$6$RzuwLDGrTXf3
zc<`m9gI$z}RTLzH#sKwCFcHF+50IYy;vZ+(6pKp0(8onvX>$g_US$j)a^2&}S5J@i
zjbsy=Wr_$iFjt^FL(+L@(_t3Dz~q93)g*E^5wAK%YZGWLwX6lp7Wjm_W}6zw!bP$Mzj<75h
zX<|JD!qS7|wQwPIn+t^CVk9fg$H3|w&|kstLr!1`PLrI3u}+#^`i)Q=G)39WAiVNe
z&*&`6U%*6h(XW`*)1l6JgyCq9;%AYczati+xzm==gRTU
zIid9`nf?tnb<1B7v&DQJqu5IyS~Nv#@H%Xub2*JaaHDBQRXTV2N3P7-dMV78FCCs6Coqc0xg!=T24nAIMcQi>>qE%!r@fXRqd-=gX)x+5M
zUqu8?#&?4S96({gSK(vf%+zB-#=HGC#MVxkQ!RgB0R~Dn`lZS4l0i1WEPx5ZFOW%yp3Q>oGC<
z7k%}-Qjghj-*tm05+BjAtN*h4SQFq9UU;Boh?l@mFa`scnMYMlu=ov>K?CX;hp*mV
z-5o798%sKO?0vf`+jC~s9NkGsnt>SOy?>-D_st)^Y+40Y{-hlYi9!opjo2?7$oRZc
zYI3%v+IrwY-%|PAX}82uipEljEP@!m-TVvNP+UhOK1Zn-SY}K9;l0k|uVtAH>#b(r
zKROdeYf{KbKN<2hU4rDo)}U%1^nc6vR;;e&6U#DD3@)V{-1$^eYETI9IgsE~rkzk0d=VEFkb$2KAs3KI6q?K<%
zHF1p?Gqu&t{7b2N)?Fy_V)`GxoQ~)`BLYu-FGUjTn29htitBe&=YGCxs@x+}^XCD7
zJd75ctU`K9|97y66?X^?-#DM?dyj2HmrLq{uQO=%y@Lxf{WW`9SYZ?^&7o2&<0W{g
zS9XH#c6;_DoT
zHk-5DfGFPr$29IlzS)w(l$n2Av(78US|h=>?pVv5Az^_BU)M#IYw*LHaj^F3WSjgx
z)&zczR-S1%P`}d-{^?+~F_p6fL8-GMfPu&#IkE*0`|a9xq0MT@-e
zQbo`^f^*?X#*e%@WAoPGpe+AgHJ?*eRBy%#MZ+Zllq*d5nTRy;zONV0=^R%Db-hWR
zbGL&5b_=Fq?i$7+=i(`v$b%*OR4ASSZzbaBw_F+A_zNhQSn{GchNx{Ej6}y5%$2f*
zt07LAa9L2d2ItZNpu?5e665E{d0giVmfk~~p@}TuHA?ZjB!z6~LJHJ`#!h>Y^m4y6
zgvQ|@D93zvX4meQdBG@{_RiB$=p#RfGarfG9iRtp0`-wCt?@4w9IQknKZ!O1;9R6y
z*R;@})nVo=l}u*B@HjSS{-|)$?rjVrZ2EMSJ)x)?B23CwU5bOja7FU`cp;_viIhsx
z;T{$LKpUb0q(svo_#m)Y_Vu33_va~arDX=ETG?-GkI{APNvW%}_vFRqfM40hJ`J^B
z{YZ-G_hiv*88*kgmQVKbKhV0pMaVnmaHy1Tj$v<(40BptT)^AWw5!GUZ`SrfF9)gs&T8RLf+4Om-Z7~3+
zdn6g6YApsN8NH~%Af{R~u)wpM?w7#wgG9fp`02Veg7LQ)nLX;8*%pMbt!cJdSmiro
zZoAq#m;n97RnecT4pB^fr9i2Nc+mldFLP=wx~)B=E9@ZR_Afxr_OLFl>(ke&;N3GO!YQK&gw4{5e;@e~>!CC<35TlH!LKVXF4!o;3Mpkr`CvpV
zGK8$h4&yk{0+qu;yf+L)=UmM`b?7=bFW7lbk5^x!EVg3-ZFb*Bck3-}C|zvZPqH41
zjqYbQ-ysDw>PF5t>x3Z$
zxM*x*xe0R3$1T%m!|RC~OEfrNzsB$P(_E?rcps79@_9CqBTduP*5Z{-RJ4<
zU>b2qSN^FdpV^#Gg+TP=v9xHQHEoFxe}(YYD6y*WjF
z>$hbNp!ZiRch?#gj)7KKr+Mzjr$4JzG_5K&{fVJb7g;JMW2em;LQwjTqMoX0yB^kb
z6cw{b5?AEtPK^c#jyrRsSK~df(fQx{qO9V13_uwL!H_#u;+ajY@z9I^NjUzS7yM7^
z5s+s5C-um}z{K=l8Oi^Vj|8Ma|7JfS=_JjK9Pu@o{>e<@GygrZ{5`V%J+l2h{>@wB
zbNoGL_?sQYXZV{8#b@}NJ^jp$0zLx(3;=-vKrjFd1^~hUP#6IUBS2vUD2xDw5uh*v
z6h?r;2v8US3L`)PWNPsNiCO%=DOUx2CV;{OP?!J;6F^}CC`;Q!wps)iJ4uHY|P&fbz2SDKfC>#KV1E6pK6hN{Zp97#U&;u9-
zdVs?~4}cix0TKf}fMTErSPb+4jDa4YG0+2Eih=%L@4v$MU++JG{GUi>_}BYSEdM8%
z{}avs3Fm*~nc?4nX81Rv8U77vhJRz4;oqQU_&2H<{tat}f8(0r-@s-7M7B00ouI9=
z&1dSLk?ns}6&U}n#{avjzyw&Ce`*E)pQ^%t7Y%}DXi!;)bCvXkm+;FbSb#p(C~dmW
z!&g{63yW_a4kTWkonyF*+WFbc`D=YyO1l>&0xh6wWoaaiMzGTZQK%#k`UAL%-k{sI
z3S^Th3=7kl@d_8|Vo`5hAAHkIh19YSxh^F-0wZ^BC8BtsfP-&327eD`&PCd7<=}=2
zuhDk2v+pj0A`5ZsJ=K(~NNtDQ+K>J|B4
zhbN@N{9?!;4?4Pz!RILvptVUpRv$m?RSYoeO~Xnc!tv#cl?Zp=U&3bZ3*gw}!yb__
z2`HZ=51oLt1Km50Ms0D>)P{$%7S>fRJfY;cH5>c%jkTGyW^qzZL_}F7iAB>A
zgAEAn9)j)1t9ncNjeZi#5kX-Dm?q(JOpj{9%u--=!h&_z{);Kk2Z|qR(vhP5ns0eg
znNTYxcY|MF;g1ltbc7v)AEqUbb1iK{iHA+;umi{kl^7eKCnTBXsS}*zRx1k~nIV}(
zqJp2a_@f{Gs9>U2MD-n7d^J!%J;}
zwk*oxJ_@+YCi)~D`I>^cjh41t$@UQ
zO0Sg#8rE+eYxh;0&Bd4^t$iX>dRprY4eVUkMl$GI#JQaBOCL^({6d$nX5&HUAMRPY
z#BG>yvvGTlM^%b4@%`;G#kMor-z3Ay=lEQFZIR0THX@n7yl7DwT2b2)HI$)Z5Kg0=
zK%0vef4r;ZILy+=Wv`oUgL}A3bP(WQj6J(F=J(nJ`7+E9onl4Ndx9nqIL@sJPjvW1
z-RIDGIzv5@H$^-Id`vj+N{Rn`A~g}*$3P)Aby9cshnzPn{M|eEp7iZ(k$lud8yfjC
zm^x;b_>~uEz0E>M%kXv>Y}>hamE-$BzrW6Y&zaFFn~*UJnJq8~zV}}%~V56f^E@JwoKRU)ch^yC-&8$7evz!Zs@W=Kvj6j&Gt|uK$x{~K!
znssF|F}F;;%JHxAbUgFQsHbi;SV$IQmgSzyeB3iq;t$n4zpuECCgQ516cPwVckbqi
zt?(a7$RFWvRU}M%Hh22;IicRyqjpMs>;2ugRKd<%s=>3MOXa>-S8rhV_v}Q$CqfqV
z8JsK{1#k<*Qj0YA0Vn@Hh%}r23QqXFn~+mPp-KT-LoujvQG?ssuy;FX8ED+I9>+nG
z_2bTV0rH#0x3!bf1#|p
zvU1uKSrr?-Tqsd8r-68d=}${GZfIJf3(#r27?VtENMHf9d%IlL++ldm`>Ottk%PfX
zk7KNa85(=9(g@+q-?jXaWuo=GaAeO68Yl0ZY#a-LN>pWt=htrvIM<_N1dOL01RTzG4}c3g8t_yuO(^=DTQ5*!xUiXKPXPAnAKA6*kV
zFJuYsbrba|D3v*icqrT|kO}G!KFU(LN_*eetu$lAtfRqc8{6Qz{m|c-JyRLnZaPsm
zGDILa52D1s>$=5=nrt1VRMX@<`@z6)G&r`-K*Qw~$T((UL?AAOa5eU_`Zf5Bl1$$7
zaw~qOI_ww_v6-f}g+w#Q^>d>5|5SC?DxQg0`kLEzc9oF;!qgS6h$+tP-XMsH)W2{K
zk2UqyF;FnvF4v_ftBo{z@b!%TC?K_v&5!qYlhZrO2gE>>JRHUN-7$RbOs}rQfmFtH
z1dcZi%IR$sDrcZ^MUTu51A8wc+-OGkg3`dAKc@0_O;bka!BHZ9A>MTw#Kh#&WCMEJ
z3+mXNFz<)#kM1km259^qpZo{1ZV|t$+#?HSevOwkl@CKnoU(4pGqWev;?rCwIiMSw8=|Oh)1`T|4p$g~rJ%guqH9J(X4cY&e
zIBQ1D=Y{)1QYzOkk)R#nnm^1}_FG}@(c5|((+I@gsHuQVf)(=>cM4^@`+mq}ILZ(7
zIrULYh|Sold5M$8kW0~p0L|XJ6Ss`qCE3{l1oA54uuRf>%|+nVh$*B?Q~0MEJl{fZ
zHJB?$R%AuwF`p8~^oCzD-4{e(H>{;5s;F~GZ`F_$afUmj1ZRFGpIK<4vP@PMrslAC
zz3f{7B{qPU6;PW_ZWAO5nV01U1`Q|381Lf0<-fv|H-
zV8CbYGk0{URVlsx^3Wrs$ZC_Mv=G~k)ct1b9W@fo&r
zxW8f};;{!|z91JI=j8@2so&7lc1swJ`iuG`Sc38P?R*l^B$6AhVWbJlg4Eubl3Yr
z-|*I<4o*?@Y8{W1kFLG1mS1xkTz=XmNR)$1A1;}Uda|wiI9yp1Pg3z;L?&=&PR3iw
zWMTGR;U?KFn8m-D_x$`#Kweu+GaTHpus;PNE$?2YN}4ux&-{_ccW?6`!+p=1zLiCU
z$U7P=f9hwSNOc%!>+P2vwJN5S{>^Rd>K97c{gvjo{)7z7dzlXx>;9}GJ6-GG4az^E8d({S
z%<>Ojb76=`%Sau*{C0>w$*ZWa?5tjaac$2ElCJ&_D-|uYVP|)MmjX_WUHr~Uolrt^tX`TDNr
z+BBvVw7|=9aYwHN>UdqZ&M3QDTH2+&+4Ke*yRuw=7y{L@5)=n#a8G>Fv&W_CdNZp+
z(qYEtF#>LS5f#sk1ESaB_xK|67O*P9yU@ptC}SR^xRY$M;{J(veYDiRzJ}bicwA1V
zRe2$__&U2vZwb0Kr(Y&y#(8yg7I#x}FKz9pp|RDwce|N6DMmN@?jpg3LwJ-Q2;@6j{Sw3s+HWGBVaVrFpDA
z-Y|56;(Ua6AFn`j1B@2?NujDuKMk5Izxo9`3fhb%q2jF^0znuambgKcOXJ{dPCmog
zhI$zO8Y%6GoMmFK+58PPX&kb2R
z*S{hG?V8S$w_3UKSalzOD-`CI8
z8eNr2A|%7I821K0EMy=ja{PwFLlrC9PBIhh;CS*mhm1r{{ND#v@Q&8Pn%nK6$^u2z
zq_(}>&b8lOa)A{&BN&RO+p)fw@e_K9Y6GL#F)}+C7-y%W1vpqajb_llQjNNMUTmsF
zx{3a1D)}P@Bs3DI8&JmPb&c73v?JK5>VM2ujov2ifCy6ZAQj>xZwu7DIzs40&9>GU
zau|24nz1{+tl(w~Gxz3a1o_9a$j_Z$Ea!@0+3q^bmv*+ON^Y+p#)omD_|I2|dB;1D
zmhmB}k-=sdTnShK{~YfOPPBj`xT)ag7oq_wY{
z-t05+H-ZTk`jcf2oIGceui>OT*q$~`89aMN>YoiV`1Xyg-XmwW3_pS}f5hgzuUo@Q
z8IdpUDUS3j*00mh=M@n`z3FzZJyGxaP$dlrsUs<};6+C36ZV1cBn}7Flj0-ORKgC1
z2{YM^@}oLfSh#t9^ijhju!b*SlpXkR#PO<|76;4M$>!9z3LmC-gW^x
zDl5RP1C9^D1qy)BEp*pDYOm}E0oQ57h*V$}oVJg(J1j#Yvqw>F3urX0DvY^qsk2wJTnRGKeKu%{a=oipXC-5@J8?#3=XK681LCnj}a0abe$rHRn+<#g+O!1sYX7JYUSX(Luoeu9cp9eK*Y(3n}x*(V~`=cZC3>V9V0$H}~kc
zWN|G}r(r?1o0tVjQ0YI0g)W?Mx$ekE)!%ijOF0^9kWAh5#XgdH&sN&~>jks-QP9E{
z`?P(o3n&}VI$;?f-3}ZD+D3#<0r@OvAYJ
zZd#Nh7{G={@Oq{)d_P5yARUL=ocNljthLLHLV77Ws6sxgoDrDBCO12T5>jrXaE$Te
z?AQn_oU{e=oS8<@JcK`{bAw-JxN#d4CHLxXdl@cC%@-cF#3I@Xcrqnf@ek#Nf3a-IrQQA)6sN6
zNANP!wEa~49p;TKxeR-eOBUCEnE%9Bh_p_JTPF-^9R~l>J9zfz;5)^-(Qr?PvO;!8
zzL(VHfU;;dreqoayEc#AN^IFL%3z4>_*`Zd@y2)dr;XMgrww?rQ+&UGKh?&GG}^)4
zZRYZWi*U5%9p-mJz8iFu=-xf>609bJ@H?sV{6?@ab!eTmWQp20p8MkJ%J%t7MI%{W
zI>Gv?S|ep&wx&H#wi4Cgaxnfpfxo@zmaZ#1^sFlwW$4Lgj_bDH
z#5RPQ<)0nZ)zq%_%-?MMokaHrk!~A749fLG{%5EZj#lTooh7RL(-WPkW=1vim(CDh
z0x76iL^U~jHpi0Go!n?SS-R^s>hrR5YGj(#M3&9l;d4tW;0Tf0FHumx;-gqeD&qSN
zJs$3hRH2cd546VEYpm*C33xz?2kw_HCU!PA;D=)?x{nL8dh~|1w%Q)11LU8>I|ZCW
z3ewk%b~VIDQw{G7FVRuuLYN*u1TJep1s)4mgN`kMr}`qNtMossv8+9wU-ovB0@U%l
z1{M@>-x>`1{6PEax~NNzqWd_?1#ZyN#6C!2oayn%=En|W&pLqGoLgx#>gRPDsw2sV
z!}e^IDrHgzTaoQ0lkq%~)4&JzgKvY5;LXBgcZfHcou(lJ`rp1c)*)~>xqVb84eeAT
z>1w_HCWH|D^1;c&%FrnNUH!q;eKlPNZXHtCVA|lA`qh0a1By}Zo^U(^M0gpGHq9B_
z`;ekHHf
zuQKf(Q_@AqvjBmim8^h^(}@w!Pu6E0j~aY=*=}pmxR0n0taWHbnsNZD
z_vrFSD;M}3nEHC1Il2miBhZ9jD5!>%yKnQy`B=^aZ!^o|TGEr4<i;MG&r1I}9q^xmAJgC3
z$N#Ph{H=rhpH+c>rVE(lFR!ycoVPGm{BUiQr|oYUuVByE
zS~@gubvS!o)2c%|Dwu{gDgq87yUdecU#iD451
ze=1HYJL5%c3E6a_{y3LciX$s9L<`B6aK@~T6wSe(OmkEdq3HSQVqU+f=Jk?&wz0XY
z{QJsVXunm|><6dJj(BMzo0@ytjpuq&O1%22g@Qp=0m83uf$vPQyN+%=6^=*a;qYP
z!>cacIM>p$dcEDg2wJPO+r4|XrMQ+N
zHL+(WLZ@W_E0sgrAG7248Q^=rwN(rr@|0Vuy4E-b-M=b(ly6{xTorztFQq*%Q0q!U
z#oOZ;RA*0MP%UqbFU^g`6~Mg6V3<4AkJpyDk&Iz_$N9cUw;&_C%f;j`x!$&m6~l)<
zv9Wd9c(@mYLvE7(j&cl}K)&=HTSAF6sH%Y(^>O6bL>f|Bn85@V-qbc`t^_^Fsre!h
z##!AKN2tN3Ljd)f*-obDwI?KzB=0R#q_Us5uEtGi`Idz0P9VHs`GcN2PHU@*Q9~9_
zcp$^&LlfHan1V#GGLTlX#R%)h-4q|E*y>boM|Ts4LNevCP{AMAz0jRL`~p=
zH=X-r>~1yj^@IDQSKAtoBeyDZuw)X}v$tD`Rl&zDYKNU%P|vC9tFi{_$?5Hc
zGop84OSx?&F>8DXf{R-z+-|*EtAo>>Q
zcQE_$)(d8nNxQ4kB_jp9A`?!6q}B>`rXM{~19XG8VhRj4IW*mNAa1|ql6s0r5oLd<
zC`DU%H(Caj#H*C-hD_nRA)v5I342zP566y?EooF7w{$Jlw}Fl3e;do|{;q9@bM7y=
znbVJJ?quuL?3_P68!(}$TqPYNnJ3Cnbc|DF(*r(q(Pz)rI0`Q?hl#rozZJ&SSOx|~
z^5+0=Me^1S@oR1`#o}Xs7=)w^GKCw$D?__0?X+t6_v+G#qic877`^gXVo;{0bEmuS
z$-$C9ol+WO>&#UwqQ2_A?c0Tge!mg#RW!tjjJN1QoIQC&w7pbzkodVt~Njnx!tM=W|YVOAi?lZZD98em}(dX6GOKg<-{
zHR$G=(0Dt~HNg}bkR&H%jrkTXc1Hx$DngW!2Yj?+*T`F;QZNslw1;0gwlD!3yJ#Il
zlA$SMmN{4^VxeKFhtHwmdf;kUT{QN-0$(-=KZM<(E8^tuA;lub>-kg7(%9oWX?OjW
zqr^ebN7030I$W$C0?5Gl#u=J&mSTBWnzFNMofqqQOk!2khzIxEI_KyVz)R
zDaVimQP
zFeC4mwuD>DzQrRk4Rvlabbq}gB}^$PA|r(NC&dn9rPh)Nh6C>s@M8xM0$Fvh;-MG_+4N`I;?Wz
zZfa$w4jqAgyy+~&1xU2fP8|h{*F6eJ-lSS4yipVUP`gP6mbGQ7HzY27uUU#tIjd7S
zYH18g$ojqO#NA!ZSxW+`J||3cj0%eijQ}20<*+Wt=uCAqmv=aj&ETS6JF=tU7xF2L+A`Ps~qPO
zbC7XL%dQaHH)u1W0(?*sq4-&%x(p|Ux_}Y8TizV+y==y#D-4Npy}wLhhMdkg&ChV7
z2y9>;FGE(Y6wt?MXwKfKNG|ju(KcrC=}VLI+zNk?b=mYQ^(CkGLjb`lNXDl6e7T^L
zlIVyNUN{hF383iK#%^eQR#aivI|enzE{xKy*)jjs!L~+sna|oc^9z%{S%+9x4v;#elC-?&tF?Ro|*Q6-NB~%;@hhwdj*`^;r
zp18+TF{&5=$CL9if{Ji7k5hjXa!b1r-EGE
zqd9Ls{+~O~f3}nVY%v*G*x3Gi=lSo&{~E3Rr>E?nxmpL~&)${49Xg-mvc^W{`U19Y
z_?rK;@UVV1+OTmj{%vrvar(UNa{w36;{!>jVC-n?>|ppggZl}J*nSfK{AR>w0yOh{
zZf2Q2&;K^`e4ev>p8sv?`8;R+JpbF+^SQ01QAK0Pf9J^kn0?LS`>w6(Hz
zP_)xG{Ckg(v5CI3m6L*~z^5cGC@7%s_&Ea%*oG@;1HK{ZVC!u6kEHnd90z?HN4tL(
z#nAoJ`n)1!>|$pa>|7*+t
zxBc#aZTSH$O#eSyen8LP=gRy$Ud;5*eg6y>GctU-|F#f5`nO92m0HU@QoNv;)?Evu
zAh44^6a^lXG&YO)M){6p#yfa1c^0LRn%$u3TjOUPDnE5e3MR%aLYoWO3~l`RY6Z$S
zWy8fn_nqU}M3ExDzJZVDsbmWZ6+6O
z$=V#I=3i|fJYFx6s@VJA*x&JzkCTPSagi31sk_pQj}#3a#yn!{+2mHqQFt;1Y;yd~
zm9+zI*`yCHYW}Yf|GRvDL;QbqO)~xM2m9X({kJ#l|6J(*UdvxW$r(RNcz*uM6@f&U
zbdT!cTKm)1WcmYzqc3>p__jKpvO+=%R3p^eC(+Nat`^y?E#}UH$x(q&p|fQxRR_&g
zu}3l5=rCEgl&oTm%x74vIOo)=?3&K!d`F1R07r3Lbabj8bu=d2TXTH@SyR+2*CU`H
z=Ip^T#iB83ua5U~Mi~cj6#Jr*NuYD_r9}cAQ9u>+PS=FA1T&@Kv4b{B3GsvsM9>h7
zlK!1&Fx}JLl$BH?yV@W1nN@-{H9MmGsKVr&CQROAn{gYvy|aIZaF04OYm~o0g(E!J
z4hKy6Iq|6tos~4i!43^ce1PTnhqPS$po9I=^H?(!3g_(x2PqnaYlYb&TU5ulABBHd
zGud7sefI8C#vVw-TW)QnzR72Y!63F(NumfA@$;y~;XoCNjRDhuywLEqKZ?qtwlWAy
zaWH{e&}6^fdaGK09VqK9ycBAt!@8D8981zZlDybxsVR{XW(BhmNM2K5<5->8P^+yRc>f-#t7zlYE476Nl()
zRj6QBiU84bQoNPawY`o;X!T2vck@TsQt2b@iZQQWIT+pvypX>u7NR;0TM!}VQ^|H+
z(tQVuxCL6W(Hut1RRuT)2v;q$X79&+rqY#P{hwxFOk&d$8*2~SGk1qfck6@1#rL>#
z=W@3Str*<*=f^j6T0RScEGvqHR1pg-Z?oM!bX&GISWXtm!C;p
zEO^4f&M-wLMyhUlk|(=mgug$?um*sE?okHLfp7?m`00XhcrbcK6L>bdg10HaW|1rO-iY;lQ-)y%y4!o)z@wa#rXCLec=wiKLNEO)2sy;=-gk3Vw$U
zN$17_ggA*T$mTaUPs>##2g9HBortflRBJj#vMKVzHtBB0OU~rJD-0%)Z0)+#^!Kyy^{GDG0YK*Rt0kE;QuMcl`ao;!SN0y^q
zlCj%C?jUP;>VZ*(Mot%A9_rl%m0soS_mg%=I|lYE&+l2K)$`VW2(;X(dLIv1=J8A>3JEIt45LjbBeMqx(ibdo{jwqbN6!9jC9)KlVb~+aQe{^o}W?Pfq)^{
zs@H!ctx38}eqLayu<1zdo8y?#*0(=)b64;LDfLyNDfC-f(d1;%t1xW(7YBT?N!JoR
z6t+hB*WP*Na|n}GetJ~l6~y6kfl`~?Ec>W%^~BY}TN8BP$+w?hnN&HTNxx(`*c0<5
zF3!(6>~|92qiSvY0ek-Ls?
z_zF^a0MXY(oq3k~4xj2ftbBN@w*416g@CQTciP`re7;F5&Hb98f2zQ^ejRKT5Bx4q
zRb--OGXH;=d&ekA*DY%_ZQHi3N>w_u(zb2ewr$(CZQFKMIyABl2d3b)HNk?FA?Y=dg7Je;2hUn(x|LLWla#
zUpn`wPN{)9tWUTbsqGEB@Ut&LItItUZ>C3-KtbH)ig)N)ZmeSERVEJLfln`3(P8twx|QT-NDEQEuub?1nJa)VN2_Egcb9wdb1gA
zmRcS{2eKF!1q
z!7kx7Oe~p0(+i@&{WTvhK)@4ubijSIPvdK46&PJ9aX^0qm`$Pi@V!c@&d1|wvO6#k
zctkWaX+NCuwQ{U1l+|iu%S@hK`(ENZr_dL^3gDrrHlPp;x2_UiiJn?gl=U%(21AFY
zs^c2OP_9J)J{&%KGs(T+DK<7*-CiqZH8S%y?`}(I;EY7~^|z(-9phKp(x^?`D$Qhf
zobUF>D(37qVzoHAV#Tpsg5;b%OH*OB_O%*A{DUZWeG83Mprvgl9(%xv?UKIMS2|sF
zM7w3I;Vp!P!^e4sE)TnW0NVj_ftI^s2ao&HPjQ5%2H15wbl;p&Qws%zr%$RfUYF6~
zJ|Z(MlF`{>xgkH|#nxqCN?_r?Y+GomNM4|;;OA=We@>G(^MSAoH8*#0E(X;W0|R#{
zD7ddAuht-=*gy0q`{1R!l~gcM8T42y66Wp{oNhuM6FMo}vzV)^T%-~T;fvJ%u+gPz
z04H{?p%i>tcgk!RqwjQQZu}lgyFVoLWI|1WgUnX8fxQ`0QdT6DYFpoQtG^Ogj%mmv
zz%bSahAuPeEW6n!LJYG47V%+SglFagCo8tev$w4x%@Wn5^j;&JcYM4_Js@)Fe^QRw
zv(R!`o`Yav2r%j%%_FjDXVGj=rJAxennFzY!T}3FDBG>Ss%O^a<|d)enTk0{xY0CH
z!9FUt#$$(x$pok00W>*`*61#m&7h=@ak~@obuueo*Xb>;Hq`+zz8n~
zIt83{cSMQzG5;&St6vE1M*y%*BFZIoq`HWGbo?CNHs_z{iP`OPG&VoR;m_
zHL@+ly{Nx16wvdGsP@MP?b?(Qnf#mLl2jDps~p)3mdyP{sSMYW+&wTwMh5jNo$tus
zvV=dd{~vsSnSqhiSQp}@_#4A
z{XZ!!M5AoS6OxFwO=NHV@YFjt~MsF%l%ji-ucPU
zL^i<^D*fWCYtvQv1&HOI+M!h`Sl-Zwy5zBvTZgt%Lhuv1cF6BYwy(V}%*d$vjUy2~
z;KOoMk2&-w0E9&|i^vOuw94Y^j}SQ4S!9nHsap3*k6<}3ir6C{ShR7L>4<$78M0B#
z;;6v!C>^^C7^hM~f`*LC-g1S>;X6YI##DGK&#WpSfWT>>fRndviG()%oE*|7>&JIn
zio=HUGgfN3iN`QS?E}yls^>$-YxCezPIjx#W1CevUV=AwhDQD>5*hJ+9lxSX`x$-WjYM^+V
zgl*`^_`^LZV*GZLy1U
zQC_I&9o5!WVaOF;))n_|Gc3nZ0WB+bY!1w}FC2lwx;-5VbVy4NWJ2wnX*B{|Gp~5Y
zabY(#MsnHE$6;+(>dXgL=URp{;ev$L46T}))^AZK_>eEcBT#N7hz@H98J>STSOG|A
zBYNF#CCQL5s~;;3xuXpqJ^8j=c9B}sVA}^Cw;;o}g69#Z1wB72+RZ3ek|Bm(BD!GF
z9G4uLhu2ES+*$@caDhplrux^E%9#9&-UHk@gx_v*>iL$Wug{_
zfiGrh|8^kgG=B;$luz#&!qyplIVm5d060290ssvJja06P!*y{GC@EJY@1FKW
zAfB)k=V(xf+mw|=M`=ilm>
z;fq8GD7O{3=ijWt$=XN#(1;Rx#0MXw&OT4nDiH%H@gBtSaL|*ww!SDO!D8H>4@n(;
z+5=!Qt5!1Lg?Ur@f>CLKj_+0JDWxGUwkwO5ihiTjm>`{ci%z=!W
z#e>|Iy-myb=21A2Z^WqvgL5Loxu)|qt7%)`xGqRwP(}r5K-7cJ3^<1>}_eq1U`yjstH#-@ri%<7f<;by3WtkW>Al8v6VJ^LP|-W%U4@9Y88
zaDe=iKTV-RgAmPK8oT3!F+f8dWaJrt->-;+`4(g%)~xw+wM}h)%D(Or{br4>rZu~*
z0$VSSF%B=0$0g$gyL(FqvN$ZQv5*ojKf#syeh#I4K}Bx;9=
zA&+gOt>jdPS-gqAg2)aJ%1G)Vn`$@(E#EUhdSw3k=jk`=;LGMRT;yW`J`Gl}vK0R9
zoE4jrHYSC+l_BQ?tXQkO>v(lfpxjm@iAQpp=fWJ5$uT_q;R9BnyVB>*6?~mc;gkA7
z#i@nOpn8QMlOLiFCp$}b1I)y=B6?eF*W49_QeCY{f$`LPd0QAdSO(A?_T#rYm~v)@NoeP5fuV4Z02?oJLnUK2L@DTsqF|-{ggp4Who(AI@f>P
zTs;m}oeL3HUd!E~=Wm%H7|EZAS}^5l=iFg-WjKG=nM)fw6t{=a>Z2ftghY3o)fDK-
zm)n5&(Bzh{zK5Tp+w~&N2WsvPC%XAL`NnK>P3_AmUp4>BmLw_L-Ae7e_$JAN2~e|8
z%@o)f>p}aR?BS%@D5)O8ujhLjVV2it7`pvxjW#ZsIo}X}2ZMBE^3|f()THdSVm#>B
ztz)$m(7MFBL#?kZ8wl~Zys|EHSGj5}S7j&}u+-2>W>Fqj6k_H|=E#9d!HxG!`q+_n9kEk!QgbYM5JGvUW
zJZyjoJle`Q_$lE?-+r-_H0%n=EEe9N5OK8XK2QvAO$O&rv9zSx^$&rzdmo|xdl_v8
zrQC37kPXhJr~!F9wUIpY1zqd4y~K>L`0?`j(&qBKH!({rlXRSZj2?;>vPtkyr~&S7
zn)U`YMr{PowMDHK@YpWM@RX$;>1{?HK!6~TUN=enYpd?Enj#l@ovN%9H4w%*^Jzek
z4FMZdy8xas^%DIuGf>4sNLE+nfE}LUo`>z_?p0*1-C^Lpm}
zb3=}?s+xTc1l&%JT2aQ%7}JkpnkAAIhUsvwxx;!_K47C}J0;=kw5vixp5{na62X8orYQGkZZy4z*2wA*ZLXPB&*HPl8~c72v!
z{faDs|DL6=;?fO)i*M1dMSkoH4cHHad3dMg7}^0H8}_q(2t?K#N`xMUXc}fr`m7B
z{7!;pwp&PXG;)8QNPBCvmra&r|K%R
zhPk|iZ#(LzuW*@v1kre2P~donSA1e`_Bzpnn3S|q!eO3dlV1PKvNX|2Cig1a=7w8@
z9-dLfX|g*DFy7QOE(y9Pwg06CMx;w{I{AKXZh#G49n7OnT6;)sW$(d7dC-FW6uF5*;HGVeF{Tlgaq;zECw1
zb)qh*o4C_z4XEa+YaxfT(bwn{-@-j~=?qNOx;pjVBBPh**selJ-(8aiuV~Dqeg&PT
zp=a-Qa(3r!Vp|`ipqG9)fq>B#Ya#RTob5^hBtQ=$0O{B&gj@9O6}EfFRR_OP$p)UX
zj*o&P5I#knl&;?qtKit0;DXCS@FmPo9V#~q1TzADoA*IkaS)dYPzmIut`RWKwGeMb
zB{fC--0n$qkg@yjd;|c1yEf4Wf#m)1K~F^CRcbccFLEH=HK>
zatLu60P~n}*1mvpSTi5szX!mUFWEQ@qu`qpd8{2tsZ
zBE9cbP#4U`woT`~)(3pUogp;48RUMts-tvBKbqnbNQx{X@;jMJz7O2cpg3^Qlt$TF
zV0bbV6mrCJ#-$Lx!x~SchbK6$xy5pw`1%lV{AaIIle3=M4nOdO2;B1v*ys069)fZB
z&rO+iCu7iT|GDY$-;+a>cbCPYivrcnX%fSppj&@TQeczOqst@c-^9CPSI8t&
zh80oz3G2arL<#7n=zR|3CixmJmzIqH_2M;dC2O!iOmH-SD*Z7j$1Nvr{5Fb#lz@FE
z^7X<#tNnpO+C9N2f$_dl0hvU&C-Vz~^kt~_ZaTCZuvh5Y99a7+C~VIf(gxT7&*r^z
zDY*Cu<|ifr#0Or0Fvo}-b2K+++qTcpH>9j~?bzxtX^Zv&Qb0sTb}7CEGjNuW{B&3+
z0#~JUFLIsIM<%0B;JLWKK;Pwy2Lb_+?#u1I0t23+z~JfopDfH9EBM244QC(TGrl{L`>)xZ+uLJ0%bekDbvA$~LWxZXfYU`D
zI*MV?=}&ratCUc&(7@=1Un&N44hLNuGlj{P4zf`i2R-339eFm-riZ1P%$);R!0Vk>
zFUP4fvPSXjFSm-1tp)YwLoO5-gB8`@wTadvF5=#mUo1SaNeps$h8|eatowCjTE;jlO4dfM47zM%)~8O^-75O!VmR$LjadV
z$o65sK~*+UC`9)_pSlh48uJ03=5~4=~6QhACd`AQ=>!Uqy!>ZA?kEbk2C^NWq6p-K6xW`DD
zyv0z*>ePF5J>?=)c1%x>#Fsrd>d+)P
z69LRw@N_@@(0t)%a*d#n#
zkkuh*9WU6N8Rt$0k0Kg31$c79IOsFpsIx_DICQ^4GYidHQ~Dk*#5RQ6+k8IarI)rMfsx~Lx)Vufi0XuP|DA@
z_^x4*CK7O06O&#P<@p{9O3I@KDqhQcEY;Kqg11Ptf)go~5L9tRvV>g~YAfjmhGD{@
zVQ+&jl6Pe&Z;KG-oN&s-`H0C|mUcMddI%$REYge7tCwIx8E5Bd^7B^S&Td;AJ^j!a
zDIu^vXDLl^>B)Dx`*2xP4d(+SY6!iK{SFPZ%oNm_=~{ltgpF=E7UjlE^1Gj#-hko4
zccnJ$MJc=Kwda(E&u=am9^)9sw4;~t)8{2+JM1`(55?)O*$0N2P%4&4QYT8-MAwT}
z^Z;TgumEz{1%!}AGL7aJ>0=tmgY1MADGL`XqGhGlQ?9i5`6_kBc{)DdhbI>Aa8b~N
z%$48Z69X`6UlP!?RxMZ|^8?Xhik=PI#@fxp
zsSlkC(7%=bLaz0MpuB^ozs>JT>K1_P1AgImKL$l=$T0kUP0y#b((~CWW*O@q()NL%
zzmcz@D3KLyZN3VeYLoP-Rw}vM)F3D9UMSY!rJ`7k2G$mS?|FvxgPyjTx{lwQ6$d;v?+^-y4eLBq$amP5YgJjHpYQA4M)R8-(5`w@Y>OL{d{Pt;aSaJ6wiH
zzSqe{eza!kCwT$?A*uG0DM8`pjpN3u>JassKWqo3`*RAp3ds=rV*|yRprwn&sr1%Q
zPepEkhL^E4zL(!NFXPycdg1A$LkF)by;a6IlhDCdy}CgKORwBo{7Zw~+x5uG=U=_>
zyV9iz;30(S7InJ^3(Eo5FlKd5Y0-^|g$T-v-W1S8(>4Cd{?O_Oxv=twa1F>n?Ci&bOo+HwRgb7ovl=5E3*@N=b6tn57PBcV~!uEvI0&;YSJP
znw)iez)@L;nS>>fEHysBsj&#o-;TR?mdjKJgmr+t@qA|_VpDC(C?%$rtf=R#yo=b(
z8@02%i17NW&i5>oi3Z^V$U_Fh=FsuReZ!$Y5vPk!P7#E^wJ^O~?YBAQS{%uE94U@i
zS#P2o6w~D5ZO6S9T9SzT(6&BFZ!!xbliR)^s|Tkh#w-t~z3*4K#7K&ow{V?9*;TTR6g24OVD+011-qSFxN9wrLlmMbOlg7z
zZh;WkU_|WO%NLGR4>5#gQTeZFHB9P6ZkP*F)?*A-#LSSo!!
zckAfJ1~SrO%L)x1oTNqe9|Yy|N=bi4os=!k5R5mCXho9cnbN^ASuT{{+pV(Ggtxk^?*&O)r-33RDx9*rJf@4-{MpRV^CsbXbaYrz+`1|ue#7}(#g_LH>`*L
zNR5z51!;wL&RmmcpowS#u&5S2(2q@q?Z%^XmW>VB{8ky&K81%TmV!`25Rg6B
zNSO4ox{gMK=ZvH;qx|NPeXyzLYYlJm@wW)@4_No7s3^8I_7Ln}BQt{WoKrt1_`W#;xQhVEcaK*dP*
zD|`6-y8T2!u2YB9>h4$e;bKB_M8CK{xc8FD)!eHK;rd7%Pi{s=6bYVo{v|O55eM9B
zweiMLWm2NIMdpP#9x;@!Bl^vm%x24cj%#_39{@2ae0eS^TRl3EC@f$a&g59
zqdT(f=6eo;C)9cI?_ouno6TOJVAYgLA`Q7dI;z97#(t>a!X+{DN!+wTWN{#mQf|vK
zeLi^_m|C+aSZCKiela{x)hcM%O|k_?*7~@2ext5h<%kW{(Q*b4{&mum;j3(W-p;>D
zPj7YYP1_vW)p%ag{RRb<+roMh679b9CU+=x&`mC-F(GZyn+d#}cdG((Qq>ab+sz0b
zJ0iIRJ&o2k3PsS1Nm;F$^;4eW8?;)WVVQ5Oa2CSk0tnd1exU~AYn
zcudMvSh-DnBF{vBo|60a)uG38TgtVo-RJl}5aLYsIex%IV%eocMnXo8
z$t;7P^da2%8GUkmA9QQoP<6%ZXt^PgZ`i`)^$eNt_K+0O3HVR=Vq(uSHfJJmDe?3i
zIi#OvWq|6pmXlWBHGgmqR2m8Fi=kk>G?>PZaL^Z?Vy1gCfHql12D!Gr0~W-BZsg(6
z;3xdP?wCyTqT{hjxPVpVGcu5XrfK-7I?1;=j@rT!svktE13B{V*&bq3N~-XnynGOp
zZox&zAv9(SVX3mEj~rnN4atks-R9sJ@H#B$WYFD|<{srMr*;guxozz2y>;%-A^q&Z
zDmfCaeD_9mt&o?8$Bm9$WzY!$7-Bh(2q^hO^;-~4CTnkHrex|sZL+E-uKm$Vl~hDQ
zhrOE8UT(E-2(Rpd+B#$GgoLqsbmG^+>xyghcN8lO^n3@6f<~SaB%c!{-wG>h3V3h3
zWGX?LCVyE-uDV_Q@EpddjzlzB1liYK~8J
zp2vDDi?u6L7tcep!l0AfcH!YV2gh1ly}hWmjwaPcm;lz*?xB#_(*_&eO_{)?9Qs=w6qt8+j|o8z@)frF9B_r?RwE8<=<
zK(KbmHuuS3e{^8gX$&kcEOq
z(R8~k2(S5_EL0QE!LV#=1@iRs?^@>_$aKI2VM*zQ7#uHCvsqY6F7xwX8c8>+`T|T
z9iE|ec}g#Ygt0(i`jkIPQ1*z%Y)w_1PL-`qcc70hT)4?sto
z0$BDM6@p8M9{G;YS+btc2_Ehl3kuCd)C(BS-jAQ;iaWvnN?e5TvnonT>akh#h`b|t
z$#zSgC(Rbc{s|fct`HyfsnspwyGjZP`CauEZ$02KRhBI!jJi5Vp&1n1rxYq0IoJfB
zyi1&dBE6h6Tm(H{5ESmBc
zL47L8xBJKf!c^?CcId5H+3C>a%^QpZQHHH79|jYD2~@-#I{Pr30eQy}WDh{C=B5p`
zszCvt&cXIyjvJD*J3cf+MKVP)0#aC7ScE|3lpQy>HVO_cHsU9ZrKqLNFKmfV;Cs~i
z9;T(eHn)WBo|g(AaDe5s1&=2MA}6K`Yzm^!p*P##F<#|H5w(Vbea)OlxmZ#eu7NnP
zLgcKpWW%gh5$&2Ds_g&}_5mIJ+ii&v>4V~#;PU~%Q3ygdMg3ax^d(i9fJnL-2N*jG
zU3|49;%FNglQ~kqdPk&)yHd1vP~QFVoBi5My(@qJOEQ&)5)eOsuBf38p4W&t+Q-wq
zx5Lc_v#oeZdQWBygU7}umcq~rg{mM>s0+B2&#!eP(Vrn{a6+%l-5LwW+nlx>FzM+C308unLB4wfyv`;qLcI
zlh~fw@pR@y#Oc|`bf4me95>0e`>y;3gtN}s^ZKqHc4V?vPPtE^+Dxb+c_`)wfY!c?
z+qm5ia}$A9N{Ga7jj*-sGzlTMZppZI>NA`L!9e)}aI
zDXi{ifa)}o1PHmo%b>Nt}?Zx>Xrb3pUmmdl&a)#Hd`^
zX8i``e5rmgmXO?bT3mV-w|)d;+>1X{^S&B*o8d6*TxGtyj~|xW-r%Dob(q5B3DfTm
zmThYe9}p3#NXbWwtO8uO0){)1kEqW|W#Urgh#EGGQ-OveC)iR0+k~~p!dNHDb6&m?L2co{$?M@T?1fY?u~mhzp`yRR|hLX`dF2}8Qi%05Fhk+V0l{F
zt3YH}Sm*SHNFL0q+
z8_^|P1qMeLM|b}&)m-WUW&%u2U4K1*5eMOO5$U?{KNV@!kICwKb)mJ_
z4K!BA&XcfXSW<-`I;)hR^g=9#YJ@)
zw>wb@HhZ~g(imm~;yn~iiQ<@@JXAivVOh$&WKRuMAyp9xo;6#h+Fr~6XKa*J1zikF
z^|SM`{&7Y-xl&%t?-&5#OO31B}ICgxI=$rkr3^eeh0thijV|k
zuaKZ#Vq38d>ZDe1v$~XfJhud?_c1$oIqyhGv!d`ioj`_Oy~im?wxqy)tn2i9T7~j^
zNv_m%<>Ji=n+uwIn2D&WFaC!Ma=5ZN%nvgcE)VS@8rNbw1?-(46p)Z6yv>rvoT(u2
zLnkq)xGdSqUK%eL7GRdX8S__M!{E)9r5#GW^+=$(YCkB?mI+OfB}gMO0luzsit3zKp&ITPh6FW|UP0Ra?kbC+w`3K{o&wvVYH|UoWt=aAG)x>Cp>Cwt2^_
zMp=^Nr`)NLM~1NLD7>Hwb-&ZzIqNeWE*zw$eQ4DnfC$29nqZ@s?&+ObyURK<_wA6m
zFp7$e=$7#&wC=`Iuk=s$s+
z3-wY49s#>NKl4~$a3FPJzul~(S6RhjGnQSxs1IZS(AD~3s8AvI77IRFuH=W2@N4mb
zog&$14YFqMP*Sj8e^r8U%v6cD8^;Ax6Mi1)2O{J%n=4=@U(-^{i0aWOGh+g8Vv(&FdGlffd-w}YYd@jb_oP_5xu|=;_RLaN@(Ak8Lam@D
z*5!sza&5%=l?9v5L>(A#4Z$2h4KNQ&?D`B}!yI)X_(jq5A98d29`W77as;sOd*N{m
zDc@m9riWS_*r;@^3+mk(A`SDZAIMRcQYiaOP}Aa1X?V@Sw|Aw#D|b+T)d*bh2Nj-+~9YPes{=Uguwrz+3?SJ6Qqk1GU9wsfq94W%a>3jy);+8hBz6!ug(6&RoMH
ze;JG^;0$QR>_$<5^I3H819ID~y4CHeMZGl?eh+gnlxdWsCm0Br$G6Tzl1=N?zDv+H
z*9d(-nz7!v1>CYJOzRvpj5iA@p(`pW$#TGj^v)}RwV)+NzE(hxgHJTv_O#*wc-!jP
z_E#?C4}~h_T?{KZd;Jw!m<@jii?uZ}@aj>T_>;G#sZ<(ERainNF8tLV!+eosEtKa$
zC3%nXoZJ((?q*e9)d{)Er5r=#3O!o85&RvJhy@$^4Z9)<*xipjlkWzpS|cO+Ys8Ak
zCl&Xxv~sh_dWF@!oci}dJs+lN;6rzsCQnHLbl4fu4%#{r+G;;BiKx*^?|tkus@5OG
zw$nzN{c~w(wYvkQw5uSW2lID!Gp&7uts~TB7t&~BU@ERFn2VKI!#qugq^zv{PDLhn
zdM^NzNBdnm{T7L2!gxPyeUk^MH1{ve?nRX9nO3i*7%EKc0^ErwD9n~xAVd?dD
zMU8c0vAA*zbtmbF^7w2bb-B=2JD0d33X5?725Kwnv8#%?+^N#!!bdBc8BVf2^W3xp
zm_x5>jg^9S5f5)To;v9=OW92Nh6oc1cf&TBEyDj6W&T6ZU}F6zmE#|7i+|5p@fTM8
zzgn9AcNi;J{@UyCuPO(}->V#dZh!a}^!?W=h<{Jz7)3yD@M%X_yBXC^?u*X@=MPJJ
zI&DQ-PfEr`)Iu|3@73;~ek)qqYnyT?7U{Ec83YXGH$-#O&)h(7%#IR=!+4vHulGlBVECma8o~mw?dbeQMdo$YJ^W)^R3y2SBp;WaX
zr&*RwF2ljw`Kql?MCzHp+p2*s9$g*Epz-?&%|xEOtAHEFSrr#jaR@Hv8bhdd3~ob7
z)d`Lw@_js|sJ5dAHb{xW11y&kH`HI5Tk|qIS2}}67moi#gO-4xEaR06(Pq3^RV%YX
zEMv)>J%1X4%LeIGaAEfpua~KSKUgLsHF{@`x#Qu(i2rwCGq5$40`zdxZi@p)<8~0&&nBLRn9{q;m3>8?E*0zdwAU_?J&+YR
za!~{#CYqIa0Bhm4^D);>{(Wi(TU2AY^ck|^wCjCj_b*NI-T?+6Gm*1VI
zVb}q|1a#QVkslBh($ZUEUg68lyMmhlCu>{%l`y#;n%#vMlN}&wGp{C%8)66pfCB_s
zYzA}23m$9@07RYQVh^{)6!STgzsmC3EaxxMMWPpdpfO!7cYSzPlT6l7YBJiV@&{UlbSL`9XB>JtLVdaAVd^PiCkF~=(%j(h`yaw
zcK=YatJbY()Q;lBovC@)=)PP3m!_8;3XCZoA4^tJDcT7YogSvIKuH1#(x=U
zn|~Mheu*d6pgQ|Ry!7r9CEMa*MbW8%T>1_uwyjf<
z){Ho+Qd#j>lT_jxhWvLcAS|n_5SmxYD8U_|L}o*B$#d(|L-TZnsS24WQ*GzlrNht#
z{S&^vfsGS6WUb_=zCqL+2~;~$7?P^FEA|KP*Xe->O>6N+C~Bpp*kwyK!SV884Ygwo&ZoSfgvIw()Tki+Jsz
zaitWQ%qAcxD$JIf{R|-0Hk9x1ccAt~jelG>pX@6JIbdkSnh%=0S^wP)^k@0}51r$`
ztbHthZr1siO8eKEoxiQL|22EB`wM?z>_V(VZdZ!j`#7e>p3lMWGa>OTe&0z)wSgnW
zqB6(DzR;tGagCqTL-$=Vut_~A=SUa?NvZOyI0epv46eW?oV=yH?s5J!~O`Mc2u}>
zSRx@^B@!Zt%ocw)_;hG5v0zN>&I76CYJl^I}IW?l(fw^yZ%N~b_hH%Rcz){C6$h{8@UB0t(vRgWHlekZT
z&69_gR_XD=vjv7eC6%5i?zm`}x4kGxb3SQ1&sOMKDM|(Ed@QsHsdjS_M&8DIxtJ>o
z9i)UYkm7^Z@*M~vgmge;dRkE7v!)e6d#phb*Hm4&v4>NU+Kjh?P++-vQSU$zm=~Lu
z;+6F9w_E(bZQWw|^I-mQSlJjj{`mZlmr#G?ll;d4{x@1he?18Q+dlD;
zkHDU2NjErM4>T63@kw?lB{->SFLa5ZO~*jMXaMt$(Fz?kX?<32KE+wgqZUvOE+%E%
zdcbxC=0Lk;yQMoGvU%a6Z`me})fM|R&m*}WHxrfMByer%VSU3XXv5+hq`Kr^uZU->
zEtxc1viKY>In&4-!OdJ5C`@-kPx5y1#U1J^l1Pwd37LmaYdoL1lOqPKu{-d$C+Q!a
zX2ySt+F|)~YuLa3VE=E%<7$sh^gU-C&xt$s+0t!Q>_9il@$JhUhQ@xiMLrIbRh$Ra
zi;2N49pi~9v@WU!TeR1~yDU1jN2#E!!j!l5pm>if6?=B&094;Zz?-de(1zJ~q?
zwCz``hSJ#*7?MNgakQ3f?%p1G19sTd$mF9_Hc`tmCS_GT0Sm-H|nYc4C&{dCbAv
zx(bt{7j?HpdWH_ps*C`xNkxfZ2WZ+|L&Gg3jwu`~VP%(V3cZy!2-MmD!APlDh&;_q
zcXrgZ*+x1quZ^m(DbP!;oRE!gh<6h*wLKUhF@U_eEJzO=GZ@(#D@05`%AiiL{I9-^
zS_Nq36PcQG2;Bc(O2PRO3jP4AaQRakhxEtR@)CFW63t%YVFN|j<=)5Rhek}|{Er!Q
z-bPn{1Mar`fl9V%zTI6#D?@-?bIEg{W+JU-lkPGq9{7hfc
z@_l!$Q5tT*YuzhGj3ZyZWw+xp0sn2e&kMwtNLpvY03XirF#e1<9uh?9xF!=CW
z1MNnKa_bP+*!Q?q?%cECC{8fyy57m$?TztFIM|a
z7q0B!CmWK0X1+yiQOsY#uc@VqjUU6}0r8B{`bboT!cMJ0^=
z0-N4{)-rcTpuZtYJY%FJbn%Gr=qnTzX~KX0UWv2!2vm@s+FbL7*T_p{vlQhG*QxQ@
zIX*S
zC5k{SvDAj+xp4woEGxRWu$X|xFuYzv7=_2C6?p)4p0h9e!7V9$nJYO95W0F;|jPhTKPuMeLu$n9-MyafsEFJ_M%|Egx`%mM^0`l
zWjF#@slILH%Z?R&
zR6jL-s*=;twA{B6%WLA2yEoj7mNZWsA+9V7XPrYq!J^+PnwaB}ifNlw=!D#TTgjL_
z*stw+cmi6?cPLH5n~(hDxLGT#4Xl$CjG?0>c)k3FvX@0Xy#9tLFgnG<8*wDqhXuc;
zEv)f+g!-}I$F_PriA3BKR|`^^=B4Sz-<|2kQX?BL?~_Pka5isP@D#SD`VCL-qzwbu
zwnPKs;ahAxH2ZFh`4z;}{YmsO#c@t-@h7`iy?r;>blxzG_ii=y+LERE8E~F?BZ}}w
z+8#Ol6|7YvLQK$dYhNUVQq
z4kEU7|4^u>NXul|hVdYAo^n3oPd0soxd=e225e{^Q^2P?;1mf*8z(Mv2
zhfvk|UMprc7gioT6!i=87ltGV+>EQL;{DXstu_Y2-No>m|K$Lps2Tzz$6Zi(7K75x
z^1AMB_vnv%c%d%zfI-hgj3mE9%Hhl~i^hhL7?3mYMToKbuD&bZxD0)Vhok7x^)cEo
zEz9IbEI)NhU56Q9o|z!MNO*qR^4`_O7vD1DE+KNsc~g;#dzKmEGy>%-g15dGkE@mIAmCWOT&-tfVqHyi)dKM>7H*(*77j3S!Lm9HgjNId>TP3Fo{1AMnmjN!(MYUuN1?$n$Q(#A73+Yf+#
z)L#fM*r}W7*THy;#KuMV!#Y%$KPr0nhswh})gNB@7?V
zr?jF3Ut0^fc_}VR4^LAp7&u)9oyLv$ncH6Os^}=eQeq%SWc9`LF;?y1wr0weiOD_N
z+)*0nNv8uPb2Z#^TPFfqzH9Xz@wy_}qb_O(HC9H-JiEI$Q@H}l)O3&*C*ZdA&wl2L
zQOB5VpXfbn0qB(|)oz|m$QptT*!
z$+~x)KJp3z%4jt9YU8XukzJ;pXP>Ls5~>Li1Wn=G$BUKewJV5k=XZ+B-fB^rroGfb
z4}e*#)6*j49bCL*)LZmO7K5b}RqJHlM;-B_DuufU`IPUqKVb`XmOrUJF>FJaacUh-
z;0ra~g7vcjL9|lD-6hFW;>H9|JA2ywsPU9L2aK$w@)e~OXKcMRzG=dJ9sFWrWz2V7
z9#|T@whZJV%K6OJ59%y9XK*g9I@1wmN658Ri~6KB%X7<5*|fBC{xHsBV5J(SlFTbpPOOj>3;XD@a*hK^
zMbw07_0&DB=I2@2`+t~wrzqL_ZQC<#J9DL-D{b4hZQHhO8!K(wwzbl>jaqx}v+sB6
z)OT*HYPTNFTeR6C=1WA3`5(VNM(;H+z*(7FZo^n(f!NuKQ~LgNem@FXMdSj$Ca;=m
z^TZY;!|(S@1Z80KSAu*)-I#oJBT`syot%t-d56p{WQ=^OOjQ_tF}Y`1x@q(dn@lIU
z6O$l}467md)EW(_D=yv_Jo*zGgUynFR
zdx66;a|ORdvWIidQ*@PmTd5l1Fu1DY>>q*YuAtikIYF|e`!kRtZEaz?))3-W=6^?$
ziRvsB-jgw#Q?V9lbAiV7w8POW`OJv+{B8I0Z{dKEp5?EZm4BFX{{PSj|0_EAfB4Mg
zzv7JlpN%l{-!{VkOg;WDecitzkpC8P{Y@jx_K!FI!^)G9@ju!6<2l_XLa#vVZ9#jM
z#s=gE=so5WWYTFQGgO>49-8C2L0+tAykHn$GT~Mw#E9`jgad3Q6y$v(mS{-^RhiLR
z(ltmV#X<_D1wvj6=c{?B1j8b*T$oPZapr{&<&&~E@*nYM8Vo&CA^9zLAv8@7AZvhA
z3pIMaQZfn?&@4lJ)YNlJcklpIEKcGjRU`8ds8q&C!~Tk;jh57H94cKT*M8nu5_b5#
zaMatUo2e-vDg7am!W@wvnmuO+Q&gEyW;9V5%LnZGC01tmaqgrqFwP{8igOhVc~Ua`
zSQakGv6^zY_W7(A#7R4U%zbdn=b>)5oAXq~k_
zQ})1tJ->KD`&fW)s&jvf_yfR_-h6`?X+4KG8!f(ii6tX%Dv1jFv&TH2`q_f2bGtgP
z_-7O<&uJyC)S`n`PJFz@??h{Z*%mk)2L;{<;oLLHVgWW#_FCv9MTA@M-Jj|8-piK|
z^;7R#FfWEn8(hDArrC9De9sko`RB^-Je*`AJNKPMivlgEXIVQ%Me0?`llF3_^};xV
z7>0B0o@{s7T$$lLkPq^~wu;+XGN<5F0n5rOu#7|)tEi>FMai^F@OJ#J2d_imp)%#C
z^}Gi>K#V&Q-!-KQ@u)jAxW!<~?Tk(jVvmi#Q&wi+Ld)BTMynTJ
zXUZ1|#B6q%+0EBxoO>O_+J<81B&!_OJz|$G-uuQTbDS_)zBjU(iI$C&dUg~~P5m*F
zh~3=87b-9%_|4OxZjco-=v7w5MZ&?DW!%}|#jz!D;~PJQiF4PrRf&O??o%rvFxNWLlP=q(
zYBu?fS>24JGG1XmLs%0%KYNJW$H{(1Ef66bB3AJqNE+J97i95$!TexXRaX#7-!>X|
zfDMq{Szb}CG?zJ7BO9?X2>8YTTZ!%22wIdU4g+;TQh;N2GB5X@sn~c@oMA1>@
z=sH}ogagotrL@O+B8c)_8Xyfwn9(;@|AATgh(hI6wdf}>LMk;dPVQz?E+iGnVmXJ1
zP|zm3tjNN8Q!m%fMlrTBWzbv2^}u9()1@6e!rm{Kz`gcNYvP;!14Hps{cK~ova-Ry
zw>VWF9f%%X#^w9uyeerO!$?#T!m*}QsI?#grEn)^jQAp2;yo#scZ#6Q?AQGmt^(%|
zV7U9)AMm8sP2dG%_MSh1fU)g{u@yn#1Hkd+wjz-rV<@v7-@5{!L|W_b4)z5eZY8uX
zhr@G}Wk72jlAeqOU2}E9yS`q+{Ia980rvmy8Su~g^^clH|0mb{f5A|ue@43h*HZUS
z+vdM5b${`ERE6|@_&pv*Yi%za^B!h3R!bN`mU_Fyhd7Za3T+@+krXngA&JZ-;*?*T
z;bx9s*&$YW^#bpmks^?Ffnb2;6Yp$+Ag(t?T5#@q2o;YZKR4cMB~a2y7eH^W2m~aM
zUwZ0+9y%t>SW^W05D7a0aDwqZ56;dQrKWw*lJyF*Ts8%=p2y__=r-^S_z2?+GGecU
z#2dHcVUhr+31DFVBw#!&^u>>2N#w)scL1X^?@FTm85h=Fj61dvD<J^iM3^!0;ttFS-Hwa&V&3SsC(??qFZpD39wg;$iodUY&Q;z2C@uxR?~ydx_^&
z2WV6!SPSV5(2S65mhqPEcAtZ}f`4Mc^~)EW^wz`u6;ze}@bf>?q{_^ut&P8To_q`B
zEt_?v0r&U!phw?qnihFH(@h&_Y<{}$-DZDY;MQS8^0v9E$irmpu%MT5KUPbXkBODk
zCD+<@K!8&S5U0QwEE-|bBV{jlLHcM_MHex@w2KL{?uM&94JJg;lWF+IQk!>NlMlLR
z-OpPCm36t_g%Y65Xm>i7B}H1_aqR3ZI8^?rXeSlak*VD4QJ~}CJVn=B%>H+m?gR5D
zgV;F+bLu-4&8%UfJ?4|+)WY!A|4l0Ww$!IPJ_sriX^0AN5p{kF^1ufS4
z%(yE)m)MOSNp+D=ylP30;@PD`&Dgq4l;I-I%I1$P#2{@_qD*4X8Y^T#t)O7RE7+1W
zA9NJmq7JI><^kb|PUn1_U{>TcI}eki$0|ZJ!j%3MO$YsyJh+_zxAvwhva7R&*9ZV?EpOvwl$C{!p?o!tun4TSfOtx-1AFc(8Y7&G
z=h^S?ED4O;edJF{)UT0NPFyzO-i}ybU09e8CXejHK14Q3(mem6CoI%F+o;?)V^&{R
zl$??!zf9+3`()@SA@s>$%%y08D9q+A4Y5S!KFO+&qkqWBM$M5?5Xga
z?=LBU%xo$%O4=hP0u%PGLGI`bGEyLuZrMQ9FM{!`_`rj21cX|(o^Lf}>_D0G3-vpH
zK;V#_JGnlEhAxPA$DclEg2z#)vC)GXQUcu|Pi;CW@Ezmw3++{_l3*n@@U@ZCy8w*N
zil*ubB67k)@tseMi-;>Av=m!VaUX~8x;|*Rj;Hd^7<$ah^mrsQKfzK}&Vh1E_ivS(
zMTKn`6sTbmRq#g#3xGUt=d6JY$DYG1u`{HP2ad-Yj(o`z7~eu*Q{dg?%MSdMt=+Ju
z9_#+W`TE&LixuSd((P}1KzASPArFXRTBH}%AuO8UI|~m=_Ja$dRnWV$OQqPRScD8~
z9j+M0)o4uyPL*A*D^KV=AX~MBZ&Y0Y@n=6Cry<3YOKHk%+nNECG?!
z2o~unZ~-?dQx4yRd`0w=@(t)YcbKch)l|Sx
zg9`7IObl;l_rq0Hqrk$0@O8x;faOIr~Hk2$|+)IdsUTsPOvd*W0%
z_uThv=Ymv7A~X31>Ea254W>}Yiynl-dKGN7bb?dBL#vjOT7oL--`g=aI)gKjUeP8R
zWFBTmevY7}=5Bw_^_O5~OKS(T=ojFwFFt!b@|sPZy-ZZ8^Wsr?(m$IKvjqw>+FB*L
zLQKgd2+|QFM(I*xI+w`g`4NhS>mMFrBY}b_lPbl#ku*$ck^*B70Uc^&uQp%VHOR;e83dJT!@_E;$O`mhKVE{RW<;#$&(4^0(rX0;j~A5cBJ|~N?NfMbJ8odPZ&sPS=dpr;OGoD({m)3
zO89D}ct<7$tJc|4cos6a`65w~F^e=cZov2v=JH$tEd1mr3JrD~Vc{0k^^I1SYqaL(
zyBw)Q$AjFNf_+}&T1eX|^=h0j(4|Wz*^p$SW&K!!!=^M%5-maWr7qa=&6{Hzs{<1=
zoP8Ho8SYDo11k0A8pLtUohtD#nmQ(<54hn64hYV`SAODoE)FKcT^5L{yUd|$xUBzU
z2H1QWKJMO~W1NYt)Cuw246}nmx-8JVSwsYA6aWY&ddUr0Uqok3>Q0PKⅈzI4fQT
z%|cyiXd&n_en`o~J}Mg=Yiv}FiV3INN?c)8;|6}Rp7POeZST+QoF*nd;eEl}+Fr9I
zBJN8dvjCzbrXh=zK3N6xhlqZnUs3Fb!UbQGPAc>6x8az(QvJ|H&>-GlW{zeuWvIvfBegRIuITL5@s*3zau9%tZTdZKXg
zT0&vRV;qpgs|S}G2SuRPHHtlaHCXlV1s-)n0O4T4``hO3qG`sD(B_GyX`o{Kb}K_u
z_#>9mTy31KQ-=@On!DU1rkTSR&eSH&q94MD8G@sKlqdSlEK!YBploQdDpSGur`tlB6$50yoBGH6+K4^pRNSB@$u4
z&(0qhB@dVx_N@8NVis#};g0M6K-g-52w8EL?1m7N){(Wu@X|%OyV>PS&EnXoIEP6}
z12l19Ts7goMJ^b0*JH;QYswHY!jPfmUA0pRVy
z={kbLpk;IgNK7I|<5ZI7$soP1Umi^tUDG;splg-$KvO31tteMvMuuHXrZvE=PbXgK
zRCH$6)sh?Sf=u*N{!Esxc+N*Q*bFQ4_LY^Oi&s)E8#1^mJ^qn{d2
z%CR>rwDaxFuW&;yhzZutO{`o4?0mD|B|^@};Z%
zO*4DXO%T<{fvy5^ZqjAjI}*EkNh5)mN6MVwVuAX*WiF}Y>Yodr{}GJwZ#|#spHU_M
zIKncpu>N(j{b$0+e;jQ8Pjvo&9+3Zs>-@}&|KWA=Up!s^z@EPeDq&`1{EPfZ8QYjT
znc*`t{`dJAe}gyv68hQL{%Q%n`&M>w&5ps$=s3^K<*``Y@X?R|(*Ub5;wDnv)i
z;Z1-hM#15R^B^C$!b56Fz59D9l+Hm!Vmy`8&h6GN5TOlW3Myi2SWhVK3+FR6aTft>kK}h3T@bvqGH~?+kCRQt%vvy0`es!Cba$>(}
zGREdk;^bjEu=B%lZRxSlb0=;5^PcCf-dJlcO4|MT=+c;OZ^kH8T38B|x$rQr%ykN7
zwB*+!vqem|EH&}MBJXSZJ9(((yl92l!sG?qre7+(l5q#KJHGQyb!=JKcT))p5w(uP
zsx&`NZVkJ%f-hduQp&Xw7w)Hrw(~aBq?;@A!A@wziR^>)Oo6mxQDHzj-e#w_`~t3-4RwILxOOs0_DjU#X=dCd{Y^M{gL3!QSO-YG7e{_HalpE9{_H%
zkejsJ;wWgYPO>#F6&*QPb
z{D>(?5Bn4DIym4(p(|-YIVsj;K#1p=g3))GU1Pu7pCbchRvTMVX&xS1R-?TCw1p~d
z{9i~{`__=C!8Db+8?(+^zu?-M7~3MSuk$5z1GM?XUkNgRlH)(9Cu{2}$;@k-+IaX=
z1@oEwQoraVs4Dn)>0EO-+68_p3dVTz>D|>Bd^(YLva#Ud%Az)bf%uzc5KNiZnt&30
zw6qPH#klg}yQM-)xMfup=LeN$fEjrGe7iHv^kW%nISkTOkgRn}P;Y6nNTe{WAufAs
zEkYNV$QG0~vrq_GQ9I;%eMXnW{}TzgSj}z?(+P)An~3LI(1QI<-o-`IX`w4e1f7Lp
z*x^LaF&)QlDFP;?JL|bYDIU`AmrX9J>|<6
zf%|w7la^=l2&8uNz}4&+e??!Rrbn1Q1Yhz*D^5y
zSbQp++fvL)@B&+4IiPPHD|(-&-nh(K(t7y{|0Nd7;PocIPQfp3lX48d#2~6BuPX)~
zWi7O(s=Njo@kS(3Fd7yRY6z9;j40=U!ef=gs=vVz|Ef3tD9`kCOn((^X2yTd+58!C
z|6ir)|IHdDBhFC%QKnFOt9pOK;J!7sTnbSvuX*0HCYb}nzO%mz(U0Bfv(gf|M`|YU
zHm7BA;lrL9Zm^hLDuGmcTDgdMNo;N=H#yTtOvUtRB-dpoW9N^Ujs4rlH9~