bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Cleanup before MKS changes

Browse Source
This commit is contained in:
Scott Lahteine 2020-09-20 19:07:59 -05:00
parent 76d8d1742c
commit 60ab7a1ddb
66 changed files with 294 additions and 318 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Marlin/src/HAL/DUE/usb/compiler.h
View File

@ -1112,8 +1112,7 @@ static inline uint32_t convert_byte_array_to_32_bit(uint8_t *data)
uint8_t u8[8]; uint8_t u8[8];
}long_addr; }long_addr;
uint8_t index; uint8_t index;
for (index = 0; index < 4; index++) for (index = 0; index < 4; index++) {
{
long_addr.u8[index] = *data++; long_addr.u8[index] = *data++;
} }
return long_addr.u32; return long_addr.u32;

6
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp
View File

@ -395,9 +395,8 @@ bool UIFlashStorage::is_present = false;
uint32_t UIFlashStorage::get_media_file_start(uint8_t slot) { uint32_t UIFlashStorage::get_media_file_start(uint8_t slot) {
uint32_t addr = media_storage_addr + sizeof(uint32_t) * media_storage_slots; uint32_t addr = media_storage_addr + sizeof(uint32_t) * media_storage_slots;
spi_read_begin(media_storage_addr); spi_read_begin(media_storage_addr);
for(uint8_t i = 0; i < slot; i++) { for (uint8_t i = 0; i < slot; i++)
addr += spi_read_32(); addr += spi_read_32();
}
spi_read_end(); spi_read_end();
return addr; return addr;
} }
@ -450,8 +449,7 @@ bool UIFlashStorage::is_present = false;
} }
addr = write(addr, buff, nBytes); addr = write(addr, buff, nBytes);
if (nBytes != write_page_size) if (nBytes != write_page_size) break;
break;
TERN_(EXTENSIBLE_UI, ExtUI::yield()); TERN_(EXTENSIBLE_UI, ExtUI::yield());
} }

3
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.cpp
View File

@ -69,10 +69,9 @@ using namespace FTDI;
void DLCache::init() { void DLCache::init() {
CLCD::mem_write_32(DL_FREE_ADDR, DL_FREE_ADDR + 4); CLCD::mem_write_32(DL_FREE_ADDR, DL_FREE_ADDR + 4);
for(uint8_t slot = 0; slot < DL_CACHE_SLOTS; slot++) { for (uint8_t slot = 0; slot < DL_CACHE_SLOTS; slot++)
save_slot(slot, 0, 0, 0); save_slot(slot, 0, 0, 0);
} }
}
bool DLCache::has_data() { bool DLCache::has_data() {
return dl_slot_size != 0; return dl_slot_size != 0;

3
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.cpp
View File

@ -50,10 +50,9 @@ void ScreenRef::setScreen(onRedraw_func_t onRedraw_ptr) {
} }
void ScreenRef::initializeAll() { void ScreenRef::initializeAll() {
for(uint8_t type = 0; type < functionTableSize; type++) { for (uint8_t type = 0; type < functionTableSize; type++)
GET_METHOD(type, onStartup)(); GET_METHOD(type, onStartup)();
} }
}
/********************** SCREEN STACK ******************************/ /********************** SCREEN STACK ******************************/

13
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/status_screen.cpp
View File

@ -176,11 +176,7 @@ void StatusScreen::draw_temperature(draw_mode_t what) {
char bed_str[20]; char bed_str[20];
char fan_str[20]; char fan_str[20];
sprintf_P( sprintf_P(fan_str, PSTR("%-3d %%"), int8_t(getActualFan_percent(FAN0)));
fan_str,
PSTR("%-3d %%"),
int8_t(getActualFan_percent(FAN0))
);
if (isHeaterIdle(BED)) if (isHeaterIdle(BED))
format_temp_and_idle(bed_str, getActualTemp_celsius(BED)); format_temp_and_idle(bed_str, getActualTemp_celsius(BED));
@ -193,16 +189,13 @@ void StatusScreen::draw_temperature(draw_mode_t what) {
format_temp_and_temp(e0_str, getActualTemp_celsius(H0), getTargetTemp_celsius(H0)); format_temp_and_temp(e0_str, getActualTemp_celsius(H0), getTargetTemp_celsius(H0));
#if EXTRUDERS == 2 #if HAS_MULTI_EXTRUDER
if (isHeaterIdle(H1)) if (isHeaterIdle(H1))
format_temp_and_idle(e1_str, getActualTemp_celsius(H1)); format_temp_and_idle(e1_str, getActualTemp_celsius(H1));
else else
format_temp_and_temp(e1_str, getActualTemp_celsius(H1), getTargetTemp_celsius(H1)); format_temp_and_temp(e1_str, getActualTemp_celsius(H1), getTargetTemp_celsius(H1));
#else #else
strcpy_P( strcpy_P(e1_str, PSTR("-"));
e1_str,
PSTR("-")
);
#endif #endif
cmd.tag(5) cmd.tag(5)

4
Marlin/src/lcd/extui/lib/mks_ui/draw_about.cpp
View File

@ -75,7 +75,7 @@ void lv_draw_about(void) {
LV_IMG_DECLARE(bmp_pic); LV_IMG_DECLARE(bmp_pic);
/*Create an Image button*/ // Create an Image button
buttonBack = lv_imgbtn_create(scr, NULL); buttonBack = lv_imgbtn_create(scr, NULL);
#if 1 #if 1
@ -88,8 +88,8 @@ void lv_draw_about(void) {
lv_obj_set_pos(buttonBack, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight); lv_obj_set_pos(buttonBack, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
lv_btn_set_layout(buttonBack, LV_LAYOUT_OFF); lv_btn_set_layout(buttonBack, LV_LAYOUT_OFF);
/*Create a label on the Image button*/
// Create a label on the image button
label_Back = lv_label_create(buttonBack, NULL); label_Back = lv_label_create(buttonBack, NULL);
if (gCfgItems.multiple_language != 0) { if (gCfgItems.multiple_language != 0) {

10
Marlin/src/lcd/extui/lib/mks_ui/draw_change_speed.cpp
View File

@ -73,7 +73,7 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) {
#if HAS_MULTI_EXTRUDER #if HAS_MULTI_EXTRUDER
planner.flow_percentage[1] = planner.flow_percentage[0]; planner.flow_percentage[1] = planner.flow_percentage[0];
planner.refresh_e_factor(1); planner.refresh_e_factor(1);
} #endif
} }
disp_print_speed(); disp_print_speed();
} }
@ -98,10 +98,10 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) {
//planner.flow_percentage[1] = planner.flow_percentage[0]; //planner.flow_percentage[1] = planner.flow_percentage[0];
//planner.e_factor[1]= planner.flow_percentage[1] * 0.01; //planner.e_factor[1]= planner.flow_percentage[1] * 0.01;
planner.refresh_e_factor(0); planner.refresh_e_factor(0);
if (EXTRUDERS == 2) { #if HAS_MULTI_EXTRUDER
planner.flow_percentage[1] = planner.flow_percentage[0]; planner.flow_percentage[1] = planner.flow_percentage[0];
planner.refresh_e_factor(1); planner.refresh_e_factor(1);
} #endif
} }
disp_print_speed(); disp_print_speed();
} }
@ -177,7 +177,7 @@ void lv_draw_change_speed(void) {
LV_IMG_DECLARE(bmp_pic); LV_IMG_DECLARE(bmp_pic);
/*Create an Image button*/ // Create an Image button
buttonAdd = lv_imgbtn_create(scr, NULL); buttonAdd = lv_imgbtn_create(scr, NULL);
buttonDec = lv_imgbtn_create(scr, NULL); buttonDec = lv_imgbtn_create(scr, NULL);
buttonMov = lv_imgbtn_create(scr, NULL); buttonMov = lv_imgbtn_create(scr, NULL);
@ -228,7 +228,7 @@ void lv_draw_change_speed(void) {
lv_obj_set_pos(buttonStep, BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight); lv_obj_set_pos(buttonStep, BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
lv_obj_set_pos(buttonBack, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight); lv_obj_set_pos(buttonBack, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
/*Create a label on the Image button*/ // Create labels on the image buttons
lv_btn_set_layout(buttonAdd, LV_LAYOUT_OFF); lv_btn_set_layout(buttonAdd, LV_LAYOUT_OFF);
lv_btn_set_layout(buttonDec, LV_LAYOUT_OFF); lv_btn_set_layout(buttonDec, LV_LAYOUT_OFF);
lv_btn_set_layout(buttonMov, LV_LAYOUT_OFF); lv_btn_set_layout(buttonMov, LV_LAYOUT_OFF);

9
Marlin/src/lcd/extui/lib/mks_ui/draw_extrusion.cpp
View File

@ -100,9 +100,9 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) {
queue.inject_P(PSTR("T0")); queue.inject_P(PSTR("T0"));
} }
} }
else { else
uiCfg.curSprayerChoose = 0; uiCfg.curSprayerChoose = 0;
}
extructAmount = 0; extructAmount = 0;
disp_hotend_temp(); disp_hotend_temp();
disp_ext_type(); disp_ext_type();
@ -149,7 +149,6 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) {
} }
} }
void lv_draw_extrusion(void) { void lv_draw_extrusion(void) {
lv_obj_t *buttonAdd, *buttonDec, *buttonBack; lv_obj_t *buttonAdd, *buttonDec, *buttonBack;
@ -174,7 +173,7 @@ void lv_draw_extrusion(void) {
LV_IMG_DECLARE(bmp_pic); LV_IMG_DECLARE(bmp_pic);
/*Create an Image button*/ // Create image buttons
buttonAdd = lv_imgbtn_create(scr, NULL); buttonAdd = lv_imgbtn_create(scr, NULL);
buttonDec = lv_imgbtn_create(scr, NULL); buttonDec = lv_imgbtn_create(scr, NULL);
buttoType = lv_imgbtn_create(scr, NULL); buttoType = lv_imgbtn_create(scr, NULL);
@ -224,7 +223,7 @@ void lv_draw_extrusion(void) {
lv_obj_set_pos(buttonSpeed, BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight); lv_obj_set_pos(buttonSpeed, BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
lv_obj_set_pos(buttonBack, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight); lv_obj_set_pos(buttonBack, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
/*Create a label on the Image button*/ // Create labels on the image buttons
lv_btn_set_layout(buttonAdd, LV_LAYOUT_OFF); lv_btn_set_layout(buttonAdd, LV_LAYOUT_OFF);
lv_btn_set_layout(buttonDec, LV_LAYOUT_OFF); lv_btn_set_layout(buttonDec, LV_LAYOUT_OFF);
lv_btn_set_layout(buttoType, LV_LAYOUT_OFF); lv_btn_set_layout(buttoType, LV_LAYOUT_OFF);

7
Marlin/src/lcd/extui/lib/mks_ui/draw_fan.cpp
View File

@ -140,7 +140,7 @@ void lv_draw_fan(void) {
LV_IMG_DECLARE(bmp_pic); LV_IMG_DECLARE(bmp_pic);
/*Create an Image button*/ // Create an Image button
buttonAdd = lv_imgbtn_create(scr, NULL); buttonAdd = lv_imgbtn_create(scr, NULL);
buttonDec = lv_imgbtn_create(scr, NULL); buttonDec = lv_imgbtn_create(scr, NULL);
buttonHigh = lv_imgbtn_create(scr, NULL); buttonHigh = lv_imgbtn_create(scr, NULL);
@ -154,6 +154,7 @@ void lv_draw_fan(void) {
lv_imgbtn_set_style(buttonAdd, LV_BTN_STATE_PR, &tft_style_label_pre); lv_imgbtn_set_style(buttonAdd, LV_BTN_STATE_PR, &tft_style_label_pre);
lv_imgbtn_set_style(buttonAdd, LV_BTN_STATE_REL, &tft_style_label_rel); lv_imgbtn_set_style(buttonAdd, LV_BTN_STATE_REL, &tft_style_label_rel);
lv_obj_clear_protect(buttonAdd, LV_PROTECT_FOLLOW); lv_obj_clear_protect(buttonAdd, LV_PROTECT_FOLLOW);
#if 1 #if 1
lv_obj_set_event_cb_mks(buttonDec, event_handler, ID_F_DEC, "bmp_Dec.bin", 0); lv_obj_set_event_cb_mks(buttonDec, event_handler, ID_F_DEC, "bmp_Dec.bin", 0);
lv_imgbtn_set_src(buttonDec, LV_BTN_STATE_REL, &bmp_pic); lv_imgbtn_set_src(buttonDec, LV_BTN_STATE_REL, &bmp_pic);
@ -184,6 +185,7 @@ void lv_draw_fan(void) {
lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_PR, &bmp_pic); lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_PR, &bmp_pic);
lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_PR, &tft_style_label_pre); lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_PR, &tft_style_label_pre);
lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_REL, &tft_style_label_rel); lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_REL, &tft_style_label_rel);
#endif #endif
lv_obj_set_pos(buttonAdd, INTERVAL_V, titleHeight); lv_obj_set_pos(buttonAdd, INTERVAL_V, titleHeight);
@ -193,7 +195,7 @@ void lv_draw_fan(void) {
lv_obj_set_pos(buttonOff, BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight); lv_obj_set_pos(buttonOff, BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
lv_obj_set_pos(buttonBack, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight); lv_obj_set_pos(buttonBack, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
/*Create a label on the Image button*/ // Create labels on the image buttons
lv_btn_set_layout(buttonAdd, LV_LAYOUT_OFF); lv_btn_set_layout(buttonAdd, LV_LAYOUT_OFF);
lv_btn_set_layout(buttonDec, LV_LAYOUT_OFF); lv_btn_set_layout(buttonDec, LV_LAYOUT_OFF);
lv_btn_set_layout(buttonHigh, LV_LAYOUT_OFF); lv_btn_set_layout(buttonHigh, LV_LAYOUT_OFF);
@ -208,7 +210,6 @@ void lv_draw_fan(void) {
lv_obj_t *labelOff = lv_label_create(buttonOff, NULL); lv_obj_t *labelOff = lv_label_create(buttonOff, NULL);
lv_obj_t *label_Back = lv_label_create(buttonBack, NULL); lv_obj_t *label_Back = lv_label_create(buttonBack, NULL);
if (gCfgItems.multiple_language != 0) { if (gCfgItems.multiple_language != 0) {
lv_label_set_text(labelAdd, fan_menu.add); lv_label_set_text(labelAdd, fan_menu.add);
lv_obj_align(labelAdd, buttonAdd, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET); lv_obj_align(labelAdd, buttonAdd, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);

1
Marlin/src/lcd/extui/lib/mks_ui/draw_home.cpp
View File

@ -96,7 +96,6 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) {
lv_draw_tool(); lv_draw_tool();
} }
break; break;
} }
} }

5
Marlin/src/lcd/extui/lib/mks_ui/draw_language.cpp
View File

@ -246,7 +246,7 @@ void lv_draw_language(void) {
LV_IMG_DECLARE(bmp_pic); LV_IMG_DECLARE(bmp_pic);
/*Create an Image button*/ // Create image buttons
buttonCN = lv_imgbtn_create(scr, NULL); buttonCN = lv_imgbtn_create(scr, NULL);
buttonT_CN = lv_imgbtn_create(scr, NULL); buttonT_CN = lv_imgbtn_create(scr, NULL);
buttonEN = lv_imgbtn_create(scr, NULL); buttonEN = lv_imgbtn_create(scr, NULL);
@ -304,6 +304,7 @@ void lv_draw_language(void) {
lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_PR, &bmp_pic); lv_imgbtn_set_src(buttonBack, LV_BTN_STATE_PR, &bmp_pic);
lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_PR, &tft_style_label_pre); lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_PR, &tft_style_label_pre);
lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_REL, &tft_style_label_rel); lv_imgbtn_set_style(buttonBack, LV_BTN_STATE_REL, &tft_style_label_rel);
#endif // if 1 #endif // if 1
lv_obj_set_pos(buttonCN, INTERVAL_V, titleHeight); lv_obj_set_pos(buttonCN, INTERVAL_V, titleHeight);
@ -315,7 +316,7 @@ void lv_draw_language(void) {
lv_obj_set_pos(buttonIT, BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight); lv_obj_set_pos(buttonIT, BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
lv_obj_set_pos(buttonBack, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight); lv_obj_set_pos(buttonBack, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
/*Create a label on the Image button*/ // Create labels on the image buttons
lv_btn_set_layout(buttonCN, LV_LAYOUT_OFF); lv_btn_set_layout(buttonCN, LV_LAYOUT_OFF);
lv_btn_set_layout(buttonT_CN, LV_LAYOUT_OFF); lv_btn_set_layout(buttonT_CN, LV_LAYOUT_OFF);
lv_btn_set_layout(buttonEN, LV_LAYOUT_OFF); lv_btn_set_layout(buttonEN, LV_LAYOUT_OFF);

4
Marlin/src/lcd/extui/lib/mks_ui/draw_manuaLevel.cpp
View File

@ -187,7 +187,7 @@ void lv_draw_manualLevel(void) {
LV_IMG_DECLARE(bmp_pic); LV_IMG_DECLARE(bmp_pic);
/*Create an Image button*/ // Create an Image button
buttonPoint1 = lv_imgbtn_create(scr, NULL); buttonPoint1 = lv_imgbtn_create(scr, NULL);
buttonPoint2 = lv_imgbtn_create(scr, NULL); buttonPoint2 = lv_imgbtn_create(scr, NULL);
buttonPoint3 = lv_imgbtn_create(scr, NULL); buttonPoint3 = lv_imgbtn_create(scr, NULL);
@ -240,7 +240,7 @@ void lv_draw_manualLevel(void) {
lv_obj_set_pos(buttonPoint5, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight); lv_obj_set_pos(buttonPoint5, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
lv_obj_set_pos(buttonBack, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight); lv_obj_set_pos(buttonBack, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
/*Create a label on the Image button*/ // Create labels on the image buttons
lv_btn_set_layout(buttonPoint1, LV_LAYOUT_OFF); lv_btn_set_layout(buttonPoint1, LV_LAYOUT_OFF);
lv_btn_set_layout(buttonPoint2, LV_LAYOUT_OFF); lv_btn_set_layout(buttonPoint2, LV_LAYOUT_OFF);
lv_btn_set_layout(buttonPoint3, LV_LAYOUT_OFF); lv_btn_set_layout(buttonPoint3, LV_LAYOUT_OFF);

4
Marlin/src/lcd/extui/lib/mks_ui/draw_move_motor.cpp
View File

@ -181,7 +181,7 @@ void lv_draw_move_motor(void) {
LV_IMG_DECLARE(bmp_pic); LV_IMG_DECLARE(bmp_pic);
/*Create an Image button*/ // Create an Image button
buttonXI = lv_imgbtn_create(scr, NULL); buttonXI = lv_imgbtn_create(scr, NULL);
buttonXD = lv_imgbtn_create(scr, NULL); buttonXD = lv_imgbtn_create(scr, NULL);
buttonYI = lv_imgbtn_create(scr, NULL); buttonYI = lv_imgbtn_create(scr, NULL);
@ -249,7 +249,7 @@ void lv_draw_move_motor(void) {
lv_obj_set_pos(buttonZD, BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight); lv_obj_set_pos(buttonZD, BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
lv_obj_set_pos(buttonBack, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight); lv_obj_set_pos(buttonBack, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
/*Create a label on the Image button*/ // Create labels on the image buttons
lv_btn_set_layout(buttonXI, LV_LAYOUT_OFF); lv_btn_set_layout(buttonXI, LV_LAYOUT_OFF);
lv_btn_set_layout(buttonXD, LV_LAYOUT_OFF); lv_btn_set_layout(buttonXD, LV_LAYOUT_OFF);
lv_btn_set_layout(buttonYI, LV_LAYOUT_OFF); lv_btn_set_layout(buttonYI, LV_LAYOUT_OFF);

15
Marlin/src/lcd/extui/lib/mks_ui/draw_number_key.cpp
View File

@ -34,8 +34,9 @@
#include "../../../../MarlinCore.h" #include "../../../../MarlinCore.h"
#include "../../../../module/temperature.h" #include "../../../../module/temperature.h"
#include "../../../../gcode/queue.h" #include "../../../../gcode/queue.h"
#if ENABLED(POWER_LOSS_RECOVERY) #if ENABLED(POWER_LOSS_RECOVERY)
#include "../../../../../feature/powerloss.h" #include "../../../../feature/powerloss.h"
#endif #endif
#include "../../../../gcode/gcode.h" #include "../../../../gcode/gcode.h"
@ -253,15 +254,12 @@ static void set_value_confirm() {
switch (value) { switch (value) {
case PrintAcceleration: case PrintAcceleration:
planner.settings.acceleration = atof(key_value); planner.settings.acceleration = atof(key_value);
break; break;
case RetractAcceleration: case RetractAcceleration:
planner.settings.retract_acceleration = atof(key_value); planner.settings.retract_acceleration = atof(key_value);
break; break;
case TravelAcceleration: case TravelAcceleration:
planner.settings.travel_acceleration = atof(key_value); planner.settings.travel_acceleration = atof(key_value);
break; break;
case XAcceleration: case XAcceleration:
planner.settings.max_acceleration_mm_per_s2[X_AXIS] = atof(key_value); planner.settings.max_acceleration_mm_per_s2[X_AXIS] = atof(key_value);
@ -293,7 +291,6 @@ static void set_value_confirm() {
case E1MaxFeedRate: case E1MaxFeedRate:
planner.settings.max_feedrate_mm_s[E_AXIS_N(1)] = atof(key_value); planner.settings.max_feedrate_mm_s[E_AXIS_N(1)] = atof(key_value);
break; break;
case XJerk: case XJerk:
#if HAS_CLASSIC_JERK #if HAS_CLASSIC_JERK
planner.max_jerk[X_AXIS] = atof(key_value); planner.max_jerk[X_AXIS] = atof(key_value);
@ -314,7 +311,6 @@ static void set_value_confirm() {
planner.max_jerk[E_AXIS] = atof(key_value); planner.max_jerk[E_AXIS] = atof(key_value);
#endif #endif
break; break;
case Xstep: case Xstep:
planner.settings.axis_steps_per_mm[X_AXIS] = atof(key_value); planner.settings.axis_steps_per_mm[X_AXIS] = atof(key_value);
break; break;
@ -330,43 +326,36 @@ static void set_value_confirm() {
case E1step: case E1step:
planner.settings.axis_steps_per_mm[E_AXIS_N(1)] = atof(key_value); planner.settings.axis_steps_per_mm[E_AXIS_N(1)] = atof(key_value);
break; break;
case Xcurrent: case Xcurrent:
#if AXIS_IS_TMC(X) #if AXIS_IS_TMC(X)
current_mA = atoi(key_value); current_mA = atoi(key_value);
stepperX.rms_current(current_mA); stepperX.rms_current(current_mA);
#endif #endif
break; break;
case Ycurrent: case Ycurrent:
#if AXIS_IS_TMC(Y) #if AXIS_IS_TMC(Y)
current_mA = atoi(key_value); current_mA = atoi(key_value);
stepperY.rms_current(current_mA); stepperY.rms_current(current_mA);
#endif #endif
break; break;
case Zcurrent: case Zcurrent:
#if AXIS_IS_TMC(Z) #if AXIS_IS_TMC(Z)
current_mA = atoi(key_value); current_mA = atoi(key_value);
stepperZ.rms_current(current_mA); stepperZ.rms_current(current_mA);
#endif #endif
break; break;
case E0current: case E0current:
#if AXIS_IS_TMC(E0) #if AXIS_IS_TMC(E0)
current_mA = atoi(key_value); current_mA = atoi(key_value);
stepperE0.rms_current(current_mA); stepperE0.rms_current(current_mA);
#endif #endif
break; break;
case E1current: case E1current:
#if AXIS_IS_TMC(E1) #if AXIS_IS_TMC(E1)
current_mA = atoi(key_value); current_mA = atoi(key_value);
stepperE1.rms_current(current_mA); stepperE1.rms_current(current_mA);
#endif #endif
break; break;
break;
case pause_pos_x: case pause_pos_x:
gCfgItems.pausePosX = atof(key_value); gCfgItems.pausePosX = atof(key_value);
update_spi_flash(); update_spi_flash();

5
Marlin/src/lcd/extui/lib/mks_ui/draw_preHeat.cpp
View File

@ -267,7 +267,7 @@ void lv_draw_preHeat(void) {
lv_obj_set_pos(buttonOff, BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight); lv_obj_set_pos(buttonOff, BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
lv_obj_set_pos(buttonBack, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight); lv_obj_set_pos(buttonBack, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
/*Create a label on the Image button*/ // Create labels on the image buttons
lv_btn_set_layout(buttonAdd, LV_LAYOUT_OFF); lv_btn_set_layout(buttonAdd, LV_LAYOUT_OFF);
lv_btn_set_layout(buttonDec, LV_LAYOUT_OFF); lv_btn_set_layout(buttonDec, LV_LAYOUT_OFF);
lv_btn_set_layout(buttoType, LV_LAYOUT_OFF); lv_btn_set_layout(buttoType, LV_LAYOUT_OFF);
@ -282,7 +282,6 @@ void lv_draw_preHeat(void) {
lv_obj_t *labelOff = lv_label_create(buttonOff, NULL); lv_obj_t *labelOff = lv_label_create(buttonOff, NULL);
lv_obj_t *label_Back = lv_label_create(buttonBack, NULL); lv_obj_t *label_Back = lv_label_create(buttonBack, NULL);
if (gCfgItems.multiple_language != 0) { if (gCfgItems.multiple_language != 0) {
lv_label_set_text(labelAdd, preheat_menu.add); lv_label_set_text(labelAdd, preheat_menu.add);
lv_obj_align(labelAdd, buttonAdd, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET); lv_obj_align(labelAdd, buttonAdd, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
@ -306,7 +305,6 @@ void lv_draw_preHeat(void) {
} }
void disp_temp_type() { void disp_temp_type() {
if (uiCfg.curTempType == 0) { if (uiCfg.curTempType == 0) {
if (uiCfg.curSprayerChoose == 1) { if (uiCfg.curSprayerChoose == 1) {
lv_obj_set_event_cb_mks(buttoType, event_handler, ID_P_TYPE, "bmp_extru2.bin", 0); lv_obj_set_event_cb_mks(buttoType, event_handler, ID_P_TYPE, "bmp_extru2.bin", 0);
@ -331,7 +329,6 @@ void disp_temp_type() {
lv_obj_align(labelType, buttoType, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET); lv_obj_align(labelType, buttoType, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
} }
} }
} }
void disp_desire_temp() { void disp_desire_temp() {

4
Marlin/src/lcd/extui/lib/mks_ui/draw_print_file.cpp
View File

@ -305,6 +305,7 @@ void disp_gcode_icon(uint8_t file_num) {
lv_refr_now(lv_refr_get_disp_refreshing()); lv_refr_now(lv_refr_get_disp_refreshing());
// Create image buttons
buttonPageUp = lv_imgbtn_create(scr, NULL); buttonPageUp = lv_imgbtn_create(scr, NULL);
buttonPageDown = lv_imgbtn_create(scr, NULL); buttonPageDown = lv_imgbtn_create(scr, NULL);
buttonBack = lv_imgbtn_create(scr, NULL); buttonBack = lv_imgbtn_create(scr, NULL);
@ -334,8 +335,7 @@ void disp_gcode_icon(uint8_t file_num) {
lv_obj_set_pos(buttonPageDown, OTHER_BTN_XPIEL * 3 + INTERVAL_V * 4, titleHeight + OTHER_BTN_YPIEL + INTERVAL_H); lv_obj_set_pos(buttonPageDown, OTHER_BTN_XPIEL * 3 + INTERVAL_V * 4, titleHeight + OTHER_BTN_YPIEL + INTERVAL_H);
lv_obj_set_pos(buttonBack, OTHER_BTN_XPIEL * 3 + INTERVAL_V * 4, titleHeight + OTHER_BTN_YPIEL * 2 + INTERVAL_H * 2); lv_obj_set_pos(buttonBack, OTHER_BTN_XPIEL * 3 + INTERVAL_V * 4, titleHeight + OTHER_BTN_YPIEL * 2 + INTERVAL_H * 2);
/*Create a label on the Image button*/ // Create labels on the image buttons
lv_btn_set_layout(buttonPageUp, LV_LAYOUT_OFF); lv_btn_set_layout(buttonPageUp, LV_LAYOUT_OFF);
lv_btn_set_layout(buttonPageDown, LV_LAYOUT_OFF); lv_btn_set_layout(buttonPageDown, LV_LAYOUT_OFF);
lv_btn_set_layout(buttonBack, LV_LAYOUT_OFF); lv_btn_set_layout(buttonBack, LV_LAYOUT_OFF);

4
Marlin/src/lcd/extui/lib/mks_ui/draw_ready_print.cpp
View File

@ -159,7 +159,7 @@ void lv_draw_ready_print(void) {
//lv_obj_set_pos(title,TITLE_XPOS,TITLE_YPOS); //lv_obj_set_pos(title,TITLE_XPOS,TITLE_YPOS);
//lv_label_set_text(title, creat_title_text()); //lv_label_set_text(title, creat_title_text());
/*Create an Image button*/ // Create image buttons
//buttonPrint = lv_imgbtn_create(scr, NULL); //buttonPrint = lv_imgbtn_create(scr, NULL);
buttonTool = lv_imgbtn_create(scr, NULL); buttonTool = lv_imgbtn_create(scr, NULL);
//buttonSet = lv_imgbtn_create(scr, NULL); //buttonSet = lv_imgbtn_create(scr, NULL);
@ -196,7 +196,7 @@ void lv_draw_ready_print(void) {
//lv_obj_set_pos(buttonSet,BTN_X_PIXEL+SIMPLE_FIRST_PAGE_GRAP*2+1,(TFT_HEIGHT-BTN_Y_PIXEL)/2+2); //lv_obj_set_pos(buttonSet,BTN_X_PIXEL+SIMPLE_FIRST_PAGE_GRAP*2+1,(TFT_HEIGHT-BTN_Y_PIXEL)/2+2);
//lv_obj_set_pos(buttonPrint,BTN_X_PIXEL*2+SIMPLE_FIRST_PAGE_GRAP*3+1,(TFT_HEIGHT-BTN_Y_PIXEL)/2+2); //lv_obj_set_pos(buttonPrint,BTN_X_PIXEL*2+SIMPLE_FIRST_PAGE_GRAP*3+1,(TFT_HEIGHT-BTN_Y_PIXEL)/2+2);
/*Create a label on the Image button*/ // Create labels on the image buttons
//lv_btn_set_layout(buttonPrint, LV_LAYOUT_OFF); //lv_btn_set_layout(buttonPrint, LV_LAYOUT_OFF);
//lv_btn_set_layout(buttonSet, LV_LAYOUT_OFF); //lv_btn_set_layout(buttonSet, LV_LAYOUT_OFF);
lv_btn_set_layout(buttonTool, LV_LAYOUT_OFF); lv_btn_set_layout(buttonTool, LV_LAYOUT_OFF);

1
Marlin/src/lcd/extui/lib/mks_ui/draw_tmc_current_settings.cpp
View File

@ -25,6 +25,7 @@
#include "lv_conf.h" #include "lv_conf.h"
#include "draw_ui.h" #include "draw_ui.h"
#include "../../../../MarlinCore.h" #include "../../../../MarlinCore.h"
#include "../../../../module/planner.h" #include "../../../../module/planner.h"
#include "../../../../module/stepper/indirection.h" #include "../../../../module/stepper/indirection.h"

4
Marlin/src/lcd/extui/lib/mks_ui/draw_tool.cpp
View File

@ -140,7 +140,7 @@ void lv_draw_tool(void) {
LV_IMG_DECLARE(bmp_pic); LV_IMG_DECLARE(bmp_pic);
/*Create an Image button*/ // Create image buttons
buttonPreHeat = lv_imgbtn_create(scr, NULL); buttonPreHeat = lv_imgbtn_create(scr, NULL);
buttonExtrusion = lv_imgbtn_create(scr, NULL); buttonExtrusion = lv_imgbtn_create(scr, NULL);
buttonMove = lv_imgbtn_create(scr, NULL); buttonMove = lv_imgbtn_create(scr, NULL);
@ -210,7 +210,7 @@ void lv_draw_tool(void) {
//lv_obj_set_pos(buttonMore,BTN_X_PIXEL*2+INTERVAL_V*3, BTN_Y_PIXEL+INTERVAL_H+titleHeight); //lv_obj_set_pos(buttonMore,BTN_X_PIXEL*2+INTERVAL_V*3, BTN_Y_PIXEL+INTERVAL_H+titleHeight);
lv_obj_set_pos(buttonBack, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight); lv_obj_set_pos(buttonBack, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight);
/*Create a label on the Image button*/ // Create labels on the image buttons
lv_btn_set_layout(buttonPreHeat, LV_LAYOUT_OFF); lv_btn_set_layout(buttonPreHeat, LV_LAYOUT_OFF);
lv_btn_set_layout(buttonExtrusion, LV_LAYOUT_OFF); lv_btn_set_layout(buttonExtrusion, LV_LAYOUT_OFF);
lv_btn_set_layout(buttonMove, LV_LAYOUT_OFF); lv_btn_set_layout(buttonMove, LV_LAYOUT_OFF);

1
Marlin/src/lcd/extui/lib/mks_ui/printer_operation.cpp
View File

@ -51,6 +51,7 @@ void printer_state_polling() {
if (uiCfg.waitEndMoves > 20) { if (uiCfg.waitEndMoves > 20) {
uiCfg.waitEndMoves = 0; uiCfg.waitEndMoves = 0;
planner.synchronize(); planner.synchronize();
gcode.process_subcommands_now_P(PSTR("M25")); gcode.process_subcommands_now_P(PSTR("M25"));
if (gCfgItems.pausePosZ != (float)-1) { if (gCfgItems.pausePosZ != (float)-1) {
gcode.process_subcommands_now_P(PSTR("G91")); gcode.process_subcommands_now_P(PSTR("G91"));

20
Marlin/src/pins/pins.h
View File

@ -498,10 +498,10 @@
#include "stm32f1/pins_STM3R_MINI.h" // STM32F1 env:STM32F103RE #include "stm32f1/pins_STM3R_MINI.h" // STM32F1 env:STM32F103RE
#elif MB(GTM32_PRO_VB) #elif MB(GTM32_PRO_VB)
#include "stm32f1/pins_GTM32_PRO_VB.h" // STM32F1 env:STM32F103RE #include "stm32f1/pins_GTM32_PRO_VB.h" // STM32F1 env:STM32F103RE
#elif MB(GTM32_MINI_A30)
#include "stm32f1/pins_GTM32_MINI_A30.h" // STM32F1 env:STM32F103RE
#elif MB(GTM32_MINI) #elif MB(GTM32_MINI)
#include "stm32f1/pins_GTM32_MINI.h" // STM32F1 env:STM32F103RE #include "stm32f1/pins_GTM32_MINI.h" // STM32F1 env:STM32F103RE
#elif MB(GTM32_MINI_A30)
#include "stm32f1/pins_GTM32_MINI_A30.h" // STM32F1 env:STM32F103RE
#elif MB(GTM32_REV_B) #elif MB(GTM32_REV_B)
#include "stm32f1/pins_GTM32_REV_B.h" // STM32F1 env:STM32F103RE #include "stm32f1/pins_GTM32_REV_B.h" // STM32F1 env:STM32F103RE
#elif MB(MORPHEUS) #elif MB(MORPHEUS)
@ -518,6 +518,14 @@
#include "stm32f1/pins_MKS_ROBIN_NANO_V2.h" // STM32F1 env:mks_robin_nano35 #include "stm32f1/pins_MKS_ROBIN_NANO_V2.h" // STM32F1 env:mks_robin_nano35
#elif MB(MKS_ROBIN_LITE) #elif MB(MKS_ROBIN_LITE)
#include "stm32f1/pins_MKS_ROBIN_LITE.h" // STM32F1 env:mks_robin_lite #include "stm32f1/pins_MKS_ROBIN_LITE.h" // STM32F1 env:mks_robin_lite
#elif MB(MKS_ROBIN_LITE3)
#include "stm32f1/pins_MKS_ROBIN_LITE3.h" // STM32F1 env:mks_robin_lite3
#elif MB(MKS_ROBIN_PRO)
#include "stm32f1/pins_MKS_ROBIN_PRO.h" // STM32F1 env:mks_robin_pro
#elif MB(MKS_ROBIN_E3)
#include "stm32f1/pins_MKS_ROBIN_E3.h" // STM32F1 env:mks_robin_e3
#elif MB(MKS_ROBIN_E3D)
#include "stm32f1/pins_MKS_ROBIN_E3D.h" // STM32F1 env:mks_robin_e3
#elif MB(BTT_SKR_MINI_V1_1) #elif MB(BTT_SKR_MINI_V1_1)
#include "stm32f1/pins_BTT_SKR_MINI_V1_1.h" // STM32F1 env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_USB env:STM32F103RC_btt_512K_USB #include "stm32f1/pins_BTT_SKR_MINI_V1_1.h" // STM32F1 env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_USB env:STM32F103RC_btt_512K_USB
#elif MB(BTT_SKR_MINI_E3_V1_0) #elif MB(BTT_SKR_MINI_E3_V1_0)
@ -538,14 +546,6 @@
#include "stm32f1/pins_FYSETC_CHEETAH_V12.h" // STM32F1 env:STM32F103RC_fysetc #include "stm32f1/pins_FYSETC_CHEETAH_V12.h" // STM32F1 env:STM32F103RC_fysetc
#elif MB(LONGER3D_LK) #elif MB(LONGER3D_LK)
#include "stm32f1/pins_LONGER3D_LK.h" // STM32F1 env:STM32F103VE_longer #include "stm32f1/pins_LONGER3D_LK.h" // STM32F1 env:STM32F103VE_longer
#elif MB(MKS_ROBIN_LITE3)
#include "stm32f1/pins_MKS_ROBIN_LITE3.h" // STM32F1 env:mks_robin_lite3
#elif MB(MKS_ROBIN_PRO)
#include "stm32f1/pins_MKS_ROBIN_PRO.h" // STM32F1 env:mks_robin_pro
#elif MB(MKS_ROBIN_E3D)
#include "stm32f1/pins_MKS_ROBIN_E3D.h" // STM32F1 env:mks_robin_e3
#elif MB(MKS_ROBIN_E3)
#include "stm32f1/pins_MKS_ROBIN_E3.h" // STM32F1 env:mks_robin_e3
#elif MB(CCROBOT_MEEB_3DP) #elif MB(CCROBOT_MEEB_3DP)
#include "stm32f1/pins_CCROBOT_MEEB_3DP.h" // STM32F1 env:STM32F103RC_meeb #include "stm32f1/pins_CCROBOT_MEEB_3DP.h" // STM32F1 env:STM32F103RC_meeb
#elif MB(CHITU3D_V5) #elif MB(CHITU3D_V5)