wp/Marlin-2-0-x-Anycubic-i3-MEGA-S
1
0
Fork 0
Code Issues 28 Pull Requests 2 Actions Packages Projects Releases 30 Wiki Activity

harmonize indentation in anycubic_touchscreen sources

Browse Source
This commit is contained in:
Stefan Kalscheuer
2021-10-03 20:24:57 +02:00
parent 7077da3591
commit 9ffed0e031
2 changed files with 1153 additions and 1359 deletions
Download Patch File Download Diff File Expand all files Collapse all files

699
Marlin/src/lcd/anycubic_touchscreen.cpp
View File

File diff suppressed because it is too large Load Diff

19
Marlin/src/lcd/anycubic_touchscreen.h
View File

@@ -147,8 +147,7 @@ char *ftostr32(const float &);
#define SM_BLTZ_DN_S "<DNOFFZ0>" #define SM_BLTZ_DN_S "<DNOFFZ0>"
#define SM_BLTZ_EXIT_L "<SAVE and EXIT>" #define SM_BLTZ_EXIT_L "<SAVE and EXIT>"
#define SM_BLTZ_EXIT_S "<EXTABLM>" #define SM_BLTZ_EXIT_S "<EXTABLM>"
#endif // !KNUTWURST_DGUS2_TFT
#endif
#if ENABLED(KNUTWURST_DGUS2_TFT) #if ENABLED(KNUTWURST_DGUS2_TFT)
#define SM_DIR_UP_L "<<< BACK <<< .gcode" #define SM_DIR_UP_L "<<< BACK <<< .gcode"
@@ -235,8 +234,7 @@ char *ftostr32(const float &);
#define SM_BLTZ_DN_S "<DOWNOFZ.GCO" #define SM_BLTZ_DN_S "<DOWNOFZ.GCO"
#define SM_BLTZ_EXIT_L "<SAVE and EXIT> .gcode" #define SM_BLTZ_EXIT_L "<SAVE and EXIT> .gcode"
#define SM_BLTZ_EXIT_S "<EXTABLM.GCO" #define SM_BLTZ_EXIT_S "<EXTABLM.GCO"
#endif // KNUTWURST_DGUS2_TFT
#endif
#if ENABLED(KNUTWURST_TFT_LEVELING) #if ENABLED(KNUTWURST_TFT_LEVELING)
// eeprom_index // eeprom_index
@@ -246,8 +244,7 @@ char *ftostr32(const float &);
extern float SAVE_zprobe_zoffset; extern float SAVE_zprobe_zoffset;
#endif #endif
class AnycubicTouchscreenClass class AnycubicTouchscreenClass {
{
public: public:
AnycubicTouchscreenClass(); AnycubicTouchscreenClass();
void Setup(); void Setup();
@@ -291,8 +288,7 @@ private:
int currentFlowRate = 0; int currentFlowRate = 0;
#if defined(POWER_OUTAGE_TEST) #if defined(POWER_OUTAGE_TEST)
struct OutageDataStruct struct OutageDataStruct {
{
char OutageDataVersion; char OutageDataVersion;
char OutageFlag; char OutageFlag;
float last_position[XYZE]; float last_position[XYZE];
@@ -340,9 +336,7 @@ private:
int FilamentRunoutCounter = 0; int FilamentRunoutCounter = 0;
#endif #endif
#if ENABLED(KNUTWURST_MEGA_P_LASER) #if ENABLED(KNUTWURST_MEGA_P_LASER)
typedef struct { typedef struct {
unsigned char bfType[2]; unsigned char bfType[2];
unsigned char bfSize[4]; unsigned char bfSize[4];
@@ -362,9 +356,7 @@ typedef struct {
unsigned char biClrImportant[4]; unsigned char biClrImportant[4];
} BMP_HEAD; } BMP_HEAD;
typedef struct {
typedef struct
{
unsigned long pic_file_size; unsigned long pic_file_size;
unsigned long pic_ptr; unsigned long pic_ptr;
unsigned long pic_start; unsigned long pic_start;
@@ -396,7 +388,6 @@ typedef struct
#define MIN_GRAY_VLAUE 20 #define MIN_GRAY_VLAUE 20
#define LASER_PRINT_SPEED 30 //50*60 #define LASER_PRINT_SPEED 30 //50*60
#endif #endif
}; };
extern AnycubicTouchscreenClass AnycubicTouchscreen; extern AnycubicTouchscreenClass AnycubicTouchscreen;