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

Enable junction deviation by default (#15481)

Browse Source
This commit is contained in:
Scott Lahteine
2019-10-08 19:42:18 -05:00
committed by GitHub
parent 1df6c7a46c
commit c0005e939c
144 changed files with 1930 additions and 2164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/advanced_settings_menu.cpp
View File

@ -82,7 +82,7 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
.tag(10).button( BTN_POS(1,8), BTN_SIZE(2,1), GET_TEXT_F(RESTORE_DEFAULTS))
.tag(5) .button( BTN_POS(2,2), BTN_SIZE(1,1), GET_TEXT_F(VELOCITY))
.tag(6) .button( BTN_POS(2,3), BTN_SIZE(1,1), GET_TEXT_F(ACCELERATION))
#if ENABLED(JUNCTION_DEVIATION)
#if DISABLED(CLASSIC_JERK)
.tag(7) .button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXT_F(JUNC_DEVIATION))
#else
.tag(7) .button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXT_F(JERK))
@ -135,7 +135,7 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
.tag(12).button( BTN_POS(3,4), BTN_SIZE(1,1), GET_TEXT_F(ENDSTOPS))
.tag(5) .button( BTN_POS(2,2), BTN_SIZE(1,1), GET_TEXT_F(VELOCITY))
.tag(6) .button( BTN_POS(2,3), BTN_SIZE(1,1), GET_TEXT_F(ACCELERATION))
#if ENABLED(JUNCTION_DEVIATION)
#if DISABLED(CLASSIC_JERK)
.tag(7) .button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXT_F(JUNC_DEVIATION))
#else
.tag(7) .button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXT_F(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 ENABLED(JUNCTION_DEVIATION)
#if DISABLED(CLASSIC_JERK)
GOTO_SCREEN(JunctionDeviationScreen);
#else
GOTO_SCREEN(JerkScreen);

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/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(STEPS_PER_MM))
.tag(8) .button( BTN_POS(2,2), BTN_SIZE(1,1), GET_TEXT_F(VELOCITY))
.tag(9) .button( BTN_POS(2,3), BTN_SIZE(1,1), GET_TEXT_F(ACCELERATION))
#if ENABLED(JUNCTION_DEVIATION)
#if DISABLED(CLASSIC_JERK)
.tag(10) .button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXT_F(JUNC_DEVIATION))
#else
.tag(10) .button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXT_F(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 ENABLED(JUNCTION_DEVIATION)
#if DISABLED(CLASSIC_JERK)
GOTO_SCREEN(JunctionDeviationScreen);
#else
GOTO_SCREEN(JerkScreen);

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/jerk_screen.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if ENABLED(LULZBOT_TOUCH_UI) && DISABLED(JUNCTION_DEVIATION)
#if BOTH(LULZBOT_TOUCH_UI, CLASSIC_JERK)
#include "screens.h"
@ -62,4 +62,4 @@ bool JerkScreen::onTouchHeld(uint8_t tag) {
return true;
}
#endif // LULZBOT_TOUCH_UI
#endif // LULZBOT_TOUCH_UI && CLASSIC_JERK

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/junction_deviation_screen.cpp
View File

@ -22,7 +22,7 @@
#include "../config.h"
#if BOTH(LULZBOT_TOUCH_UI, JUNCTION_DEVIATION)
#if ENABLED(LULZBOT_TOUCH_UI) && DISABLED(CLASSIC_JERK)
#include "screens.h"
@ -51,4 +51,4 @@ bool JunctionDeviationScreen::onTouchHeld(uint8_t tag) {
return true;
}
#endif // LULZBOT_TOUCH_UI
#endif // LULZBOT_TOUCH_UI && !CLASSIC_JERK

2
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/screens.cpp
View File

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

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/screens.h
View File

@ -55,7 +55,7 @@ enum {
MAX_VELOCITY_SCREEN_CACHE,
MAX_ACCELERATION_SCREEN_CACHE,
DEFAULT_ACCELERATION_SCREEN_CACHE,
#if ENABLED(JUNCTION_DEVIATION)
#if DISABLED(CLASSIC_JERK)
JUNC_DEV_SCREEN_CACHE,
#else
JERK_SCREEN_CACHE,
@ -503,7 +503,7 @@ class DefaultAccelerationScreen : public BaseNumericAdjustmentScreen, public Cac
static bool onTouchHeld(uint8_t tag);
};
#if ENABLED(JUNCTION_DEVIATION)
#if DISABLED(CLASSIC_JERK)
class JunctionDeviationScreen : public BaseNumericAdjustmentScreen, public CachedScreen<JUNC_DEV_SCREEN_CACHE> {
public:
static void onRedraw(draw_mode_t);

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

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

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

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

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

@ -486,7 +486,7 @@ void menu_backlash();
START_MENU();
BACK_ITEM(MSG_ADVANCED_SETTINGS);
#if ENABLED(JUNCTION_DEVIATION)
#if DISABLED(CLASSIC_JERK)
#if ENABLED(LIN_ADVANCE)
EDIT_ITEM(float43, MSG_JUNCTION_DEVIATION, &planner.junction_deviation_mm, 0.01f, 0.3f, planner.recalculate_max_e_jerk);
#else
@ -511,7 +511,7 @@ void menu_backlash();
#else
EDIT_ITEM_FAST(float52sign, MSG_VC_JERK, &planner.max_jerk.c, 0.1f, max_jerk_edit.c);
#endif
#if !BOTH(JUNCTION_DEVIATION, LIN_ADVANCE)
#if HAS_CLASSIC_E_JERK
EDIT_ITEM_FAST(float52sign, MSG_VE_JERK, &planner.max_jerk.e, 0.1f, max_jerk_edit.e);
#endif
#endif