This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
roox gerrit-no-reply at lists.osmocom.orgroox has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19483 ) Change subject: Implemented fb_bw8_line. ...................................................................... Implemented fb_bw8_line. Change-Id: Id8856ace2a31ba4ebcd04746e0c96c23a679cc40 --- M src/target/firmware/fb/fb_bw8.c 1 file changed, 40 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/83/19483/1 diff --git a/src/target/firmware/fb/fb_bw8.c b/src/target/firmware/fb/fb_bw8.c index ffb59d8..d4ffd21 100644 --- a/src/target/firmware/fb/fb_bw8.c +++ b/src/target/firmware/fb/fb_bw8.c @@ -22,6 +22,7 @@ * */ +#include <stdlib.h> #include <fb/framebuffer.h> #include <fb/fb_bw8.h> @@ -51,7 +52,7 @@ uint16_t x2,uint16_t y2 /* right lower corner (inclusive) */ ){ fb_sanitize_box(&x1,&y1,&x2,&y2); - + x2++; /* see definition of fb_bw8->damage_x2/y2 */ y2++; @@ -86,17 +87,6 @@ #endif } -static void fb_bw8_line(uint16_t x1,uint16_t y1,uint16_t x2,uint16_t y2){ - fb_sanitize_box(&x1,&y1,&x2,&y2); - /* FIXME : this is currently unimplemented! */ -} - -void fb_bw8_lineto(uint16_t x,uint16_t y){ - fb_bw8_line(framebuffer->cursor_x,framebuffer->cursor_y,x,y); - framebuffer->cursor_x = x; - framebuffer->cursor_y = y; -} - /* depending on color set (add to or_mask) or clear (remove from and_mask) bit number bitnum */ static void set_pixel(uint8_t *and_mask, @@ -166,13 +156,48 @@ framebuffer->cursor_y = y; } +/* just set this pixel to the current front ground color */ +void set_pixel_r(uint16_t x,uint16_t y){ + uint8_t *p = fb_bw8->mem + (y/8)*framebuffer->width + x; + uint8_t and_mask = 0xff, or_mask = 0x00; + set_fg_pixel(&and_mask, &or_mask, y % 8); + *p = (*p & and_mask)|or_mask; + /* printf("fb_bw8.c: Set: (%u|%u)\n", x, y); */ +} + +/* Copy Paste from + * http://de.wikipedia.org/wiki/Bresenham-Algorithmus#Kompakte_Variante */ +static void fb_bw8_line(int16_t x1,int16_t y1,int16_t x2,int16_t y2){ + fb_bw8_update_damage(x1,y1,x2,y2); + fb_limit_fb_range(&x1, &y1); + fb_limit_fb_range(&x2, &y2); + /* printf("fb_bw8_line from (%u|%u) -> (%u|%u)\n", x1, y1, x2, y2); */ + int16_t dx = abs(x2-x1), dy = -abs(y2-y1); + int16_t sx = x1<x2 ? 1 : -1, sy = y1<y2 ? 1 : -1; + int16_t err = dx+dy, e2; /* error value e_xy */ + + for(;;){ /* loop */ + set_pixel_r(x1,y1); + if (x1==x2 && y1==y2) break; + e2 = 2*err; + if (e2 > dy) { err += dy; x1 += sx; } /* e_xy+e_x > 0 */ + if (e2 < dx) { err += dx; y1 += sy; } /* e_xy+e_y < 0 */ + } +} + +void fb_bw8_lineto(uint16_t x,uint16_t y){ + fb_bw8_line(framebuffer->cursor_x,framebuffer->cursor_y,x,y); + framebuffer->cursor_x = x; + framebuffer->cursor_y = y; +} + + /* this is the most ridiculous function ever, because it has to fiddle with two braindead bitmaps at once, both being organized differently */ /* draw text at current position, with current font and colours up to a width of maxwidth pixels, return pixelwidth consumed */ - int fb_bw8_putstr(char *str,int maxwidth){ const struct fb_font *font = fb_fonts[framebuffer->font]; @@ -187,7 +212,7 @@ int bitmap_offs,bitmap_bit; // offset inside bitmap, bit number of pixel int fb8_offs; // offset to current pixel in framebuffer uint8_t and_mask,or_mask; // to draw on framebuffer - uint8_t *p; // pointer into framebuffer memorya + uint8_t *p; // pointer into framebuffer memory int total_w; // total width /* center, if maxwidth < 0 */ @@ -251,7 +276,7 @@ bitmap_y = fchr->bbox_h - (char_y - fchr->bbox_y) - 1; - fb8_offs = framebuffer->cursor_x + + fb8_offs = framebuffer->cursor_x + char_x + (y/8)*framebuffer->width; and_mask = 0xff; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19483 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Id8856ace2a31ba4ebcd04746e0c96c23a679cc40 Gerrit-Change-Number: 19483 Gerrit-PatchSet: 1 Gerrit-Owner: roox <mardnh at gmx.de> Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200801/da5cf9c2/attachment.htm>