Browse Source

Use itoa for sprintf int

Scott Lahteine 3 years ago
parent
commit
73f6426114

+ 1
- 1
Marlin/src/HAL/DUE/usb/usb_task.c View File

@@ -322,7 +322,7 @@ void usb_task_init(void) {
322 322
       char *sptr;
323 323
 
324 324
       // Patch in the filament diameter
325
-      sprintf_P(diam, PSTR("%d"), (int)((DEFAULT_NOMINAL_FILAMENT_DIA) * 1000.0));
325
+      itoa((int)((DEFAULT_NOMINAL_FILAMENT_DIA) * 1000), diam, 10);
326 326
 
327 327
       // And copy it to the proper place, expanding it to unicode
328 328
       sptr = &diam[0];

+ 5
- 5
Marlin/src/lcd/extui/lib/mks_ui/draw_acceleration_settings.cpp View File

@@ -119,22 +119,22 @@ void lv_draw_acceleration_settings() {
119 119
     dtostrf(planner.settings.travel_acceleration, 1, 1, public_buf_l);
120 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);
121 121
 
122
-    sprintf_P(public_buf_l, PSTR("%d"), (int)planner.settings.max_acceleration_mm_per_s2[X_AXIS]);
122
+    itoa(planner.settings.max_acceleration_mm_per_s2[X_AXIS], public_buf_l, 10);
123 123
     lv_screen_menu_item_1_edit(scr, machine_menu.X_Acceleration, PARA_UI_POS_X, PARA_UI_POS_Y * 4, event_handler, ID_ACCE_X, 3, public_buf_l);
124 124
 
125 125
     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_ACCE_DOWN, true);
126 126
   }
127 127
   else {
128
-    sprintf_P(public_buf_l, PSTR("%d"), (int)planner.settings.max_acceleration_mm_per_s2[Y_AXIS]);
128
+    itoa(planner.settings.max_acceleration_mm_per_s2[Y_AXIS], public_buf_l, 10);
129 129
     lv_screen_menu_item_1_edit(scr, machine_menu.Y_Acceleration, PARA_UI_POS_X, PARA_UI_POS_Y, event_handler, ID_ACCE_Y, 0, public_buf_l);
130 130
 
131
-    sprintf_P(public_buf_l, PSTR("%d"), (int)planner.settings.max_acceleration_mm_per_s2[Z_AXIS]);
131
+    itoa(planner.settings.max_acceleration_mm_per_s2[Z_AXIS], public_buf_l, 10);
132 132
     lv_screen_menu_item_1_edit(scr, machine_menu.Z_Acceleration, PARA_UI_POS_X, PARA_UI_POS_Y * 2, event_handler, ID_ACCE_Z, 1, public_buf_l);
133 133
 
134
-    sprintf_P(public_buf_l, PSTR("%d"), (int)planner.settings.max_acceleration_mm_per_s2[E_AXIS]);
134
+    itoa(planner.settings.max_acceleration_mm_per_s2[E_AXIS], public_buf_l, 10);
135 135
     lv_screen_menu_item_1_edit(scr, machine_menu.E0_Acceleration, PARA_UI_POS_X, PARA_UI_POS_Y * 3, event_handler, ID_ACCE_E0, 2, public_buf_l);
136 136
 
137
-    sprintf_P(public_buf_l, PSTR("%d"), (int)planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(1)]);
137
+    itoa(planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(1)], public_buf_l, 10);
138 138
     lv_screen_menu_item_1_edit(scr, machine_menu.E1_Acceleration, PARA_UI_POS_X, PARA_UI_POS_Y * 4, event_handler, ID_ACCE_E1, 3, public_buf_l);
139 139
 
140 140
     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_ACCE_UP, true);

+ 5
- 5
Marlin/src/lcd/extui/lib/mks_ui/draw_filament_settings.cpp View File

@@ -92,22 +92,22 @@ void lv_draw_filament_settings() {
92 92
   scr = lv_screen_create(FILAMENT_SETTINGS_UI, machine_menu.FilamentConfTitle);
93 93
 
94 94
   if (!uiCfg.para_ui_page) {
95
-    sprintf_P(public_buf_l, PSTR("%d"), gCfgItems.filamentchange_load_length);
95
+    itoa(gCfgItems.filamentchange_load_length, public_buf_l, 10);
96 96
     lv_screen_menu_item_1_edit(scr, machine_menu.InLength, PARA_UI_POS_X, PARA_UI_POS_Y, event_handler, ID_FILAMENT_SET_IN_LENGTH, 0, public_buf_l);
97 97
 
98
-    sprintf_P(public_buf_l, PSTR("%d"), gCfgItems.filamentchange_load_speed);
98
+    itoa(gCfgItems.filamentchange_load_speed, public_buf_l, 10);
99 99
     lv_screen_menu_item_1_edit(scr, machine_menu.InSpeed, PARA_UI_POS_X, PARA_UI_POS_Y * 2, event_handler, ID_FILAMENT_SET_IN_SPEED, 1, public_buf_l);
100 100
 
101
-    sprintf_P(public_buf_l, PSTR("%d"), gCfgItems.filamentchange_unload_length);
101
+    itoa(gCfgItems.filamentchange_unload_length, public_buf_l, 10);
102 102
     lv_screen_menu_item_1_edit(scr, machine_menu.OutLength, PARA_UI_POS_X, PARA_UI_POS_Y * 3, event_handler, ID_FILAMENT_SET_OUT_LENGTH, 2, public_buf_l);
103 103
 
104
-    sprintf_P(public_buf_l, PSTR("%d"), gCfgItems.filamentchange_unload_speed);
104
+    itoa(gCfgItems.filamentchange_unload_speed, public_buf_l, 10);
105 105
     lv_screen_menu_item_1_edit(scr, machine_menu.OutSpeed, PARA_UI_POS_X, PARA_UI_POS_Y * 4, event_handler, ID_FILAMENT_SET_OUT_SPEED, 3, public_buf_l);
106 106
 
107 107
     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_FILAMENT_SET_DOWN, true);
108 108
   }
109 109
   else {
110
-    sprintf_P(public_buf_l, PSTR("%d"), gCfgItems.filament_limit_temp);
110
+    itoa(gCfgItems.filament_limit_temp, public_buf_l, 10);
111 111
     lv_screen_menu_item_1_edit(scr, machine_menu.FilamentTemperature, PARA_UI_POS_X, PARA_UI_POS_Y, event_handler, ID_FILAMENT_SET_TEMP, 0, public_buf_l);
112 112
 
113 113
     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_FILAMENT_SET_UP, true);

+ 4
- 4
Marlin/src/lcd/extui/lib/mks_ui/draw_homing_sensitivity_settings.cpp View File

@@ -77,17 +77,17 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
77 77
 void lv_draw_homing_sensitivity_settings() {
78 78
   scr = lv_screen_create(HOMING_SENSITIVITY_UI, machine_menu.HomingSensitivityConfTitle);
79 79
 
80
-  sprintf_P(public_buf_l, PSTR("%d"), TERN(X_SENSORLESS, stepperX.homing_threshold(), 0));
80
+  itoa(TERN(X_SENSORLESS, stepperX.homing_threshold(), 0), public_buf_l, 10);
81 81
   lv_screen_menu_item_1_edit(scr, machine_menu.X_Sensitivity, PARA_UI_POS_X, PARA_UI_POS_Y, event_handler, ID_SENSITIVITY_X, 0, public_buf_l);
82 82
 
83
-  sprintf_P(public_buf_l, PSTR("%d"), TERN(Y_SENSORLESS, stepperY.homing_threshold(), 0));
83
+  itoa(TERN(Y_SENSORLESS, stepperY.homing_threshold(), 0), public_buf_l, 10);
84 84
   lv_screen_menu_item_1_edit(scr, machine_menu.Y_Sensitivity, PARA_UI_POS_X, PARA_UI_POS_Y * 2, event_handler, ID_SENSITIVITY_Y, 1, public_buf_l);
85 85
 
86
-  sprintf_P(public_buf_l, PSTR("%d"), TERN(Z_SENSORLESS, stepperZ.homing_threshold(), 0));
86
+  itoa(TERN(Z_SENSORLESS, stepperZ.homing_threshold(), 0), public_buf_l, 10);
87 87
   lv_screen_menu_item_1_edit(scr, machine_menu.Z_Sensitivity, PARA_UI_POS_X, PARA_UI_POS_Y * 3, event_handler, ID_SENSITIVITY_Z, 2, public_buf_l);
88 88
 
89 89
   #if Z2_SENSORLESS
90
-    sprintf_P(public_buf_l, PSTR("%d"), TERN(Z2_SENSORLESS, stepperZ2.homing_threshold(), 0));
90
+    itoa(TERN(Z2_SENSORLESS, stepperZ2.homing_threshold(), 0), public_buf_l, 10);
91 91
     lv_screen_menu_item_1_edit(scr, machine_menu.Z2_Sensitivity, PARA_UI_POS_X, PARA_UI_POS_Y * 4, event_handler, ID_SENSITIVITY_Z2, 3, public_buf_l);
92 92
   #endif
93 93
 

+ 3
- 3
Marlin/src/lcd/extui/lib/mks_ui/draw_ready_print.cpp View File

@@ -216,7 +216,7 @@ void lv_draw_ready_print() {
216 216
 
217 217
     labelFan = lv_label_create(scr, 380, 80, nullptr);
218 218
 
219
-    sprintf_P(buf, PSTR("%d"), (int)thermalManager.degHotend(0));
219
+    itoa(thermalManager.degHotend(0), buf, 10);
220 220
     lv_label_set_text(labelExt1, buf);
221 221
     lv_obj_align(labelExt1, buttonExt1, LV_ALIGN_CENTER, 0, LABEL_MOD_Y);
222 222
     sprintf_P(buf, PSTR("-> %d"), (int)thermalManager.degTargetHotend(0));
@@ -224,7 +224,7 @@ void lv_draw_ready_print() {
224 224
     lv_obj_align(labelExt1Target, buttonExt1, LV_ALIGN_CENTER, 0, TARGET_LABEL_MOD_Y);
225 225
 
226 226
     #if HAS_MULTI_EXTRUDER
227
-      sprintf_P(buf, PSTR("%d"), (int)thermalManager.degHotend(1));
227
+      itoa(thermalManager.degHotend(1), buf, 10);
228 228
       lv_label_set_text(labelExt2, buf);
229 229
       lv_obj_align(labelExt2, buttonExt2, LV_ALIGN_CENTER, 0, LABEL_MOD_Y);
230 230
       sprintf_P(buf, PSTR("-> %d"), (int)thermalManager.degTargetHotend(1));
@@ -233,7 +233,7 @@ void lv_draw_ready_print() {
233 233
     #endif
234 234
 
235 235
     #if HAS_HEATED_BED
236
-      sprintf_P(buf, PSTR("%d"), (int)thermalManager.degBed());
236
+      itoa(thermalManager.degBed(), buf, 10);
237 237
       lv_label_set_text(labelBed, buf);
238 238
       lv_obj_align(labelBed, buttonBedstate, LV_ALIGN_CENTER, 0, LABEL_MOD_Y);
239 239
       sprintf_P(buf, PSTR("-> %d"), (int)thermalManager.degTargetBed());

+ 10
- 10
Marlin/src/lcd/extui/lib/mks_ui/draw_tramming_pos_settings.cpp View File

@@ -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);
111
-    sprintf_P(buf2, PSTR("%d"), gCfgItems.trammingPos[0].y);
110
+    itoa(gCfgItems.trammingPos[0].x, public_buf_l, 10);
111
+    itoa(gCfgItems.trammingPos[0].y, buf2, 10);
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);
115
-    sprintf_P(buf2, PSTR("%d"), gCfgItems.trammingPos[1].y);
114
+    itoa(gCfgItems.trammingPos[1].x, public_buf_l, 10);
115
+    itoa(gCfgItems.trammingPos[1].y, buf2, 10);
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);
119
-    sprintf_P(buf2, PSTR("%d"), gCfgItems.trammingPos[2].y);
118
+    itoa(gCfgItems.trammingPos[2].x, public_buf_l, 10);
119
+    itoa(gCfgItems.trammingPos[2].y, buf2, 10);
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);
123
-    sprintf_P(buf2, PSTR("%d"), gCfgItems.trammingPos[3].y);
122
+    itoa(gCfgItems.trammingPos[3].x, public_buf_l, 10);
123
+    itoa(gCfgItems.trammingPos[3].y, buf2, 10);
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);
130
-    sprintf_P(buf2, PSTR("%d"), gCfgItems.trammingPos[4].y);
129
+    itoa(gCfgItems.trammingPos[4].x, public_buf_l, 10);
130
+    itoa(gCfgItems.trammingPos[4].y, buf2, 10);
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);

Loading…
Cancel
Save