From 71e97ec2bc954e57b6955b3ec3fc49379116efc7 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Sat, 27 Oct 2018 22:45:41 +0200 Subject: put scrolling into separate thread; activate minutely updates; cleanup --- anzeige.c | 110 ++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 57 insertions(+), 53 deletions(-) (limited to 'anzeige.c') diff --git a/anzeige.c b/anzeige.c index ed79b1c..7bc8980 100644 --- a/anzeige.c +++ b/anzeige.c @@ -9,6 +9,7 @@ #include #include #include +#include #include "fonts.h" #include "input_gadgets.h" @@ -17,16 +18,14 @@ void drop_privileges(); void handle_signals(int signo); -t_display_data display_data; +t_scroll_data scroll_data; int main(int argc, char **argv) { - pthread_t thread_id; int ret_val; - #define TEXT_BUFFER_LENGTH 256 + #define TEXT_BUFFER_LENGTH SCROLL_BUF_LEN / 5 char *text_buffer; char *text_buffer_end; - t_scroll_buffer scroll_buffers[2]; // Set up gpi pointer for direct register access ret_val = multiplexer_setup_root(); @@ -49,7 +48,7 @@ int main(int argc, char **argv) sigaction (SIGHUP, &new_action, NULL); sigaction (SIGTERM, NULL, &old_action); if (old_action.sa_handler != SIG_IGN) - sigaction (SIGTERM, &new_action, NULL);struct sigaction action; + sigaction (SIGTERM, &new_action, NULL); /************************************************************************\ * You are about to change the GPIO settings of your computer. * @@ -59,62 +58,67 @@ int main(int argc, char **argv) \************************************************************************/ // configure the gpio pins and start the multiplexer thread - thread_id = multiplexer_setup_non_root(&display_data); - - int i,j; + multiplexer_setup_scroll(&scroll_data); text_buffer = malloc(TEXT_BUFFER_LENGTH); if (text_buffer == NULL) { - fprintf(stderr, "malloc failed to allocate 24 bytes\n"); + fprintf(stderr, "malloc failed to allocate %d bytes\n", TEXT_BUFFER_LENGTH); exit(EXIT_FAILURE); } - memset(text_buffer, 0, TEXT_BUFFER_LENGTH); - - text_buffer_end = text_buffer; - text_buffer_end = gadgets_retrieve_weather_warnings(text_buffer_end,text_buffer + TEXT_BUFFER_LENGTH - text_buffer_end); - if (text_buffer_end == NULL) { - fprintf(stderr, "gadgets_retrieve_weather_warnings failed\n"); - free(text_buffer); - return EXIT_FAILURE; - } - if (text_buffer + TEXT_BUFFER_LENGTH - text_buffer_end > 0) - text_buffer_end += snprintf(text_buffer_end, text_buffer + TEXT_BUFFER_LENGTH - text_buffer_end, "; "); - text_buffer_end = gadgets_retrieve_current_temperature(text_buffer_end,text_buffer + TEXT_BUFFER_LENGTH - text_buffer_end); - if (text_buffer_end == NULL) { - fprintf(stderr, "gadgets_retrieve_current_temperature failed\n"); - free(text_buffer); - return EXIT_FAILURE; - } - if (text_buffer + TEXT_BUFFER_LENGTH - text_buffer_end > 0) - text_buffer_end += snprintf(text_buffer_end, text_buffer + TEXT_BUFFER_LENGTH - text_buffer_end, "; "); - text_buffer_end = gadgets_retrieve_weather_forecast(text_buffer_end,text_buffer + TEXT_BUFFER_LENGTH - text_buffer_end); - if (text_buffer_end == NULL) { - fprintf(stderr, "gadgets_retrieve_weather_forecast failed\n"); - free(text_buffer); - return EXIT_FAILURE; - } - if (text_buffer + TEXT_BUFFER_LENGTH - text_buffer_end > 0) - text_buffer_end += snprintf(text_buffer_end, text_buffer + TEXT_BUFFER_LENGTH - text_buffer_end, "; "); - - scroll_buffers[0].scroll_len = render(text_buffer, TEXT_BUFFER_LENGTH, scroll_buffers[0].buf, sizeof(scroll_buffers[0].buf), 1); - - i=-40; - while (display_data.keep_running) { - usleep(100000); - for (j=0; j<40; j++) - if (i+j<0) - display_data.buf[(display_data.should_buf+1)%3][j] = 0; - else - display_data.buf[(display_data.should_buf+1)%3][j] = scroll_buffers[0].buf[(i+j) % scroll_buffers[0].scroll_len]; - display_data.should_buf = (display_data.should_buf+1)%3; - i++; - i = i % scroll_buffers[0].scroll_len; + time_t next_update = 0; + + int i=0; + + while (scroll_data . keep_running) { + if ((time(NULL) >= next_update) && (scroll_data . update == 0)) { + next_update = time(NULL) + 60; // one minute ahead + + memset(text_buffer, 0, TEXT_BUFFER_LENGTH); + + text_buffer_end = text_buffer; + + text_buffer_end = gadgets_retrieve_weather_warnings(text_buffer_end,text_buffer + TEXT_BUFFER_LENGTH - text_buffer_end); + if (text_buffer_end == NULL) { + fprintf(stderr, "gadgets_retrieve_weather_warnings failed\n"); + free(text_buffer); + return EXIT_FAILURE; + } + if (text_buffer + TEXT_BUFFER_LENGTH - text_buffer_end > 0) + text_buffer_end += snprintf(text_buffer_end, text_buffer + TEXT_BUFFER_LENGTH - text_buffer_end, "; "); + text_buffer_end = gadgets_retrieve_current_temperature(text_buffer_end,text_buffer + TEXT_BUFFER_LENGTH - text_buffer_end); + if (text_buffer_end == NULL) { + fprintf(stderr, "gadgets_retrieve_current_temperature failed\n"); + free(text_buffer); + return EXIT_FAILURE; + } + if (text_buffer + TEXT_BUFFER_LENGTH - text_buffer_end > 0) + text_buffer_end += snprintf(text_buffer_end, text_buffer + TEXT_BUFFER_LENGTH - text_buffer_end, "; "); + text_buffer_end = gadgets_retrieve_weather_forecast(text_buffer_end,text_buffer + TEXT_BUFFER_LENGTH - text_buffer_end); + if (text_buffer_end == NULL) { + fprintf(stderr, "gadgets_retrieve_weather_forecast failed\n"); + free(text_buffer); + return EXIT_FAILURE; + } + if (text_buffer + TEXT_BUFFER_LENGTH - text_buffer_end > 0) + text_buffer_end += snprintf(text_buffer_end, text_buffer + TEXT_BUFFER_LENGTH - text_buffer_end, "; "); + + scroll_data . input_len = + render( + text_buffer, + text_buffer_end - text_buffer, + scroll_data . input, + sizeof(scroll_data . input), + 1 + ); + scroll_data . update = 1; + } + + sleep(1); } free(text_buffer); - display_data.keep_running = 0; - pthread_join(thread_id, NULL); + pthread_join(scroll_data . thread_id, NULL); return 0; @@ -145,6 +149,6 @@ void handle_signals(int signo) { if ((signo == SIGINT) || (signo == SIGHUP) || (signo == SIGTERM)) { fprintf(stderr, "stopping\n"); - display_data.keep_running = 0; + scroll_data . keep_running = 0; } } -- cgit v1.2.3-54-g00ecf