Skip to content

Adjust Pure version info display && Adjust Pure version menu functions. #135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lihuanhuan merged 2 commits into from
Mar 18, 2025
Merged

Adjust Pure version info display && Adjust Pure version menu functions. #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13a89c1
Adjust Pure version info display.
lihuanhuan Mar 18, 2025
d796f0b
Adjust Pure version menu functions.
lihuanhuan Mar 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions legacy/firmware/config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,17 +372,21 @@ bool config_genSessionSeed(void) {
return true;
}

static const char *DEVICE_MODEL_PURE = "OneKey Classic 1S Pure";
static const char *DEVICE_MODEL_CLASSIC = "OneKey Classic 1S";

char *config_get_device_model(void) {
return ble_hw_ver_is_pure() ? "OneKey Pure" : "OneKey Classic 1S";
return ble_hw_ver_is_pure() ? (char *)DEVICE_MODEL_PURE
: (char *)DEVICE_MODEL_CLASSIC;
}

bool config_getLabel(char *dest, uint16_t dest_size) {
if (secfalse == config_get_string(KEY_LABEL, dest, &dest_size)) {
strncpy(dest, config_get_device_model(), dest_size);
strncpy(dest, DEVICE_MODEL_CLASSIC, dest_size);
} else {
int len = strlen(dest);
if (0 == len) {
strncpy(dest, config_get_device_model(), dest_size);
strncpy(dest, DEVICE_MODEL_CLASSIC, dest_size);
}
}
return true;
Expand Down
27 changes: 26 additions & 1 deletion legacy/firmware/menu_list.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#include "menu_core.h"
#include "menu_para.h"

#include "ble.h"
#include "buttons.h"
#include "common.h"
#include "config.h"
Expand Down Expand Up @@ -290,6 +291,17 @@ static const struct menu_item settings_menu_items[] = {
menu_para_usb_lock, false, menu_para_usb_lock_index},
{"Input Direction", NULL, false, .sub_menu = &input_direction_set_menu,
menu_para_input_direction, false, menu_para_input_direction_index}};

static const struct menu_item settings_menu_items_pure[] = {
{"Bluetooth", NULL, false, .sub_menu = &ble_set_menu, menu_para_ble_state,
false, menu_para_ble_index},
{"Language", NULL, false, .sub_menu = &language_set_menu,
menu_para_language, false, menu_para_language_index},
{"Auto-Lock", NULL, false, .sub_menu = &autolock_set_menu,
menu_para_autolock, false, menu_para_autolock_index},
{"Input Direction", NULL, false, .sub_menu = &input_direction_set_menu,
menu_para_input_direction, false, menu_para_input_direction_index}};

static struct menu settings_menu = {
.start = 0,
.current = 0,
Expand All @@ -300,6 +312,16 @@ static struct menu settings_menu = {
.button_type = BTN_TYPE_NEXT,
};

void menu_init_settings_menu(void) {
if (ble_hw_ver_is_pure()) {
settings_menu.items = (struct menu_item *)settings_menu_items_pure;
settings_menu.counts = COUNT_OF(settings_menu_items_pure);
} else {
settings_menu.items = (struct menu_item *)settings_menu_items;
settings_menu.counts = COUNT_OF(settings_menu_items);
}
}

void menu_check_all_words(int index) {
(void)index;
char desc[128] = "";
Expand Down Expand Up @@ -674,4 +696,7 @@ void main_menu_init(bool state) {
}
}

void menu_default(void) { menu_init(&main_menu); }
void menu_default(void) {
menu_init_settings_menu();
menu_init(&main_menu);
}
Loading