Skip to content

Commit f98a3b0

Browse files
committed
add new setting field
1 parent 9ca92f9 commit f98a3b0

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

fw/application/src/mod/settings.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
#ifdef OLED_SCREEN
1010
// Though OLED doesn't necessarily imply rechargeable battery, it's usually the case.
1111
#define DEFAULT_BAT_MODE 1
12-
#else // !OLED_SCREEN
12+
#else // !OLED_SCREEN
1313
#define DEFAULT_BAT_MODE 0
14-
#endif // OLED_SCREEN
14+
#endif // OLED_SCREEN
1515

1616
const settings_data_t def_settings_data = {.backlight = 0,
1717
.oled_contrast = 40,
@@ -26,7 +26,8 @@ const settings_data_t def_settings_data = {.backlight = 0,
2626
.show_mem_usage = false,
2727
.anim_enabled = false,
2828
.amiidb_data_slot_num = 20,
29-
.qrcode_enabled = true};
29+
.qrcode_enabled = true,
30+
.chameleon_freq_slot_index = INVALID_SLOT_INDEX};
3031

3132
settings_data_t m_settings_data = {0};
3233

@@ -63,6 +64,7 @@ static void validate_settings() {
6364
BOOL_VALIDATE(m_settings_data.qrcode_enabled, 0);
6465
INT8_VALIDATE(m_settings_data.language, 0, LANGUAGE_COUNT - 1, LANGUAGE_EN_US);
6566
INT8_VALIDATE(m_settings_data.amiidb_data_slot_num, 1, 100, 20);
67+
INT8_VALIDATE(m_settings_data.chameleon_freq_slot_index, 0, 8, INVALID_SLOT_INDEX);
6668
}
6769

6870
int32_t settings_init() {

fw/application/src/mod/settings.h

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,14 @@
77
#include "app_amiibolink.h"
88
#include "i18n/language.h"
99

10+
#define INVALID_SLOT_INDEX 0xFF
11+
1012
typedef struct {
11-
bool backlight; //deprecated, keep for capability issue
13+
bool backlight; // deprecated, keep for capability issue
1214
uint8_t sleep_timeout_sec;
1315
bool dirty;
1416
bool auto_gen_amiibo;
15-
bool auto_gen_amiibolink; //deprecated, keep for capability issue
17+
bool auto_gen_amiibolink; // deprecated, keep for capability issue
1618
bool skip_driver_select;
1719
bool bat_mode;
1820
ble_amiibolink_ver_t amiibo_link_ver;
@@ -24,6 +26,7 @@ typedef struct {
2426
bool qrcode_enabled;
2527
Language language;
2628
uint8_t amiidb_data_slot_num;
29+
uint8_t chameleon_freq_slot_index;
2730
} settings_data_t;
2831

2932
int32_t settings_init();

0 commit comments

Comments
 (0)