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

A little cleanup

Browse Source
This commit is contained in:
Knutwurst
2021-01-19 09:21:17 +01:00
parent fe5f2c6e16
commit 9734a61c2a
3 changed files with 87 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Marlin/Configuration.h
View File

@@ -42,6 +42,7 @@
#define ANYCUBIC_FILAMENT_RUNOUT_SENSOR #define ANYCUBIC_FILAMENT_RUNOUT_SENSOR
#define KNUTWURST_SPECIAL_MENU #define KNUTWURST_SPECIAL_MENU
#define KNUTWURST_SPECIAL_MENU_WO_SD #define KNUTWURST_SPECIAL_MENU_WO_SD
//#define KNUTWURST_MEGA_P_LASER
//#define ANYCUBIC_TFT_DEBUG //#define ANYCUBIC_TFT_DEBUG
//#define POWER_OUTAGE_TEST //#define POWER_OUTAGE_TEST

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

@@ -145,77 +145,73 @@ void AnycubicTouchscreenClass::Setup()
buzzer.tone(100, 740); buzzer.tone(100, 740);
buzzer.tone(100, 831); buzzer.tone(100, 831);
#endif #endif
setup_OutageTestPin(); setup_OutageTestPin();
} }
#if ENABLED(KNUTWURST_MEGA_P_LASER) #if ENABLED(KNUTWURST_MEGA_P_LASER)
PRINTER_STRUCT Laser_printer_st={0}; PRINTER_STRUCT Laser_printer_st = {0};
BMP_HEAD st_bmp={0}; BMP_HEAD st_bmp = {0};
void laser_init() void laser_init()
{ {
Laser_printer_st.pic_pixel_distance = PIC_FIXED;
Laser_printer_st.laser_height = 50;
Laser_printer_st.x_offset = 0;
Laser_printer_st.x_offset = 0;
Laser_printer_st.pic_pixel_distance = PIC_FIXED;//<2F><><EFBFBD><EFBFBD>֮<EFBFBD><D6AE>ľ<EFBFBD><C4BE><EFBFBD>?.1-0.3<EFBFBD><EFBFBD> Laser_printer_st.pic_vector = 0;
Laser_printer_st.laser_height = 50;//<2F><><EFBFBD><EFBFBD>߶<EFBFBD>? Laser_printer_st.pic_x_mirror = 1;
Laser_printer_st.x_offset = 0;//X<><58><EFBFBD><EFBFBD><EFBFBD>ƫ<EFBFBD><C6AB>? Laser_printer_st.pic_y_mirror = 0;
Laser_printer_st.x_offset = 0;//Y<><59><EFBFBD><EFBFBD><EFBFBD>ƫ<EFBFBD><C6AB>? Laser_printer_st.pic_laser_time = 15;
Laser_printer_st.pic_vector = 0;//<2F>Ƿ<EFBFBD><C7B7><EFBFBD>ʸ<EFBFBD><CAB8>ͼ<EFBFBD><CDBC>1Ϊʸ<CEAA><CAB8>ͼ<EFBFBD><CDBC>0Ϊλͼ
Laser_printer_st.pic_x_mirror = 1; //X<><58><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,1Ϊ<31><CEAA><EFBFBD><EFBFBD>
Laser_printer_st.pic_y_mirror = 0; //Y<><59><EFBFBD><EFBFBD><EFBFBD><EFBFBD>1Ϊ<31><CEAA><EFBFBD><EFBFBD>
Laser_printer_st.pic_laser_time = 15;//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD>䣨1-100<30><30>
send_laser_param() ; send_laser_param() ;
} }
void send_pic_param() void send_pic_param()
{ {
HARDWARE_SERIAL_PROTOCOLPGM("A45V");
HARDWARE_SERIAL_PROTOCOLPGM("A45V"); HARDWARE_SERIAL_SPACE();
HARDWARE_SERIAL_SPACE(); HARDWARE_SERIAL_PROTOCOLPGM("W");
HARDWARE_SERIAL_PROTOCOLPGM("W"); HARDWARE_SERIAL_PROTOCOL(Laser_printer_st.pic_widht);
HARDWARE_SERIAL_PROTOCOL(Laser_printer_st.pic_widht);//ͼƬ<CDBC>Ŀ<EFBFBD><C4BF>? HARDWARE_SERIAL_SPACE();
HARDWARE_SERIAL_SPACE(); HARDWARE_SERIAL_PROTOCOLPGM("H");
HARDWARE_SERIAL_PROTOCOLPGM("H"); HARDWARE_SERIAL_PROTOCOL(Laser_printer_st.pic_hight);
HARDWARE_SERIAL_PROTOCOL(Laser_printer_st.pic_hight);//ͼƬ<CDBC>ĸ߶<C4B8> HARDWARE_SERIAL_SPACE();
HARDWARE_SERIAL_SPACE(); HARDWARE_SERIAL_ENTER();
HARDWARE_SERIAL_ENTER();
} }
void send_laser_param() void send_laser_param()
{ {
HARDWARE_SERIAL_PROTOCOLPGM("A44V"); HARDWARE_SERIAL_PROTOCOLPGM("A44V");
HARDWARE_SERIAL_SPACE(); HARDWARE_SERIAL_SPACE();
HARDWARE_SERIAL_PROTOCOLPGM("A"); HARDWARE_SERIAL_PROTOCOLPGM("A");
HARDWARE_SERIAL_PROTOCOL(Laser_printer_st.pic_vector); HARDWARE_SERIAL_PROTOCOL(Laser_printer_st.pic_vector);
HARDWARE_SERIAL_SPACE(); HARDWARE_SERIAL_SPACE();
HARDWARE_SERIAL_PROTOCOLPGM("B"); HARDWARE_SERIAL_PROTOCOLPGM("B");
HARDWARE_SERIAL_PROTOCOL(Laser_printer_st.pic_laser_time); HARDWARE_SERIAL_PROTOCOL(Laser_printer_st.pic_laser_time);
HARDWARE_SERIAL_SPACE(); HARDWARE_SERIAL_SPACE();
HARDWARE_SERIAL_PROTOCOLPGM("C"); HARDWARE_SERIAL_PROTOCOLPGM("C");
HARDWARE_SERIAL_PROTOCOL(Laser_printer_st.laser_height); HARDWARE_SERIAL_PROTOCOL(Laser_printer_st.laser_height);
HARDWARE_SERIAL_SPACE(); HARDWARE_SERIAL_SPACE();
HARDWARE_SERIAL_PROTOCOLPGM("D"); HARDWARE_SERIAL_PROTOCOLPGM("D");
HARDWARE_SERIAL_PROTOCOL(Laser_printer_st.pic_pixel_distance); HARDWARE_SERIAL_PROTOCOL(Laser_printer_st.pic_pixel_distance);
HARDWARE_SERIAL_SPACE(); HARDWARE_SERIAL_SPACE();
HARDWARE_SERIAL_PROTOCOLPGM("E"); HARDWARE_SERIAL_PROTOCOLPGM("E");
HARDWARE_SERIAL_PROTOCOL(Laser_printer_st.x_offset); HARDWARE_SERIAL_PROTOCOL(Laser_printer_st.x_offset);
HARDWARE_SERIAL_SPACE(); HARDWARE_SERIAL_SPACE();
HARDWARE_SERIAL_PROTOCOLPGM("F"); HARDWARE_SERIAL_PROTOCOLPGM("F");
HARDWARE_SERIAL_PROTOCOL(Laser_printer_st.y_offset); HARDWARE_SERIAL_PROTOCOL(Laser_printer_st.y_offset);
HARDWARE_SERIAL_SPACE(); HARDWARE_SERIAL_SPACE();
HARDWARE_SERIAL_PROTOCOLPGM("G"); HARDWARE_SERIAL_PROTOCOLPGM("G");
HARDWARE_SERIAL_PROTOCOL(Laser_printer_st.pic_x_mirror); HARDWARE_SERIAL_PROTOCOL(Laser_printer_st.pic_x_mirror);
HARDWARE_SERIAL_SPACE(); HARDWARE_SERIAL_SPACE();
HARDWARE_SERIAL_PROTOCOLPGM("H"); HARDWARE_SERIAL_PROTOCOLPGM("H");
HARDWARE_SERIAL_PROTOCOL(Laser_printer_st.pic_y_mirror); HARDWARE_SERIAL_PROTOCOL(Laser_printer_st.pic_y_mirror);
HARDWARE_SERIAL_SPACE(); HARDWARE_SERIAL_SPACE();
HARDWARE_SERIAL_ENTER(); HARDWARE_SERIAL_ENTER();
} }
#endif #endif

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

@@ -289,62 +289,58 @@ private:
#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]; unsigned char bfReserved1[2];
unsigned char bfReserved1[2]; unsigned char bfReserved2[2];
unsigned char bfReserved2[2]; unsigned char bfOffBits[4];
unsigned char bfOffBits[4]; unsigned char biSize[4];
unsigned char biSize[4]; unsigned char biWidth[4];
unsigned char biWidth[4]; unsigned char biHeight[4];
unsigned char biHeight[4]; unsigned char biPlanes[2];
unsigned char biPlanes[2]; unsigned char biBitCount[2];
unsigned char biBitCount[2]; unsigned char biCompression[4];
unsigned char biCompression[4]; unsigned char biSizeImage[4];
unsigned char biSizeImage[4]; unsigned char biXPelsPerMeter[4];
unsigned char biXPelsPerMeter[4]; unsigned char biYPelsPerMeter[4];
unsigned char biYPelsPerMeter[4]; unsigned char biClrUsed[4];
unsigned char biClrUsed[4]; unsigned char biClrImportant[4];
unsigned char biClrImportant[4];
}BMP_HEAD; }BMP_HEAD;
typedef struct typedef struct
{ /*ͼƬ<CDBC><C6AC>ӡ<EFBFBD><D3A1><EFBFBD>ֲ<EFBFBD><D6B2><EFBFBD>**/ {
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;
float pic_pixel_distance;//<2F><><EFBFBD><EFBFBD>֮<EFBFBD><D6AE>ľ<EFBFBD><C4BE>루0.1-0.3<EFBFBD><EFBFBD> float pic_pixel_distance;
float laser_height;//<2F><><EFBFBD><EFBFBD>߶<EFBFBD> float laser_height;
float x_offset;//X<><58><EFBFBD><EFBFBD><EFBFBD>ƫ<EFBFBD><C6AB> float x_offset;
float y_offset;//Y<><59><EFBFBD><EFBFBD><EFBFBD>ƫ<EFBFBD><C6AB> float y_offset;
unsigned int pic_realy_widht;
unsigned int pic_widht;
unsigned int pic_hight;
unsigned char pic_bit;
unsigned char pic_widht_odd; //<2F><>ż<EFBFBD><C5BC>
unsigned char pic_hight_odd; //<2F><>ż<EFBFBD><C5BC>
unsigned char pic_print_status; //<2F><>ӡ״̬
unsigned char pic_dir;//ͼƬ<CDBC><C6AC><EFBFBD><EFBFBD>
unsigned char pic_vector;//<2F>Ƿ<EFBFBD><C7B7><EFBFBD>ʸ<EFBFBD><CAB8>ͼ<EFBFBD><CDBC>1Ϊʸ<CEAA><CAB8>ͼ<EFBFBD><CDBC>0Ϊλͼ
unsigned char pic_x_mirror; //X<><58><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,1Ϊ<31><CEAA><EFBFBD><EFBFBD>
unsigned char pic_y_mirror; //Y<><59><EFBFBD><EFBFBD><EFBFBD><EFBFBD>1Ϊ<31><CEAA><EFBFBD><EFBFBD>
unsigned char pic_laser_time;//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD>䣨10-30<33><30>
unsigned int pic_realy_widht;
unsigned int pic_widht;
unsigned int pic_hight;
unsigned char pic_bit;
unsigned char pic_widht_odd;
unsigned char pic_hight_odd;
unsigned char pic_print_status;
unsigned char pic_dir;
unsigned char pic_vector;
unsigned char pic_x_mirror;
unsigned char pic_y_mirror;
unsigned char pic_laser_time;
}PRINTER_STRUCT; }PRINTER_STRUCT;
#define PIC_FIXED 0.1f // // POINT/MM #define PIC_FIXED 0.1f // // POINT/MM
#define PIC_OPEN 50 // // ms #define PIC_OPEN 50 // // ms
#define PIC_SPEDD 20000 #define PIC_SPEDD 20000
#define MIN_GRAY_VLAUE 20 //<2F><>С<EFBFBD>ĻҶ<C4BB>ֵ С<>ڸ<EFBFBD>ֵ<EFBFBD><D6B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> #define MIN_GRAY_VLAUE 20
#define LASER_PRINT_SPEED 30 //50*60 #define LASER_PRINT_SPEED 30 //50*60
#endif #endif