Skip to content

Commit 4b3cbd7

Browse files
authored
Adjust Pure version info display && Adjust Pure version menu functions. (#135)
* Adjust Pure version info display. * Adjust Pure version menu functions.
1 parent e45984b commit 4b3cbd7

File tree

2 files changed

+33
-4
lines changed

2 files changed

+33
-4
lines changed

legacy/firmware/config.c

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -372,17 +372,21 @@ bool config_genSessionSeed(void) {
372372
return true;
373373
}
374374

375+
static const char *DEVICE_MODEL_PURE = "OneKey Classic 1S Pure";
376+
static const char *DEVICE_MODEL_CLASSIC = "OneKey Classic 1S";
377+
375378
char *config_get_device_model(void) {
376-
return ble_hw_ver_is_pure() ? "OneKey Pure" : "OneKey Classic 1S";
379+
return ble_hw_ver_is_pure() ? (char *)DEVICE_MODEL_PURE
380+
: (char *)DEVICE_MODEL_CLASSIC;
377381
}
378382

379383
bool config_getLabel(char *dest, uint16_t dest_size) {
380384
if (secfalse == config_get_string(KEY_LABEL, dest, &dest_size)) {
381-
strncpy(dest, config_get_device_model(), dest_size);
385+
strncpy(dest, DEVICE_MODEL_CLASSIC, dest_size);
382386
} else {
383387
int len = strlen(dest);
384388
if (0 == len) {
385-
strncpy(dest, config_get_device_model(), dest_size);
389+
strncpy(dest, DEVICE_MODEL_CLASSIC, dest_size);
386390
}
387391
}
388392
return true;

legacy/firmware/menu_list.c

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#include "menu_core.h"
33
#include "menu_para.h"
44

5+
#include "ble.h"
56
#include "buttons.h"
67
#include "common.h"
78
#include "config.h"
@@ -290,6 +291,17 @@ static const struct menu_item settings_menu_items[] = {
290291
menu_para_usb_lock, false, menu_para_usb_lock_index},
291292
{"Input Direction", NULL, false, .sub_menu = &input_direction_set_menu,
292293
menu_para_input_direction, false, menu_para_input_direction_index}};
294+
295+
static const struct menu_item settings_menu_items_pure[] = {
296+
{"Bluetooth", NULL, false, .sub_menu = &ble_set_menu, menu_para_ble_state,
297+
false, menu_para_ble_index},
298+
{"Language", NULL, false, .sub_menu = &language_set_menu,
299+
menu_para_language, false, menu_para_language_index},
300+
{"Auto-Lock", NULL, false, .sub_menu = &autolock_set_menu,
301+
menu_para_autolock, false, menu_para_autolock_index},
302+
{"Input Direction", NULL, false, .sub_menu = &input_direction_set_menu,
303+
menu_para_input_direction, false, menu_para_input_direction_index}};
304+
293305
static struct menu settings_menu = {
294306
.start = 0,
295307
.current = 0,
@@ -300,6 +312,16 @@ static struct menu settings_menu = {
300312
.button_type = BTN_TYPE_NEXT,
301313
};
302314

315+
void menu_init_settings_menu(void) {
316+
if (ble_hw_ver_is_pure()) {
317+
settings_menu.items = (struct menu_item *)settings_menu_items_pure;
318+
settings_menu.counts = COUNT_OF(settings_menu_items_pure);
319+
} else {
320+
settings_menu.items = (struct menu_item *)settings_menu_items;
321+
settings_menu.counts = COUNT_OF(settings_menu_items);
322+
}
323+
}
324+
303325
void menu_check_all_words(int index) {
304326
(void)index;
305327
char desc[128] = "";
@@ -674,4 +696,7 @@ void main_menu_init(bool state) {
674696
}
675697
}
676698

677-
void menu_default(void) { menu_init(&main_menu); }
699+
void menu_default(void) {
700+
menu_init_settings_menu();
701+
menu_init(&main_menu);
702+
}

0 commit comments

Comments
 (0)