diff --git a/TFT/src/User/Menu/Macros.c b/TFT/src/User/Menu/Macros.c deleted file mode 100644 index f5bfb1bbfd..0000000000 --- a/TFT/src/User/Menu/Macros.c +++ /dev/null @@ -1,418 +0,0 @@ -#include "Macros.h" -#include "includes.h" - -#define FOLDER_NUM 255 -#define FILE_NUM 255 -#define MAX_PATH_LEN 1024 - -typedef struct -{ - TCHAR title[MAX_PATH_LEN]; // max path depth - TCHAR *folder[FOLDER_NUM]; // folder name buffer - TCHAR *file[FILE_NUM]; // file name buffer - uint16_t F_num; // current folder number - uint16_t f_num; // current gcode file number - uint16_t cur_page; // current display page index (5 files per page) - FS_SOURCE source; //The source of the file. TFT SD or ONBOARD SD. - TCHAR *Longfile[FILE_NUM]; // Long file name buffer from ONBOARD SD only - TCHAR pageTitle[40]; // max path depth -} MACROFILE; - -extern MACROFILE macroFile; - -MACROFILE macroFile = {"?:", {0}, {0}, 0, 0, 0, BOARD_SD, {0}, "<>"}; - -LISTITEMS macroListItems = { - // title - LABEL_BACKGROUND, - // icon ItemType Item Title item value text(only for custom value) - { - {ICONCHAR_BACKGROUND, LIST_LABEL, LABEL_BACKGROUND, LABEL_BACKGROUND}, - {ICONCHAR_BACKGROUND, LIST_LABEL, LABEL_BACKGROUND, LABEL_BACKGROUND}, - {ICONCHAR_BACKGROUND, LIST_LABEL, LABEL_BACKGROUND, LABEL_BACKGROUND}, - {ICONCHAR_BACKGROUND, LIST_LABEL, LABEL_BACKGROUND, LABEL_BACKGROUND}, - {ICONCHAR_BACKGROUND, LIST_LABEL, LABEL_BACKGROUND, LABEL_BACKGROUND}, - {ICONCHAR_BACKGROUND, LIST_LABEL, LABEL_BACKGROUND, LABEL_BACKGROUND}, - {ICONCHAR_BACKGROUND, LIST_LABEL, LABEL_BACKGROUND, LABEL_BACKGROUND}, - {ICONCHAR_BACK, LIST_LABEL, LABEL_BACKGROUND, LABEL_BACKGROUND}, - } -}; - -// File list number per page -#define NUM_PER_PAGE 5 -SCROLL macroTitleScroll; -const GUI_RECT macroTitleRect = {10, (TITLE_END_Y - BYTE_HEIGHT) / 2, LCD_WIDTH - 10, (TITLE_END_Y - BYTE_HEIGHT) / 2 + BYTE_HEIGHT}; -const int16_t labelMacroError[] = {LABEL_READ_TFTSD_ERROR, LABEL_READ_U_DISK_ERROR, LABEL_READ_ONBOARDSD_ERROR}; -/****/ - -/*** - * TODOS: - * proper subdirectory support, - * move away from half-using Vfs functions, - * sort order: Number_files first in order, hide Number_; alphabetical, directories alphabetical - ***/ - -/************************************************************************/ - -/* -*/ -bool setMacroFile(char *nextdir) -{ - strcpy(macroFile.title, nextdir); - return 1; -} - -/* -*/ -bool EnterMacroDir(char *nextdir) -{ - if (strlen(macroFile.title) + strlen(nextdir) + 2 >= MAX_PATH_LEN) - return 0; - strcat(macroFile.title, "/"); - strcat(macroFile.title, nextdir); - return 1; -} - -/* -*/ -bool IsMacroRootDir(void) -{ - return !strchr(macroFile.title, '/'); -} - -/* -*/ -void clearMacroFile(void) -{ - uint8_t i = 0; - for (i = 0; i < macroFile.F_num; i++) - { - free(macroFile.folder[i]); - macroFile.folder[i] = 0; - } - for (i = 0; i < macroFile.f_num; i++) - { - free(macroFile.file[i]); - macroFile.file[i] = 0; - free(macroFile.Longfile[i]); - macroFile.Longfile[i] = 0; - } - macroFile.F_num = 0; - macroFile.f_num = 0; -} - -/* -*/ -void resetMacroFile(void) -{ - FS_SOURCE source = macroFile.source; - clearMacroFile(); - memset(¯oFile, 0, sizeof(macroFile)); - macroFile.source = source; - - strcpy(macroFile.title, "/"); -} - -bool scanMacroFilesFs(void) -{ - // - clearMacroFile(); - // - strcpy(macroFile.title, "/"); - char *ret = request_M20_macros(macroFile.title); - if (strlen(ret) <= 3) - return false; - char *data = malloc(strlen(ret) + 1); - strcpy(data, ret); - - clearRequestCommandInfo(); - char s[3]; - - strcpy(s, ","); // filenames containing "," will break - - data = strtok(data, "]"); // to end of Array - - char *line = strtok(strstr(data, "files\":[") + 8, s); - for (; line != NULL; line = strtok(NULL, s)) - { - char *pline = line + 1; - - if (strchr(pline, '*') == NULL) - { - // FILE - if (macroFile.f_num >= FILE_NUM) - continue; // Gcode max number is FILE_NUM - - char *Pstr_tmp = strrchr(line, '"'); - if (Pstr_tmp != NULL) - *Pstr_tmp = 0; //remove правую ковычку - Pstr_tmp = strrchr(line, '"'); //remove начальная ковычка - if (Pstr_tmp == NULL) - Pstr_tmp = line; - else - Pstr_tmp++; - macroFile.Longfile[macroFile.f_num] = malloc(strlen(Pstr_tmp) + 1); - - strcpy(macroFile.Longfile[macroFile.f_num], Pstr_tmp); - - macroFile.file[macroFile.f_num] = malloc(strlen(pline) + 1); - if (macroFile.file[macroFile.f_num] == NULL) - break; - strcpy(macroFile.file[macroFile.f_num++], pline); - } - else - { - // DIRECTORY - if (macroFile.F_num >= FOLDER_NUM) - continue; // floder max number is FOLDER_NUM - - char *rest = pline + 1; - char *folder = strtok_r(rest, "\"", &rest); - - bool found = false; - for (int i = 0; i < macroFile.F_num; i++) - { - if (strcmp(folder, macroFile.folder[i]) == 0) - { - found = true; - break; - } - } - - if (!found) - { - uint16_t len = strlen(folder) + 1; - macroFile.folder[macroFile.F_num] = malloc(len); - if (macroFile.folder[macroFile.F_num] == NULL) - break; - strcpy(macroFile.folder[macroFile.F_num++], folder); - } - } - } - free(data); - return true; -} - -void menuStartMacro(void) -{ - char info[100]; - sprintf(info, "%s - %s\n", textSelect(LABEL_MACROS), macroFile.title); - GUI_Clear(BACKGROUND_COLOR); - GUI_DispStringInRect(0, 0, LCD_WIDTH, LCD_HEIGHT, (uint8_t *)info); - - request_M98(macroFile.title); - Delay_ms(500); - infoMenu.cur--; - - // loopProcess(); -} - -void menuExecMacro(void) -{ - u16 key_num = IDLE_TOUCH; - - char buf[89]; - sprintf(buf, "Do you want to start %.65s?\n", macroFile.title); - - popupDrawPage(DIALOG_TYPE_QUESTION, bottomDoubleBtn, textSelect(LABEL_INFO), (u8 *)buf, textSelect(LABEL_CONFIRM), textSelect(LABEL_CANCEL)); - - while (infoMenu.menu[infoMenu.cur] == menuExecMacro) - { - key_num = KEY_GetValue(2, doubleBtnRect); - switch (key_num) - { - case KEY_POPUP_CONFIRM: - infoMenu.menu[infoMenu.cur] = menuStartMacro; - break; - - case KEY_POPUP_CANCEL: - ExitDir(); - infoMenu.cur--; - break; - } - loopProcess(); - } -} - -/* -*/ -void drawTitle(void) -{ - // menuDrawTitle(labelGetAddress(&listItems->title)); -} - -/* -*/ -void menuCallMacro(void) -{ - KEY_VALUES key_num = KEY_IDLE; - - u8 update = 0; - //strcpy(macroFile.pageTitle, textSelect(LABEL_MACROS)); - sprintf(macroFile.pageTitle, "<%s>", textSelect(LABEL_MACROS)); - - GUI_Clear(BACKGROUND_COLOR); - GUI_DispStringInRect(0, 0, LCD_WIDTH, LCD_HEIGHT, textSelect(LABEL_LOADING)); - if (scanMacroFilesFs() == true) - { - menuDrawListPage(¯oListItems); - macroListDraw(); - } - else - { - GUI_DispStringInRect(0, 0, LCD_WIDTH, LCD_HEIGHT, textSelect(labelMacroError[macroFile.source])); - Delay_ms(1000); - infoMenu.cur--; - } - - while (infoMenu.menu[infoMenu.cur] == menuCallMacro) - { - GUI_SetBkColor(TITLE_BACKGROUND_COLOR); - Scroll_DispString(¯oTitleScroll, LEFT); - GUI_SetBkColor(BACKGROUND_COLOR); - - key_num = menuKeyGetValue(); - - switch (key_num) - { - case KEY_ICON_5: - if (macroFile.cur_page > 0) - { - macroFile.cur_page--; - update = 1; - } - break; - - case KEY_ICON_6: - if (macroFile.cur_page + 1 < (macroFile.F_num + macroFile.f_num + (NUM_PER_PAGE - 1)) / NUM_PER_PAGE) - { - macroFile.cur_page++; - update = 1; - } - break; - - case KEY_ICON_7: - macroFile.cur_page = 0; - if (IsRootDir() == true) - { - clearMacroFile(); - infoMenu.cur--; - break; - } - else - { - ExitDir(); - scanMacroFilesFs(); - update = 1; - } - break; - - case KEY_IDLE: - break; - - default: - if (key_num <= KEY_ICON_4) - { - u16 start = macroFile.cur_page * NUM_PER_PAGE; - if (key_num + start < macroFile.F_num) //folder - { - if (EnterMacroDir(macroFile.folder[key_num + start]) == false) - break; - scanMacroFilesFs(); - update = 1; - macroFile.cur_page = 0; - } - else if (key_num + start < macroFile.F_num + macroFile.f_num) //gcode - { - if (infoHost.connected != true) - break; - if (setMacroFile(macroFile.file[key_num + start - macroFile.F_num]) == false) - break; - - infoMenu.menu[++infoMenu.cur] = menuExecMacro; - } - } - break; - } - - if (update) - { - update = 0; - - macroListDraw(); - } - - #ifdef SD_CD_PIN - if (isVolumeExist(macroFile.source) != true) - { - resetMacroFile(); - infoMenu.cur--; - } - #endif - - loopProcess(); - } -} - -void macroListDraw(void) -{ - u8 i = 0; - /* - Scroll_CreatePara(¯oTitleScroll, (u8 *)macroFile.title, ¯oTitleRect); - macroListItems.title.address = (u8 *)macroFile.title; - */ - Scroll_CreatePara(¯oTitleScroll, (u8 *)macroFile.pageTitle, ¯oTitleRect); - macroListItems.title.address = (u8 *)macroFile.pageTitle; - GUI_SetBkColor(TITLE_BACKGROUND_COLOR); - GUI_ClearRect(0, 0, LCD_WIDTH, TITLE_END_Y); - GUI_SetBkColor(BACKGROUND_COLOR); - - for (i = 0; (i + macroFile.cur_page * NUM_PER_PAGE < macroFile.F_num) && (i < NUM_PER_PAGE); i++) // folder - { - macroListItems.items[i].icon = ICONCHAR_FOLDER; - setDynamicLabel(i, macroFile.folder[i + macroFile.cur_page * NUM_PER_PAGE]); - macroListItems.items[i].titlelabel.index = LABEL_DYNAMIC; - menuDrawListItem(¯oListItems.items[i], i); - } - for (; (i + macroFile.cur_page * NUM_PER_PAGE < macroFile.f_num + macroFile.F_num) && (i < NUM_PER_PAGE); i++) // gcode file - { - macroListItems.items[i].icon = ICONCHAR_FILE; - setDynamicLabel(i, (macroFile.source == BOARD_SD) ? macroFile.Longfile[i + macroFile.cur_page * NUM_PER_PAGE - macroFile.F_num] : macroFile.file[i + macroFile.cur_page * NUM_PER_PAGE - macroFile.F_num]); - macroListItems.items[i].titlelabel.index = LABEL_DYNAMIC; - menuDrawListItem(¯oListItems.items[i], i); - } - - for (; (i < NUM_PER_PAGE); i++) //background - { - macroListItems.items[i].icon = ICONCHAR_BACKGROUND; - macroListItems.items[i].titlelabel.index = LABEL_BACKGROUND; - menuDrawListItem(¯oListItems.items[i], i); - } - // set page up down button according to page count and current page - int t_pagenum = (macroFile.F_num + macroFile.f_num + (LISTITEM_PER_PAGE - 1)) / LISTITEM_PER_PAGE; - if ((macroFile.F_num + macroFile.f_num) <= LISTITEM_PER_PAGE) - { - macroListItems.items[5].icon = ICONCHAR_BACKGROUND; - macroListItems.items[6].icon = ICONCHAR_BACKGROUND; - } - else - { - if (macroFile.cur_page == 0) - { - macroListItems.items[5].icon = ICONCHAR_BACKGROUND; - macroListItems.items[6].icon = ICONCHAR_PAGEDOWN; - } - else if (macroFile.cur_page == (t_pagenum - 1)) - { - macroListItems.items[5].icon = ICONCHAR_PAGEUP; - macroListItems.items[6].icon = ICONCHAR_BACKGROUND; - } - else - { - macroListItems.items[5].icon = ICONCHAR_PAGEUP; - macroListItems.items[6].icon = ICONCHAR_PAGEDOWN; - } - } - menuDrawListItem(¯oListItems.items[5], 5); - menuDrawListItem(¯oListItems.items[6], 6); -} diff --git a/TFT/src/User/Menu/RRFMacros.c b/TFT/src/User/Menu/RRFMacros.c new file mode 100644 index 0000000000..9ffe88d17e --- /dev/null +++ b/TFT/src/User/Menu/RRFMacros.c @@ -0,0 +1,297 @@ +#include "RRFMacros.h" +#include "includes.h" + +/*** + * TODOS: + * proper subdirectory support, + * move away from half-using Vfs functions, + * sort order: Number_files first in order, hide Number_; alphabetical, directories alphabetical + ***/ + +/************************************************************************/ + +LISTITEMS * macroListItems; +const GUI_RECT macroTitleRect = {10, (TITLE_END_Y - BYTE_HEIGHT) / 2, LCD_WIDTH - 10, (TITLE_END_Y - BYTE_HEIGHT) / 2 + BYTE_HEIGHT}; +const int16_t labelMacroError[] = {LABEL_READ_TFTSD_ERROR, LABEL_READ_U_DISK_ERROR, LABEL_READ_ONBOARDSD_ERROR}; + +//Scan files in RRF +bool scaninfoFilesFs(void) +{ + clearInfoFile(); + strcpy(infoFile.title, "/"); + char *ret = request_M20_macros(infoFile.title); + if (strlen(ret) <= 3) + return false; + + char *data = malloc(strlen(ret) + 1); + strcpy(data, ret); + clearRequestCommandInfo(); + char s[3]; + + strcpy(s, ","); // filenames containing "," will break + + data = strtok(data, "]"); // to end of Array + + char *line = strtok(strstr(data, "files\":[") + 8, s); + for (; line != NULL; line = strtok(NULL, s)) + { + char *pline = line + 1; + + if (strchr(pline, '*') == NULL) + { + // FILE + if (infoFile.folderCount >= FILE_NUM) + continue; // Gcode max number is FILE_NUM + + char *Pstr_tmp = strrchr(line, '"'); + if (Pstr_tmp != NULL) + *Pstr_tmp = 0; //remove right quote + Pstr_tmp = strrchr(line, '"'); //remove initial quote + if (Pstr_tmp == NULL) + Pstr_tmp = line; + else + Pstr_tmp++; + infoFile.Longfile[infoFile.folderCount] = malloc(strlen(Pstr_tmp) + 1); + + strcpy(infoFile.Longfile[infoFile.folderCount], Pstr_tmp); + + infoFile.file[infoFile.folderCount] = malloc(strlen(pline) + 1); + if (infoFile.file[infoFile.folderCount] == NULL) + break; + strcpy(infoFile.file[infoFile.folderCount++], pline); + } + else + { + // DIRECTORY + if (infoFile.folderCount >= FOLDER_NUM) + continue; // floder max number is FOLDER_NUM + + char *rest = pline + 1; + char *folder = strtok_r(rest, "\"", &rest); + + bool found = false; + for (int i = 0; i < infoFile.folderCount; i++) + { + if (strcmp(folder, infoFile.folder[i]) == 0) + { + found = true; + break; + } + } + + if (!found) + { + uint16_t len = strlen(folder) + 1; + infoFile.folder[infoFile.folderCount] = malloc(len); + if (infoFile.folder[infoFile.folderCount] == NULL) + break; + strcpy(infoFile.folder[infoFile.folderCount++], folder); + } + } + } + free(data); + return true; +} + +void runMacro(void) +{ + char info[100]; + sprintf(info, "%s - %s\n", textSelect(LABEL_MACROS), infoFile.title); + GUI_Clear(BACKGROUND_COLOR); + GUI_DispStringInRect(0, 0, LCD_WIDTH, LCD_HEIGHT, (uint8_t *)info); + + request_M98(infoFile.title); + Delay_ms(500); +} + +// Run selected macro +void menuExecMacro(void) +{ + char buf[89]; + + sprintf(buf, "Do you want to start %.65s?\n", infoFile.title); + setDialogText(textSelect(LABEL_INFO), (uint8_t *)buf, textSelect(LABEL_CONFIRM), textSelect(LABEL_CANCEL)); + showDialog(DIALOG_TYPE_QUESTION, runMacro, ExitDir, NULL); + + infoMenu.cur--; +} + +//Draw Macro file list +void macroListDraw(void) +{ + uint8_t i = 0; + + GUI_SetBkColor(TITLE_BACKGROUND_COLOR); + GUI_ClearRect(0, 0, LCD_WIDTH, TITLE_END_Y); + GUI_SetBkColor(BACKGROUND_COLOR); + + for (i = 0; (i + infoFile.cur_page * LISTITEM_PER_PAGE < infoFile.folderCount) && (i < LISTITEM_PER_PAGE); i++) // folder + { + macroListItems->items[i].icon = ICONCHAR_FOLDER; + setDynamicLabel(i, infoFile.folder[i + infoFile.cur_page * LISTITEM_PER_PAGE]); + macroListItems->items[i].titlelabel.index = LABEL_DYNAMIC; + menuDrawListItem(¯oListItems->items[i], i); + } + for (; (i + infoFile.cur_page * LISTITEM_PER_PAGE < infoFile.folderCount + infoFile.folderCount) && (i < LISTITEM_PER_PAGE); i++) // gcode file + { + macroListItems->items[i].icon = ICONCHAR_FILE; + setDynamicLabel(i, (infoFile.source == BOARD_SD) ? infoFile.Longfile[i + infoFile.cur_page * LISTITEM_PER_PAGE - infoFile.folderCount] : infoFile.file[i + infoFile.cur_page * LISTITEM_PER_PAGE - infoFile.folderCount]); + macroListItems->items[i].titlelabel.index = LABEL_DYNAMIC; + menuDrawListItem(¯oListItems->items[i], i); + } + + for (; (i < LISTITEM_PER_PAGE); i++) //background + { + macroListItems->items[i].icon = ICONCHAR_BACKGROUND; + macroListItems->items[i].titlelabel.index = LABEL_BACKGROUND; + menuDrawListItem(¯oListItems->items[i], i); + } + // set page up down button according to page count and current page + int t_pagenum = (infoFile.folderCount + infoFile.folderCount + (LISTITEM_PER_PAGE - 1)) / LISTITEM_PER_PAGE; + if ((infoFile.folderCount + infoFile.folderCount) <= LISTITEM_PER_PAGE) + { + macroListItems->items[5].icon = ICONCHAR_BACKGROUND; + macroListItems->items[6].icon = ICONCHAR_BACKGROUND; + } + else + { + if (infoFile.cur_page == 0) + { + macroListItems->items[5].icon = ICONCHAR_BACKGROUND; + macroListItems->items[6].icon = ICONCHAR_PAGEDOWN; + } + else if (infoFile.cur_page == (t_pagenum - 1)) + { + macroListItems->items[5].icon = ICONCHAR_PAGEUP; + macroListItems->items[6].icon = ICONCHAR_BACKGROUND; + } + else + { + macroListItems->items[5].icon = ICONCHAR_PAGEUP; + macroListItems->items[6].icon = ICONCHAR_PAGEDOWN; + } + } + menuDrawListItem(¯oListItems->items[5], 5); + menuDrawListItem(¯oListItems->items[6], 6); +} + +// View and run macros stored in RRF firmware +void menuCallMacro(void) +{ + LISTITEMS _macroListItems = { + // title + LABEL_BACKGROUND, + // icon ItemType Item Title item value text(only for custom value) + { + {ICONCHAR_BACKGROUND, LIST_LABEL, LABEL_BACKGROUND, LABEL_BACKGROUND}, + {ICONCHAR_BACKGROUND, LIST_LABEL, LABEL_BACKGROUND, LABEL_BACKGROUND}, + {ICONCHAR_BACKGROUND, LIST_LABEL, LABEL_BACKGROUND, LABEL_BACKGROUND}, + {ICONCHAR_BACKGROUND, LIST_LABEL, LABEL_BACKGROUND, LABEL_BACKGROUND}, + {ICONCHAR_BACKGROUND, LIST_LABEL, LABEL_BACKGROUND, LABEL_BACKGROUND}, + {ICONCHAR_BACKGROUND, LIST_LABEL, LABEL_BACKGROUND, LABEL_BACKGROUND}, + {ICONCHAR_BACKGROUND, LIST_LABEL, LABEL_BACKGROUND, LABEL_BACKGROUND}, + {ICONCHAR_BACK, LIST_LABEL, LABEL_BACKGROUND, LABEL_BACKGROUND}, + } + }; + + KEY_VALUES key_num = KEY_IDLE; + uint8_t update = 0; + char pageTitle[40]; + macroListItems = &_macroListItems; + infoFile.source = BOARD_SD; + + resetInfoFile(); + sprintf(pageTitle, "<%s>", textSelect(LABEL_MACROS)); + _macroListItems.title.address = (uint8_t *)pageTitle; + + GUI_Clear(BACKGROUND_COLOR); + GUI_DispStringInRect(0, 0, LCD_WIDTH, LCD_HEIGHT, textSelect(LABEL_LOADING)); + + if (scaninfoFilesFs() == true) + { + menuDrawListPage(&_macroListItems); + macroListDraw(); + } + else + { + GUI_DispStringInRect(0, 0, LCD_WIDTH, LCD_HEIGHT, textSelect(labelMacroError[infoFile.source])); + Delay_ms(1000); + infoMenu.cur--; + } + + while (infoMenu.menu[infoMenu.cur] == menuCallMacro) + { + key_num = menuKeyGetValue(); + + switch (key_num) + { + case KEY_ICON_5: + if (infoFile.cur_page > 0) + { + infoFile.cur_page--; + update = 1; + } + break; + + case KEY_ICON_6: + if (infoFile.cur_page + 1 < (infoFile.folderCount + infoFile.folderCount + (LISTITEM_PER_PAGE - 1)) / LISTITEM_PER_PAGE) + { + infoFile.cur_page++; + update = 1; + } + break; + + case KEY_ICON_7: + infoFile.cur_page = 0; + if (IsRootDir() == true) + { + clearInfoFile(); + infoMenu.cur--; + break; + } + else + { + ExitDir(); + scaninfoFilesFs(); + update = 1; + } + break; + + case KEY_IDLE: + break; + + default: + if (key_num <= KEY_ICON_4) + { + u16 start = infoFile.cur_page * LISTITEM_PER_PAGE; + if (key_num + start < infoFile.folderCount) //folder + { + if (EnterDir(infoFile.folder[key_num + start]) == false) + break; + scaninfoFilesFs(); + update = 1; + infoFile.cur_page = 0; + } + else if (key_num + start < infoFile.folderCount + infoFile.folderCount) //gcode + { + if (infoHost.connected != true) + break; + //set file path + strcpy(infoFile.title, infoFile.file[key_num + start - infoFile.folderCount]); + + infoMenu.menu[++infoMenu.cur] = menuExecMacro; + } + } + break; + } + + if (update) + { + update = 0; + macroListDraw(); + } + + loopProcess(); + } +} + diff --git a/TFT/src/User/Menu/Macros.h b/TFT/src/User/Menu/RRFMacros.h similarity index 61% rename from TFT/src/User/Menu/Macros.h rename to TFT/src/User/Menu/RRFMacros.h index 6f90b43f17..fc4ead6c39 100644 --- a/TFT/src/User/Menu/Macros.h +++ b/TFT/src/User/Menu/RRFMacros.h @@ -1,13 +1,11 @@ -#ifndef _MACROS_H_ -#define _MACROS_H_ +#ifndef _RRFMACROS_H_ +#define _RRFMACROS_H_ #ifdef __cplusplus extern "C" { #endif void menuCallMacro(void); -void macroListDraw(void); - #ifdef __cplusplus } #endif diff --git a/TFT/src/User/includes.h b/TFT/src/User/includes.h index 43f05470b6..4996b2c825 100644 --- a/TFT/src/User/includes.h +++ b/TFT/src/User/includes.h @@ -98,7 +98,7 @@ #include "Babystep.h" #include "Extrude.h" #include "LoadUnload.h" -#include "Macros.h" +#include "RRFMacros.h" #include "Fan.h" #include "SettingsMenu.h" #include "PrintingMenu.h"