Ver código fonte

Fix option / string name conflict

Scott Lahteine 5 anos atrás
pai
commit
ddd9d9032a

+ 1
- 1
Marlin/src/lcd/extensible_ui/lib/lulzbot/language/language_en.h Ver arquivo

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

+ 1
- 1
Marlin/src/lcd/extensible_ui/lib/lulzbot/language/language_fr.h Ver arquivo

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

+ 2
- 2
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/advanced_settings_menu.cpp Ver arquivo

@@ -83,7 +83,7 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
83 83
       .tag(5) .button( BTN_POS(2,2), BTN_SIZE(1,1), GET_TEXTF(VELOCITY))
84 84
       .tag(6) .button( BTN_POS(2,3), BTN_SIZE(1,1), GET_TEXTF(ACCELERATION))
85 85
       #if ENABLED(JUNCTION_DEVIATION)
86
-      .tag(7) .button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXTF(JUNCTION_DEVIATION))
86
+      .tag(7) .button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXTF(JUNC_DEVIATION))
87 87
       #else
88 88
       .tag(7) .button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXTF(JERK))
89 89
       #endif
@@ -136,7 +136,7 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
136 136
       .tag(5) .button( BTN_POS(2,2),  BTN_SIZE(1,1), GET_TEXTF(VELOCITY))
137 137
       .tag(6) .button( BTN_POS(2,3),  BTN_SIZE(1,1), GET_TEXTF(ACCELERATION))
138 138
       #if ENABLED(JUNCTION_DEVIATION)
139
-      .tag(7) .button( BTN_POS(2,4),  BTN_SIZE(1,1), GET_TEXTF(JUNCTION_DEVIATION))
139
+      .tag(7) .button( BTN_POS(2,4),  BTN_SIZE(1,1), GET_TEXTF(JUNC_DEVIATION))
140 140
       #else
141 141
       .tag(7) .button( BTN_POS(2,4),  BTN_SIZE(1,1), GET_TEXTF(JERK))
142 142
       #endif

+ 1
- 1
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/bio_advanced_settings.cpp Ver arquivo

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

+ 1
- 1
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/junction_deviation_screen.cpp Ver arquivo

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

Carregando…
Cancelar
Salvar