Selaa lähdekoodia

Fix LVGL_UI G-code preview (#20564)

Victor Oliveira 4 vuotta sitten
vanhempi
commit
9eaa69874a
No account linked to committer's email address

+ 5
- 4
Marlin/src/lcd/extui/lib/mks_ui/draw_print_file.cpp Näytä tiedosto

298
           strcat(test_public_buf_l, list_file.file_name[i]);
298
           strcat(test_public_buf_l, list_file.file_name[i]);
299
           char *temp = strstr(test_public_buf_l, ".GCO");
299
           char *temp = strstr(test_public_buf_l, ".GCO");
300
           if (temp) strcpy(temp, ".bin");
300
           if (temp) strcpy(temp, ".bin");
301
-          lv_obj_set_event_cb_mks(buttonGcode[i], event_handler, (i + 1), "", 0);
302
-          lv_imgbtn_set_src_both(buttonGcode[i], test_public_buf_l);
301
+          lv_obj_set_event_cb_mks(buttonGcode[i], event_handler, (i + 1), test_public_buf_l, 0);
302
+          lv_imgbtn_set_src_both(buttonGcode[i], buttonGcode[i]->mks_pic_name);
303
           if (i < 3) {
303
           if (i < 3) {
304
             lv_obj_set_pos(buttonGcode[i], BTN_X_PIXEL * i + INTERVAL_V * (i + 1) + FILE_PRE_PIC_X_OFFSET, titleHeight + FILE_PRE_PIC_Y_OFFSET);
304
             lv_obj_set_pos(buttonGcode[i], BTN_X_PIXEL * i + INTERVAL_V * (i + 1) + FILE_PRE_PIC_X_OFFSET, titleHeight + FILE_PRE_PIC_Y_OFFSET);
305
             buttonText[i] = lv_btn_create(scr, nullptr);
305
             buttonText[i] = lv_btn_create(scr, nullptr);
358
 uint32_t lv_open_gcode_file(char *path) {
358
 uint32_t lv_open_gcode_file(char *path) {
359
   #if ENABLED(SDSUPPORT)
359
   #if ENABLED(SDSUPPORT)
360
     uint32_t *ps4;
360
     uint32_t *ps4;
361
-    uint32_t pre_sread_cnt = 0;
361
+    uint32_t pre_sread_cnt = UINT32_MAX;
362
     char *cur_name;
362
     char *cur_name;
363
 
363
 
364
     cur_name = strrchr(path, '/');
364
     cur_name = strrchr(path, '/');
399
     char temp_test[200];
399
     char temp_test[200];
400
     volatile uint16_t *p_index;
400
     volatile uint16_t *p_index;
401
 
401
 
402
+    watchdog_refresh();
402
     memset(public_buf, 0, 200);
403
     memset(public_buf, 0, 200);
403
 
404
 
404
     while (card.isFileOpen()) {
405
     while (card.isFileOpen()) {
418
       uint16_t c = card.get();
419
       uint16_t c = card.get();
419
       // check if we have more data or finished the line (CR)
420
       // check if we have more data or finished the line (CR)
420
       if (c == '\r') break;
421
       if (c == '\r') break;
421
-      card.setIndex(card.getIndex());
422
+      card.setIndex(card.getIndex() - 1);
422
       k++;
423
       k++;
423
       j = 0;
424
       j = 0;
424
       ignore_start = false;
425
       ignore_start = false;

+ 1
- 1
Marlin/src/lcd/extui/lib/mks_ui/tft_lvgl_configuration.cpp Näytä tiedosto

380
   if (temp) strcpy(temp, ".GCO");
380
   if (temp) strcpy(temp, ".GCO");
381
   sd_read_base_addr = lv_open_gcode_file((char *)name_buf);
381
   sd_read_base_addr = lv_open_gcode_file((char *)name_buf);
382
   sd_read_addr_offset = sd_read_base_addr;
382
   sd_read_addr_offset = sd_read_base_addr;
383
-  if (sd_read_addr_offset == 0) return LV_FS_RES_NOT_EX;
383
+  if (sd_read_addr_offset == UINT32_MAX) return LV_FS_RES_NOT_EX;
384
   return LV_FS_RES_OK;
384
   return LV_FS_RES_OK;
385
 }
385
 }
386
 
386
 

Loading…
Peruuta
Tallenna