diff options
| -rw-r--r-- | firmware/drivers/lcd-1bit-vert.c | 5 | ||||
| -rw-r--r-- | firmware/drivers/lcd-2bit-horz.c | 5 | ||||
| -rw-r--r-- | firmware/drivers/lcd-2bit-vert.c | 5 | ||||
| -rw-r--r-- | firmware/drivers/lcd-remote-1bit-v.c | 5 | ||||
| -rw-r--r-- | firmware/drivers/lcd-remote-2bit-vi.c | 5 | ||||
| -rw-r--r-- | firmware/export/scroll_engine.h | 4 |
6 files changed, 10 insertions, 19 deletions
diff --git a/firmware/drivers/lcd-1bit-vert.c b/firmware/drivers/lcd-1bit-vert.c index 1720a5ff5c..bd62e105cb 100644 --- a/firmware/drivers/lcd-1bit-vert.c +++ b/firmware/drivers/lcd-1bit-vert.c @@ -687,9 +687,8 @@ void lcd_puts_scroll_style_offset(int x, int y, const unsigned char *string, s = &lcd_scroll_info.scroll[y]; s->start_tick = current_tick + lcd_scroll_info.delay; - s->invert = false; + s->style = style; if (style & STYLE_INVERT) { - s->invert = true; lcd_puts_style_offset(x,y,string,STYLE_INVERT,offset); } else @@ -785,7 +784,7 @@ void lcd_scroll_fn(void) } lastmode = drawmode; - drawmode = s->invert ? + drawmode = (s->style&STYLE_INVERT) ? (DRMODE_SOLID|DRMODE_INVERSEVID) : DRMODE_SOLID; lcd_putsxyofs(xpos, ypos, s->offset, s->line); drawmode = lastmode; diff --git a/firmware/drivers/lcd-2bit-horz.c b/firmware/drivers/lcd-2bit-horz.c index 70d6b439ce..32ebfa7f81 100644 --- a/firmware/drivers/lcd-2bit-horz.c +++ b/firmware/drivers/lcd-2bit-horz.c @@ -886,9 +886,8 @@ void lcd_puts_scroll_style_offset(int x, int y, const unsigned char *string, s = &lcd_scroll_info.scroll[y]; s->start_tick = current_tick + lcd_scroll_info.delay; - s->invert = false; + s->style = style; if (style & STYLE_INVERT) { - s->invert = true; lcd_puts_style_offset(x,y,string,STYLE_INVERT,offset); } else @@ -984,7 +983,7 @@ void lcd_scroll_fn(void) } lastmode = drawmode; - drawmode = s->invert ? + drawmode = (s->style&STYLE_INVERT) ? (DRMODE_SOLID|DRMODE_INVERSEVID) : DRMODE_SOLID; lcd_putsxyofs(xpos, ypos, s->offset, s->line); drawmode = lastmode; diff --git a/firmware/drivers/lcd-2bit-vert.c b/firmware/drivers/lcd-2bit-vert.c index 6be42afe86..aa3cd2cc3b 100644 --- a/firmware/drivers/lcd-2bit-vert.c +++ b/firmware/drivers/lcd-2bit-vert.c @@ -1022,9 +1022,8 @@ void lcd_puts_scroll_style_offset(int x, int y, const unsigned char *string, s = &lcd_scroll_info.scroll[y]; s->start_tick = current_tick + lcd_scroll_info.delay; - s->invert = false; + s->style = style; if (style & STYLE_INVERT) { - s->invert = true; lcd_puts_style_offset(x,y,string,STYLE_INVERT,offset); } else @@ -1120,7 +1119,7 @@ void lcd_scroll_fn(void) } lastmode = drawmode; - drawmode = s->invert ? + drawmode = (s->style&STYLE_INVERT) ? (DRMODE_SOLID|DRMODE_INVERSEVID) : DRMODE_SOLID; lcd_putsxyofs(xpos, ypos, s->offset, s->line); drawmode = lastmode; diff --git a/firmware/drivers/lcd-remote-1bit-v.c b/firmware/drivers/lcd-remote-1bit-v.c index 480df73c2d..9bfbf580d9 100644 --- a/firmware/drivers/lcd-remote-1bit-v.c +++ b/firmware/drivers/lcd-remote-1bit-v.c @@ -685,9 +685,8 @@ void lcd_remote_puts_scroll_style_offset(int x, int y, const unsigned char *stri s = &lcd_remote_scroll_info.scroll[y]; s->start_tick = current_tick + lcd_remote_scroll_info.delay; - s->invert = false; + s->style = style; if (style & STYLE_INVERT) { - s->invert = true; lcd_remote_puts_style_offset(x,y,string,STYLE_INVERT,offset); } else @@ -783,7 +782,7 @@ void lcd_remote_scroll_fn(void) } lastmode = drawmode; - drawmode = s->invert ? + drawmode = (s->style&STYLE_INVERT) ? (DRMODE_SOLID|DRMODE_INVERSEVID) : DRMODE_SOLID; lcd_remote_putsxyofs(xpos, ypos, s->offset, s->line); drawmode = lastmode; diff --git a/firmware/drivers/lcd-remote-2bit-vi.c b/firmware/drivers/lcd-remote-2bit-vi.c index 51189b0fa9..d5757f4dbb 100644 --- a/firmware/drivers/lcd-remote-2bit-vi.c +++ b/firmware/drivers/lcd-remote-2bit-vi.c @@ -1022,9 +1022,8 @@ void lcd_remote_puts_scroll_style_offset(int x, int y, const unsigned char *stri s = &lcd_remote_scroll_info.scroll[y]; s->start_tick = current_tick + lcd_remote_scroll_info.delay; - s->invert = false; + s->style = style; if (style & STYLE_INVERT) { - s->invert = true; lcd_remote_puts_style_offset(x,y,string,STYLE_INVERT,offset); } else @@ -1120,7 +1119,7 @@ void lcd_remote_scroll_fn(void) } lastmode = drawmode; - drawmode = s->invert ? + drawmode = (s->style&STYLE_INVERT) ? (DRMODE_SOLID|DRMODE_INVERSEVID) : DRMODE_SOLID; lcd_remote_putsxyofs(xpos, ypos, s->offset, s->line); drawmode = lastmode; diff --git a/firmware/export/scroll_engine.h b/firmware/export/scroll_engine.h index 238641c08c..5e39990129 100644 --- a/firmware/export/scroll_engine.h +++ b/firmware/export/scroll_engine.h @@ -43,11 +43,7 @@ struct scrollinfo int startx; #ifdef HAVE_LCD_BITMAP int width; /* length of line in pixels */ -#ifdef HAVE_LCD_COLOR int style; /* line style */ -#else - bool invert; /* invert the scrolled text */ -#endif #endif/* HAVE_LCD_BITMAP */ bool backward; /* scroll presently forward or backward? */ bool bidir; |