From 8d0e68db4f73c6243be4e9c5955ef1eb842dd95b Mon Sep 17 00:00:00 2001
From: bot1131357 <yuang86@gmail.com>
Date: Sat, 16 Jan 2021 04:06:51 +1100
Subject: [PATCH] Added parameter to Preferences::begin to select non-default
 NVS partition (#4718)

---
 libraries/Preferences/src/Preferences.cpp | 15 +++++++++++++--
 libraries/Preferences/src/Preferences.h   |  2 +-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/libraries/Preferences/src/Preferences.cpp b/libraries/Preferences/src/Preferences.cpp
index 6b45d2c7..3c1928b8 100644
--- a/libraries/Preferences/src/Preferences.cpp
+++ b/libraries/Preferences/src/Preferences.cpp
@@ -14,6 +14,7 @@
 #include "Preferences.h"
 
 #include "nvs.h"
+#include "nvs_flash.h"
 
 const char * nvs_errors[] = { "OTHER", "NOT_INITIALIZED", "NOT_FOUND", "TYPE_MISMATCH", "READ_ONLY", "NOT_ENOUGH_SPACE", "INVALID_NAME", "INVALID_HANDLE", "REMOVE_FAILED", "KEY_TOO_LONG", "PAGE_FULL", "INVALID_STATE", "INVALID_LENGTH"};
 #define nvs_error(e) (((e)>ESP_ERR_NVS_BASE)?nvs_errors[(e)&~(ESP_ERR_NVS_BASE)]:nvs_errors[0])
@@ -28,12 +29,22 @@ Preferences::~Preferences(){
     end();
 }
 
-bool Preferences::begin(const char * name, bool readOnly){
+bool Preferences::begin(const char * name, bool readOnly, const char* partition_label){
     if(_started){
         return false;
     }
     _readOnly = readOnly;
-    esp_err_t err = nvs_open(name, readOnly?NVS_READONLY:NVS_READWRITE, &_handle);
+    esp_err_t err = ESP_OK;
+    if (partition_label != NULL) {
+        err = nvs_flash_init_partition(partition_label);
+        if (err) {
+            log_e("nvs_flash_init_partition failed: %s", nvs_error(err));
+            return false;
+        }
+        err = nvs_open_from_partition(partition_label, name, readOnly ? NVS_READONLY : NVS_READWRITE, &_handle);
+    } else {
+        err = nvs_open(name, readOnly?NVS_READONLY:NVS_READWRITE, &_handle);
+    }
     if(err){
         log_e("nvs_open failed: %s", nvs_error(err));
         return false;
diff --git a/libraries/Preferences/src/Preferences.h b/libraries/Preferences/src/Preferences.h
index 1b8be270..5dbcbd4c 100644
--- a/libraries/Preferences/src/Preferences.h
+++ b/libraries/Preferences/src/Preferences.h
@@ -29,7 +29,7 @@ class Preferences {
         Preferences();
         ~Preferences();
 
-        bool begin(const char * name, bool readOnly=false);
+        bool begin(const char * name, bool readOnly=false, const char* partition_label=NULL);
         void end();
 
         bool clear();