<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmocom-bb/+/19483">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">firmware/fb: Implemtented fb_bw8_line and fb_set_p(uint16_t x,uint16_t y)<br><br>Change-Id: Id8856ace2a31ba4ebcd04746e0c96c23a679cc40<br>---<br>M src/target/firmware/fb/fb_bw8.c<br>M src/target/firmware/fb/fb_st7558.c<br>M src/target/firmware/include/fb/fb_bw8.h<br>M src/target/firmware/include/fb/framebuffer.h<br>4 files changed, 60 insertions(+), 19 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/target/firmware/fb/fb_bw8.c b/src/target/firmware/fb/fb_bw8.c</span><br><span>index ffb59d8..0fc12ee 100644</span><br><span>--- a/src/target/firmware/fb/fb_bw8.c</span><br><span>+++ b/src/target/firmware/fb/fb_bw8.c</span><br><span>@@ -22,6 +22,7 @@</span><br><span> *</span><br><span> */</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#include <stdlib.h></span><br><span> #include <fb/framebuffer.h></span><br><span> #include <fb/fb_bw8.h></span><br><span> </span><br><span>@@ -51,7 +52,7 @@</span><br><span> uint16_t x2,uint16_t y2 /* right lower corner (inclusive) */</span><br><span> ){</span><br><span> fb_sanitize_box(&x1,&y1,&x2,&y2);</span><br><span style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> x2++; /* see definition of fb_bw8->damage_x2/y2 */</span><br><span> y2++;</span><br><span> </span><br><span>@@ -86,17 +87,6 @@</span><br><span> #endif</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void fb_bw8_line(uint16_t x1,uint16_t y1,uint16_t x2,uint16_t y2){</span><br><span style="color: hsl(0, 100%, 40%);">- fb_sanitize_box(&x1,&y1,&x2,&y2);</span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME : this is currently unimplemented! */</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-void fb_bw8_lineto(uint16_t x,uint16_t y){</span><br><span style="color: hsl(0, 100%, 40%);">- fb_bw8_line(framebuffer->cursor_x,framebuffer->cursor_y,x,y);</span><br><span style="color: hsl(0, 100%, 40%);">- framebuffer->cursor_x = x;</span><br><span style="color: hsl(0, 100%, 40%);">- framebuffer->cursor_y = y; </span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* depending on color set (add to or_mask) or clear</span><br><span> (remove from and_mask) bit number bitnum */</span><br><span> static void set_pixel(uint8_t *and_mask,</span><br><span>@@ -166,13 +156,56 @@</span><br><span> framebuffer->cursor_y = y;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Just set the given pixel to the current front ground color.</span><br><span style="color: hsl(120, 100%, 40%);">+ * This function does not update the damage rectangle! */</span><br><span style="color: hsl(120, 100%, 40%);">+void fb_bw8_set_pixel(uint16_t x,uint16_t y){</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t *p = fb_bw8->mem + (y/8)*framebuffer->width + x;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t and_mask = 0xff, or_mask = 0x00;</span><br><span style="color: hsl(120, 100%, 40%);">+ set_fg_pixel(&and_mask, &or_mask, y % 8);</span><br><span style="color: hsl(120, 100%, 40%);">+ *p = (*p & and_mask)|or_mask;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* printf("fb_bw8_set_pixel: set: (%u|%u)\n", x, y); */</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* Copy Paste from</span><br><span style="color: hsl(120, 100%, 40%);">+ * http://de.wikipedia.org/wiki/Bresenham-Algorithmus#Kompakte_Variante */</span><br><span style="color: hsl(120, 100%, 40%);">+static void fb_bw8_line(int16_t x1,int16_t y1,int16_t x2,int16_t y2){</span><br><span style="color: hsl(120, 100%, 40%);">+ fb_limit_fb_range(&x1, &y1);</span><br><span style="color: hsl(120, 100%, 40%);">+ fb_limit_fb_range(&x2, &y2);</span><br><span style="color: hsl(120, 100%, 40%);">+ fb_bw8_update_damage(x1,y1,x2,y2);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* printf("fb_bw8_line from (%u|%u) -> (%u|%u)\n", x1, y1, x2, y2); */</span><br><span style="color: hsl(120, 100%, 40%);">+ int16_t dx = abs(x2-x1), dy = -abs(y2-y1);</span><br><span style="color: hsl(120, 100%, 40%);">+ int16_t sx = x1<x2 ? 1 : -1, sy = y1<y2 ? 1 : -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ int16_t err = dx+dy, e2; /* error value e_xy */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ while (1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ fb_bw8_set_pixel(x1,y1);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (x1==x2 && y1==y2) break;</span><br><span style="color: hsl(120, 100%, 40%);">+ e2 = 2*err;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (e2 > dy) { err += dy; x1 += sx; } /* e_xy+e_x > 0 */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (e2 < dx) { err += dx; y1 += sy; } /* e_xy+e_y < 0 */</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* Set the given pixel to the current front ground color and update the damage</span><br><span style="color: hsl(120, 100%, 40%);">+ * rectangle. */</span><br><span style="color: hsl(120, 100%, 40%);">+void fb_bw8_set_p(uint16_t x,uint16_t y){</span><br><span style="color: hsl(120, 100%, 40%);">+ fb_bw8_update_damage(x,y,x+1,y+1);</span><br><span style="color: hsl(120, 100%, 40%);">+ fb_bw8_set_pixel(x,y);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+void fb_bw8_lineto(uint16_t x,uint16_t y){</span><br><span style="color: hsl(120, 100%, 40%);">+ fb_bw8_line(framebuffer->cursor_x,framebuffer->cursor_y,x,y);</span><br><span style="color: hsl(120, 100%, 40%);">+ framebuffer->cursor_x = x;</span><br><span style="color: hsl(120, 100%, 40%);">+ framebuffer->cursor_y = y;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* this is the most ridiculous function ever, because it has to</span><br><span> fiddle with two braindead bitmaps at once, both being</span><br><span> organized differently */</span><br><span> </span><br><span> /* draw text at current position, with current font and colours up</span><br><span> to a width of maxwidth pixels, return pixelwidth consumed */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> int</span><br><span> fb_bw8_putstr(char *str,int maxwidth){</span><br><span> const struct fb_font *font = fb_fonts[framebuffer->font];</span><br><span>@@ -187,7 +220,7 @@</span><br><span> int bitmap_offs,bitmap_bit; // offset inside bitmap, bit number of pixel</span><br><span> int fb8_offs; // offset to current pixel in framebuffer</span><br><span> uint8_t and_mask,or_mask; // to draw on framebuffer</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t *p; // pointer into framebuffer memorya</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t *p; // pointer into framebuffer memory</span><br><span> int total_w; // total width</span><br><span> </span><br><span> /* center, if maxwidth < 0 */</span><br><span>@@ -251,7 +284,7 @@</span><br><span> bitmap_y = fchr->bbox_h -</span><br><span> (char_y - fchr->bbox_y) - 1;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- fb8_offs = framebuffer->cursor_x + </span><br><span style="color: hsl(120, 100%, 40%);">+ fb8_offs = framebuffer->cursor_x +</span><br><span> char_x + (y/8)*framebuffer->width;</span><br><span> </span><br><span> and_mask = 0xff;</span><br><span>diff --git a/src/target/firmware/fb/fb_st7558.c b/src/target/firmware/fb/fb_st7558.c</span><br><span>index fdcd38f..f09b12b 100644</span><br><span>--- a/src/target/firmware/fb/fb_st7558.c</span><br><span>+++ b/src/target/firmware/fb/fb_st7558.c</span><br><span>@@ -118,6 +118,7 @@</span><br><span> .clear = fb_bw8_clear,</span><br><span> .boxto = fb_bw8_boxto,</span><br><span> .lineto = fb_bw8_lineto,</span><br><span style="color: hsl(120, 100%, 40%);">+ .set_p = fb_bw8_set_p,</span><br><span> .putstr = fb_bw8_putstr,</span><br><span> .flush = fb_st7558_flush,</span><br><span> .width = ST7558_WIDTH,</span><br><span>diff --git a/src/target/firmware/include/fb/fb_bw8.h b/src/target/firmware/include/fb/fb_bw8.h</span><br><span>index d84f91a..db0b31a 100644</span><br><span>--- a/src/target/firmware/include/fb/fb_bw8.h</span><br><span>+++ b/src/target/firmware/include/fb/fb_bw8.h</span><br><span>@@ -6,9 +6,9 @@</span><br><span> are common to similar organized displays. */</span><br><span> </span><br><span> /*</span><br><span style="color: hsl(0, 100%, 40%);">- Sketch of Memory Layout </span><br><span style="color: hsl(120, 100%, 40%);">+ Sketch of Memory Layout</span><br><span> Left Upper Corner of Display</span><br><span style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> col0 col2</span><br><span> col1</span><br><span> +-------------</span><br><span>@@ -22,7 +22,7 @@</span><br><span> ...</span><br><span> </span><br><span> Backing store (and internal display memory?) looks like...</span><br><span style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> uint8_t mem[] = { A, B, C, .... Q, R, S, ... }</span><br><span> </span><br><span> We work on a in-memory copy of the framebuffer and only</span><br><span>@@ -45,6 +45,7 @@</span><br><span> extern void fb_bw8_clear();</span><br><span> extern void fb_bw8_boxto(uint16_t x,uint16_t y); /* draw a box from cursor to x,y */</span><br><span> extern void fb_bw8_lineto(uint16_t x,uint16_t y); /* draw a line from cursor to x,y */</span><br><span style="color: hsl(120, 100%, 40%);">+extern void fb_bw8_set_p(uint16_t x,uint16_t y);</span><br><span> </span><br><span> extern int fb_bw8_putstr(char *str,int maxwidth);</span><br><span> </span><br><span>diff --git a/src/target/firmware/include/fb/framebuffer.h b/src/target/firmware/include/fb/framebuffer.h</span><br><span>index e765b36..8a56565 100644</span><br><span>--- a/src/target/firmware/include/fb/framebuffer.h</span><br><span>+++ b/src/target/firmware/include/fb/framebuffer.h</span><br><span>@@ -8,7 +8,7 @@</span><br><span> /* if a color is "special", then the RGB components most likely</span><br><span> don't make sense. Use "special" colours when you have to</span><br><span> mask out bits with transparency or you have to encode</span><br><span style="color: hsl(0, 100%, 40%);">- colours in a fixed color palette... */</span><br><span style="color: hsl(120, 100%, 40%);">+ colours in a fixed color palette ... */</span><br><span> </span><br><span> #define FB_COLOR_WHITE 0x00ffffffU</span><br><span> #define FB_COLOR_BLACK 0x00000000U</span><br><span>@@ -31,6 +31,7 @@</span><br><span> char name[8]; // keep it short!</span><br><span> void (*init)(); // (re)initialize</span><br><span> void (*clear)(); // clear display</span><br><span style="color: hsl(120, 100%, 40%);">+ void (*set_p)(uint16_t x,uint16_t y); // set pixel to fg color</span><br><span> void (*boxto)(uint16_t x,uint16_t y); // draw box to xy</span><br><span> void (*lineto)(uint16_t x,uint16_t y); // draw line to xy</span><br><span> int (*putstr)(char *c,int maxwidth); // put text in current font to fb</span><br><span>@@ -66,6 +67,11 @@</span><br><span> framebuffer->lineto(x,y);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static inline void</span><br><span style="color: hsl(120, 100%, 40%);">+fb_set_p(uint16_t x,uint16_t y){</span><br><span style="color: hsl(120, 100%, 40%);">+ framebuffer->set_p(x,y);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static inline int</span><br><span> fb_putstr(char *str,int maxwidth){</span><br><span> return framebuffer->putstr(str,maxwidth);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmocom-bb/+/19483">change 19483</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmocom-bb/+/19483"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Id8856ace2a31ba4ebcd04746e0c96c23a679cc40 </div>
<div style="display:none"> Gerrit-Change-Number: 19483 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: roox <mardnh@gmx.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>