Skip to content

Commit 643704e

Browse files
thinkyheadthinkyhead
authored
🩹 Show Linear Advance for FT Motion (#28306)
Followup to 5a0923e, #21827
1 parent 488bd82 commit 643704e

File tree

18 files changed

+42
-42
lines changed

18 files changed

+42
-42
lines changed

‎Marlin/src/HAL/ESP32/inc/SanityCheck.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
#endif
5858

5959
#if ALL(I2S_STEPPER_STREAM, LIN_ADVANCE) && DISABLED(EXPERIMENTAL_I2S_LA)
60-
#error "I2S stream is currently incompatible with LIN_ADVANCE."
60+
#error "I2S stream is currently incompatible with LIN_ADVANCE. Enable EXPERIMENTAL_I2S_LA to proceed anyway."
6161
#endif
6262

6363
#if ALL(I2S_STEPPER_STREAM, PRINTCOUNTER) && PRINTCOUNTER_SAVE_INTERVAL > 0 && DISABLED(PRINTCOUNTER_SYNC)

‎Marlin/src/lcd/dwin/jyersui/dwin.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2325,7 +2325,7 @@ void JyersDWIN::menuItemHandler(const uint8_t menu, const uint8_t item, bool dra
23252325
#define MOTION_JERK (MOTION_ACCEL + ENABLED(CLASSIC_JERK))
23262326
#define MOTION_STEPS (MOTION_JERK + 1)
23272327
#define MOTION_FLOW (MOTION_STEPS + ENABLED(HAS_HOTEND))
2328-
#define MOTION_LA (MOTION_FLOW + ENABLED(LIN_ADVANCE))
2328+
#define MOTION_LA (MOTION_FLOW + ENABLED(HAS_LIN_ADVANCE_K))
23292329
#define MOTION_TOTAL MOTION_LA
23302330

23312331
switch (item) {
@@ -2383,7 +2383,7 @@ void JyersDWIN::menuItemHandler(const uint8_t menu, const uint8_t item, bool dra
23832383
break;
23842384
#endif
23852385

2386-
#if ENABLED(LIN_ADVANCE)
2386+
#if HAS_LIN_ADVANCE_K
23872387
case MOTION_LA:
23882388
if (draw) {
23892389
drawMenuItem(row, ICON_MaxAccelerated, GET_TEXT_F(MSG_ADVANCE_K));
@@ -2845,7 +2845,7 @@ void JyersDWIN::menuItemHandler(const uint8_t menu, const uint8_t item, bool dra
28452845
#define ADVANCED_PROBE (ADVANCED_BEEPER + ENABLED(HAS_BED_PROBE))
28462846
#define ADVANCED_TMC (ADVANCED_PROBE + ENABLED(HAS_TRINAMIC_CONFIG))
28472847
#define ADVANCED_CORNER (ADVANCED_TMC + 1)
2848-
#define ADVANCED_LA (ADVANCED_CORNER + ENABLED(LIN_ADVANCE))
2848+
#define ADVANCED_LA (ADVANCED_CORNER + ENABLED(HAS_LIN_ADVANCE_K))
28492849
#define ADVANCED_LOAD (ADVANCED_LA + ENABLED(ADVANCED_PAUSE_FEATURE))
28502850
#define ADVANCED_UNLOAD (ADVANCED_LOAD + ENABLED(ADVANCED_PAUSE_FEATURE))
28512851
#define ADVANCED_COLD_EXTRUDE (ADVANCED_UNLOAD + ENABLED(PREVENT_COLD_EXTRUSION))
@@ -2902,7 +2902,7 @@ void JyersDWIN::menuItemHandler(const uint8_t menu, const uint8_t item, bool dra
29022902
modifyValue(corner_pos, 1, 100, 10);
29032903
break;
29042904

2905-
#if ENABLED(LIN_ADVANCE)
2905+
#if HAS_LIN_ADVANCE_K
29062906
case ADVANCED_LA:
29072907
if (draw) {
29082908
drawMenuItem(row, ICON_MaxAccelerated, GET_TEXT_F(MSG_ADVANCE_K));
@@ -3819,7 +3819,7 @@ void JyersDWIN::menuItemHandler(const uint8_t menu, const uint8_t item, bool dra
38193819
#define TUNE_ZOFFSET (TUNE_FAN + ENABLED(HAS_ZOFFSET_ITEM))
38203820
#define TUNE_ZUP (TUNE_ZOFFSET + ENABLED(HAS_ZOFFSET_ITEM))
38213821
#define TUNE_ZDOWN (TUNE_ZUP + ENABLED(HAS_ZOFFSET_ITEM))
3822-
#define TUNE_LA (TUNE_ZDOWN + ENABLED(LIN_ADVANCE))
3822+
#define TUNE_LA (TUNE_ZDOWN + ENABLED(HAS_LIN_ADVANCE_K))
38233823
#define TUNE_CHANGEFIL (TUNE_LA + ENABLED(FILAMENT_LOAD_UNLOAD_GCODES))
38243824
#define TUNE_FWRETRACT (TUNE_CHANGEFIL + ENABLED(FWRETRACT))
38253825
#define TUNE_FILSENSORENABLED (TUNE_FWRETRACT + ENABLED(HAS_FILAMENT_SENSOR))
@@ -3913,7 +3913,7 @@ void JyersDWIN::menuItemHandler(const uint8_t menu, const uint8_t item, bool dra
39133913
break;
39143914
#endif
39153915

3916-
#if ENABLED(LIN_ADVANCE)
3916+
#if HAS_LIN_ADVANCE_K
39173917
case TUNE_LA:
39183918
if (draw) {
39193919
drawMenuItem(row, ICON_MaxAccelerated, GET_TEXT_F(MSG_ADVANCE_K));

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2691,7 +2691,7 @@ void applyMaxAccel() { planner.set_max_acceleration(hmiValue.axis, menuData.valu
26912691
void setMaxJerkE() { hmiValue.axis = E_AXIS; setFloatOnClick(min_jerk_edit_values.e, max_jerk_edit_values.e, UNITFDIGITS, planner.max_jerk.e, applyMaxJerk); }
26922692
#endif
26932693
#elif HAS_JUNCTION_DEVIATION
2694-
void applyJDmm() { TERN_(LIN_ADVANCE, planner.recalculate_max_e_jerk()); }
2694+
void applyJDmm() { TERN_(HAS_LINEAR_E_JERK, planner.recalculate_max_e_jerk()); }
26952695
void setJDmm() { setPFloatOnClick(MIN_JD_MM, MAX_JD_MM, 3, applyJDmm); }
26962696
#endif
26972697

‎Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/advanced_settings.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
5858
.tag(10) .button(BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXT_F(TERN(HAS_JUNCTION_DEVIATION, MSG_JUNCTION_DEVIATION, MSG_JERK)))
5959
.enabled(ENABLED(BACKLASH_GCODE))
6060
.tag(11) .button(BTN_POS(2,5), BTN_SIZE(1,1), GET_TEXT_F(MSG_BACKLASH))
61-
.enabled(ENABLED(LIN_ADVANCE))
61+
.enabled(ENABLED(HAS_LIN_ADVANCE_K))
6262
.tag(12) .button(BTN_POS(1,6), BTN_SIZE(2,1), GET_TEXT_F(MSG_LINEAR_ADVANCE))
6363
.tag(13) .button(BTN_POS(1,7), BTN_SIZE(2,1), GET_TEXT_F(MSG_INTERFACE))
6464
.tag(14) .button(BTN_POS(1,8), BTN_SIZE(2,1), GET_TEXT_F(MSG_RESTORE_DEFAULTS))
@@ -88,7 +88,7 @@ bool AdvancedSettingsMenu::onTouchEnd(uint8_t tag) {
8888
#if ENABLED(BACKLASH_GCODE)
8989
case 11: GOTO_SCREEN(BacklashCompensationScreen); break;
9090
#endif
91-
#if ENABLED(LIN_ADVANCE)
91+
#if HAS_LIN_ADVANCE_K
9292
case 12: GOTO_SCREEN(LinearAdvanceScreen); break;
9393
#endif
9494
case 13: GOTO_SCREEN(InterfaceSettingsScreen); break;

‎Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/advanced_settings_menu.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
5757
.tag(2) .button(STEPS_PER_MM_POS, GET_TEXT_F(MSG_STEPS_PER_MM))
5858
.enabled(ENABLED(HAS_TRINAMIC_CONFIG))
5959
.tag(3) .button(TMC_CURRENT_POS, GET_TEXT_F(MSG_TMC_CURRENT))
60-
.enabled(ENABLED(LIN_ADVANCE))
60+
.enabled(ENABLED(HAS_LIN_ADVANCE_K))
6161
.tag(4) .button(LIN_ADVANCE_POS, GET_TEXT_F(MSG_LINEAR_ADVANCE))
6262
.tag(5) .button(VELOCITY_POS, GET_TEXT_F(MSG_MAX_SPEED_NO_UNITS))
6363
.tag(6) .button(ACCELERATION_POS, GET_TEXT_F(MSG_ACCELERATION))
@@ -76,10 +76,10 @@ bool AdvancedSettingsMenu::onTouchEnd(uint8_t tag) {
7676
case 1: SaveSettingsDialogBox::promptToSaveSettings(); break;
7777
case 2: GOTO_SCREEN(StepsScreen); break;
7878
#if HAS_TRINAMIC_CONFIG
79-
case 3: GOTO_SCREEN(StepperCurrentScreen); break;
79+
case 3: GOTO_SCREEN(StepperCurrentScreen); break;
8080
#endif
81-
#if ENABLED(LIN_ADVANCE)
82-
case 4: GOTO_SCREEN(LinearAdvanceScreen); break;
81+
#if HAS_LIN_ADVANCE_K
82+
case 4: GOTO_SCREEN(LinearAdvanceScreen); break;
8383
#endif
8484
case 5: GOTO_SCREEN(MaxVelocityScreen); break;
8585
case 6: GOTO_SCREEN(DefaultAccelerationScreen); break;

‎Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/advanced_settings_menu.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
102102
#endif
103103
.enabled(ENABLED(HAS_MULTI_HOTEND))
104104
.tag(4) .button(OFFSETS_POS, GET_TEXT_F(MSG_OFFSETS_MENU))
105-
.enabled(ANY(LIN_ADVANCE, HAS_FILAMENT_SENSOR))
105+
.enabled(ANY(HAS_LIN_ADVANCE_K, HAS_FILAMENT_SENSOR))
106106
.tag(11).button(FILAMENT_POS, GET_TEXT_F(MSG_FILAMENT))
107107
.tag(12).button(ENDSTOPS_POS, GET_TEXT_F(MSG_LCD_ENDSTOPS))
108108
.tag(15).button(DISPLAY_POS, GET_TEXT_F(MSG_DISPLAY_MENU))
@@ -136,7 +136,7 @@ bool AdvancedSettingsMenu::onTouchEnd(uint8_t tag) {
136136
#endif
137137
case 9: GOTO_SCREEN(InterfaceSettingsScreen); LockScreen::check_passcode(); break;
138138
case 10: GOTO_SCREEN(RestoreFailsafeDialogBox); LockScreen::check_passcode(); break;
139-
#if ANY(LIN_ADVANCE, HAS_FILAMENT_SENSOR)
139+
#if HAS_LIN_ADVANCE_K || HAS_FILAMENT_SENSOR
140140
case 11: GOTO_SCREEN(FilamentMenu); break;
141141
#endif
142142
case 12: GOTO_SCREEN(EndstopStatesScreen); break;

‎Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/filament_menu.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ void FilamentMenu::onRedraw(draw_mode_t what) {
6060
.font(font_medium).colors(normal_btn)
6161
.enabled(ENABLED(HAS_FILAMENT_SENSOR))
6262
.tag(2).button(RUNOUT_SENSOR_POS, GET_TEXT_F(MSG_RUNOUT_SENSOR))
63-
.enabled(ENABLED(LIN_ADVANCE))
63+
.enabled(ENABLED(HAS_LIN_ADVANCE_K))
6464
.tag(3).button(LIN_ADVANCE_POS, GET_TEXT_F(MSG_LINEAR_ADVANCE))
6565
.colors(action_btn)
6666
.tag(1).button(BACK_POS, GET_TEXT_F(MSG_BUTTON_DONE));
@@ -73,7 +73,7 @@ bool FilamentMenu::onTouchEnd(uint8_t tag) {
7373
#if HAS_FILAMENT_SENSOR
7474
case 2: GOTO_SCREEN(FilamentRunoutScreen); break;
7575
#endif
76-
#if ENABLED(LIN_ADVANCE)
76+
#if HAS_LIN_ADVANCE_K
7777
case 3: GOTO_SCREEN(LinearAdvanceScreen); break;
7878
#endif
7979
default: return false;

‎Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/screens.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@ enum {
7575
#if ENABLED(CASE_LIGHT_ENABLE)
7676
CASE_LIGHT_SCREEN_CACHE,
7777
#endif
78-
#if ANY(LIN_ADVANCE, HAS_FILAMENT_SENSOR)
78+
#if HAS_LIN_ADVANCE_K || HAS_FILAMENT_SENSOR
7979
FILAMENT_MENU_CACHE,
8080
#endif
81-
#if ENABLED(LIN_ADVANCE)
81+
#if HAS_LIN_ADVANCE_K
8282
LINEAR_ADVANCE_SCREEN_CACHE,
8383
#endif
8484
#if HAS_FILAMENT_SENSOR
@@ -197,15 +197,15 @@ enum {
197197
#include "case_light_screen.h"
198198
#endif
199199

200-
#if ANY(LIN_ADVANCE, HAS_FILAMENT_SENSOR)
200+
#if HAS_LIN_ADVANCE_K || HAS_FILAMENT_SENSOR
201201
#include "filament_menu.h"
202202
#endif
203203

204204
#if HAS_FILAMENT_SENSOR
205205
#include "filament_runout_screen.h"
206206
#endif
207207

208-
#if ENABLED(LIN_ADVANCE)
208+
#if HAS_LIN_ADVANCE_K
209209
#include "linear_advance_screen.h"
210210
#endif
211211

‎Marlin/src/lcd/extui/nextion/nextion_tft.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ void NextionTFT::panelInfo(uint8_t req) {
263263
break;
264264

265265
case 23: // Linear Advance
266-
#if ENABLED(LIN_ADVANCE)
266+
#if HAS_LIN_ADVANCE_K
267267
SEND_VALasTXT("linadvance", getLinearAdvance_mm_mm_s(getActiveTool()));
268268
#else
269269
SEND_NA("linadvance");

‎Marlin/src/lcd/extui/ui_api.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -641,7 +641,7 @@ namespace ExtUI {
641641
void setPowerLossRecoveryEnabled(const bool value) { recovery.enable(value); }
642642
#endif
643643

644-
#if ENABLED(LIN_ADVANCE)
644+
#if HAS_LIN_ADVANCE_K
645645
float getLinearAdvance_mm_mm_s(const extruder_t extruder) {
646646
return (extruder < EXTRUDERS) ? planner.get_advance_k(E_INDEX_N(extruder - E0)) : 0;
647647
}
@@ -676,7 +676,7 @@ namespace ExtUI {
676676

677677
void setJunctionDeviation_mm(const float value) {
678678
planner.junction_deviation_mm = constrain(value, 0.001, 0.3);
679-
TERN_(LIN_ADVANCE, planner.recalculate_max_e_jerk());
679+
TERN_(HAS_LIN_ADVANCE_K, planner.recalculate_max_e_jerk());
680680
}
681681

682682
#else

0 commit comments

Comments
 (0)