From def77b5d344c9fb22374c1ea34c3d0cffea298f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Andr=C3=A9=20Santoni?= Date: Fri, 23 Sep 2016 14:45:07 +0200 Subject: [PATCH] Wi-Fi menu, pass over the entry index to know which network we're trying to connect --- menu/cbs/menu_cbs_ok.c | 4 +++- menu/widgets/menu_input_dialog.c | 5 +++++ menu/widgets/menu_input_dialog.h | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index 38abf6abab..7f53bf7a04 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -1493,7 +1493,9 @@ static void menu_input_wifi_cb(void *userdata, const char *passphrase) { (void)userdata; - driver_wifi_connect_ssid(0, passphrase); + unsigned idx = menu_input_dialog_get_kb_idx(); + + driver_wifi_connect_ssid(idx, passphrase); menu_input_dialog_end(); } diff --git a/menu/widgets/menu_input_dialog.c b/menu/widgets/menu_input_dialog.c index f0356d58f7..b6e232c458 100644 --- a/menu/widgets/menu_input_dialog.c +++ b/menu/widgets/menu_input_dialog.c @@ -81,6 +81,11 @@ unsigned menu_input_dialog_get_kb_type(void) return menu_input_dialog_keyboard_type; } +unsigned menu_input_dialog_get_kb_idx(void) +{ + return menu_input_dialog_keyboard_idx; +} + bool menu_input_dialog_get_display_kb(void) { return menu_input_dialog_keyboard_display; diff --git a/menu/widgets/menu_input_dialog.h b/menu/widgets/menu_input_dialog.h index bfdc1bdc04..be28d1d10e 100644 --- a/menu/widgets/menu_input_dialog.h +++ b/menu/widgets/menu_input_dialog.h @@ -45,6 +45,8 @@ const char *menu_input_dialog_get_buffer(void); unsigned menu_input_dialog_get_kb_type(void); +unsigned menu_input_dialog_get_kb_idx(void); + bool menu_input_dialog_start_search(void); void menu_input_dialog_hide_kb(void);