From 705ac2a8862761fdd536b760ded84a35e75287f8 Mon Sep 17 00:00:00 2001 From: Arthur Bonnaudet Date: Thu, 30 May 2024 19:44:03 +0200 Subject: [PATCH] Add defines for default features setting value --- include/os_settings.h | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/include/os_settings.h b/include/os_settings.h index b0d9bf843..d9e4571f2 100644 --- a/include/os_settings.h +++ b/include/os_settings.h @@ -112,13 +112,26 @@ typedef enum os_setting_e { * */ // if (os_settings[OS_SETTING_FEATURES] & OS_SETTING_FEATURES_NFC_ENABLED) then NFC is enabled -#define OS_SETTING_FEATURES_NFC_ENABLED 0x1 +#define OS_SETTING_FEATURES_NFC_ENABLED_MASK 0x0 +#define OS_SETTING_FEATURES_NFC_ENABLED (1 << OS_SETTING_FEATURES_NFC_ENABLED_MASK) // if (os_settings[OS_SETTING_FEATURES] & OS_SETTING_FEATURES_NO_PIN_SHUFFLE) then PIN shuffle is // disable -#define OS_SETTING_FEATURES_NO_PIN_SHUFFLE 0x2 +#define OS_SETTING_FEATURES_NO_PIN_SHUFFLE_MASK 0x1 +#define OS_SETTING_FEATURES_NO_PIN_SHUFFLE (1 << OS_SETTING_FEATURES_NO_PIN_SHUFFLE_MASK) // if (os_settings[OS_SETTING_FEATURES] & OS_SETTING_FEATURES_BATT_IN_SIDE) then Battery percentage // in side screen is enabled -#define OS_SETTING_FEATURES_BATT_IN_SIDE 0x4 +#define OS_SETTING_FEATURES_BATT_IN_SIDE_MASK 0x2 +#define OS_SETTING_FEATURES_BATT_IN_SIDE (1 << OS_SETTING_FEATURES_BATT_IN_SIDE_MASK) + +// Default features value +#define FEATURES_DEFAULT_NFC_ENABLED 1 +#define FEATURES_DEFAULT_NO_PIN_SHUFFLE 0 +#define FEATURES_DEFAULT_BATT_IN_SIDE 0 + +#define FEATURES_DEFAULT_VALUE \ + ((FEATURES_DEFAULT_NFC_ENABLED << OS_SETTING_FEATURES_NFC_ENABLED_MASK) \ + | (FEATURES_DEFAULT_BATT_IN_SIDE << OS_SETTING_FEATURES_BATT_IN_SIDE_MASK) \ + | (FEATURES_DEFAULT_NO_PIN_SHUFFLE << OS_SETTING_FEATURES_NO_PIN_SHUFFLE_MASK)) /** * Retrieve the value of a setting in a user specified buffer, with a max length, and return the