diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/plugins/oscilloscope.c | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c index baaf25d2b0..3c20d39500 100644 --- a/apps/plugins/oscilloscope.c +++ b/apps/plugins/oscilloscope.c | |||
@@ -300,6 +300,19 @@ void anim_horizontal(int cur_left, int cur_right) | |||
300 | last_left = cur_left; | 300 | last_left = cur_left; |
301 | last_right = cur_right; | 301 | last_right = cur_right; |
302 | 302 | ||
303 | if (displaymsg) | ||
304 | { | ||
305 | int width; | ||
306 | |||
307 | rb->lcd_getstringsize(message, &width, NULL); | ||
308 | last_pos -= width - 1; | ||
309 | rb->lcd_putsxy(last_pos, 0, message); | ||
310 | displaymsg = false; | ||
311 | |||
312 | if (last_pos < 0) | ||
313 | last_pos = 0; | ||
314 | } | ||
315 | |||
303 | if (full_update) | 316 | if (full_update) |
304 | { | 317 | { |
305 | rb->lcd_update(); | 318 | rb->lcd_update(); |
@@ -468,11 +481,11 @@ void anim_vertical(int cur_left, int cur_right) | |||
468 | if (displaymsg) | 481 | if (displaymsg) |
469 | { | 482 | { |
470 | last_pos -= font_height - 1; | 483 | last_pos -= font_height - 1; |
471 | if (last_pos < 0) | ||
472 | last_pos = LCD_HEIGHT - font_height; | ||
473 | |||
474 | rb->lcd_putsxy(0, last_pos, message); | 484 | rb->lcd_putsxy(0, last_pos, message); |
475 | displaymsg = false; | 485 | displaymsg = false; |
486 | |||
487 | if (last_pos < 0) | ||
488 | last_pos = 0; | ||
476 | } | 489 | } |
477 | 490 | ||
478 | if (full_update) | 491 | if (full_update) |
@@ -651,7 +664,9 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
651 | 664 | ||
652 | if (tell_speed) | 665 | if (tell_speed) |
653 | { | 666 | { |
654 | rb->snprintf(message, sizeof(message), "Speed: %d", 100 / osc.delay); | 667 | rb->snprintf(message, sizeof(message), "%s%d", |
668 | (osc.orientation == OSC_VERT) ? "Speed: " : "", | ||
669 | 100 / osc.delay); | ||
655 | displaymsg = true; | 670 | displaymsg = true; |
656 | } | 671 | } |
657 | } | 672 | } |