jessikitty/Marlin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix and clean up

Browse Source
This commit is contained in:
Scott Lahteine
2025-11-08 18:00:06 -06:00
parent df12f6d723
commit 629d262ed3
6 changed files with 39 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Marlin/src/inc/SanityCheck.h
+2 -4
View File
@@ -1660,10 +1660,8 @@ static_assert(NUM_SERVOS <= NUM_SERVO_PLUGS, "NUM_SERVOS (or some servo index) i
#elif ENABLED(SENSORLESS_PROBING)
#error "BED_TRAMMING_USE_PROBE is incompatible with SENSORLESS_PROBING."
#endif
#else
#ifndef BED_TRAMMING_INSET_LFRB
#error "LCD_BED_TRAMMING requires BED_TRAMMING_INSET_LFRB values."
#endif
#elif !defined(BED_TRAMMING_INSET_LFRB)
#error "LCD_BED_TRAMMING requires BED_TRAMMING_INSET_LFRB values."
#endif
static_assert(BED_TRAMMING_Z_HOP >= 0, "BED_TRAMMING_Z_HOP must be >= 0.");
#elif ANY(DGUS_LCD_UI_RELOADED, DGUS_LCD_UI_E3S1PRO)
Marlin/src/lcd/e3v2/proui/dwin.cpp
+16 -11
View File
@@ -200,7 +200,7 @@ typedef struct {
select_t select_page{0}, select_print{0};
#if ENABLED(LCD_BED_TRAMMING) && DISABLED(BED_TRAMMING_USE_PROBE)
constexpr float bed_tramming_inset_lfbr[] = BED_TRAMMING_INSET_LFRB;
constexpr float bed_tramming_inset_lfrb[] = BED_TRAMMING_INSET_LFRB;
#endif
bool hash_changed = true; // Flag to know if message status was changed
@@ -2433,30 +2433,35 @@ void setFlow() { setPIntOnClick(FLOW_EDIT_MIN, FLOW_EDIT_MAX, []{ planner.refres
void tramXY(const uint8_t point, float &x, float &y) {
#if ENABLED(BED_TRAMMING_USE_PROBE)
float bed_tramming_inset_lfbr[] = {X_MIN_BED + probe.min_x() + 0.01f, Y_MIN_BED + probe.min_y() + 0.01f,
X_MAX_BED - probe.max_x() - 0.01f, Y_MAX_BED - probe.max_y() - 0.01f };
constexpr float slop = 0.01f;
float bed_tramming_inset_lfrb[] = {
(X_MIN_BED) + probe.min_x() + slop,
(Y_MIN_BED) + probe.min_y() + slop,
(X_MAX_BED) - probe.max_x() - slop,
(Y_MAX_BED) - probe.max_y() - slop
};
#endif
switch (point) {
case 0:
LCD_MESSAGE(MSG_TRAM_FL);
x = bed_tramming_inset_lfbr[0];
y = bed_tramming_inset_lfbr[1];
x = bed_tramming_inset_lfrb[0];
y = bed_tramming_inset_lfrb[1];
break;
case 1:
LCD_MESSAGE(MSG_TRAM_FR);
x = X_BED_SIZE - bed_tramming_inset_lfbr[2];
y = bed_tramming_inset_lfbr[1];
x = X_BED_SIZE - bed_tramming_inset_lfrb[2];
y = bed_tramming_inset_lfrb[1];
break;
case 2:
LCD_MESSAGE(MSG_TRAM_BR);
x = X_BED_SIZE - bed_tramming_inset_lfbr[2];
y = Y_BED_SIZE - bed_tramming_inset_lfbr[3];
x = X_BED_SIZE - bed_tramming_inset_lfrb[2];
y = Y_BED_SIZE - bed_tramming_inset_lfrb[3];
break;
case 3:
LCD_MESSAGE(MSG_TRAM_BL);
x = bed_tramming_inset_lfbr[0];
y = Y_BED_SIZE - bed_tramming_inset_lfbr[3];
x = bed_tramming_inset_lfrb[0];
y = Y_BED_SIZE - bed_tramming_inset_lfrb[3];
break;
#if ENABLED(BED_TRAMMING_INCLUDE_CENTER)
case 4:
Marlin/src/lcd/extui/anycubic_vyper/dgus_tft.cpp
+4 -4
View File
@@ -1967,14 +1967,14 @@ namespace Anycubic {
setSoftEndstopState(false);
z_off = getZOffset_mm() - 0.01f;
z_off = getZOffset_mm() - BABYSTEP_SIZE_Z;
setZOffset_mm(z_off);
sendTxtToTFT(ftostr52sprj(getZOffset_mm()) + 2, TXT_LEVEL_OFFSET);
if (isAxisPositionKnown(Z)) {
const float currZpos = getAxisPosition_mm(Z);
setAxisPosition_mm(currZpos - 0.01f, Z);
setAxisPosition_mm(currZpos - BABYSTEP_SIZE_Z, Z);
}
setSoftEndstopState(true);
@@ -1985,14 +1985,14 @@ namespace Anycubic {
setSoftEndstopState(false);
z_off = getZOffset_mm() + 0.01f;
z_off = getZOffset_mm() + BABYSTEP_SIZE_Z;
setZOffset_mm(z_off);
sendTxtToTFT(ftostr52sprj(getZOffset_mm()) + 2, TXT_LEVEL_OFFSET);
if (isAxisPositionKnown(Z)) { // Move Z axis
const float currZpos = getAxisPosition_mm(Z);
setAxisPosition_mm(currZpos + 0.01f, Z);
setAxisPosition_mm(currZpos + BABYSTEP_SIZE_Z, Z);
}
setSoftEndstopState(true);
Marlin/src/lcd/extui/dgus_e3s1pro/DGUSReturnKeyCodeHandler.cpp
+7 -3
View File
@@ -396,13 +396,17 @@ void DGUSReturnKeyCodeHandler::Command_SettingsMenu(DGUS_VP &vp, void *data) {
static void _gotoTrammingPoint(unsigned char point) {
#if ENABLED(BED_TRAMMING_USE_PROBE)
float lfrb[4] = {X_MIN_BED + probe.min_x(), Y_MIN_BED + probe.min_y(),
X_MAX_BED - probe.max_x(), Y_MAX_BED - probe.max_y() };
float lfrb[4] = {
(X_MIN_BED) + probe.min_x(),
(Y_MIN_BED) + probe.min_y(),
(X_MAX_BED) - probe.max_x(),
(Y_MAX_BED) - probe.max_y()
};
#else
constexpr float lfrb[4] = BED_TRAMMING_INSET_LFRB;
#endif
float x, y;
float x, y;
switch (point) {
default: return;
case 1: x = X_CENTER; y = Y_CENTER; break;
Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp
+6 -2
View File
@@ -469,8 +469,12 @@ void DGUSRxHandler::moveToPoint(DGUS_VP &vp, void *data_ptr) {
const uint8_t point = ((uint8_t*)data_ptr)[1];
#if ENABLED(BED_TRAMMING_USE_PROBE)
float lfrb[4] = {X_MIN_BED + probe.min_x(), Y_MIN_BED + probe.min_y(),
X_MAX_BED - probe.max_x(), Y_MAX_BED - probe.max_y() };
float lfrb[4] = {
(X_MIN_BED) + probe.min_x(),
(Y_MIN_BED) + probe.min_y(),
(X_MAX_BED) - probe.max_x(),
(Y_MAX_BED) - probe.max_y()
};
#else
constexpr float lfrb[4] = BED_TRAMMING_INSET_LFRB;
#endif
Marlin/src/lcd/menu/menu_bed_tramming.cpp
+4 -3
View File
@@ -90,7 +90,7 @@ constexpr int center_index = TERN(BED_TRAMMING_INCLUDE_CENTER, available_points
#if DISABLED(BED_TRAMMING_USE_PROBE)
constexpr float inset_lfrb[4] = BED_TRAMMING_INSET_LFRB;
constexpr xy_pos_t lf { (X_MIN_BED) + inset_lfrb[0], (Y_MIN_BED) + inset_lfrb[1] },
rb { (X_MAX_BED) - inset_lfrb[2], (Y_MAX_BED) - inset_lfrb[3] };
rb { (X_MAX_BED) - inset_lfrb[2], (Y_MAX_BED) - inset_lfrb[3] };
#endif
static int8_t bed_corner;
@@ -99,8 +99,9 @@ static int8_t bed_corner;
*/
static void _lcd_goto_next_corner() {
#if ENABLED(BED_TRAMMING_USE_PROBE)
xy_pos_t lf = {X_MIN_BED + probe.min_x() + 0.01f, Y_MIN_BED + probe.min_y() + 0.01f },
rb = {X_MAX_BED - probe.max_x() - 0.01f, Y_MAX_BED - probe.max_y() - 0.01f };
constexpr float slop = 0.01f;
const xy_pos_t lf = { (X_MIN_BED) + probe.min_x() + slop, (Y_MIN_BED) + probe.min_y() + slop },
rb = { (X_MAX_BED) - probe.max_x() - slop, (Y_MAX_BED) - probe.max_y() - slop };
#endif
xy_pos_t corner_point = lf; // Left front