From 9734a61c2aeb4f744c6347cf909963747a973631 Mon Sep 17 00:00:00 2001 From: Knutwurst <36196269+knutwurst@users.noreply.github.com> Date: Tue, 19 Jan 2021 09:21:17 +0100 Subject: [PATCH] A little cleanup --- Marlin/Configuration.h | 1 + Marlin/src/lcd/anycubic_touchscreen.cpp | 100 ++++++++++++------------ Marlin/src/lcd/anycubic_touchscreen.h | 80 +++++++++---------- 3 files changed, 87 insertions(+), 94 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 7fcf84ea..cbded42b 100755 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -42,6 +42,7 @@ #define ANYCUBIC_FILAMENT_RUNOUT_SENSOR #define KNUTWURST_SPECIAL_MENU #define KNUTWURST_SPECIAL_MENU_WO_SD +//#define KNUTWURST_MEGA_P_LASER //#define ANYCUBIC_TFT_DEBUG //#define POWER_OUTAGE_TEST diff --git a/Marlin/src/lcd/anycubic_touchscreen.cpp b/Marlin/src/lcd/anycubic_touchscreen.cpp index 1ac21ee1..465ff0e3 100755 --- a/Marlin/src/lcd/anycubic_touchscreen.cpp +++ b/Marlin/src/lcd/anycubic_touchscreen.cpp @@ -145,77 +145,73 @@ void AnycubicTouchscreenClass::Setup() buzzer.tone(100, 740); buzzer.tone(100, 831); #endif - + setup_OutageTestPin(); } #if ENABLED(KNUTWURST_MEGA_P_LASER) -PRINTER_STRUCT Laser_printer_st={0}; -BMP_HEAD st_bmp={0}; +PRINTER_STRUCT Laser_printer_st = {0}; +BMP_HEAD st_bmp = {0}; 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;//����֮��ľ���?.1-0.3�� - Laser_printer_st.laser_height = 50;//����߶�? - Laser_printer_st.x_offset = 0;//X�����ƫ��? - Laser_printer_st.x_offset = 0;//Y�����ƫ��? - - Laser_printer_st.pic_vector = 0;//�Ƿ���ʸ��ͼ��1Ϊʸ��ͼ��0Ϊλͼ - Laser_printer_st.pic_x_mirror = 1; //X������,1Ϊ���� - Laser_printer_st.pic_y_mirror = 0; //Y������1Ϊ���� - Laser_printer_st.pic_laser_time = 15;//��������ʱ�䣨1-100�� + Laser_printer_st.pic_vector = 0; + Laser_printer_st.pic_x_mirror = 1; + Laser_printer_st.pic_y_mirror = 0; + Laser_printer_st.pic_laser_time = 15; - send_laser_param() ; + send_laser_param() ; } void send_pic_param() { - -HARDWARE_SERIAL_PROTOCOLPGM("A45V"); -HARDWARE_SERIAL_SPACE(); -HARDWARE_SERIAL_PROTOCOLPGM("W"); -HARDWARE_SERIAL_PROTOCOL(Laser_printer_st.pic_widht);//ͼƬ�Ŀ��? -HARDWARE_SERIAL_SPACE(); -HARDWARE_SERIAL_PROTOCOLPGM("H"); -HARDWARE_SERIAL_PROTOCOL(Laser_printer_st.pic_hight);//ͼƬ�ĸ߶� -HARDWARE_SERIAL_SPACE(); -HARDWARE_SERIAL_ENTER(); - - + HARDWARE_SERIAL_PROTOCOLPGM("A45V"); + HARDWARE_SERIAL_SPACE(); + HARDWARE_SERIAL_PROTOCOLPGM("W"); + HARDWARE_SERIAL_PROTOCOL(Laser_printer_st.pic_widht); + HARDWARE_SERIAL_SPACE(); + HARDWARE_SERIAL_PROTOCOLPGM("H"); + HARDWARE_SERIAL_PROTOCOL(Laser_printer_st.pic_hight); + HARDWARE_SERIAL_SPACE(); + HARDWARE_SERIAL_ENTER(); } + void send_laser_param() { - HARDWARE_SERIAL_PROTOCOLPGM("A44V"); - HARDWARE_SERIAL_SPACE(); - HARDWARE_SERIAL_PROTOCOLPGM("A"); - HARDWARE_SERIAL_PROTOCOL(Laser_printer_st.pic_vector); - HARDWARE_SERIAL_SPACE(); - HARDWARE_SERIAL_PROTOCOLPGM("B"); - HARDWARE_SERIAL_PROTOCOL(Laser_printer_st.pic_laser_time); - HARDWARE_SERIAL_SPACE(); - HARDWARE_SERIAL_PROTOCOLPGM("C"); - HARDWARE_SERIAL_PROTOCOL(Laser_printer_st.laser_height); - HARDWARE_SERIAL_SPACE(); - HARDWARE_SERIAL_PROTOCOLPGM("D"); - HARDWARE_SERIAL_PROTOCOL(Laser_printer_st.pic_pixel_distance); - HARDWARE_SERIAL_SPACE(); - HARDWARE_SERIAL_PROTOCOLPGM("E"); - HARDWARE_SERIAL_PROTOCOL(Laser_printer_st.x_offset); - HARDWARE_SERIAL_SPACE(); - HARDWARE_SERIAL_PROTOCOLPGM("F"); - HARDWARE_SERIAL_PROTOCOL(Laser_printer_st.y_offset); - HARDWARE_SERIAL_SPACE(); - HARDWARE_SERIAL_PROTOCOLPGM("G"); - HARDWARE_SERIAL_PROTOCOL(Laser_printer_st.pic_x_mirror); - HARDWARE_SERIAL_SPACE(); + HARDWARE_SERIAL_PROTOCOLPGM("A44V"); + HARDWARE_SERIAL_SPACE(); + HARDWARE_SERIAL_PROTOCOLPGM("A"); + HARDWARE_SERIAL_PROTOCOL(Laser_printer_st.pic_vector); + HARDWARE_SERIAL_SPACE(); + HARDWARE_SERIAL_PROTOCOLPGM("B"); + HARDWARE_SERIAL_PROTOCOL(Laser_printer_st.pic_laser_time); + HARDWARE_SERIAL_SPACE(); + HARDWARE_SERIAL_PROTOCOLPGM("C"); + HARDWARE_SERIAL_PROTOCOL(Laser_printer_st.laser_height); + HARDWARE_SERIAL_SPACE(); + HARDWARE_SERIAL_PROTOCOLPGM("D"); + HARDWARE_SERIAL_PROTOCOL(Laser_printer_st.pic_pixel_distance); + HARDWARE_SERIAL_SPACE(); + HARDWARE_SERIAL_PROTOCOLPGM("E"); + HARDWARE_SERIAL_PROTOCOL(Laser_printer_st.x_offset); + HARDWARE_SERIAL_SPACE(); + HARDWARE_SERIAL_PROTOCOLPGM("F"); + HARDWARE_SERIAL_PROTOCOL(Laser_printer_st.y_offset); + HARDWARE_SERIAL_SPACE(); + HARDWARE_SERIAL_PROTOCOLPGM("G"); + HARDWARE_SERIAL_PROTOCOL(Laser_printer_st.pic_x_mirror); + HARDWARE_SERIAL_SPACE(); HARDWARE_SERIAL_PROTOCOLPGM("H"); - HARDWARE_SERIAL_PROTOCOL(Laser_printer_st.pic_y_mirror); - HARDWARE_SERIAL_SPACE(); - HARDWARE_SERIAL_ENTER(); - + HARDWARE_SERIAL_PROTOCOL(Laser_printer_st.pic_y_mirror); + HARDWARE_SERIAL_SPACE(); + HARDWARE_SERIAL_ENTER(); } #endif diff --git a/Marlin/src/lcd/anycubic_touchscreen.h b/Marlin/src/lcd/anycubic_touchscreen.h index 97e82325..84d2f503 100755 --- a/Marlin/src/lcd/anycubic_touchscreen.h +++ b/Marlin/src/lcd/anycubic_touchscreen.h @@ -289,62 +289,58 @@ private: #if ENABLED(KNUTWURST_MEGA_P_LASER) + typedef struct { - -unsigned char bfType[2]; -unsigned char bfSize[4]; -unsigned char bfReserved1[2]; -unsigned char bfReserved2[2]; -unsigned char bfOffBits[4]; -unsigned char biSize[4]; -unsigned char biWidth[4]; -unsigned char biHeight[4]; -unsigned char biPlanes[2]; -unsigned char biBitCount[2]; -unsigned char biCompression[4]; -unsigned char biSizeImage[4]; -unsigned char biXPelsPerMeter[4]; -unsigned char biYPelsPerMeter[4]; -unsigned char biClrUsed[4]; -unsigned char biClrImportant[4]; + unsigned char bfType[2]; + unsigned char bfSize[4]; + unsigned char bfReserved1[2]; + unsigned char bfReserved2[2]; + unsigned char bfOffBits[4]; + unsigned char biSize[4]; + unsigned char biWidth[4]; + unsigned char biHeight[4]; + unsigned char biPlanes[2]; + unsigned char biBitCount[2]; + unsigned char biCompression[4]; + unsigned char biSizeImage[4]; + unsigned char biXPelsPerMeter[4]; + unsigned char biYPelsPerMeter[4]; + unsigned char biClrUsed[4]; + unsigned char biClrImportant[4]; }BMP_HEAD; - typedef struct -{ /*ͼƬ��ӡ���ֲ���**/ - unsigned long pic_file_size; - unsigned long pic_ptr; - unsigned long pic_start; +{ + unsigned long pic_file_size; + unsigned long pic_ptr; + unsigned long pic_start; - float pic_pixel_distance;//����֮��ľ��루0.1-0.3�� - float laser_height;//����߶� - float x_offset;//X�����ƫ�� - float y_offset;//Y�����ƫ�� - - 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;//�Ƿ���ʸ��ͼ��1Ϊʸ��ͼ��0Ϊλͼ - unsigned char pic_x_mirror; //X������,1Ϊ���� - unsigned char pic_y_mirror; //Y������1Ϊ���� - unsigned char pic_laser_time;//��������ʱ�䣨10-30�� + float pic_pixel_distance; + float laser_height; + float x_offset; + 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; + 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; #define PIC_FIXED 0.1f // // POINT/MM #define PIC_OPEN 50 // // ms #define PIC_SPEDD 20000 -#define MIN_GRAY_VLAUE 20 //��С�ĻҶ�ֵ С�ڸ�ֵ���������� +#define MIN_GRAY_VLAUE 20 #define LASER_PRINT_SPEED 30 //50*60 #endif