Skip to content

Commit

Permalink
mks_hardware_test => mks_hardware
Browse files Browse the repository at this point in the history
  • Loading branch information
thinkyhead committed Jul 19, 2021
1 parent 183ef14 commit f495cec
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Marlin/src/MarlinCore.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 <lvgl.h>
#endif

Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/extui/mks_ui/draw_error_message.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/extui/mks_ui/draw_ready_print.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
#include "draw_touch_calibration.h"
#endif

#include "mks_hardware_test.h"
#include "mks_hardware.h"
#include <stdio.h>

#define ICON_POS_Y 38
Expand Down
4 changes: 2 additions & 2 deletions Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
#endif

#if ENABLED(MKS_TEST)
#include "mks_hardware_test.h"
#include "mks_hardware.h"
#endif

CFG_ITMES gCfgItems;
Expand Down Expand Up @@ -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));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/extui/mks_ui/pic_manager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 <lvgl.h>
Expand Down

0 comments on commit f495cec

Please sign in to comment.