danielinux/gadget-tester
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed menu scrolling; deleted unused header

Browse source
This commit is contained in:
Daniele Lacamera 2019-11-22 23:22:42 +01:00
parent c6b1b628bb
commit 2a28216601
2 changed files with 18 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
ui.c
View file

@ -70,6 +70,18 @@ void ui_msg(const char *txt)
static uint8_t display_cur_v = 0; static uint8_t display_cur_v = 0;
static uint8_t menu_selection = 0; static uint8_t menu_selection = 0;
void ui_menu_autoscroll(void)
{
int lines = CurrentMenu->entry_n;
if ((lines < 5) || (menu_selection < 2))
display_cur_v = 0;
else if (menu_selection > lines - 2)
display_cur_v = 0x40 - ((lines - 4) * 8);
else
display_cur_v = 0x40 - ((menu_selection - 2) * 8);
display_scroll(NULL, display_cur_v);
}
static void ui_display_menu_refresh(void) static void ui_display_menu_refresh(void)
{ {
const struct display_menu *menu = CurrentMenu; const struct display_menu *menu = CurrentMenu;
@ -78,8 +90,8 @@ static void ui_display_menu_refresh(void)
display_scroll(NULL, display_cur_v); display_scroll(NULL, display_cur_v);
display_clear(NULL); display_clear(NULL);
for (i = menu->entry_n - 1; i >= 0; i--) { for (i = 0; i < menu->entry_n; i++) {
vline = i + 5; vline = i + 4;
if (vline > 7) if (vline > 7)
vline -= 8; vline -= 8;
if (i == menu_selection) if (i == menu_selection)
@ -118,30 +130,17 @@ void ui_button_press(uint8_t b, int hold)
if (b == '-') { if (b == '-') {
if (menu_selection > 0) { if (menu_selection > 0) {
menu_selection--; menu_selection--;
if ((display_cur_v / 8) - (menu_selection > 2)) { ui_menu_autoscroll();
int s; ui_display_menu_refresh();
s = display_cur_v + 8;
if (s > 0x3f)
s = 0;
display_cur_v = (uint8_t)s;
display_scroll(NULL, display_cur_v);
}
} }
} }
if (b == '+') { if (b == '+') {
if (menu_selection < CurrentMenu->entry_n - 1) { if (menu_selection < CurrentMenu->entry_n - 1) {
menu_selection++; menu_selection++;
if ((menu_selection - display_cur_v / 8) > 2) { ui_menu_autoscroll();
int s; ui_display_menu_refresh();
s = display_cur_v - 8;
if (s < 0)
s = 0x40 - 8;
display_cur_v = (uint8_t)s;
display_scroll(NULL, display_cur_v);
}
} }
} }
ui_display_menu_refresh();
} }
void ui_init(void) void ui_init(void)

56
user_settings.h
View file

@ -1,56 +0,0 @@
/* user_settings.h
*/
#ifndef H_USER_SETTINGS_
#define H_USER_SETTINGS_
/* System */
#define WOLFSSL_GENERAL_ALIGNMENT 4
#define SINGLE_THREADED
//#define WOLFSSL_SMALL_STACK
#define WOLFCRYPT_ONLY
#define TFM_TIMING_RESISTANT
#define HAVE_CHACHA
#define HAVE_SHA256
#define HAVE_PBKDF2
#define HAVE_AES
#define HAVE_AES_CBC
#define HAVE_AES_DECRYPT
#define CUSTOM_RAND_GENERATE random_uint32
#define CUSTOM_RAND_TYPE uint32_t
#define WOLFSSL_SP
#define WOLFSSL_SP_SMALL
#define WOLFSSL_SP_MATH
#define SP_WORD_SIZE 32
#define SINGLE_THREADED
/* Disables - For minimum wolfCrypt build */
#define NO_CMAC
#define NO_CODING
#define NO_RSA
#define NO_BIG_INT
#define NO_ASN
#define NO_RC4
#define NO_SHA
#define NO_DH
#define NO_DSA
#define NO_MD4
#define NO_RABBIT
#define NO_MD5
#define NO_SIG_WRAPPER
#define NO_CERT
#define NO_SESSION_CACHE
#define NO_HC128
#define NO_DES3
#define NO_WRITEV
#define NO_DEV_RANDOM
#define NO_FILESYSTEM
#define NO_MAIN_DRIVER
#define NO_OLD_RNGNAME
#define NO_WOLFSSL_DIR
#define WOLFSSL_NO_SOCK
#endif /* !H_USER_SETTINGS_ */