diff --git a/main/module/Printer_Config.h b/main/module/Printer_Config.h index fbaec02..a11ba03 100644 --- a/main/module/Printer_Config.h +++ b/main/module/Printer_Config.h @@ -3,6 +3,7 @@ #define TH_WIDTH 58 //打印机头点数 +#define TH_ACTUAL_WIDTH 48//实际能加热的点数 #define MAX_PAPERSIZE 58//头片支持纸张宽度 #define DOTMAPLINE 450*8 diff --git a/main/module/Printer_run.c b/main/module/Printer_run.c index c87173c..837ad76 100644 --- a/main/module/Printer_run.c +++ b/main/module/Printer_run.c @@ -23,7 +23,8 @@ Receive_data_t Rev_USB_data = { typedef struct _Heat_page_t{ char* Heat_Page_buff; - uint8_t Heat_line_buf[58]; + char Heat_block_buff[80][TH_ACTUAL_WIDTH]; + uint8_t Heat_line_buf[TH_WIDTH]; uint32_t Heat_Read; uint32_t Heat_Write; uint16_t Heat_Initial_time; @@ -67,15 +68,25 @@ void Sys_heap_Init(void) void Fill_Page_Buff(char ch) { - int i=0; + int i=0,j=0; uint8_t Rebuff[72]; - memcpy(&Rebuff[0],&Font24x24ASCII[0x41*72],72); + memcpy(&Rebuff[0],&Font24x24ASCII[ch*72],72); // ESP_LOGI(TAG, "Font24x24ASCII[%d]: %X %X %X",0x41,) - // for(i=0;i<24;i++) - // { - // memcpy(Rebuff[0],&Font24x24ASCII[0x41*72],3); - // ESP_LOGI(TAG, "Font24x24ASCII[%d]: %X %X %X",i,Heat58MM.Heat_Page_buff[0],Heat58MM.Heat_Page_buff[0],Heat58MM.Heat_Page_buff[0]); - // } + for(i=0;i<24;i++) + { + for(j=0;j<16;j++) + { + memcpy(&Rebuff[0],&Font24x24ASCII[(ch+j)*72],72); + memcpy(&Heat58MM.Heat_block_buff[i][j*3],&Rebuff[i*3],3); + } + // memcpy(&Heat58MM.Heat_block_buff[i][0],&Rebuff[i*3],3); + + } + + for(i=0;i<80;i++) + { + memcpy(&Heat58MM.Heat_Page_buff[i*TH_ACTUAL_WIDTH],&Heat58MM.Heat_block_buff[i][0],TH_ACTUAL_WIDTH); + } } @@ -89,7 +100,7 @@ void Printer_Run_task(void *pvParameter) { if(gpio_get_level(FEED_KEY.pin_num) == 0) { - + Fill_Page_Buff('1'); xEventGroupSetBits(Printer_group,EVENT_Motor_Test); while (gpio_get_level(FEED_KEY.pin_num) == 0) { vTaskDelay(10 / portTICK_PERIOD_MS); @@ -130,7 +141,8 @@ static void Printer_start(uint8_t Heat_Step) if(Heat_Step == 0) { // memset(&PrnHeatProp[0],0xf0,TOTALBIT/8); - memcpy(&Heat58MM.Heat_line_buf[0],&Heat58MM.Heat_Page_buff[Heat58MM.Heat_Read*TH_WIDTH],TH_WIDTH); + memcpy(&Heat58MM.Heat_line_buf[10],&Heat58MM.Heat_Page_buff[Heat58MM.Heat_Read*TH_ACTUAL_WIDTH],TH_ACTUAL_WIDTH); + // ESP_LOGI(TAG, "Font24x24ASCII[%d]: %X %X %X",Heat_Step,Heat58MM.Heat_line_buf[0],Heat58MM.Heat_line_buf[1],Heat58MM.Heat_line_buf[2]); spi_printer_data_send(Printer_spi,&Heat58MM.Heat_line_buf[0]); Heat58MM.Heat_Read+=1; }else{ @@ -153,6 +165,7 @@ void Printer_Heat_task(void *pvParameter) { case EVENT_Motor_Test: // ESP_LOGI(TAG,"Event Motor_Test"); + // Fill_Page_Buff('A'); Heat58MM.Heat_Write = 80; Printer_start(Heat_Step); // Set_heat_timer_value(1000*1000*5); @@ -162,7 +175,7 @@ void Printer_Heat_task(void *pvParameter) //开始加热 STB.state = 1; gpio_set_level(STB.pin_num,STB.state); - Set_heat_timer_value(600*1); + Set_heat_timer_value(400*1); // Motor_GO(1); // //ESP_LOGI(TAG,"Heat_EVENT:%d",PrnDotRd); // xSemaphoreGive(Spi_send_end);