From bf3305ac35293cbb8987395e8daa988dcb822b30 Mon Sep 17 00:00:00 2001 From: Antonino Di Guardo <64427768+digant73@users.noreply.github.com> Date: Fri, 8 Mar 2024 02:22:50 +0100 Subject: [PATCH] Minor cleanup (#2909) --- TFT/src/User/API/Mainboard_AckHandler.c | 6 ++--- TFT/src/User/API/Settings.c | 23 +++++++++---------- TFT/src/User/API/boot.h | 2 +- TFT/src/User/API/config.c | 20 +++++++++------- TFT/src/User/Fatfs/myfatfs.c | 2 +- TFT/src/User/Menu/ABL.c | 2 +- TFT/src/User/Menu/ABL.h | 2 +- TFT/src/User/Menu/CaseLight.h | 2 +- TFT/src/User/Menu/Heat.h | 1 + TFT/src/User/Menu/MeshValid.c | 18 +++++---------- TFT/src/User/Menu/Move.c | 2 +- TFT/src/User/Menu/PreheatMenu.h | 2 ++ TFT/src/User/Menu/Print.c | 8 +++---- TFT/src/User/Menu/Speed.h | 9 ++++++-- TFT/src/User/Menu/Terminal.h | 2 +- TFT/src/User/Menu/TuneExtruder.c | 4 ++-- TFT/src/User/Menu/ZOffset.h | 2 ++ .../User/Variants/Resolution/TFT_480X800.h | 2 +- .../User/Variants/Resolution/TFT_800X480.h | 2 +- 19 files changed, 59 insertions(+), 52 deletions(-) diff --git a/TFT/src/User/API/Mainboard_AckHandler.c b/TFT/src/User/API/Mainboard_AckHandler.c index aac37c47c4..6e83b9baef 100644 --- a/TFT/src/User/API/Mainboard_AckHandler.c +++ b/TFT/src/User/API/Mainboard_AckHandler.c @@ -831,11 +831,11 @@ void parseAck(void) sprintf(tmpMsg, "Mean: %0.5f", ack_value()); - if (ack_continue_seen("Min: ")) + if (ack_continue_seen("Min:")) sprintf(strchr(tmpMsg, '\0'), "\nMin: %0.5f", ack_value()); - if (ack_continue_seen("Max: ")) + if (ack_continue_seen("Max:")) sprintf(strchr(tmpMsg, '\0'), "\nMax: %0.5f", ack_value()); - if (ack_continue_seen("Range: ")) + if (ack_continue_seen("Range:")) sprintf(strchr(tmpMsg, '\0'), "\nRange: %0.5f", ack_value()); popupReminder(DIALOG_TYPE_INFO, (uint8_t *)"Repeatability Test", (uint8_t *)tmpMsg); diff --git a/TFT/src/User/API/Settings.c b/TFT/src/User/API/Settings.c index 5c9e964a06..ec42370c7f 100644 --- a/TFT/src/User/API/Settings.c +++ b/TFT/src/User/API/Settings.c @@ -4,18 +4,17 @@ SETTINGS infoSettings; MACHINE_SETTINGS infoMachineSettings; -const uint8_t default_serial_port[] = {SP_1, SP_2, SP_3, SP_4}; -const uint16_t default_max_temp[] = MAX_TEMP; -const uint16_t default_max_fan[] = FAN_MAX; -const uint16_t default_size_min[] = {X_MIN_POS, Y_MIN_POS, Z_MIN_POS}; -const uint16_t default_size_max[] = {X_MAX_POS, Y_MAX_POS, Z_MAX_POS}; -const uint16_t default_xy_speed[] = {SPEED_XY_SLOW, SPEED_XY_NORMAL, SPEED_XY_FAST}; -const uint16_t default_z_speed[] = {SPEED_Z_SLOW, SPEED_Z_NORMAL, SPEED_Z_FAST}; -const uint16_t default_ext_speed[] = {EXTRUDE_SLOW_SPEED, EXTRUDE_NORMAL_SPEED, EXTRUDE_FAST_SPEED}; -const uint16_t default_pause_speed[] = {NOZZLE_PAUSE_XY_FEEDRATE, NOZZLE_PAUSE_Z_FEEDRATE, NOZZLE_PAUSE_E_FEEDRATE}; -const uint16_t default_level_speed[] = {LEVELING_XY_FEEDRATE, LEVELING_Z_FEEDRATE}; -const uint8_t default_led_color[] = {LED_R, LED_G, LED_B, LED_W, LED_P, LED_I}; -const uint8_t default_custom_enabled[] = CUSTOM_GCODE_ENABLED; +const uint8_t default_serial_port[] = {SP_1, SP_2, SP_3, SP_4}; +const uint16_t default_max_temp[] = MAX_TEMP; +const uint16_t default_max_fan[] = FAN_MAX; +const uint16_t default_size_min[] = {X_MIN_POS, Y_MIN_POS, Z_MIN_POS}; +const uint16_t default_size_max[] = {X_MAX_POS, Y_MAX_POS, Z_MAX_POS}; +const uint16_t default_xy_speed[] = {SPEED_XY_SLOW, SPEED_XY_NORMAL, SPEED_XY_FAST}; +const uint16_t default_z_speed[] = {SPEED_Z_SLOW, SPEED_Z_NORMAL, SPEED_Z_FAST}; +const uint16_t default_ext_speed[] = {EXTRUDE_SLOW_SPEED, EXTRUDE_NORMAL_SPEED, EXTRUDE_FAST_SPEED}; +const uint16_t default_pause_speed[] = {NOZZLE_PAUSE_XY_FEEDRATE, NOZZLE_PAUSE_Z_FEEDRATE, NOZZLE_PAUSE_E_FEEDRATE}; +const uint16_t default_level_speed[] = {LEVELING_XY_FEEDRATE, LEVELING_Z_FEEDRATE}; +const uint8_t default_led_color[] = {LED_R, LED_G, LED_B, LED_W, LED_P, LED_I}; // Init settings data with default values void initSettings(void) diff --git a/TFT/src/User/API/boot.h b/TFT/src/User/API/boot.h index cb8606a171..62cd723f25 100644 --- a/TFT/src/User/API/boot.h +++ b/TFT/src/User/API/boot.h @@ -21,7 +21,7 @@ extern "C" { #define STRINGS_STORE_MAX_SIZE 0x1000 // label strings max size #define PREHEAT_STORE_MAX_SIZE 0x1000 // preheat setting max size #define PRINT_GCODES_MAX_SIZE 0x5000 // start/end/cancel gcodes max size - #define CUSTOM_GCODE_MAX_SIZE 0x5000 // custom gocdes max size + #define CUSTOM_GCODE_MAX_SIZE 0x5000 // custom gcodes max size #define ICON_MAX_SIZE 0x5000 #define INFOBOX_MAX_SIZE 0xB000 #define SMALL_ICON_MAX_SIZE 0x2000 diff --git a/TFT/src/User/API/config.c b/TFT/src/User/API/config.c index ed9394cba6..7d5795f27b 100644 --- a/TFT/src/User/API/config.c +++ b/TFT/src/User/API/config.c @@ -216,6 +216,7 @@ const GUI_POINT pointProgressText = {BYTE_WIDTH/2-2, LCD_HEIGHT-(BYTE_HEIGHT*4)} const char * const preheatNames[] = PREHEAT_LABELS; const uint16_t preheatHotend[] = PREHEAT_HOTEND; const uint16_t preheatBed[] = PREHEAT_BED; +const uint8_t cgEnabled[] = CUSTOM_GCODE_ENABLED; const char * const cgNames[] = CUSTOM_GCODE_LABELS; const char * const cgList[] = CUSTOM_GCODE_LIST; @@ -1239,15 +1240,17 @@ void resetConfig(void) // restore custom gcode presets int n = 0; + for (int i = 0; i < CUSTOM_GCODES_COUNT; i++) { - if (default_custom_enabled[i] == 1) + if (cgEnabled[i] == 1) { strcpy(tempCG.name[n], cgNames[i]); strcpy(tempCG.gcode[n], cgList[i]); n++; } } + tempCG.count = n; // write restored config @@ -1328,6 +1331,7 @@ bool getLangFromFile(char * rootDir) FRESULT r = f_findfirst(&d, &f, rootDir, "language_*.ini"); f_closedir(&d); + if (r != FR_OK) return false; @@ -1355,19 +1359,19 @@ bool getLangFromFile(char * rootDir) showError(CSTAT_FILE_INVALID); success = false; } - else - { // rename file if update was successful - if (!f_file_exists(FILE_ADMIN_MODE) && f_file_exists(langpath)) - { // language exists + else // rename file if update was successful + { + if (!f_file_exists(FILE_ADMIN_MODE) && f_file_exists(langpath)) // language exists + { char newlangpath[256]; sprintf(newlangpath, "%s/%s.CUR", rootDir, f.fname); - if (f_file_exists(newlangpath)) - { // old language also exists + if (f_file_exists(newlangpath)) // old language also exists f_unlink(newlangpath); - } + f_rename(langpath, newlangpath); } } + return success; } diff --git a/TFT/src/User/Fatfs/myfatfs.c b/TFT/src/User/Fatfs/myfatfs.c index 6dc29c2821..e402d66771 100644 --- a/TFT/src/User/Fatfs/myfatfs.c +++ b/TFT/src/User/Fatfs/myfatfs.c @@ -42,7 +42,7 @@ static inline bool compareFile(char * name1, uint32_t date1, char * name2, uint3 /** * sort file list */ -void sortFile(uint16_t fileCount, TCHAR * fileName[], uint32_t fileDate[]) +static void sortFile(uint16_t fileCount, TCHAR * fileName[], uint32_t fileDate[]) { for (int i = 1; i < fileCount; i++) { diff --git a/TFT/src/User/Menu/ABL.c b/TFT/src/User/Menu/ABL.c index 01fb15be7f..cb7faa9482 100644 --- a/TFT/src/User/Menu/ABL.c +++ b/TFT/src/User/Menu/ABL.c @@ -54,7 +54,7 @@ void ablUpdateStatus(bool succeeded) } } -// Start ABL process +// start ABL process void ablStart(void) { storeCmd("G28\n"); diff --git a/TFT/src/User/Menu/ABL.h b/TFT/src/User/Menu/ABL.h index 3d8ffd6dd5..2dd85c4fbf 100644 --- a/TFT/src/User/Menu/ABL.h +++ b/TFT/src/User/Menu/ABL.h @@ -10,7 +10,7 @@ extern "C" { // called by parseAck() to notify ABL process status void ablUpdateStatus(bool succeeded); -// Start ABL process +// start ABL process void ablStart(void); void menuUBLSave(void); diff --git a/TFT/src/User/Menu/CaseLight.h b/TFT/src/User/Menu/CaseLight.h index b1b75efeda..ee4994e6ec 100644 --- a/TFT/src/User/Menu/CaseLight.h +++ b/TFT/src/User/Menu/CaseLight.h @@ -7,9 +7,9 @@ extern "C" { #include #include -void menuCaseLight(void); void caseLightSetPercent(uint8_t brightness); void caseLightSetState(bool state); +void menuCaseLight(void); #ifdef __cplusplus } diff --git a/TFT/src/User/Menu/Heat.h b/TFT/src/User/Menu/Heat.h index 1d59bdc9cc..a8fd841faf 100644 --- a/TFT/src/User/Menu/Heat.h +++ b/TFT/src/User/Menu/Heat.h @@ -13,6 +13,7 @@ extern "C" { * index == -2 to set the last used bed index */ void heatSetCurrentIndex(uint8_t index); + void menuHeat(void); #ifdef __cplusplus diff --git a/TFT/src/User/Menu/MeshValid.c b/TFT/src/User/Menu/MeshValid.c index cba62fa898..937840c3c2 100644 --- a/TFT/src/User/Menu/MeshValid.c +++ b/TFT/src/User/Menu/MeshValid.c @@ -35,18 +35,12 @@ void menuMeshValid(void) key_num = menuKeyGetValue(); switch (key_num) { - // MESHVALID PLA - case KEY_ICON_0: - // MESHVALID PETG - case KEY_ICON_1: - // MESHVALID ABS - case KEY_ICON_2: - // MESHVALID WOOD - case KEY_ICON_3: - // MESHVALID TPU - case KEY_ICON_4: - // MESHVALID NYLON - case KEY_ICON_5: + case KEY_ICON_0: // MESHVALID PLA + case KEY_ICON_1: // MESHVALID PETG + case KEY_ICON_2: // MESHVALID ABS + case KEY_ICON_3: // MESHVALID WOOD + case KEY_ICON_4: // MESHVALID TPU + case KEY_ICON_5: // MESHVALID NYLON mustStoreCmd("G28\n"); mustStoreCmd("G26 H%u B%u R99\n", preheatStore.preheat_hotend[key_num], preheatStore.preheat_bed[key_num]); mustStoreCmd("G1 Z10 F%d\n", infoSettings.level_feedrate[FEEDRATE_Z]); diff --git a/TFT/src/User/Menu/Move.c b/TFT/src/User/Menu/Move.c index ee6ea68bb6..61d00a143e 100644 --- a/TFT/src/User/Menu/Move.c +++ b/TFT/src/User/Menu/Move.c @@ -10,7 +10,7 @@ #define X_MOVE_GCODE "G0 X%.2f F%d\n" // X axis gcode #define Y_MOVE_GCODE "G0 Y%.2f F%d\n" // Y axis gcode #define Z_MOVE_GCODE "G0 Z%.2f F%d\n" // Z axis gcode -#define GANTRY_REFRESH_TIME 500 // 1 seconds is 1000 +#define GANTRY_REFRESH_TIME 500 // 1 second is 1000 #ifdef PORTRAIT_MODE #define OFFSET 0 diff --git a/TFT/src/User/Menu/PreheatMenu.h b/TFT/src/User/Menu/PreheatMenu.h index bf4bac81c1..289bdd4607 100644 --- a/TFT/src/User/Menu/PreheatMenu.h +++ b/TFT/src/User/Menu/PreheatMenu.h @@ -9,7 +9,9 @@ extern "C" { #include #include "Settings.h" +// called by menuMeshValid() void refreshPreheatIcon(PREHEAT_STORE * preheatStore, uint8_t index, bool redrawIcon); + void menuPreheat(void); #ifdef __cplusplus diff --git a/TFT/src/User/Menu/Print.c b/TFT/src/User/Menu/Print.c index fa0cdc7074..9b9936ce15 100644 --- a/TFT/src/User/Menu/Print.c +++ b/TFT/src/User/Menu/Print.c @@ -73,7 +73,7 @@ void normalNameDisp(const GUI_RECT * rect, uint8_t * name) // - icon mode menu is an option available only for browsing files from TFT SD card / TFT USB disk. // It is not available for browsing files from onboard media // - only short (not long) folder names and filenames are available browsing files from TFT SD card / TFT USB disk -static inline void gocdeIconDraw(void) +static inline void gcodeIconDraw(void) { ITEM curItem = {ICON_NULL, LABEL_NULL}; uint8_t baseIndex = infoFile.curPage * NUM_PER_PAGE; @@ -118,7 +118,7 @@ static inline void gocdeIconDraw(void) } // update items in list mode -void gocdeListDraw(LISTITEM * item, uint16_t index, uint8_t itemPos) +void gcodeListDraw(LISTITEM * item, uint16_t index, uint8_t itemPos) { if (index < infoFile.folderCount) // folder { @@ -329,7 +329,7 @@ void menuPrintFromSource(void) if (list_mode != true) { printIconItems.title.address = (uint8_t *)infoFile.path; - gocdeIconDraw(); + gcodeIconDraw(); if (update != 2) // update title only when entering/exiting to/from directory menuDrawTitle(); @@ -337,7 +337,7 @@ void menuPrintFromSource(void) else { // title bar is also drawn by listViewCreate listViewCreate((LABEL){.address = (uint8_t *)infoFile.path}, NULL, infoFile.folderCount + infoFile.fileCount, - &infoFile.curPage, false, NULL, gocdeListDraw); + &infoFile.curPage, false, NULL, gcodeListDraw); } Scroll_CreatePara(&scrollLine, (uint8_t *)infoFile.path, &titleRect); diff --git a/TFT/src/User/Menu/Speed.h b/TFT/src/User/Menu/Speed.h index 43407616d3..2f75c02e2e 100644 --- a/TFT/src/User/Menu/Speed.h +++ b/TFT/src/User/Menu/Speed.h @@ -5,9 +5,14 @@ extern "C" { #endif -#include +#include "variants.h" // for TFT70_V3_0 + +#ifdef TFT70_V3_0 + #include + + void setSpeedItemIndex(uint8_t index); +#endif -void setSpeedItemIndex(uint8_t index); void menuSpeed(void); #ifdef __cplusplus diff --git a/TFT/src/User/Menu/Terminal.h b/TFT/src/User/Menu/Terminal.h index f2388d83c2..e914733b69 100644 --- a/TFT/src/User/Menu/Terminal.h +++ b/TFT/src/User/Menu/Terminal.h @@ -15,8 +15,8 @@ typedef enum SRC_TERMINAL_COUNT } TERMINAL_SRC; -void menuTerminal(void); void terminalCache(const char * stream, uint16_t streamLen, SERIAL_PORT_INDEX portIndex, TERMINAL_SRC src); +void menuTerminal(void); #ifdef __cplusplus } diff --git a/TFT/src/User/Menu/TuneExtruder.c b/TFT/src/User/Menu/TuneExtruder.c index 3ad26dc287..e843a943a6 100644 --- a/TFT/src/User/Menu/TuneExtruder.c +++ b/TFT/src/User/Menu/TuneExtruder.c @@ -3,8 +3,8 @@ #define ITEM_TUNE_EXTRUDER_LEN_NUM 4 -#define EXTRUDE_LEN 100.0f // in mm -#define REMAINING_LEN 20.0f // in mm +#define EXTRUDE_LEN 100.0f // in mm +#define REMAINING_LEN 20.0f // in mm static uint8_t tool_index = NOZZLE0; static uint8_t degreeSteps_index = 1; diff --git a/TFT/src/User/Menu/ZOffset.h b/TFT/src/User/Menu/ZOffset.h index 25538a1b11..4fe79a64a0 100644 --- a/TFT/src/User/Menu/ZOffset.h +++ b/TFT/src/User/Menu/ZOffset.h @@ -7,7 +7,9 @@ extern "C" { #include +// called by menuTuning() void zOffsetSetMenu(bool probeOffset); + void menuZOffset(void); #ifdef __cplusplus diff --git a/TFT/src/User/Variants/Resolution/TFT_480X800.h b/TFT/src/User/Variants/Resolution/TFT_480X800.h index 5388a102eb..9d7178ae56 100644 --- a/TFT/src/User/Variants/Resolution/TFT_480X800.h +++ b/TFT/src/User/Variants/Resolution/TFT_480X800.h @@ -103,7 +103,7 @@ #define STRINGS_STORE_MAX_SIZE 0x1000 // label strings max size #define PREHEAT_STORE_MAX_SIZE 0x1000 // preheat setting max size #define PRINT_GCODES_MAX_SIZE 0x5000 // start/end/cancel gcodes max size - #define CUSTOM_GCODE_MAX_SIZE 0x5000 // custom gocdes max size + #define CUSTOM_GCODE_MAX_SIZE 0x5000 // custom gcodes max size #define ICON_MAX_SIZE 0xB000 // 160*140*2 = 0xAF00 (+0xB000) per button icon #define INFOBOX_MAX_SIZE 0x19000 // 360*140*2 = 0x189C0 (+0x19000) #define SMALL_ICON_MAX_SIZE 0x2000 // 24*24*2 = 0x480 (+0x1000) per small icon diff --git a/TFT/src/User/Variants/Resolution/TFT_800X480.h b/TFT/src/User/Variants/Resolution/TFT_800X480.h index 2ee035fc65..e1d44ddd20 100644 --- a/TFT/src/User/Variants/Resolution/TFT_800X480.h +++ b/TFT/src/User/Variants/Resolution/TFT_800X480.h @@ -102,7 +102,7 @@ #define STRINGS_STORE_MAX_SIZE 0x1000 // label strings max size #define PREHEAT_STORE_MAX_SIZE 0x1000 // preheat setting max size #define PRINT_GCODES_MAX_SIZE 0x5000 // start/end/cancel gcodes max size - #define CUSTOM_GCODE_MAX_SIZE 0x5000 // custom gocdes max size + #define CUSTOM_GCODE_MAX_SIZE 0x5000 // custom gcodes max size #define ICON_MAX_SIZE 0xB000 // 160*140*2 = 0xAF00 (+0xB000) per button icon #define INFOBOX_MAX_SIZE 0x19000 // 360*140*2 = 0x189C0 (+0x19000) #define SMALL_ICON_MAX_SIZE 0x2000 // 24*24*2 = 0x480 (+0x1000) per small icon