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

bug fix,first line disappear fixed,next is clear extra points that appear incorrectly at bottom,and word-to-word alignment

Browse Source
This commit is contained in:
cuu 2022-02-28 06:04:37 -06:00
parent 441adea43f
commit 5d0727108d
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Code/thermal_printer/Makefile
View File

@ -1,6 +1,6 @@
CC = gcc CC = gcc
CFLAGS = -g -Wall CFLAGS = -O0 -g -Wall
LDFLAGS = LDFLAGS =
INCLUDES = -I /usr/include/freetype2 INCLUDES = -I /usr/include/freetype2
LIBS = -lwiringPi -lm -lcrypt -lpthread -lfreetype -lrt LIBS = -lwiringPi -lm -lcrypt -lpthread -lfreetype -lrt

19
Code/thermal_printer/printer.c
View File

@ -454,6 +454,7 @@ uint8_t print_lines_ft(CONFIG*cfg) {
i = lastidx; i = lastidx;
row_cnt = 0; row_cnt = 0;
row_offset = 0; row_offset = 0;
row = 0;
while(row<current_font.height){ while(row<current_font.height){
line_bits=cfg->margin.width; line_bits=cfg->margin.width;
dot_line_idx = line_bits/8; dot_line_idx = line_bits/8;
@ -475,7 +476,8 @@ uint8_t print_lines_ft(CONFIG*cfg) {
int x_off = (advance - glyph_width) / 2; int x_off = (advance - glyph_width) / 2;
int bitmap_rows = cfg->face->glyph->bitmap.rows; int bitmap_rows = cfg->face->glyph->bitmap.rows;
int bitmap_top = cfg->face->glyph->bitmap_top; int bitmap_top = cfg->face->glyph->bitmap_top;
int bitmap_left = cfg->face->glyph->bitmap_left; int bitmap_left = cfg->face->glyph->bitmap_left;
int bitmap_width = cfg->face->glyph->bitmap.width;
//FT_Render_Glyph(cfg->face->glyph, FT_RENDER_MODE_NORMAL); //FT_Render_Glyph(cfg->face->glyph, FT_RENDER_MODE_NORMAL);
FT_Render_Glyph(cfg->face->glyph, FT_RENDER_MODE_MONO); //disable AA FT_Render_Glyph(cfg->face->glyph, FT_RENDER_MODE_MONO); //disable AA
@ -484,8 +486,9 @@ uint8_t print_lines_ft(CONFIG*cfg) {
j = 0; w= 0; j = 0; w= 0;
if(lastj !=0){j= lastj;} if(lastj !=0){j= lastj;}
if(lastw !=0) { w = lastw;} if(lastw !=0) { w = lastw;}
while(w < glyph_width) { while(w < bitmap_width ) {
if(w > 0 && (w%8) == 0) j++; //if(w > 0 && (w%8) == 0) j++;
j = w/8;
if(dot_line_bitsidx > 7 ){ if(dot_line_bitsidx > 7 ){
dot_line_idx++; dot_line_idx++;
dot_line_bitsidx=0; dot_line_bitsidx=0;
@ -493,11 +496,13 @@ uint8_t print_lines_ft(CONFIG*cfg) {
//unsigned char p = cfg->face->glyph->bitmap.buffer[row * cfg->face->glyph->bitmap.pitch + w]; //unsigned char p = cfg->face->glyph->bitmap.buffer[row * cfg->face->glyph->bitmap.pitch + w];
unsigned char p = 0; unsigned char p = 0;
int pitch = abs(cfg->face->glyph->bitmap.pitch);
if( row >= row_offset ) { if( row >= row_offset ) {
row_cnt = row-row_offset; row_cnt = row-row_offset;
if(row_cnt <= bitmap_rows) { if(row_cnt < bitmap_rows) {
p = (cfg->face->glyph->bitmap.buffer[row_cnt*cfg->face->glyph->bitmap.pitch+j] >> (7-w%8)) & 1;//disable AA //p = (cfg->face->glyph->bitmap.buffer[row_cnt*cfg->face->glyph->bitmap.pitch+j] >> (7-w%8)) & 1;//disable AA
p = cfg->face->glyph->bitmap.buffer[row_cnt*pitch+j];
p = p & (128 >> (w&7));
} }
} }
@ -533,7 +538,7 @@ uint8_t print_lines_ft(CONFIG*cfg) {
if(line_bits >= MAX_DOTS || i >=ser_cache.idx){ if(line_bits >= MAX_DOTS || i >=ser_cache.idx){
if(row == (current_font.height-1)) {// last of the row loop if(row == (current_font.height-1)) {// last of the row loop
if(w >= current_font.width){ if(w >= bitmap_width){
lastidx = i+1; lastidx = i+1;
lastw =0; lastw =0;
lastj =0; lastj =0;