From f495ceceea4896928ac29496b90afdfab6b579a6 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 18 Jul 2021 20:54:06 -0500 Subject: [PATCH] mks_hardware_test => mks_hardware --- Marlin/src/MarlinCore.cpp | 2 +- Marlin/src/lcd/extui/mks_ui/draw_error_message.cpp | 2 +- Marlin/src/lcd/extui/mks_ui/draw_ready_print.cpp | 2 +- Marlin/src/lcd/extui/mks_ui/draw_ui.cpp | 4 ++-- .../extui/mks_ui/{mks_hardware_test.cpp => mks_hardware.cpp} | 4 ++-- .../lcd/extui/mks_ui/{mks_hardware_test.h => mks_hardware.h} | 2 +- Marlin/src/lcd/extui/mks_ui/pic_manager.cpp | 2 +- Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) rename Marlin/src/lcd/extui/mks_ui/{mks_hardware_test.cpp => mks_hardware.cpp} (99%) rename Marlin/src/lcd/extui/mks_ui/{mks_hardware_test.h => mks_hardware.h} (97%) diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp index 1da030b249659..07a6a31b94e35 100644 --- a/Marlin/src/MarlinCore.cpp +++ b/Marlin/src/MarlinCore.cpp @@ -70,7 +70,7 @@ #if HAS_TFT_LVGL_UI #include "lcd/extui/mks_ui/tft_lvgl_configuration.h" #include "lcd/extui/mks_ui/draw_ui.h" - #include "lcd/extui/mks_ui/mks_hardware_test.h" + #include "lcd/extui/mks_ui/mks_hardware.h" #include #endif diff --git a/Marlin/src/lcd/extui/mks_ui/draw_error_message.cpp b/Marlin/src/lcd/extui/mks_ui/draw_error_message.cpp index abfdeb281588a..48ff56253b81e 100644 --- a/Marlin/src/lcd/extui/mks_ui/draw_error_message.cpp +++ b/Marlin/src/lcd/extui/mks_ui/draw_error_message.cpp @@ -28,7 +28,7 @@ #include "tft_lvgl_configuration.h" #include "SPI_TFT.h" #include "../../../inc/MarlinConfig.h" -#include "mks_hardware_test.h" +#include "mks_hardware.h" static lv_obj_t *scr; diff --git a/Marlin/src/lcd/extui/mks_ui/draw_ready_print.cpp b/Marlin/src/lcd/extui/mks_ui/draw_ready_print.cpp index f3fbf2fe5f3fe..6f24d81b49310 100644 --- a/Marlin/src/lcd/extui/mks_ui/draw_ready_print.cpp +++ b/Marlin/src/lcd/extui/mks_ui/draw_ready_print.cpp @@ -39,7 +39,7 @@ #include "draw_touch_calibration.h" #endif -#include "mks_hardware_test.h" +#include "mks_hardware.h" #include #define ICON_POS_Y 38 diff --git a/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp b/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp index caf94554e12b9..a53533c7a4e91 100644 --- a/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp +++ b/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp @@ -52,7 +52,7 @@ #endif #if ENABLED(MKS_TEST) - #include "mks_hardware_test.h" + #include "mks_hardware.h" #endif CFG_ITMES gCfgItems; @@ -1367,7 +1367,7 @@ void LV_TASK_HANDLER() { lv_task_handler(); #if BOTH(MKS_TEST, SDSUPPORT) - if (mks_test_flag == 0x1E) mks_hardware_test(); + if (mks_test_flag == 0x1E) mks_hardware(); #endif TERN_(HAS_GCODE_PREVIEW, disp_pre_gcode(2, 36)); diff --git a/Marlin/src/lcd/extui/mks_ui/mks_hardware_test.cpp b/Marlin/src/lcd/extui/mks_ui/mks_hardware.cpp similarity index 99% rename from Marlin/src/lcd/extui/mks_ui/mks_hardware_test.cpp rename to Marlin/src/lcd/extui/mks_ui/mks_hardware.cpp index a3be359d558e9..b5f618ee6e41d 100644 --- a/Marlin/src/lcd/extui/mks_ui/mks_hardware_test.cpp +++ b/Marlin/src/lcd/extui/mks_ui/mks_hardware.cpp @@ -37,7 +37,7 @@ #if ENABLED(MKS_TEST) - #include "mks_hardware_test.h" + #include "mks_hardware.h" bool pw_det_sta, pw_off_sta, mt_det_sta; #if PIN_EXISTS(MT_DET_2) @@ -157,7 +157,7 @@ disp_Limit_error(); } - void mks_hardware_test() { + void mks_hardware() { if (millis() % 2000 < 1000) { WRITE(X_DIR_PIN, LOW); WRITE(Y_DIR_PIN, LOW); diff --git a/Marlin/src/lcd/extui/mks_ui/mks_hardware_test.h b/Marlin/src/lcd/extui/mks_ui/mks_hardware.h similarity index 97% rename from Marlin/src/lcd/extui/mks_ui/mks_hardware_test.h rename to Marlin/src/lcd/extui/mks_ui/mks_hardware.h index de0c3a738ebd4..3f260a74887c4 100644 --- a/Marlin/src/lcd/extui/mks_ui/mks_hardware_test.h +++ b/Marlin/src/lcd/extui/mks_ui/mks_hardware.h @@ -28,7 +28,7 @@ // Functions for MKS_TEST #if ENABLED(MKS_TEST) void mks_gpio_test(); - void mks_hardware_test(); + void mks_hardware(); void mks_test_get(); #endif diff --git a/Marlin/src/lcd/extui/mks_ui/pic_manager.cpp b/Marlin/src/lcd/extui/mks_ui/pic_manager.cpp index edace4c65fc24..68344e770c020 100644 --- a/Marlin/src/lcd/extui/mks_ui/pic_manager.cpp +++ b/Marlin/src/lcd/extui/mks_ui/pic_manager.cpp @@ -27,7 +27,7 @@ #include "draw_ui.h" #include "pic_manager.h" #include "draw_ready_print.h" -#include "mks_hardware_test.h" +#include "mks_hardware.h" #include "SPIFlashStorage.h" #include "../../../libs/W25Qxx.h" #include "../../../sd/cardreader.h" diff --git a/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp b/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp index ce1c5e09582ce..d8c5fbd6ec6b3 100644 --- a/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp +++ b/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp @@ -29,7 +29,7 @@ #include "draw_ready_print.h" #include "pic_manager.h" -#include "mks_hardware_test.h" +#include "mks_hardware.h" #include "draw_ui.h" #include "SPIFlashStorage.h" #include