소스 검색

Fix LVGL_UI G-code preview (#20564)

Victor Oliveira 4 년 전
부모
커밋
9eaa69874a
No account linked to committer's email address
2개의 변경된 파일6개의 추가작업 그리고 5개의 파일을 삭제
  1. 5
    4
      Marlin/src/lcd/extui/lib/mks_ui/draw_print_file.cpp
  2. 1
    1
      Marlin/src/lcd/extui/lib/mks_ui/tft_lvgl_configuration.cpp

+ 5
- 4
Marlin/src/lcd/extui/lib/mks_ui/draw_print_file.cpp 파일 보기

@@ -298,8 +298,8 @@ void disp_gcode_icon(uint8_t file_num) {
298 298
           strcat(test_public_buf_l, list_file.file_name[i]);
299 299
           char *temp = strstr(test_public_buf_l, ".GCO");
300 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 303
           if (i < 3) {
304 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 305
             buttonText[i] = lv_btn_create(scr, nullptr);
@@ -358,7 +358,7 @@ void disp_gcode_icon(uint8_t file_num) {
358 358
 uint32_t lv_open_gcode_file(char *path) {
359 359
   #if ENABLED(SDSUPPORT)
360 360
     uint32_t *ps4;
361
-    uint32_t pre_sread_cnt = 0;
361
+    uint32_t pre_sread_cnt = UINT32_MAX;
362 362
     char *cur_name;
363 363
 
364 364
     cur_name = strrchr(path, '/');
@@ -399,6 +399,7 @@ void lv_gcode_file_read(uint8_t *data_buf) {
399 399
     char temp_test[200];
400 400
     volatile uint16_t *p_index;
401 401
 
402
+    watchdog_refresh();
402 403
     memset(public_buf, 0, 200);
403 404
 
404 405
     while (card.isFileOpen()) {
@@ -418,7 +419,7 @@ void lv_gcode_file_read(uint8_t *data_buf) {
418 419
       uint16_t c = card.get();
419 420
       // check if we have more data or finished the line (CR)
420 421
       if (c == '\r') break;
421
-      card.setIndex(card.getIndex());
422
+      card.setIndex(card.getIndex() - 1);
422 423
       k++;
423 424
       j = 0;
424 425
       ignore_start = false;

+ 1
- 1
Marlin/src/lcd/extui/lib/mks_ui/tft_lvgl_configuration.cpp 파일 보기

@@ -380,7 +380,7 @@ lv_fs_res_t sd_open_cb (lv_fs_drv_t * drv, void * file_p, const char * path, lv_
380 380
   if (temp) strcpy(temp, ".GCO");
381 381
   sd_read_base_addr = lv_open_gcode_file((char *)name_buf);
382 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 384
   return LV_FS_RES_OK;
385 385
 }
386 386
 

Loading…
취소
저장