Browse Source

Fix option / string name conflict

Scott Lahteine 5 years ago
parent
commit
ddd9d9032a

+ 1
- 1
Marlin/src/lcd/extensible_ui/lib/lulzbot/language/language_en.h View File

66
   PROGMEM Language_Str AMAX_E3                  = u8"Amax E3";
66
   PROGMEM Language_Str AMAX_E3                  = u8"Amax E3";
67
   PROGMEM Language_Str AMAX_E4                  = u8"Amax E4";
67
   PROGMEM Language_Str AMAX_E4                  = u8"Amax E4";
68
   PROGMEM Language_Str JERK                     = u8"Jerk";
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
   PROGMEM Language_Str BACKLASH                 = u8"Backlash";
70
   PROGMEM Language_Str BACKLASH                 = u8"Backlash";
71
   PROGMEM Language_Str SMOOTHING                = u8"Smoothing";
71
   PROGMEM Language_Str SMOOTHING                = u8"Smoothing";
72
   PROGMEM Language_Str CORRECTION               = u8"Correction";
72
   PROGMEM Language_Str CORRECTION               = u8"Correction";

+ 1
- 1
Marlin/src/lcd/extensible_ui/lib/lulzbot/language/language_fr.h View File

48
   PROGMEM Language_Str ACCEL_PRINTING           = u8"A impr.";
48
   PROGMEM Language_Str ACCEL_PRINTING           = u8"A impr.";
49
   PROGMEM Language_Str ACCEL_TRAVEL             = u8"A dépl.";
49
   PROGMEM Language_Str ACCEL_TRAVEL             = u8"A dépl.";
50
   PROGMEM Language_Str ACCEL_RETRACT            = u8"A retrait";
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
   //PROGMEM Language_Str BACKLASH                 = u8"Backlash";
52
   //PROGMEM Language_Str BACKLASH                 = u8"Backlash";
53
   PROGMEM Language_Str SMOOTHING                = u8"Lissage";
53
   PROGMEM Language_Str SMOOTHING                = u8"Lissage";
54
   PROGMEM Language_Str MOTOR_CURRENT            = u8"Courant";
54
   PROGMEM Language_Str MOTOR_CURRENT            = u8"Courant";

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

83
       .tag(5) .button( BTN_POS(2,2), BTN_SIZE(1,1), GET_TEXTF(VELOCITY))
83
       .tag(5) .button( BTN_POS(2,2), BTN_SIZE(1,1), GET_TEXTF(VELOCITY))
84
       .tag(6) .button( BTN_POS(2,3), BTN_SIZE(1,1), GET_TEXTF(ACCELERATION))
84
       .tag(6) .button( BTN_POS(2,3), BTN_SIZE(1,1), GET_TEXTF(ACCELERATION))
85
       #if ENABLED(JUNCTION_DEVIATION)
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
       #else
87
       #else
88
       .tag(7) .button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXTF(JERK))
88
       .tag(7) .button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXTF(JERK))
89
       #endif
89
       #endif
136
       .tag(5) .button( BTN_POS(2,2),  BTN_SIZE(1,1), GET_TEXTF(VELOCITY))
136
       .tag(5) .button( BTN_POS(2,2),  BTN_SIZE(1,1), GET_TEXTF(VELOCITY))
137
       .tag(6) .button( BTN_POS(2,3),  BTN_SIZE(1,1), GET_TEXTF(ACCELERATION))
137
       .tag(6) .button( BTN_POS(2,3),  BTN_SIZE(1,1), GET_TEXTF(ACCELERATION))
138
       #if ENABLED(JUNCTION_DEVIATION)
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
       #else
140
       #else
141
       .tag(7) .button( BTN_POS(2,4),  BTN_SIZE(1,1), GET_TEXTF(JERK))
141
       .tag(7) .button( BTN_POS(2,4),  BTN_SIZE(1,1), GET_TEXTF(JERK))
142
       #endif
142
       #endif

+ 1
- 1
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/bio_advanced_settings.cpp View File

69
       .tag(8) .button( BTN_POS(2,2), BTN_SIZE(1,1), GET_TEXTF(VELOCITY))
69
       .tag(8) .button( BTN_POS(2,2), BTN_SIZE(1,1), GET_TEXTF(VELOCITY))
70
       .tag(9) .button( BTN_POS(2,3), BTN_SIZE(1,1), GET_TEXTF(ACCELERATION))
70
       .tag(9) .button( BTN_POS(2,3), BTN_SIZE(1,1), GET_TEXTF(ACCELERATION))
71
       #if ENABLED(JUNCTION_DEVIATION)
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
       #else
73
       #else
74
         .tag(10) .button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXTF(JERK))
74
         .tag(10) .button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXTF(JERK))
75
       #endif
75
       #endif

+ 1
- 1
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/junction_deviation_screen.cpp View File

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

Loading…
Cancel
Save