bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Add HAS_JUNCTION_DEVIATION

Browse Source
This commit is contained in:
Scott Lahteine
2020-04-23 20:49:11 -05:00
parent df22b96d72
commit 55d66fb897
16 changed files with 34 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp
View File

@ -133,7 +133,7 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
.tag(5) .button( VELOCITY_POS, GET_TEXT_F(MSG_VELOCITY))
.tag(6) .button( ACCELERATION_POS, GET_TEXT_F(MSG_ACCELERATION))
.tag(7) .button( JERK_POS, GET_TEXT_F(
#if DISABLED(CLASSIC_JERK)
#if HAS_JUNCTION_DEVIATION
MSG_JUNCTION_DEVIATION
#else
MSG_JERK
@ -163,7 +163,7 @@ bool AdvancedSettingsMenu::onTouchEnd(uint8_t tag) {
case 5: GOTO_SCREEN(MaxVelocityScreen); break;
case 6: GOTO_SCREEN(DefaultAccelerationScreen); break;
case 7:
#if DISABLED(CLASSIC_JERK)
#if HAS_JUNCTION_DEVIATION
GOTO_SCREEN(JunctionDeviationScreen);
#else
GOTO_SCREEN(JerkScreen);

4
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp
View File

@ -68,7 +68,7 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
.tag(7) .button( BTN_POS(2,1), BTN_SIZE(1,1), GET_TEXT_F(MSG_STEPS_PER_MM))
.tag(8) .button( BTN_POS(2,2), BTN_SIZE(1,1), GET_TEXT_F(MSG_VELOCITY))
.tag(9) .button( BTN_POS(2,3), BTN_SIZE(1,1), GET_TEXT_F(MSG_ACCELERATION))
#if DISABLED(CLASSIC_JERK)
#if HAS_JUNCTION_DEVIATION
.tag(10) .button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXT_F(MSG_JUNCTION_DEVIATION))
#else
.tag(10) .button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXT_F(MSG_JERK))
@ -113,7 +113,7 @@ bool AdvancedSettingsMenu::onTouchEnd(uint8_t tag) {
case 8: GOTO_SCREEN(MaxVelocityScreen); break;
case 9: GOTO_SCREEN(DefaultAccelerationScreen); break;
case 10:
#if DISABLED(CLASSIC_JERK)
#if HAS_JUNCTION_DEVIATION
GOTO_SCREEN(JunctionDeviationScreen);
#else
GOTO_SCREEN(JerkScreen);

2
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/junction_deviation_screen.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if ENABLED(TOUCH_UI_FTDI_EVE) && DISABLED(CLASSIC_JERK)
#if ENABLED(TOUCH_UI_FTDI_EVE) && HAS_JUNCTION_DEVIATION
#include "screens.h"

2
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.cpp
View File

@ -78,7 +78,7 @@ SCREEN_TABLE {
DECL_SCREEN(MaxVelocityScreen),
DECL_SCREEN(MaxAccelerationScreen),
DECL_SCREEN(DefaultAccelerationScreen),
#if DISABLED(CLASSIC_JERK)
#if HAS_JUNCTION_DEVIATION
DECL_SCREEN(JunctionDeviationScreen),
#else
DECL_SCREEN(JerkScreen),

4
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.h
View File

@ -58,7 +58,7 @@ enum {
#if HAS_MESH
BED_MESH_SCREEN_CACHE,
#endif
#if DISABLED(CLASSIC_JERK)
#if HAS_JUNCTION_DEVIATION
JUNC_DEV_SCREEN_CACHE,
#else
JERK_SCREEN_CACHE,
@ -566,7 +566,7 @@ class DefaultAccelerationScreen : public BaseNumericAdjustmentScreen, public Cac
static bool onTouchHeld(uint8_t tag);
};
#if DISABLED(CLASSIC_JERK)
#if HAS_JUNCTION_DEVIATION
class JunctionDeviationScreen : public BaseNumericAdjustmentScreen, public CachedScreen<JUNC_DEV_SCREEN_CACHE> {
public:
static void onRedraw(draw_mode_t);

2
Marlin/src/lcd/extui/ui_api.cpp
View File

@ -631,7 +631,7 @@ namespace ExtUI {
}
#endif
#if DISABLED(CLASSIC_JERK)
#if HAS_JUNCTION_DEVIATION
float getJunctionDeviation_mm() {
return planner.junction_deviation_mm;

2
Marlin/src/lcd/extui/ui_api.h
View File

@ -186,7 +186,7 @@ namespace ExtUI {
void setLinearAdvance_mm_mm_s(const float, const extruder_t);
#endif
#if DISABLED(CLASSIC_JERK)
#if HAS_JUNCTION_DEVIATION
float getJunctionDeviation_mm();
void setJunctionDeviation_mm(const float);
#else

2
Marlin/src/lcd/menu/menu_advanced.cpp
View File

@ -423,7 +423,7 @@ void menu_cancelobject();
START_MENU();
BACK_ITEM(MSG_ADVANCED_SETTINGS);
#if DISABLED(CLASSIC_JERK)
#if HAS_JUNCTION_DEVIATION
#if ENABLED(LIN_ADVANCE)
EDIT_ITEM(float43, MSG_JUNCTION_DEVIATION, &planner.junction_deviation_mm, 0.001f, 0.3f, planner.recalculate_max_e_jerk);
#else