Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

LVGL G-Code preview, compatibility with old versions of MKS Wifi Cura Plugin #20589

Merged
merged 2 commits into from
Dec 29, 2020
Merged

LVGL G-Code preview, compatibility with old versions of MKS Wifi Cura Plugin #20589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cfe768c
compatibility with old versions of MKS Wifi Cura Plugin
rhapsodyv Dec 28, 2020
3400d8b
Move ISEOL
thinkyhead Dec 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Marlin/src/core/macros.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,7 @@
#define ANY_BUTTON(V...) DO(BTNEX,||,V)

#define WITHIN(N,L,H) ((N) >= (L) && (N) <= (H))
#define ISEOL(C) ((C) == '\n' || (C) == '\r')
#define NUMERIC(a) WITHIN(a, '0', '9')
#define DECIMAL(a) (NUMERIC(a) || a == '.')
#define HEXCHR(a) (NUMERIC(a) ? (a) - '0' : WITHIN(a, 'a', 'f') ? ((a) - 'a' + 10) : WITHIN(a, 'A', 'F') ? ((a) - 'A' + 10) : -1)
Expand Down
1 change: 0 additions & 1 deletion Marlin/src/feature/e_parser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ class EmergencyParser {
FORCE_INLINE static void disable() { enabled = false; }

FORCE_INLINE static void update(State &state, const uint8_t c) {
#define ISEOL(C) ((C) == '\n' || (C) == '\r')
switch (state) {
case EP_RESET:
switch (c) {
Expand Down
2 changes: 0 additions & 2 deletions Marlin/src/gcode/queue.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,6 @@ bool GCodeQueue::_enqueue(const char* cmd, bool say_ok/*=false*/
return true;
}

#define ISEOL(C) ((C) == '\n' || (C) == '\r')

/**
* Enqueue with Serial Echo
* Return true if the command was consumed
Expand Down
12 changes: 10 additions & 2 deletions Marlin/src/lcd/extui/lib/mks_ui/draw_print_file.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,12 +417,20 @@ void lv_gcode_file_read(uint8_t *data_buf) {
}

uint16_t c = card.get();
// check if we have more data or finished the line (CR)
if (c == '\r') break;
// check for more data or end of line (CR or LF)
if (ISEOL(c)) {
c = card.get(); // more eol?
if (!ISEOL(c)) card.setIndex(card.getIndex() - 1);
break;
}
card.setIndex(card.getIndex() - 1);
k++;
j = 0;
ignore_start = false;
if (k > 1) {
card.closefile();
break;
}
}
#if HAS_TFT_LVGL_UI_SPI
for (i = 0; i < 200;) {
Expand Down
12 changes: 9 additions & 3 deletions Marlin/src/lcd/extui/lib/mks_ui/tft_lvgl_configuration.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,8 +369,9 @@ lv_fs_res_t spi_flash_tell_cb(lv_fs_drv_t * drv, void * file_p, uint32_t * pos_p
}

//sd
extern uint8_t public_buf[512];
char *cur_namefff;
uint32_t sd_read_base_addr = 0,sd_read_addr_offset = 0;
uint32_t sd_read_base_addr = 0, sd_read_addr_offset = 0, small_image_size = 409;
lv_fs_res_t sd_open_cb (lv_fs_drv_t * drv, void * file_p, const char * path, lv_fs_mode_t mode) {
//cur_namefff = strrchr(path, '/');
char name_buf[100];
Expand All @@ -381,6 +382,11 @@ lv_fs_res_t sd_open_cb (lv_fs_drv_t * drv, void * file_p, const char * path, lv_
sd_read_base_addr = lv_open_gcode_file((char *)name_buf);
sd_read_addr_offset = sd_read_base_addr;
if (sd_read_addr_offset == UINT32_MAX) return LV_FS_RES_NOT_EX;
// find small image size
card.read(public_buf, 512);
public_buf[511] = '\0';
char* eol = strpbrk((const char*)public_buf, "\n\r");
small_image_size = (uintptr_t)eol - (uintptr_t)((uint32_t *)(&public_buf[0])) + 1;
return LV_FS_RES_OK;
}

Expand All @@ -406,14 +412,14 @@ lv_fs_res_t sd_read_cb (lv_fs_drv_t * drv, void * file_p, void * buf, uint32_t b
}

lv_fs_res_t sd_seek_cb(lv_fs_drv_t * drv, void * file_p, uint32_t pos) {
sd_read_addr_offset = sd_read_base_addr + (pos - 4) / 200 * 409;
sd_read_addr_offset = sd_read_base_addr + (pos - 4) / 200 * small_image_size;
lv_gcode_file_seek(sd_read_addr_offset);
return LV_FS_RES_OK;
}

lv_fs_res_t sd_tell_cb(lv_fs_drv_t * drv, void * file_p, uint32_t * pos_p) {
if (sd_read_addr_offset) *pos_p = 0;
else *pos_p = (sd_read_addr_offset - sd_read_base_addr) / 409 * 200 + 4;
else *pos_p = (sd_read_addr_offset - sd_read_base_addr) / small_image_size * 200 + 4;
return LV_FS_RES_OK;
}

Expand Down