clockworkpi/DevTerm
1
0
Fork 0
mirror of https://github.com/clockworkpi/DevTerm.git synced 2025-12-15 03:38:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug fix

Browse Source
This commit is contained in:
cuu 2021-05-13 17:04:24 +08:00
parent fb12b78724
commit ae9e649925
3 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Code/thermal_printer/devterm_thermal_printer.c
View File

@ -435,16 +435,13 @@ void parse_cmd(CONFIG*cfg,uint8_t *cmd, uint8_t cmdidx){
//ESC j n //ESC j n
if(cmd[0] == ASCII_ESC && cmd[1] == 0x4a){ if(cmd[0] == ASCII_ESC && cmd[1] == 0x4a){
print_lines8(cfg); if( print_lines8(cfg) == 0) { feed_pitch1(cmd[2],cfg->orient); }
feed_pitch1(cmd[2],cfg->orient);
reset_cmd(); reset_cmd();
} }
//ESC d n //ESC d n
if(cmd[0] == ASCII_ESC && cmd[1] == 0x64){ if(cmd[0] == ASCII_ESC && cmd[1] == 0x64){
print_lines8(cfg); if( print_lines8(cfg) == 0) { feed_pitch1(cmd[2]*cfg->font->height,cfg->orient); }
feed_pitch1(cmd[2]*cfg->font->height,cfg->orient);
reset_cmd(); reset_cmd();
} }
//ESC ! n //ESC ! n

25
Code/thermal_printer/printer.c
View File

@ -368,7 +368,7 @@ uint16_t temperature() {
#endif #endif
void print_lines8(CONFIG*cfg) { uint8_t print_lines8(CONFIG*cfg) {
uint8_t i,j,k; uint8_t i,j,k;
int8_t w; int8_t w;
uint8_t *data; uint8_t *data;
@ -383,6 +383,8 @@ void print_lines8(CONFIG*cfg) {
uint8_t lastidx,lastw,lastj; uint8_t lastidx,lastw,lastj;
int8_t left; int8_t left;
uint8_t rv;
pad = current_font.width %BITS8; pad = current_font.width %BITS8;
if(pad > 0){ if(pad > 0){
@ -395,7 +397,8 @@ void print_lines8(CONFIG*cfg) {
pad = i+pad; pad = i+pad;
row = 0; row = 0;
rv = 0;
data = (uint8_t*)malloc(sizeof(uint8_t)*(pad+1)); data = (uint8_t*)malloc(sizeof(uint8_t)*(pad+1));
i=0; i=0;
@ -485,8 +488,8 @@ void print_lines8(CONFIG*cfg) {
break; break;
} }
} }
rv = IsPaper();
if(IsPaper()== IS_PAPER){ if( rv == IS_PAPER){
//DEBUG("dot_line_idx",dot_line_idx); //DEBUG("dot_line_idx",dot_line_idx);
//DEBUG("dot_line_bits",dot_line_bitsidx); //DEBUG("dot_line_bits",dot_line_bitsidx);
print_dots_8bit_split(cfg,dot_line_data,dot_line_idx+1); print_dots_8bit_split(cfg,dot_line_data,dot_line_idx+1);
@ -505,15 +508,17 @@ void print_lines8(CONFIG*cfg) {
//Serial.println("print ever"); //Serial.println("print ever");
free(data); free(data);
return rv;
} }
void print_image8(CONFIG*cfg){ uint8_t print_image8(CONFIG*cfg){
uint16_t height; uint16_t height;
uint16_t x,y,addr; uint16_t x,y,addr;
uint8_t rv;
uint8_t LinePixels[MAXPIXELS]; uint8_t LinePixels[MAXPIXELS];
uint8_t maxchars= PRINTER_BITS/8; uint8_t maxchars= PRINTER_BITS/8;
@ -521,6 +526,7 @@ void print_image8(CONFIG*cfg){
y=0; y=0;
addr = 0; addr = 0;
rv = 0;
while(y < height ) while(y < height )
{ {
x=0; x=0;
@ -536,8 +542,10 @@ void print_image8(CONFIG*cfg){
x++; x++;
} }
rv = IsPaper();
if(IsPaper()== IS_PAPER) print_dots_8bit_split(cfg,LinePixels,x); if( rv == IS_PAPER) {
print_dots_8bit_split(cfg,LinePixels,x);
}
//feed_pitch1(FEED_PITCH,cfg->orient); //feed_pitch1(FEED_PITCH,cfg->orient);
y++; y++;
@ -549,6 +557,7 @@ void print_image8(CONFIG*cfg){
cfg->img->idx = 0; cfg->img->idx = 0;
cfg->img->width = 0; cfg->img->width = 0;
return rv;
} }
void print_cut_line(CONFIG*cfg){ void print_cut_line(CONFIG*cfg){

4
Code/thermal_printer/printer.h
View File

@ -28,11 +28,11 @@ void print_dots_8bit(CONFIG*cfg,uint8_t *Array, uint8_t characters,uint8_t feed_
uint16_t temperature(); uint16_t temperature();
void print_lines8(CONFIG*); uint8_t print_lines8(CONFIG*);
uint8_t invert_bit(uint8_t a); uint8_t invert_bit(uint8_t a);
void print_image8(CONFIG*); uint8_t print_image6(CONFIG*);
void print_cut_line(CONFIG*); void print_cut_line(CONFIG*);
void printer_set_font(CONFIG*cfg,uint8_t fnbits); void printer_set_font(CONFIG*cfg,uint8_t fnbits);