3DPrinting/MarlinFirmware
0
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2025-01-19 08:08:25 +00:00
Code Issues Releases Wiki Activity

🎨 Clean up IA_CREALITY includes (#25530)

Browse source
This commit is contained in:
Davide Rombolà 2023-03-18 07:33:57 +01:00 committed by GitHub
parent f50603ff1d
commit ce97e42aa0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Marlin/src/lcd/extui/ia_creality/FileNavigator.cpp
View file

@ -33,13 +33,11 @@
#if DGUS_LCD_UI_IA_CREALITY #if DGUS_LCD_UI_IA_CREALITY
#include "ia_creality_extui.h"
#include "FileNavigator.h" #include "FileNavigator.h"
using namespace ExtUI; using namespace ExtUI;
#define DEBUG_OUT ENABLED(DEBUG_DWIN)
#include "../../../core/debug_out.h"
FileList FileNavigator::filelist; // Instance of the Marlin file API FileList FileNavigator::filelist; // Instance of the Marlin file API
char FileNavigator::currentfoldername[MAX_PATH_LEN]; // Current folder path char FileNavigator::currentfoldername[MAX_PATH_LEN]; // Current folder path
uint16_t FileNavigator::lastindex; uint16_t FileNavigator::lastindex;
@ -124,8 +122,6 @@ void FileNavigator::getFiles(uint16_t index) {
const int filelen = strlen(filelist.filename()); const int filelen = strlen(filelist.filename());
if (filelen > 20) { if (filelen > 20) {
char *buf = (char *)filelist.filename(); char *buf = (char *)filelist.filename();
//char buf[filelen];
//strcpy(&buf[filelen], filelist.filename());
buf[18] = '\0'; // cutoff at screen edge buf[18] = '\0'; // cutoff at screen edge
rtscheck.RTS_SndData(buf, (SDFILE_ADDR + (fcnt * 20))); rtscheck.RTS_SndData(buf, (SDFILE_ADDR + (fcnt * 20)));
} }

3
Marlin/src/lcd/extui/ia_creality/FileNavigator.h
View file

@ -30,9 +30,6 @@
* Written by Insanity Automation * Written by Insanity Automation
* ***************************************/ * ***************************************/
#include "creality_extui.h"
#include "../ui_api.h"
#define MAX_FOLDER_DEPTH 4 // Limit folder depth TFT has a limit for the file path #define MAX_FOLDER_DEPTH 4 // Limit folder depth TFT has a limit for the file path
#define MAX_CMND_LEN 16 * MAX_FOLDER_DEPTH // Maximum Length for a Panel command #define MAX_CMND_LEN 16 * MAX_FOLDER_DEPTH // Maximum Length for a Panel command
#define MAX_PATH_LEN 16 * MAX_FOLDER_DEPTH // Maximum number of characters in a SD file path #define MAX_PATH_LEN 16 * MAX_FOLDER_DEPTH // Maximum number of characters in a SD file path

10
Marlin/src/lcd/extui/ia_creality/creality_extui.cpp
View file

@ -34,16 +34,8 @@
#if DGUS_LCD_UI_IA_CREALITY #if DGUS_LCD_UI_IA_CREALITY
#include "creality_extui.h" #include "ia_creality_extui.h"
#include "FileNavigator.h" #include "FileNavigator.h"
#include "../ui_api.h"
#include <HardwareSerial.h>
#include <WString.h>
#include <stdio.h>
#define DEBUG_OUT ENABLED(DEBUG_DWIN)
#include "../../../core/debug_out.h"
namespace ExtUI { namespace ExtUI {
static uint16_t fileIndex = 0; static uint16_t fileIndex = 0;

3
Marlin/src/lcd/extui/ia_creality/creality_extui.h → Marlin/src/lcd/extui/ia_creality/ia_creality_extui.h
View file

@ -22,7 +22,7 @@
#pragma once #pragma once
/* **************************************** /* ****************************************
* lcd/extui/ia_creality/creality_extui.h * lcd/extui/ia_creality/ia_creality_extui.h
* **************************************** * ****************************************
* Extensible_UI implementation for Creality DWIN * Extensible_UI implementation for Creality DWIN
* 10SPro, Max, CRX, and others * 10SPro, Max, CRX, and others
@ -32,7 +32,6 @@
* ***************************************/ * ***************************************/
#include "string.h" #include "string.h"
#include <Arduino.h>
#include "../ui_api.h" #include "../ui_api.h"
/*********************************/ /*********************************/