Explorar el Código

Remove extraneous MKS UI sprintf

Scott Lahteine hace 4 años
padre
commit
e0ed57db67

+ 3
- 4
Marlin/src/lcd/extui/lib/mks_ui/draw_acceleration_settings.cpp Ver fichero

@@ -109,15 +109,14 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
109 109
 
110 110
 void lv_draw_acceleration_settings() {
111 111
   scr = lv_screen_create(ACCELERATION_UI, machine_menu.AccelerationConfTitle);
112
-  char str_1[16];
113 112
   if (!uiCfg.para_ui_page) {
114
-    sprintf_P(public_buf_l, PSTR("%s"), dtostrf(planner.settings.acceleration, 1, 1, str_1));
113
+    dtostrf(planner.settings.acceleration, 1, 1, public_buf_l);
115 114
     lv_screen_menu_item_1_edit(scr, machine_menu.PrintAcceleration, PARA_UI_POS_X, PARA_UI_POS_Y, event_handler, ID_ACCE_PRINT, 0, public_buf_l);
116 115
 
117
-    sprintf_P(public_buf_l, PSTR("%s"), dtostrf(planner.settings.retract_acceleration, 1, 1, str_1));
116
+    dtostrf(planner.settings.retract_acceleration, 1, 1, public_buf_l);
118 117
     lv_screen_menu_item_1_edit(scr, machine_menu.RetractAcceleration, PARA_UI_POS_X, PARA_UI_POS_Y * 2, event_handler, ID_ACCE_RETRA, 1, public_buf_l);
119 118
 
120
-    sprintf_P(public_buf_l, PSTR("%s"), dtostrf(planner.settings.travel_acceleration, 1, 1, str_1));
119
+    dtostrf(planner.settings.travel_acceleration, 1, 1, public_buf_l);
121 120
     lv_screen_menu_item_1_edit(scr, machine_menu.TravelAcceleration, PARA_UI_POS_X, PARA_UI_POS_Y * 3, event_handler, ID_ACCE_TRAVEL, 2, public_buf_l);
122 121
 
123 122
     sprintf_P(public_buf_l, PSTR("%d"), (int)planner.settings.max_acceleration_mm_per_s2[X_AXIS]);

+ 3
- 4
Marlin/src/lcd/extui/lib/mks_ui/draw_auto_level_offset_settings.cpp Ver fichero

@@ -65,16 +65,15 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
65 65
 }
66 66
 
67 67
 void lv_draw_auto_level_offset_settings() {
68
-  char str_1[16];
69 68
   scr = lv_screen_create(NOZZLE_PROBE_OFFSET_UI, machine_menu.OffsetConfTitle);
70 69
 
71
-  sprintf_P(public_buf_l, PSTR("%s"), TERN(HAS_PROBE_XY_OFFSET, dtostrf(probe.offset.x, 1, 1, str_1) , 0));
70
+  dtostrf(TERN0(HAS_PROBE_XY_OFFSET, probe.offset.x), 1, 1, public_buf_l);
72 71
   lv_screen_menu_item_1_edit(scr, machine_menu.Xoffset, PARA_UI_POS_X, PARA_UI_POS_Y, event_handler, ID_OFFSET_X, 0, public_buf_l);
73 72
 
74
-  sprintf_P(public_buf_l, PSTR("%s"), TERN(HAS_PROBE_XY_OFFSET, dtostrf(probe.offset.y, 1, 1, str_1) , 0));
73
+  dtostrf(TERN0(HAS_PROBE_XY_OFFSET, probe.offset.y), 1, 1, public_buf_l);
75 74
   lv_screen_menu_item_1_edit(scr, machine_menu.Yoffset, PARA_UI_POS_X, PARA_UI_POS_Y * 2, event_handler, ID_OFFSET_Y, 1, public_buf_l);
76 75
 
77
-  sprintf_P(public_buf_l, PSTR("%s"), TERN(HAS_PROBE_XY_OFFSET, dtostrf(probe.offset.z, 1, 1, str_1) , 0));
76
+  dtostrf(TERN0(HAS_PROBE_XY_OFFSET, probe.offset.z), 1, 1, public_buf_l);
78 77
   lv_screen_menu_item_1_edit(scr, machine_menu.Zoffset, PARA_UI_POS_X, PARA_UI_POS_Y * 3, event_handler, ID_OFFSET_Z, 2, public_buf_l);
79 78
 
80 79
   lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y, event_handler, ID_OFFSET_RETURN, true);

+ 4
- 5
Marlin/src/lcd/extui/lib/mks_ui/draw_jerk_settings.cpp Ver fichero

@@ -71,19 +71,18 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
71 71
 }
72 72
 
73 73
 void lv_draw_jerk_settings() {
74
-  char str_1[16];
75 74
   scr = lv_screen_create(JERK_UI, machine_menu.JerkConfTitle);
76 75
 
77
-  sprintf_P(public_buf_l, PSTR("%s"), dtostrf(planner.max_jerk[X_AXIS], 1, 1, str_1));
76
+  dtostrf(planner.max_jerk[X_AXIS], 1, 1, public_buf_l);
78 77
   lv_screen_menu_item_1_edit(scr, machine_menu.X_Jerk, PARA_UI_POS_X, PARA_UI_POS_Y, event_handler, ID_JERK_X, 0, public_buf_l);
79 78
 
80
-  sprintf_P(public_buf_l, PSTR("%s"), dtostrf(planner.max_jerk[Y_AXIS], 1, 1, str_1));
79
+  dtostrf(planner.max_jerk[Y_AXIS], 1, 1, public_buf_l);
81 80
   lv_screen_menu_item_1_edit(scr, machine_menu.Y_Jerk, PARA_UI_POS_X, PARA_UI_POS_Y * 2, event_handler, ID_JERK_Y, 1, public_buf_l);
82 81
 
83
-  sprintf_P(public_buf_l, PSTR("%s"), dtostrf(planner.max_jerk[Z_AXIS], 1, 1, str_1));
82
+  dtostrf(planner.max_jerk[Z_AXIS], 1, 1, public_buf_l);
84 83
   lv_screen_menu_item_1_edit(scr, machine_menu.Z_Jerk, PARA_UI_POS_X, PARA_UI_POS_Y * 3, event_handler, ID_JERK_Z, 2, public_buf_l);
85 84
 
86
-  sprintf_P(public_buf_l, PSTR("%s"), dtostrf(planner.max_jerk[E_AXIS], 1, 1, str_1));
85
+  dtostrf(planner.max_jerk[E_AXIS], 1, 1, public_buf_l);
87 86
   lv_screen_menu_item_1_edit(scr, machine_menu.E_Jerk, PARA_UI_POS_X, PARA_UI_POS_Y * 4, event_handler, ID_JERK_E, 3, public_buf_l);
88 87
 
89 88
   lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y, event_handler, ID_JERK_RETURN, true);

+ 1
- 1
Marlin/src/lcd/extui/lib/mks_ui/draw_manuaLevel.cpp Ver fichero

@@ -54,7 +54,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
54 54
           queue.inject_P(G28_STR);
55 55
         }
56 56
         const int ind = obj->mks_obj_id - ID_M_POINT1;
57
-        sprintf_P(public_buf_l, PSTR("G1 Z10\nG1 X%d Y%d\nG1 Z0"), (int)gCfgItems.trammingPos[ind][X_AXIS], (int)gCfgItems.trammingPos[ind][Y_AXIS]);
57
+        sprintf_P(public_buf_l, PSTR("G1 Z10\nG1 X%d Y%d\nG1 Z0"), gCfgItems.trammingPos[ind].x, gCfgItems.trammingPos[ind].y);
58 58
         queue.inject(public_buf_l);
59 59
       }
60 60
       break;

+ 5
- 6
Marlin/src/lcd/extui/lib/mks_ui/draw_max_feedrate_settings.cpp Ver fichero

@@ -80,26 +80,25 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
80 80
 }
81 81
 
82 82
 void lv_draw_max_feedrate_settings() {
83
-  char str_1[16];
84 83
   scr = lv_screen_create(MAXFEEDRATE_UI, machine_menu.MaxFeedRateConfTitle);
85 84
 
86 85
   if (!uiCfg.para_ui_page) {
87
-    sprintf_P(public_buf_l, PSTR("%s"), dtostrf(planner.settings.max_feedrate_mm_s[X_AXIS], 1, 1, str_1));
86
+    dtostrf(planner.settings.max_feedrate_mm_s[X_AXIS], 1, 1, public_buf_l);
88 87
     lv_screen_menu_item_1_edit(scr, machine_menu.XMaxFeedRate, PARA_UI_POS_X, PARA_UI_POS_Y, event_handler, ID_FEED_X, 0, public_buf_l);
89 88
 
90
-    sprintf_P(public_buf_l, PSTR("%s"), dtostrf(planner.settings.max_feedrate_mm_s[Y_AXIS], 1, 1, str_1));
89
+    dtostrf(planner.settings.max_feedrate_mm_s[Y_AXIS], 1, 1, public_buf_l);
91 90
     lv_screen_menu_item_1_edit(scr, machine_menu.YMaxFeedRate, PARA_UI_POS_X, PARA_UI_POS_Y * 2, event_handler, ID_FEED_Y, 1, public_buf_l);
92 91
 
93
-    sprintf_P(public_buf_l, PSTR("%s"), dtostrf(planner.settings.max_feedrate_mm_s[Z_AXIS], 1, 1, str_1));
92
+    dtostrf(planner.settings.max_feedrate_mm_s[Z_AXIS], 1, 1, public_buf_l);
94 93
     lv_screen_menu_item_1_edit(scr, machine_menu.ZMaxFeedRate, PARA_UI_POS_X, PARA_UI_POS_Y * 3, event_handler, ID_FEED_Z, 2, public_buf_l);
95 94
 
96
-    sprintf_P(public_buf_l, PSTR("%s"), dtostrf(planner.settings.max_feedrate_mm_s[E_AXIS], 1, 1, str_1));
95
+    dtostrf(planner.settings.max_feedrate_mm_s[E_AXIS], 1, 1, public_buf_l);
97 96
     lv_screen_menu_item_1_edit(scr, machine_menu.E0MaxFeedRate, PARA_UI_POS_X, PARA_UI_POS_Y * 4, event_handler, ID_FEED_E0, 3, public_buf_l);
98 97
 
99 98
     lv_big_button_create(scr, "F:/bmp_back70x40.bin", machine_menu.next, PARA_UI_TURN_PAGE_POS_X, PARA_UI_TURN_PAGE_POS_Y, event_handler, ID_FEED_DOWN, true);
100 99
   }
101 100
   else {
102
-    sprintf_P(public_buf_l, PSTR("%s"), dtostrf(planner.settings.max_feedrate_mm_s[E_AXIS_N(1)], 1, 1, str_1));
101
+    dtostrf(planner.settings.max_feedrate_mm_s[E_AXIS_N(1)], 1, 1, public_buf_l);
103 102
     lv_screen_menu_item_1_edit(scr, machine_menu.E1MaxFeedRate, PARA_UI_POS_X, PARA_UI_POS_Y, event_handler, ID_FEED_E1, 0, public_buf_l);
104 103
 
105 104
     lv_big_button_create(scr, "F:/bmp_back70x40.bin", machine_menu.previous, PARA_UI_TURN_PAGE_POS_X, PARA_UI_TURN_PAGE_POS_Y, event_handler, ID_FEED_UP, true);

+ 63
- 66
Marlin/src/lcd/extui/lib/mks_ui/draw_number_key.cpp Ver fichero

@@ -73,214 +73,211 @@ enum {
73 73
 
74 74
 static void disp_key_value() {
75 75
   char *temp;
76
-  char str_1[16];
77
-  #if HAS_TRINAMIC_CONFIG
78
-    float milliamps;
79
-  #endif
76
+  TERN_(HAS_TRINAMIC_CONFIG, float milliamps);
80 77
 
81 78
   switch (value) {
82 79
     case PrintAcceleration:
83
-      sprintf_P(public_buf_m, PSTR("%s"), dtostrf(planner.settings.acceleration, 1, 1, str_1));
80
+      dtostrf(planner.settings.acceleration, 1, 1, public_buf_m);
84 81
       break;
85 82
     case RetractAcceleration:
86
-      sprintf_P(public_buf_m, PSTR("%s"), dtostrf(planner.settings.retract_acceleration, 1, 1, str_1));
83
+      dtostrf(planner.settings.retract_acceleration, 1, 1, public_buf_m);
87 84
       break;
88 85
     case TravelAcceleration:
89
-      sprintf_P(public_buf_m, PSTR("%s"), dtostrf(planner.settings.travel_acceleration, 1, 1, str_1));
86
+      dtostrf(planner.settings.travel_acceleration, 1, 1, public_buf_m);
90 87
       break;
91 88
     case XAcceleration:
92
-      sprintf_P(public_buf_m, PSTR("%d"), (int)planner.settings.max_acceleration_mm_per_s2[X_AXIS]);
89
+      itoa(planner.settings.max_acceleration_mm_per_s2[X_AXIS], public_buf_m, 10);
93 90
       break;
94 91
     case YAcceleration:
95
-      sprintf_P(public_buf_m, PSTR("%d"), (int)planner.settings.max_acceleration_mm_per_s2[Y_AXIS]);
92
+      itoa(planner.settings.max_acceleration_mm_per_s2[Y_AXIS], public_buf_m, 10);
96 93
       break;
97 94
     case ZAcceleration:
98
-      sprintf_P(public_buf_m, PSTR("%d"), (int)planner.settings.max_acceleration_mm_per_s2[Z_AXIS]);
95
+      itoa(planner.settings.max_acceleration_mm_per_s2[Z_AXIS], public_buf_m, 10);
99 96
       break;
100 97
     case E0Acceleration:
101
-      sprintf_P(public_buf_m, PSTR("%d"), (int)planner.settings.max_acceleration_mm_per_s2[E_AXIS]);
98
+      itoa(planner.settings.max_acceleration_mm_per_s2[E_AXIS], public_buf_m, 10);
102 99
       break;
103 100
     case E1Acceleration:
104
-      sprintf_P(public_buf_m, PSTR("%d"), (int)planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(1)]);
101
+      itoa(planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(1)], public_buf_m, 10);
105 102
       break;
106 103
     case XMaxFeedRate:
107
-      sprintf_P(public_buf_m, PSTR("%s"), dtostrf(planner.settings.max_feedrate_mm_s[X_AXIS], 1, 1, str_1));
104
+      dtostrf(planner.settings.max_feedrate_mm_s[X_AXIS], 1, 1, public_buf_m);
108 105
       break;
109 106
     case YMaxFeedRate:
110
-      sprintf_P(public_buf_m, PSTR("%s"), dtostrf(planner.settings.max_feedrate_mm_s[Y_AXIS], 1, 1, str_1));
107
+      dtostrf(planner.settings.max_feedrate_mm_s[Y_AXIS], 1, 1, public_buf_m);
111 108
       break;
112 109
     case ZMaxFeedRate:
113
-      sprintf_P(public_buf_m, PSTR("%s"), dtostrf(planner.settings.max_feedrate_mm_s[Z_AXIS], 1, 1, str_1));
110
+      dtostrf(planner.settings.max_feedrate_mm_s[Z_AXIS], 1, 1, public_buf_m);
114 111
       break;
115 112
     case E0MaxFeedRate:
116
-      sprintf_P(public_buf_m, PSTR("%s"), dtostrf(planner.settings.max_feedrate_mm_s[E_AXIS], 1, 1, str_1));
113
+      dtostrf(planner.settings.max_feedrate_mm_s[E_AXIS], 1, 1, public_buf_m);
117 114
       break;
118 115
     case E1MaxFeedRate:
119
-      sprintf_P(public_buf_m, PSTR("%s"), dtostrf(planner.settings.max_feedrate_mm_s[E_AXIS_N(1)], 1, 1, str_1));
116
+      dtostrf(planner.settings.max_feedrate_mm_s[E_AXIS_N(1)], 1, 1, public_buf_m);
120 117
       break;
121 118
 
122 119
     case XJerk:
123 120
       #if HAS_CLASSIC_JERK
124
-        sprintf_P(public_buf_m, PSTR("%s"), dtostrf(planner.max_jerk[X_AXIS], 1, 1, str_1));
121
+        dtostrf(planner.max_jerk[X_AXIS], 1, 1, public_buf_m);
125 122
       #endif
126 123
       break;
127 124
     case YJerk:
128 125
       #if HAS_CLASSIC_JERK
129
-        sprintf_P(public_buf_m, PSTR("%s"), dtostrf(planner.max_jerk[Y_AXIS], 1, 1, str_1));
126
+        dtostrf(planner.max_jerk[Y_AXIS], 1, 1, public_buf_m);
130 127
       #endif
131 128
       break;
132 129
     case ZJerk:
133 130
       #if HAS_CLASSIC_JERK
134
-        sprintf_P(public_buf_m, PSTR("%s"), dtostrf(planner.max_jerk[Z_AXIS], 1, 1, str_1));
131
+        dtostrf(planner.max_jerk[Z_AXIS], 1, 1, public_buf_m);
135 132
       #endif
136 133
       break;
137 134
     case EJerk:
138 135
       #if HAS_CLASSIC_JERK
139
-        sprintf_P(public_buf_m, PSTR("%s"), dtostrf(planner.max_jerk[E_AXIS], 1, 1, str_1));
136
+        dtostrf(planner.max_jerk[E_AXIS], 1, 1, public_buf_m);
140 137
       #endif
141 138
       break;
142 139
 
143 140
     case Xstep:
144
-      sprintf_P(public_buf_m, PSTR("%s"), dtostrf(planner.settings.axis_steps_per_mm[X_AXIS], 1, 1, str_1));
141
+      dtostrf(planner.settings.axis_steps_per_mm[X_AXIS], 1, 1, public_buf_m);
145 142
       break;
146 143
     case Ystep:
147
-      sprintf_P(public_buf_m, PSTR("%s"), dtostrf(planner.settings.axis_steps_per_mm[Y_AXIS], 1, 1, str_1));
144
+      dtostrf(planner.settings.axis_steps_per_mm[Y_AXIS], 1, 1, public_buf_m);
148 145
 
149 146
       break;
150 147
     case Zstep:
151
-      sprintf_P(public_buf_m, PSTR("%s"), dtostrf(planner.settings.axis_steps_per_mm[Z_AXIS], 1, 1, str_1));
148
+      dtostrf(planner.settings.axis_steps_per_mm[Z_AXIS], 1, 1, public_buf_m);
152 149
 
153 150
       break;
154 151
     case E0step:
155
-      sprintf_P(public_buf_m, PSTR("%s"), dtostrf(planner.settings.axis_steps_per_mm[E_AXIS], 1, 1, str_1));
152
+      dtostrf(planner.settings.axis_steps_per_mm[E_AXIS], 1, 1, public_buf_m);
156 153
 
157 154
       break;
158 155
     case E1step:
159
-      sprintf_P(public_buf_m, PSTR("%s"), dtostrf(planner.settings.axis_steps_per_mm[E_AXIS_N(1)], 1, 1, str_1));
156
+      dtostrf(planner.settings.axis_steps_per_mm[E_AXIS_N(1)], 1, 1, public_buf_m);
160 157
       break;
161 158
 
162 159
     case Xcurrent:
163 160
       #if AXIS_IS_TMC(X)
164 161
         milliamps = stepperX.getMilliamps();
165
-        sprintf_P(public_buf_m, PSTR("%s"), dtostrf(milliamps, 1, 1, str_1));
162
+        dtostrf(milliamps, 1, 1, public_buf_m);
166 163
       #endif
167 164
       break;
168 165
 
169 166
     case Ycurrent:
170 167
       #if AXIS_IS_TMC(Y)
171 168
         milliamps = stepperY.getMilliamps();
172
-        sprintf_P(public_buf_m, PSTR("%s"), dtostrf(milliamps, 1, 1, str_1));
169
+        dtostrf(milliamps, 1, 1, public_buf_m);
173 170
       #endif
174 171
       break;
175 172
 
176 173
     case Zcurrent:
177 174
       #if AXIS_IS_TMC(Z)
178 175
         milliamps = stepperZ.getMilliamps();
179
-        sprintf_P(public_buf_m, PSTR("%s"), dtostrf(milliamps, 1, 1, str_1));
176
+        dtostrf(milliamps, 1, 1, public_buf_m);
180 177
       #endif
181 178
       break;
182 179
 
183 180
     case E0current:
184 181
       #if AXIS_IS_TMC(E0)
185 182
         milliamps = stepperE0.getMilliamps();
186
-        sprintf_P(public_buf_m, PSTR("%s"), dtostrf(milliamps, 1, 1, str_1));
183
+        dtostrf(milliamps, 1, 1, public_buf_m);
187 184
       #endif
188 185
       break;
189 186
 
190 187
     case E1current:
191 188
       #if AXIS_IS_TMC(E1)
192 189
         milliamps = stepperE1.getMilliamps();
193
-        sprintf_P(public_buf_m, PSTR("%s"), dtostrf(milliamps, 1, 1, str_1));
190
+        dtostrf(milliamps, 1, 1, public_buf_m);
194 191
       #endif
195 192
       break;
196 193
 
197 194
     case pause_pos_x:
198
-      sprintf_P(public_buf_m, PSTR("%s"), dtostrf(gCfgItems.pausePosX, 1, 1, str_1));
195
+      dtostrf(gCfgItems.pausePosX, 1, 1, public_buf_m);
199 196
       break;
200 197
     case pause_pos_y:
201
-      sprintf_P(public_buf_m, PSTR("%s"), dtostrf(gCfgItems.pausePosY, 1, 1, str_1));
198
+      dtostrf(gCfgItems.pausePosY, 1, 1, public_buf_m);
202 199
       break;
203 200
     case pause_pos_z:
204
-      sprintf_P(public_buf_m, PSTR("%s"), dtostrf(gCfgItems.pausePosZ, 1, 1, str_1));
201
+      dtostrf(gCfgItems.pausePosZ, 1, 1, public_buf_m);
205 202
       break;
206 203
     case level_pos_x1:
207
-      sprintf_P(public_buf_m, PSTR("%d"), (int)gCfgItems.trammingPos[0][X_AXIS]);
204
+      itoa(gCfgItems.trammingPos[0].x, public_buf_m, 10);
208 205
       break;
209 206
     case level_pos_y1:
210
-      sprintf_P(public_buf_m, PSTR("%d"), (int)gCfgItems.trammingPos[0][Y_AXIS]);
207
+      itoa(gCfgItems.trammingPos[0].y, public_buf_m, 10);
211 208
       break;
212 209
     case level_pos_x2:
213
-      sprintf_P(public_buf_m, PSTR("%d"), (int)gCfgItems.trammingPos[1][X_AXIS]);
210
+      itoa(gCfgItems.trammingPos[1].x, public_buf_m, 10);
214 211
       break;
215 212
     case level_pos_y2:
216
-      sprintf_P(public_buf_m, PSTR("%d"), (int)gCfgItems.trammingPos[1][Y_AXIS]);
213
+      itoa(gCfgItems.trammingPos[1].y, public_buf_m, 10);
217 214
       break;
218 215
     case level_pos_x3:
219
-      sprintf_P(public_buf_m, PSTR("%d"), (int)gCfgItems.trammingPos[2][X_AXIS]);
216
+      itoa(gCfgItems.trammingPos[2].x, public_buf_m, 10);
220 217
       break;
221 218
     case level_pos_y3:
222
-      sprintf_P(public_buf_m, PSTR("%d"), (int)gCfgItems.trammingPos[2][Y_AXIS]);
219
+      itoa(gCfgItems.trammingPos[2].y, public_buf_m, 10);
223 220
       break;
224 221
     case level_pos_x4:
225
-      sprintf_P(public_buf_m, PSTR("%d"), (int)gCfgItems.trammingPos[3][X_AXIS]);
222
+      itoa(gCfgItems.trammingPos[3].x, public_buf_m, 10);
226 223
       break;
227 224
     case level_pos_y4:
228
-      sprintf_P(public_buf_m, PSTR("%d"), (int)gCfgItems.trammingPos[3][Y_AXIS]);
225
+      itoa(gCfgItems.trammingPos[3].y, public_buf_m, 10);
229 226
       break;
230 227
     case level_pos_x5:
231
-      sprintf_P(public_buf_m, PSTR("%d"), (int)gCfgItems.trammingPos[4][X_AXIS]);
228
+      itoa(gCfgItems.trammingPos[4].x, public_buf_m, 10);
232 229
       break;
233 230
     case level_pos_y5:
234
-      sprintf_P(public_buf_m, PSTR("%d"), (int)gCfgItems.trammingPos[4][Y_AXIS]);
231
+      itoa(gCfgItems.trammingPos[4].y, public_buf_m, 10);
235 232
       break;
236 233
     #if HAS_BED_PROBE
237 234
       case x_offset:
238 235
         #if HAS_PROBE_XY_OFFSET
239
-          sprintf_P(public_buf_m, PSTR("%s"), dtostrf(probe.offset.x, 1, 3, str_1));
236
+          dtostrf(probe.offset.x, 1, 3, public_buf_m);
240 237
         #endif
241 238
         break;
242 239
       case y_offset:
243 240
         #if HAS_PROBE_XY_OFFSET
244
-          sprintf_P(public_buf_m, PSTR("%s"), dtostrf(probe.offset.y, 1, 3, str_1));
241
+          dtostrf(probe.offset.y, 1, 3, public_buf_m);
245 242
         #endif
246 243
         break;
247 244
       case z_offset:
248
-        sprintf_P(public_buf_m, PSTR("%s"), dtostrf(probe.offset.z, 1, 3, str_1));
245
+        dtostrf(probe.offset.z, 1, 3, public_buf_m);
249 246
         break;
250 247
     #endif
251 248
     case load_length:
252
-      sprintf_P(public_buf_m, PSTR("%d"), gCfgItems.filamentchange_load_length);
249
+      itoa(gCfgItems.filamentchange_load_length, public_buf_m, 10);
253 250
       break;
254 251
     case load_speed:
255
-      sprintf_P(public_buf_m, PSTR("%d"), gCfgItems.filamentchange_load_speed);
252
+      itoa(gCfgItems.filamentchange_load_speed, public_buf_m, 10);
256 253
       break;
257 254
     case unload_length:
258
-      sprintf_P(public_buf_m, PSTR("%d"), gCfgItems.filamentchange_unload_length);
255
+      itoa(gCfgItems.filamentchange_unload_length, public_buf_m, 10);
259 256
       break;
260 257
     case unload_speed:
261
-      sprintf_P(public_buf_m, PSTR("%d"), gCfgItems.filamentchange_unload_speed);
258
+      itoa(gCfgItems.filamentchange_unload_speed, public_buf_m, 10);
262 259
       break;
263 260
     case filament_temp:
264
-      sprintf_P(public_buf_m, PSTR("%d"), gCfgItems.filament_limit_temp);
261
+      itoa(gCfgItems.filament_limit_temp, public_buf_m, 10);
265 262
       break;
266 263
     case x_sensitivity:
267 264
       #if X_SENSORLESS
268
-        sprintf_P(public_buf_m, PSTR("%d"), TERN(X_SENSORLESS, stepperX.homing_threshold(), 0));
265
+        itoa(TERN(X_SENSORLESS, stepperX.homing_threshold(), 0), public_buf_m, 10);
269 266
       #endif
270 267
       break;
271 268
     case y_sensitivity:
272 269
       #if Y_SENSORLESS
273
-        sprintf_P(public_buf_m, PSTR("%d"), TERN(Y_SENSORLESS, stepperY.homing_threshold(), 0));
270
+        itoa(TERN(Y_SENSORLESS, stepperY.homing_threshold(), 0), public_buf_m, 10);
274 271
       #endif
275 272
       break;
276 273
     case z_sensitivity:
277 274
       #if Z_SENSORLESS
278
-        sprintf_P(public_buf_m, PSTR("%d"), TERN(Z_SENSORLESS, stepperZ.homing_threshold(), 0));
275
+        itoa(TERN(Z_SENSORLESS, stepperZ.homing_threshold(), 0), public_buf_m, 10);
279 276
       #endif
280 277
       break;
281 278
     case z2_sensitivity:
282 279
       #if Z2_SENSORLESS
283
-        sprintf_P(public_buf_m, PSTR("%d"), TERN(Z2_SENSORLESS, stepperZ2.homing_threshold(), 0));
280
+        itoa(TERN(Z2_SENSORLESS, stepperZ2.homing_threshold(), 0), public_buf_m, 10);
284 281
       #endif
285 282
       break;
286 283
   }
@@ -346,16 +343,16 @@ static void set_value_confirm() {
346 343
     case pause_pos_x: gCfgItems.pausePosX = atof(key_value); update_spi_flash(); break;
347 344
     case pause_pos_y: gCfgItems.pausePosY = atof(key_value); update_spi_flash(); break;
348 345
     case pause_pos_z: gCfgItems.pausePosZ = atof(key_value); update_spi_flash(); break;
349
-    case level_pos_x1: gCfgItems.trammingPos[0][X_AXIS] = atoi(key_value); update_spi_flash(); break;
350
-    case level_pos_y1: gCfgItems.trammingPos[0][Y_AXIS] = atoi(key_value); update_spi_flash(); break;
351
-    case level_pos_x2: gCfgItems.trammingPos[1][X_AXIS] = atoi(key_value); update_spi_flash(); break;
352
-    case level_pos_y2: gCfgItems.trammingPos[1][Y_AXIS] = atoi(key_value); update_spi_flash(); break;
353
-    case level_pos_x3: gCfgItems.trammingPos[2][X_AXIS] = atoi(key_value); update_spi_flash(); break;
354
-    case level_pos_y3: gCfgItems.trammingPos[2][Y_AXIS] = atoi(key_value); update_spi_flash(); break;
355
-    case level_pos_x4: gCfgItems.trammingPos[3][X_AXIS] = atoi(key_value); update_spi_flash(); break;
356
-    case level_pos_y4: gCfgItems.trammingPos[3][Y_AXIS] = atoi(key_value); update_spi_flash(); break;
357
-    case level_pos_x5: gCfgItems.trammingPos[4][X_AXIS] = atoi(key_value); update_spi_flash(); break;
358
-    case level_pos_y5: gCfgItems.trammingPos[4][Y_AXIS] = atoi(key_value); update_spi_flash(); break;
346
+    case level_pos_x1: gCfgItems.trammingPos[0].x = atoi(key_value); update_spi_flash(); break;
347
+    case level_pos_y1: gCfgItems.trammingPos[0].y = atoi(key_value); update_spi_flash(); break;
348
+    case level_pos_x2: gCfgItems.trammingPos[1].x = atoi(key_value); update_spi_flash(); break;
349
+    case level_pos_y2: gCfgItems.trammingPos[1].y = atoi(key_value); update_spi_flash(); break;
350
+    case level_pos_x3: gCfgItems.trammingPos[2].x = atoi(key_value); update_spi_flash(); break;
351
+    case level_pos_y3: gCfgItems.trammingPos[2].y = atoi(key_value); update_spi_flash(); break;
352
+    case level_pos_x4: gCfgItems.trammingPos[3].x = atoi(key_value); update_spi_flash(); break;
353
+    case level_pos_y4: gCfgItems.trammingPos[3].y = atoi(key_value); update_spi_flash(); break;
354
+    case level_pos_x5: gCfgItems.trammingPos[4].x = atoi(key_value); update_spi_flash(); break;
355
+    case level_pos_y5: gCfgItems.trammingPos[4].y = atoi(key_value); update_spi_flash(); break;
359 356
     #if HAS_BED_PROBE
360 357
       case x_offset: {
361 358
         #if HAS_PROBE_XY_OFFSET

+ 3
- 4
Marlin/src/lcd/extui/lib/mks_ui/draw_pause_position.cpp Ver fichero

@@ -60,16 +60,15 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
60 60
 }
61 61
 
62 62
 void lv_draw_pause_position() {
63
-  char str_1[16];
64 63
   scr = lv_screen_create(PAUSE_POS_UI, machine_menu.PausePosText);
65 64
 
66
-  sprintf_P(public_buf_l, PSTR("%s"), dtostrf(gCfgItems.pausePosX, 1, 1, str_1));
65
+  dtostrf(gCfgItems.pausePosX, 1, 1, public_buf_l);
67 66
   lv_screen_menu_item_1_edit(scr, machine_menu.xPos, PARA_UI_POS_X, PARA_UI_POS_Y, event_handler, ID_PAUSE_X, 0, public_buf_l);
68 67
 
69
-  sprintf_P(public_buf_l, PSTR("%s"), dtostrf(gCfgItems.pausePosY, 1, 1, str_1));
68
+  dtostrf(gCfgItems.pausePosY, 1, 1, public_buf_l);
70 69
   lv_screen_menu_item_1_edit(scr, machine_menu.yPos, PARA_UI_POS_X, PARA_UI_POS_Y * 2, event_handler, ID_PAUSE_Y, 1, public_buf_l);
71 70
 
72
-  sprintf_P(public_buf_l, PSTR("%s"), dtostrf(gCfgItems.pausePosZ, 1, 1, str_1));
71
+  dtostrf(gCfgItems.pausePosZ, 1, 1, public_buf_l);
73 72
   lv_screen_menu_item_1_edit(scr, machine_menu.zPos, PARA_UI_POS_X, PARA_UI_POS_Y * 3, event_handler, ID_PAUSE_Z, 2, public_buf_l);
74 73
 
75 74
   lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y, event_handler, ID_PAUSE_RETURN, true);

+ 1
- 2
Marlin/src/lcd/extui/lib/mks_ui/draw_printing.cpp Ver fichero

@@ -251,8 +251,7 @@ void disp_print_time() {
251 251
 }
252 252
 
253 253
 void disp_fan_Zpos() {
254
-  char str_1[16];
255
-  sprintf_P(public_buf_l, PSTR("%s"), dtostrf(current_position.z, 1, 3, str_1));
254
+  dtostrf(current_position.z, 1, 3, public_buf_l);
256 255
   lv_label_set_text(labelZpos, public_buf_l);
257 256
 }
258 257
 

+ 5
- 6
Marlin/src/lcd/extui/lib/mks_ui/draw_step_settings.cpp Ver fichero

@@ -79,26 +79,25 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
79 79
 }
80 80
 
81 81
 void lv_draw_step_settings() {
82
-  char str_1[16];
83 82
   scr = lv_screen_create(STEPS_UI, machine_menu.StepsConfTitle);
84 83
 
85 84
   if (!uiCfg.para_ui_page) {
86
-    sprintf_P(public_buf_l, PSTR("%s"), dtostrf(planner.settings.axis_steps_per_mm[X_AXIS], 1, 1, str_1));
85
+    dtostrf(planner.settings.axis_steps_per_mm[X_AXIS], 1, 1, public_buf_l);
87 86
     lv_screen_menu_item_1_edit(scr, machine_menu.X_Steps, PARA_UI_POS_X, PARA_UI_POS_Y, event_handler, ID_STEP_X, 0, public_buf_l);
88 87
 
89
-    sprintf_P(public_buf_l, PSTR("%s"), dtostrf(planner.settings.axis_steps_per_mm[Y_AXIS], 1, 1, str_1));
88
+    dtostrf(planner.settings.axis_steps_per_mm[Y_AXIS], 1, 1, public_buf_l);
90 89
     lv_screen_menu_item_1_edit(scr, machine_menu.Y_Steps, PARA_UI_POS_X, PARA_UI_POS_Y * 2, event_handler, ID_STEP_Y, 1, public_buf_l);
91 90
 
92
-    sprintf_P(public_buf_l, PSTR("%s"), dtostrf(planner.settings.axis_steps_per_mm[Z_AXIS], 1, 1, str_1));
91
+    dtostrf(planner.settings.axis_steps_per_mm[Z_AXIS], 1, 1, public_buf_l);
93 92
     lv_screen_menu_item_1_edit(scr, machine_menu.Z_Steps, PARA_UI_POS_X, PARA_UI_POS_Y * 3, event_handler, ID_STEP_Z, 2, public_buf_l);
94 93
 
95
-    sprintf_P(public_buf_l, PSTR("%s"), dtostrf(planner.settings.axis_steps_per_mm[E_AXIS], 1, 1, str_1));
94
+    dtostrf(planner.settings.axis_steps_per_mm[E_AXIS], 1, 1, public_buf_l);
96 95
     lv_screen_menu_item_1_edit(scr, machine_menu.E0_Steps, PARA_UI_POS_X, PARA_UI_POS_Y * 4, event_handler, ID_STEP_E0, 3, public_buf_l);
97 96
 
98 97
     lv_big_button_create(scr, "F:/bmp_back70x40.bin", machine_menu.next, PARA_UI_TURN_PAGE_POS_X, PARA_UI_TURN_PAGE_POS_Y, event_handler, ID_STEP_DOWN, true);
99 98
   }
100 99
   else {
101
-    sprintf_P(public_buf_l, PSTR("%s"), dtostrf(planner.settings.axis_steps_per_mm[E_AXIS_N(1)], 1, 1, str_1));
100
+    dtostrf(planner.settings.axis_steps_per_mm[E_AXIS_N(1)], 1, 1, public_buf_l);
102 101
     lv_screen_menu_item_1_edit(scr, machine_menu.E1_Steps, PARA_UI_POS_X, PARA_UI_POS_Y, event_handler, ID_STEP_E1, 0, public_buf_l);
103 102
 
104 103
     lv_big_button_create(scr, "F:/bmp_back70x40.bin", machine_menu.previous, PARA_UI_TURN_PAGE_POS_X, PARA_UI_TURN_PAGE_POS_Y, event_handler, ID_STEP_UP, true);

+ 5
- 6
Marlin/src/lcd/extui/lib/mks_ui/draw_tmc_current_settings.cpp Ver fichero

@@ -95,14 +95,13 @@ void lv_draw_tmc_current_settings() {
95 95
   scr = lv_screen_create(TMC_CURRENT_UI, machine_menu.TmcCurrentConfTitle);
96 96
 
97 97
   float milliamps;
98
-  char str_1[16];
99 98
   if (!uiCfg.para_ui_page) {
100 99
     #if AXIS_IS_TMC(X)
101 100
       milliamps = stepperX.getMilliamps();
102 101
     #else
103 102
       milliamps = -1;
104 103
     #endif
105
-    sprintf_P(public_buf_l, PSTR("%s"), dtostrf(milliamps, 1, 1, str_1));
104
+    dtostrf(milliamps, 1, 1, public_buf_l);
106 105
     lv_screen_menu_item_1_edit(scr, machine_menu.X_Current, PARA_UI_POS_X, PARA_UI_POS_Y, event_handler, ID_TMC_CURRENT_X, 0, public_buf_l);
107 106
 
108 107
     #if AXIS_IS_TMC(Y)
@@ -110,7 +109,7 @@ void lv_draw_tmc_current_settings() {
110 109
     #else
111 110
       milliamps = -1;
112 111
     #endif
113
-    sprintf_P(public_buf_l, PSTR("%s"), dtostrf(milliamps, 1, 1, str_1));
112
+    dtostrf(milliamps, 1, 1, public_buf_l);
114 113
     lv_screen_menu_item_1_edit(scr, machine_menu.Y_Current, PARA_UI_POS_X, PARA_UI_POS_Y * 2, event_handler, ID_TMC_CURRENT_Y, 1, public_buf_l);
115 114
 
116 115
     #if AXIS_IS_TMC(Z)
@@ -118,7 +117,7 @@ void lv_draw_tmc_current_settings() {
118 117
     #else
119 118
       milliamps = -1;
120 119
     #endif
121
-    sprintf_P(public_buf_l, PSTR("%s"), dtostrf(milliamps, 1, 1, str_1));
120
+    dtostrf(milliamps, 1, 1, public_buf_l);
122 121
     lv_screen_menu_item_1_edit(scr, machine_menu.Z_Current, PARA_UI_POS_X, PARA_UI_POS_Y * 3, event_handler, ID_TMC_CURRENT_Z, 2, public_buf_l);
123 122
 
124 123
     #if AXIS_IS_TMC(E0)
@@ -126,7 +125,7 @@ void lv_draw_tmc_current_settings() {
126 125
     #else
127 126
       milliamps = -1;
128 127
     #endif
129
-    sprintf_P(public_buf_l, PSTR("%s"), dtostrf(milliamps, 1, 1, str_1));
128
+    dtostrf(milliamps, 1, 1, public_buf_l);
130 129
     lv_screen_menu_item_1_edit(scr, machine_menu.E0_Current, PARA_UI_POS_X, PARA_UI_POS_Y * 4, event_handler, ID_TMC_CURRENT_E0, 3, public_buf_l);
131 130
 
132 131
     lv_big_button_create(scr, "F:/bmp_back70x40.bin", machine_menu.next, PARA_UI_TURN_PAGE_POS_X, PARA_UI_TURN_PAGE_POS_Y, event_handler, ID_TMC_CURRENT_DOWN, true);
@@ -137,7 +136,7 @@ void lv_draw_tmc_current_settings() {
137 136
     #else
138 137
       milliamps = -1;
139 138
     #endif
140
-    sprintf_P(public_buf_l, PSTR("%s"), dtostrf(milliamps, 1, 1, str_1));
139
+    dtostrf(milliamps, 1, 1, public_buf_l);
141 140
     lv_screen_menu_item_1_edit(scr, machine_menu.E1_Current, PARA_UI_POS_X, PARA_UI_POS_Y, event_handler, ID_TMC_CURRENT_E1, 0, public_buf_l);
142 141
 
143 142
     lv_big_button_create(scr, "F:/bmp_back70x40.bin", machine_menu.previous, PARA_UI_TURN_PAGE_POS_X, PARA_UI_TURN_PAGE_POS_Y, event_handler, ID_TMC_CURRENT_UP, true);

+ 10
- 10
Marlin/src/lcd/extui/lib/mks_ui/draw_tramming_pos_settings.cpp Ver fichero

@@ -107,27 +107,27 @@ void lv_draw_tramming_pos_settings() {
107 107
   scr = lv_screen_create(MANUAL_LEVELING_POSIGION_UI, machine_menu.LevelingParaConfTitle);
108 108
 
109 109
   if (!uiCfg.para_ui_page) {
110
-    sprintf_P(public_buf_l, PSTR("%d"), gCfgItems.trammingPos[0][X_AXIS]);
111
-    sprintf_P(buf2, PSTR("%d"), gCfgItems.trammingPos[0][Y_AXIS]);
110
+    sprintf_P(public_buf_l, PSTR("%d"), gCfgItems.trammingPos[0].x);
111
+    sprintf_P(buf2, PSTR("%d"), gCfgItems.trammingPos[0].y);
112 112
     lv_screen_menu_item_2_edit(scr, leveling_menu.position1, PARA_UI_POS_X, PARA_UI_POS_Y, event_handler, ID_MANUAL_POS_Y1, 0, buf2, ID_MANUAL_POS_X1, public_buf_l);
113 113
 
114
-    sprintf_P(public_buf_l, PSTR("%d"), gCfgItems.trammingPos[1][X_AXIS]);
115
-    sprintf_P(buf2, PSTR("%d"), gCfgItems.trammingPos[1][Y_AXIS]);
114
+    sprintf_P(public_buf_l, PSTR("%d"), gCfgItems.trammingPos[1].x);
115
+    sprintf_P(buf2, PSTR("%d"), gCfgItems.trammingPos[1].y);
116 116
     lv_screen_menu_item_2_edit(scr, leveling_menu.position2, PARA_UI_POS_X, PARA_UI_POS_Y * 2, event_handler, ID_MANUAL_POS_Y2, 1, buf2, ID_MANUAL_POS_X2, public_buf_l);
117 117
 
118
-    sprintf_P(public_buf_l, PSTR("%d"), gCfgItems.trammingPos[2][X_AXIS]);
119
-    sprintf_P(buf2, PSTR("%d"), gCfgItems.trammingPos[2][Y_AXIS]);
118
+    sprintf_P(public_buf_l, PSTR("%d"), gCfgItems.trammingPos[2].x);
119
+    sprintf_P(buf2, PSTR("%d"), gCfgItems.trammingPos[2].y);
120 120
     lv_screen_menu_item_2_edit(scr, leveling_menu.position3, PARA_UI_POS_X, PARA_UI_POS_Y * 3, event_handler, ID_MANUAL_POS_Y3, 2, buf2, ID_MANUAL_POS_X3, public_buf_l);
121 121
 
122
-    sprintf_P(public_buf_l, PSTR("%d"), gCfgItems.trammingPos[3][X_AXIS]);
123
-    sprintf_P(buf2, PSTR("%d"), gCfgItems.trammingPos[3][Y_AXIS]);
122
+    sprintf_P(public_buf_l, PSTR("%d"), gCfgItems.trammingPos[3].x);
123
+    sprintf_P(buf2, PSTR("%d"), gCfgItems.trammingPos[3].y);
124 124
     lv_screen_menu_item_2_edit(scr, leveling_menu.position4, PARA_UI_POS_X, PARA_UI_POS_Y * 4, event_handler, ID_MANUAL_POS_Y4, 3, buf2, ID_MANUAL_POS_X4, public_buf_l);
125 125
 
126 126
     lv_big_button_create(scr, "F:/bmp_back70x40.bin", machine_menu.next, PARA_UI_TURN_PAGE_POS_X, PARA_UI_TURN_PAGE_POS_Y, event_handler, ID_MANUAL_POS_DOWN, true);
127 127
   }
128 128
   else {
129
-    sprintf_P(public_buf_l, PSTR("%d"), gCfgItems.trammingPos[4][X_AXIS]);
130
-    sprintf_P(buf2, PSTR("%d"), gCfgItems.trammingPos[4][Y_AXIS]);
129
+    sprintf_P(public_buf_l, PSTR("%d"), gCfgItems.trammingPos[4].x);
130
+    sprintf_P(buf2, PSTR("%d"), gCfgItems.trammingPos[4].y);
131 131
     lv_screen_menu_item_2_edit(scr, leveling_menu.position4, PARA_UI_POS_X, PARA_UI_POS_Y, event_handler, ID_MANUAL_POS_Y5, 0, buf2, ID_MANUAL_POS_X5, public_buf_l);
132 132
 
133 133
     lv_big_button_create(scr, "F:/bmp_back70x40.bin", machine_menu.previous, PARA_UI_TURN_PAGE_POS_X, PARA_UI_TURN_PAGE_POS_Y, event_handler, ID_MANUAL_POS_UP, true);

+ 10
- 10
Marlin/src/lcd/extui/lib/mks_ui/draw_ui.cpp Ver fichero

@@ -125,16 +125,16 @@ void gCfgItems_init() {
125 125
   gCfgItems.pausePosX         = -1;
126 126
   gCfgItems.pausePosY         = -1;
127 127
   gCfgItems.pausePosZ         = 5;
128
-  gCfgItems.trammingPos[0][X_AXIS] = X_MIN_POS + 30;
129
-  gCfgItems.trammingPos[0][Y_AXIS] = Y_MIN_POS + 30;
130
-  gCfgItems.trammingPos[1][X_AXIS] = X_MAX_POS - 30;
131
-  gCfgItems.trammingPos[1][Y_AXIS] = Y_MIN_POS + 30;
132
-  gCfgItems.trammingPos[2][X_AXIS] = X_MAX_POS - 30;
133
-  gCfgItems.trammingPos[2][Y_AXIS] = Y_MAX_POS - 30;
134
-  gCfgItems.trammingPos[3][X_AXIS] = X_MIN_POS + 30;
135
-  gCfgItems.trammingPos[3][Y_AXIS] = Y_MAX_POS - 30;
136
-  gCfgItems.trammingPos[4][X_AXIS] = X_BED_SIZE / 2;
137
-  gCfgItems.trammingPos[4][Y_AXIS] = Y_BED_SIZE / 2;
128
+  gCfgItems.trammingPos[0].x  = X_MIN_POS + 30;
129
+  gCfgItems.trammingPos[0].y  = Y_MIN_POS + 30;
130
+  gCfgItems.trammingPos[1].x  = X_MAX_POS - 30;
131
+  gCfgItems.trammingPos[1].y  = Y_MIN_POS + 30;
132
+  gCfgItems.trammingPos[2].x  = X_MAX_POS - 30;
133
+  gCfgItems.trammingPos[2].y  = Y_MAX_POS - 30;
134
+  gCfgItems.trammingPos[3].x  = X_MIN_POS + 30;
135
+  gCfgItems.trammingPos[3].y  = Y_MAX_POS - 30;
136
+  gCfgItems.trammingPos[4].x  = X_BED_SIZE / 2;
137
+  gCfgItems.trammingPos[4].y  = Y_BED_SIZE / 2;
138 138
   gCfgItems.cloud_enable      = false;
139 139
   gCfgItems.wifi_mode_sel = STA_MODEL;
140 140
   gCfgItems.fileSysType   = FILE_SYS_SD;

+ 1
- 1
Marlin/src/lcd/extui/lib/mks_ui/draw_ui.h Ver fichero

@@ -197,7 +197,7 @@ typedef struct {
197 197
   uint8_t   wifi_type;
198 198
   bool      cloud_enable,
199 199
             encoder_enable;
200
-  int       trammingPos[5][2]; // XY
200
+  xy_int_t  trammingPos[5];
201 201
   int       filamentchange_load_length,
202 202
             filamentchange_load_speed,
203 203
             filamentchange_unload_length,

+ 2
- 2
Marlin/src/lcd/extui/lib/mks_ui/wifi_module.cpp Ver fichero

@@ -883,7 +883,7 @@ static void wifi_gcode_exec(uint8_t *cmd_line) {
883 883
             SEND_OK_TO_WIFI;
884 884
 
885 885
             char *outBuf = (char *)tempBuf;
886
-            char str_1[16], tbuf[34];
886
+            char tbuf[34];
887 887
 
888 888
             sprintf_P(tbuf, PSTR("%d /%d"), (int)thermalManager.degHotend(0), (int)thermalManager.degTargetHotend(0));
889 889
 
@@ -1313,7 +1313,7 @@ static void file_first_msg_handle(uint8_t * msg, uint16_t msgLen) {
1313 1313
       lv_draw_dialog(DIALOG_TYPE_UPLOAD_FILE);
1314 1314
       return;
1315 1315
     }
1316
-    sprintf_P((char *)saveFilePath, PSTR("%s"), dosName);
1316
+    strcpy(saveFilePath, dosName);
1317 1317
 
1318 1318
     card.cdroot();
1319 1319
     upload_file.close();

Loading…
Cancelar
Guardar