diff --git a/src/relay_chn_nvs.c b/src/relay_chn_nvs.c index c4fdb80..e152693 100644 --- a/src/relay_chn_nvs.c +++ b/src/relay_chn_nvs.c @@ -7,10 +7,10 @@ #include "esp_check.h" #include "relay_chn_nvs.h" -#define RELAY_CHN_KEY_DIR "dir" +#define RELAY_CHN_KEY_DIR "dir" /*!< Direction key */ #ifdef RELAY_CHN_ENABLE_TILTING -#define RELAY_CHN_KEY_SENS(ch) "sens_%d" -#define RELAY_CHN_KEY_TCNT(ch) "tcnt_%d" /*!< Tilt count key */ +#define RELAY_CHN_KEY_TSENS(ch) "tsens_%d" /*!< Tilt sensitivity key */ +#define RELAY_CHN_KEY_TCNT(ch) "tcnt_%d" /*!< Tilt count key */ #endif static const char *TAG = "RELAY_CHN_NVS"; @@ -72,7 +72,7 @@ esp_err_t relay_chn_nvs_get_direction(uint8_t ch, relay_chn_direction_t *directi #ifdef RELAY_CHN_ENABLE_TILTING esp_err_t relay_chn_nvs_set_tilt_sensitivity(uint8_t ch, uint8_t sensitivity) { - esp_err_t ret = nvs_set_u8(relay_chn_nvs, RELAY_CHN_KEY_SENS(ch), sensitivity); + esp_err_t ret = nvs_set_u8(relay_chn_nvs, RELAY_CHN_KEY_TSENS(ch), sensitivity); ESP_RETURN_ON_ERROR(ret, TAG, "Failed to set tilt sensitivity for channel %d", ch); return nvs_commit(relay_chn_nvs); } @@ -81,7 +81,7 @@ esp_err_t relay_chn_nvs_get_tilt_sensitivity(uint8_t ch, uint8_t *sensitivity) { ESP_RETURN_ON_FALSE(sensitivity != NULL, ESP_ERR_INVALID_ARG, TAG, "Sensitivity pointer is NULL"); - return nvs_get_u8(relay_chn_nvs, RELAY_CHN_KEY_SENS(ch), sensitivity); + return nvs_get_u8(relay_chn_nvs, RELAY_CHN_KEY_TSENS(ch), sensitivity); } esp_err_t relay_chn_nvs_set_tilt_count(uint8_t ch, uint16_t tilt_count) diff --git a/test_apps/sdkconfig b/test_apps/sdkconfig index 386f402..f47128a 100644 --- a/test_apps/sdkconfig +++ b/test_apps/sdkconfig @@ -395,13 +395,13 @@ CONFIG_ESPTOOLPY_MONITOR_BAUD=115200 # # Partition Table # -# CONFIG_PARTITION_TABLE_SINGLE_APP is not set +CONFIG_PARTITION_TABLE_SINGLE_APP=y # CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE is not set # CONFIG_PARTITION_TABLE_TWO_OTA is not set # CONFIG_PARTITION_TABLE_TWO_OTA_LARGE is not set -CONFIG_PARTITION_TABLE_CUSTOM=y -CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions/part_nvs.csv" -CONFIG_PARTITION_TABLE_FILENAME="partitions/part_nvs.csv" +# CONFIG_PARTITION_TABLE_CUSTOM is not set +CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv" +CONFIG_PARTITION_TABLE_FILENAME="partitions_singleapp.csv" CONFIG_PARTITION_TABLE_OFFSET=0x8000 CONFIG_PARTITION_TABLE_MD5=y # end of Partition Table @@ -1268,7 +1268,7 @@ CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER=y # Relay Channel Driver Configuration # CONFIG_RELAY_CHN_OPPOSITE_INERTIA_MS=200 -CONFIG_RELAY_CHN_COUNT=1 +CONFIG_RELAY_CHN_COUNT=2 CONFIG_RELAY_CHN_ENABLE_TILTING=y CONFIG_RELAY_CHN_ENABLE_NVS=y # end of Relay Channel Driver Configuration @@ -1277,8 +1277,7 @@ CONFIG_RELAY_CHN_ENABLE_NVS=y # Relay Channel NVS Storage Configuration # CONFIG_RELAY_CHN_NVS_NAMESPACE="relay_chn" -CONFIG_RELAY_CHN_NVS_CUSTOM_PARTITION=y -CONFIG_RELAY_CHN_NVS_CUSTOM_PARTITION_NAME="app_data" +# CONFIG_RELAY_CHN_NVS_CUSTOM_PARTITION is not set # end of Relay Channel NVS Storage Configuration # end of Component config