From ff98c7de21688f612696c80406290310bbb91dce Mon Sep 17 00:00:00 2001 From: Florian Richter Date: Fri, 12 Aug 2011 15:07:56 +0200 Subject: [PATCH 1/2] nick_matrix: show/hide nickname in center --- firmware/l0dable/nick_matrix.c | 66 +++++++++++++++++++++++++++++----- 1 file changed, 57 insertions(+), 9 deletions(-) diff --git a/firmware/l0dable/nick_matrix.c b/firmware/l0dable/nick_matrix.c index a6398c9..8e70318 100644 --- a/firmware/l0dable/nick_matrix.c +++ b/firmware/l0dable/nick_matrix.c @@ -1,13 +1,13 @@ #include #include "basic/basic.h" +#include "basic/config.h" #include "lcd/render.h" #include "usetable.h" -#define SCREEN_WIDTH 12 +#define SCREEN_WIDTH 13 #define SCREEN_HEIGHT 8 -#define INVALID_POS 127 #define FONT_WIDTH 7 #define FONT_HEIGHT 8 @@ -16,47 +16,95 @@ #define MAX_LINE_LENGTH 6 +#define TICKS_SHOW_NICKNAME 100 +#define TICKS_HIDE_NICKNAME 50 +#define NICKNAME_ACTION_SHOW 1 +#define NICKNAME_ACTION_HIDE 2 + void ram(void){ lcdClear(); + // nickname helper variables + int nickname_len = strlen(GLOBAL(nickname)); + int nickname_posx = (SCREEN_WIDTH - nickname_len) / 2; + int nickname_posy = SCREEN_HEIGHT / 2; + + // state variables for show/hide effect + int ticks_until_next_nickname_action = TICKS_SHOW_NICKNAME; + int nickname_action = NICKNAME_ACTION_SHOW; + struct matrix_line { int head_x, head_y; int cur_length; int length; } matrix_lines[MATRIX_LINES_LENGTH]; + // initialize matrix_lines for (int i = 0; i < MATRIX_LINES_LENGTH; i++) { matrix_lines[i].cur_length = -1; } + // main loop while (1) { + // for every matrix line for(int i = 0; icur_length == -1) { ml->head_x = getRandom() % SCREEN_WIDTH; ml->head_y = getRandom() % SCREEN_HEIGHT - 1; ml->length = getRandom() % MAX_LINE_LENGTH + 3; ml->cur_length = 0; } - // new char + // set new char if (ml->head_y < SCREEN_HEIGHT-1) { ml->head_y++; - int chr = getRandom() % 95 + 33; + char chr; + int chrpos = ml->head_x - nickname_posx; + if (nickname_action == NICKNAME_ACTION_SHOW + && ml->head_y == nickname_posy + && chrpos >= 0 && chrpos < nickname_len) { + // show the nickname + chr = GLOBAL(nickname)[chrpos]; + } else { + chr = getRandom() % 95 + 33; + } DoChar(ml->head_x * FONT_WIDTH, ml->head_y * FONT_HEIGHT, chr); ml->cur_length++; } - // remove chars (when length or bottom is reached) + // remove char (when length or bottom is reached) if (ml->cur_length > ml->length || ml->head_y >= SCREEN_HEIGHT-1) { - DoChar(ml->head_x * FONT_WIDTH, (ml->head_y - ml->cur_length) * FONT_HEIGHT, ' '); + int chrpos = ml->head_x - nickname_posx; + if ( ! (nickname_action == NICKNAME_ACTION_SHOW + && (ml->head_y - ml->cur_length) == nickname_posy + && chrpos >= 0 && chrpos < nickname_len + )) { + // only delete, if it's not the nickname + DoChar(ml->head_x * FONT_WIDTH, (ml->head_y - ml->cur_length) * FONT_HEIGHT, ' '); + } ml->cur_length--; } } lcdDisplay(); - // Exit on enter+left + // show and hide nickname + ticks_until_next_nickname_action--; + if (ticks_until_next_nickname_action <= 0) { + switch (nickname_action) { + case NICKNAME_ACTION_SHOW: + nickname_action = NICKNAME_ACTION_HIDE; + ticks_until_next_nickname_action = TICKS_HIDE_NICKNAME; + break; + case NICKNAME_ACTION_HIDE: + nickname_action = NICKNAME_ACTION_SHOW; + ticks_until_next_nickname_action = TICKS_SHOW_NICKNAME; + break; + } + } + // Exit on any key int key = getInputRaw(); if(key!= BTN_NONE) return; - delayms_queue_plus(90,0); + // sleep and process queue (e. g. meshnetwork) + delayms_queue_plus(90,0); }; }; From 423df99c9a86098189b634883b2b860d5949f090 Mon Sep 17 00:00:00 2001 From: Florian Richter Date: Fri, 12 Aug 2011 15:14:48 +0200 Subject: [PATCH 2/2] nick_matrix: show nick on random locations --- firmware/l0dable/nick_matrix.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/firmware/l0dable/nick_matrix.c b/firmware/l0dable/nick_matrix.c index 8e70318..8e6837d 100644 --- a/firmware/l0dable/nick_matrix.c +++ b/firmware/l0dable/nick_matrix.c @@ -93,6 +93,9 @@ void ram(void){ case NICKNAME_ACTION_SHOW: nickname_action = NICKNAME_ACTION_HIDE; ticks_until_next_nickname_action = TICKS_HIDE_NICKNAME; + // new nickname_pos + nickname_posx = getRandom() % (SCREEN_WIDTH - nickname_len); + nickname_posy = getRandom() % SCREEN_HEIGHT; break; case NICKNAME_ACTION_HIDE: nickname_action = NICKNAME_ACTION_SHOW;