SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix option / string name conflict

Browse source
This commit is contained in:
Scott Lahteine 2019-09-25 17:12:01 -05:00
parent c3f09e2b1b
commit ddd9d9032a
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/lcd/extensible_ui/lib/lulzbot/language/language_en.h
View file

@ -66,7 +66,7 @@ namespace Language_en {
PROGMEM Language_Str AMAX_E3 = u8"Amax E3"; PROGMEM Language_Str AMAX_E3 = u8"Amax E3";
PROGMEM Language_Str AMAX_E4 = u8"Amax E4"; PROGMEM Language_Str AMAX_E4 = u8"Amax E4";
PROGMEM Language_Str JERK = u8"Jerk"; PROGMEM Language_Str JERK = u8"Jerk";
PROGMEM Language_Str JUNCTION_DEVIATION = u8"Junc Dev"; PROGMEM Language_Str JUNC_DEVIATION = u8"Junc Dev";
PROGMEM Language_Str BACKLASH = u8"Backlash"; PROGMEM Language_Str BACKLASH = u8"Backlash";
PROGMEM Language_Str SMOOTHING = u8"Smoothing"; PROGMEM Language_Str SMOOTHING = u8"Smoothing";
PROGMEM Language_Str CORRECTION = u8"Correction"; PROGMEM Language_Str CORRECTION = u8"Correction";

2
Marlin/src/lcd/extensible_ui/lib/lulzbot/language/language_fr.h
View file

@ -48,7 +48,7 @@ namespace Language_fr {
PROGMEM Language_Str ACCEL_PRINTING = u8"A impr."; PROGMEM Language_Str ACCEL_PRINTING = u8"A impr.";
PROGMEM Language_Str ACCEL_TRAVEL = u8"A dépl."; PROGMEM Language_Str ACCEL_TRAVEL = u8"A dépl.";
PROGMEM Language_Str ACCEL_RETRACT = u8"A retrait"; PROGMEM Language_Str ACCEL_RETRACT = u8"A retrait";
PROGMEM Language_Str JUNCTION_DEVIATION = u8"Déviat. jonct."; PROGMEM Language_Str JUNC_DEVIATION = u8"Déviat. jonct.";
//PROGMEM Language_Str BACKLASH = u8"Backlash"; //PROGMEM Language_Str BACKLASH = u8"Backlash";
PROGMEM Language_Str SMOOTHING = u8"Lissage"; PROGMEM Language_Str SMOOTHING = u8"Lissage";
PROGMEM Language_Str MOTOR_CURRENT = u8"Courant"; PROGMEM Language_Str MOTOR_CURRENT = u8"Courant";

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/advanced_settings_menu.cpp
View file

@ -83,7 +83,7 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
.tag(5) .button( BTN_POS(2,2), BTN_SIZE(1,1), GET_TEXTF(VELOCITY)) .tag(5) .button( BTN_POS(2,2), BTN_SIZE(1,1), GET_TEXTF(VELOCITY))
.tag(6) .button( BTN_POS(2,3), BTN_SIZE(1,1), GET_TEXTF(ACCELERATION)) .tag(6) .button( BTN_POS(2,3), BTN_SIZE(1,1), GET_TEXTF(ACCELERATION))
#if ENABLED(JUNCTION_DEVIATION) #if ENABLED(JUNCTION_DEVIATION)
.tag(7) .button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXTF(JUNCTION_DEVIATION)) .tag(7) .button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXTF(JUNC_DEVIATION))
#else #else
.tag(7) .button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXTF(JERK)) .tag(7) .button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXTF(JERK))
#endif #endif
@ -136,7 +136,7 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
.tag(5) .button( BTN_POS(2,2), BTN_SIZE(1,1), GET_TEXTF(VELOCITY)) .tag(5) .button( BTN_POS(2,2), BTN_SIZE(1,1), GET_TEXTF(VELOCITY))
.tag(6) .button( BTN_POS(2,3), BTN_SIZE(1,1), GET_TEXTF(ACCELERATION)) .tag(6) .button( BTN_POS(2,3), BTN_SIZE(1,1), GET_TEXTF(ACCELERATION))
#if ENABLED(JUNCTION_DEVIATION) #if ENABLED(JUNCTION_DEVIATION)
.tag(7) .button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXTF(JUNCTION_DEVIATION)) .tag(7) .button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXTF(JUNC_DEVIATION))
#else #else
.tag(7) .button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXTF(JERK)) .tag(7) .button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXTF(JERK))
#endif #endif

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

@ -69,7 +69,7 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
.tag(8) .button( BTN_POS(2,2), BTN_SIZE(1,1), GET_TEXTF(VELOCITY)) .tag(8) .button( BTN_POS(2,2), BTN_SIZE(1,1), GET_TEXTF(VELOCITY))
.tag(9) .button( BTN_POS(2,3), BTN_SIZE(1,1), GET_TEXTF(ACCELERATION)) .tag(9) .button( BTN_POS(2,3), BTN_SIZE(1,1), GET_TEXTF(ACCELERATION))
#if ENABLED(JUNCTION_DEVIATION) #if ENABLED(JUNCTION_DEVIATION)
.tag(10) .button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXTF(JUNCTION_DEVIATION)) .tag(10) .button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXTF(JUNC_DEVIATION))
#else #else
.tag(10) .button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXTF(JERK)) .tag(10) .button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXTF(JERK))
#endif #endif

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

@ -34,7 +34,7 @@ void JunctionDeviationScreen::onRedraw(draw_mode_t what) {
widgets_t w(what); widgets_t w(what);
w.precision(2); w.precision(2);
w.units(GET_TEXTF(UNITS_MM)); w.units(GET_TEXTF(UNITS_MM));
w.heading(GET_TEXTF(JUNCTION_DEVIATION)); w.heading(GET_TEXTF(JUNC_DEVIATION));
w.color(other) .adjuster( 2, PSTR(""), getJunctionDeviation_mm() ); w.color(other) .adjuster( 2, PSTR(""), getJunctionDeviation_mm() );
w.increments(); w.increments();
} }