From b34f272588ffdefbb9082b70b8f40befb80f3c9a Mon Sep 17 00:00:00 2001 From: Babz Date: Thu, 9 Sep 2021 22:09:33 +0200 Subject: [PATCH] better naming of term API --- src/main.c | 4 ++-- src/term.c | 6 ++++-- src/term.h | 3 ++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main.c b/src/main.c index 941ccec..4477f54 100644 --- a/src/main.c +++ b/src/main.c @@ -77,8 +77,8 @@ int main(int isappli, int optnum) { int off_state = 0; uint16_t backlight_save; - term_append(LOREM_IPSUM); - term_append("-----------------------------------------------------------------"); + term_print(LOREM_IPSUM); + term_print("-----------------------------------------------------------------"); term_printf("isappli=%d optnum=%d\n", isappli, optnum); set_statusbar(tick_ctr, shift_state, alpha_state, get_battery_voltage()); diff --git a/src/term.c b/src/term.c index 3913848..33b74c0 100644 --- a/src/term.c +++ b/src/term.c @@ -117,7 +117,7 @@ void term_scroll_down(void) { } } -void term_append(const char *str) { +int term_print(const char *str) { static int row = 1; static int col = 0; @@ -138,6 +138,8 @@ void term_append(const char *str) { i += tgrid_sets(&row, &col, C_WHITE, C_BLACK, str + i); } + + return i; } int term_printf(const char *restrict format, ...) { @@ -146,7 +148,7 @@ int term_printf(const char *restrict format, ...) { char buf[1024]; const int n = vsprintf(buf, format, argp); - term_append(buf); + term_print(buf); va_end(argp); return n; diff --git a/src/term.h b/src/term.h index 68e8373..8170d84 100644 --- a/src/term.h +++ b/src/term.h @@ -9,7 +9,8 @@ void tgrid_display(void); int term_writeat(int row, int col, int fg, int bg, const char *s); void term_scroll_down(void); -void term_append(const char *str); + +int term_print(const char *str); int term_printf(const char *restrict format, ...); #endif // #ifndef UNS_TERM_H \ No newline at end of file