From f2c363aabad58033eedfb94c2c90e61357f0fe25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Procha=CC=81zka?=
 <90197375+P-R-O-C-H-Y@users.noreply.github.com>
Date: Mon, 20 Jun 2022 08:29:15 +0200
Subject: [PATCH 1/7] Added NVS test sketch + test script

---
 tests/nvs/nvs.ino     | 36 ++++++++++++++++++++++++++++++++++++
 tests/nvs/test_nvs.py |  7 +++++++
 2 files changed, 43 insertions(+)
 create mode 100644 tests/nvs/nvs.ino
 create mode 100644 tests/nvs/test_nvs.py

diff --git a/tests/nvs/nvs.ino b/tests/nvs/nvs.ino
new file mode 100644
index 00000000000..7bfe25ff00b
--- /dev/null
+++ b/tests/nvs/nvs.ino
@@ -0,0 +1,36 @@
+#include <Preferences.h>
+
+Preferences preferences;
+
+void setup() {
+  Serial.begin(115200);
+ 
+  while (!Serial) {
+    ;
+  }
+
+  preferences.begin("my-app", false);
+
+  // Get the counter value, if the key does not exist, return a default value of 0
+  unsigned int counter = preferences.getUInt("counter", 0);
+
+  // Print the counter to Serial Monitor
+  Serial.printf("Current counter value: %u\n", counter);
+
+  // Increase counter by 1
+  counter++;
+
+  // Store the counter to the Preferences
+  preferences.putUInt("counter", counter);
+
+  // Close the Preferences
+  preferences.end();
+  
+  // Wait 1 second
+  delay(1000);
+
+  // Restart ESP
+  ESP.restart();
+}
+
+void loop() {}
diff --git a/tests/nvs/test_nvs.py b/tests/nvs/test_nvs.py
new file mode 100644
index 00000000000..656ab544ee2
--- /dev/null
+++ b/tests/nvs/test_nvs.py
@@ -0,0 +1,7 @@
+def test_nvs(dut):
+     dut.expect('Current counter value: 0')
+     dut.expect('Current counter value: 1')
+     dut.expect('Current counter value: 2')
+     dut.expect('Current counter value: 3')
+     dut.expect('Current counter value: 4')
+     dut.expect('Current counter value: 5')
\ No newline at end of file

From 3867bb36864291feef056cc0ef60fc67a4f51eb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Procha=CC=81zka?=
 <90197375+P-R-O-C-H-Y@users.noreply.github.com>
Date: Wed, 29 Jun 2022 12:44:38 +0200
Subject: [PATCH 2/7] Added cfg.json with multiple fqbns

---
 tests/nvs/cfg.json | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 tests/nvs/cfg.json

diff --git a/tests/nvs/cfg.json b/tests/nvs/cfg.json
new file mode 100644
index 00000000000..9fb71bb3758
--- /dev/null
+++ b/tests/nvs/cfg.json
@@ -0,0 +1,40 @@
+{
+  "targets": [
+    {
+      "name": "esp32",
+      "fqbn":[
+        "espressif:esp32:esp32:PSRAM=enabled,PartitionScheme=huge_app,FlashMode=dio",
+        "espressif:esp32:esp32:PSRAM=enabled,PartitionScheme=huge_app,FlashMode=dout,FlashFreq=40",
+        "espressif:esp32:esp32:PSRAM=enabled,PartitionScheme=huge_app,FlashMode=qio",
+        "espressif:esp32:esp32:PSRAM=enabled,PartitionScheme=huge_app,FlashMode=qout,FlashFreq=40"
+      ]
+    },
+    {
+      "name": "esp32s2",
+      "fqbn": [
+        "espressif:esp32:esp32s2:PSRAM=enabled,PartitionScheme=huge_app,FlashMode=dio",
+        "espressif:esp32:esp32s2:PSRAM=enabled,PartitionScheme=huge_app,FlashMode=dout,FlashFreq=40",
+        "espressif:esp32:esp32s2:PSRAM=enabled,PartitionScheme=huge_app,FlashMode=qio",
+        "espressif:esp32:esp32s2:PSRAM=enabled,PartitionScheme=huge_app,FlashMode=qout,FlashFreq=40"
+      ]
+    },
+    {
+      "name": "esp32c3",
+      "fqbn": [
+        "espressif:esp32:esp32c3:PartitionScheme=huge_app,FlashMode=dio",
+        "espressif:esp32:esp32c3:PartitionScheme=huge_app,FlashMode=dout,FlashFreq=40",
+        "espressif:esp32:esp32c3:PartitionScheme=huge_app,FlashMode=qio",
+        "espressif:esp32:esp32c3:PartitionScheme=huge_app,FlashMode=qout,FlashFreq=40"
+      ]
+    },
+    {
+      "name": "esp32s3",
+      "fqbn": [
+        "espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,PartitionScheme=huge_app,FlashMode=qio"
+        "espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,PartitionScheme=huge_app,FlashMode=qio120"
+        "espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,PartitionScheme=huge_app,FlashMode=dio"
+        "espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,PartitionScheme=huge_app,FlashMode=opi"
+      ]
+    }
+  ]
+}
\ No newline at end of file

From 0a94dee2aa853d98778c8fd87069d4f0afe48bc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Procha=CC=81zka?=
 <90197375+P-R-O-C-H-Y@users.noreply.github.com>
Date: Tue, 19 Jul 2022 12:45:28 +0200
Subject: [PATCH 3/7] cfg.json missing commas fix

---
 tests/nvs/cfg.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/nvs/cfg.json b/tests/nvs/cfg.json
index 9fb71bb3758..a7fe609d0a6 100644
--- a/tests/nvs/cfg.json
+++ b/tests/nvs/cfg.json
@@ -30,9 +30,9 @@
     {
       "name": "esp32s3",
       "fqbn": [
-        "espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,PartitionScheme=huge_app,FlashMode=qio"
-        "espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,PartitionScheme=huge_app,FlashMode=qio120"
-        "espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,PartitionScheme=huge_app,FlashMode=dio"
+        "espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,PartitionScheme=huge_app,FlashMode=qio",
+        "espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,PartitionScheme=huge_app,FlashMode=qio120",
+        "espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,PartitionScheme=huge_app,FlashMode=dio",
         "espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,PartitionScheme=huge_app,FlashMode=opi"
       ]
     }

From 499dace9535fb50bc961a381ed7fa27fd1f06905 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Procha=CC=81zka?=
 <90197375+P-R-O-C-H-Y@users.noreply.github.com>
Date: Thu, 11 Aug 2022 16:55:14 +0200
Subject: [PATCH 4/7] Changed OPI PSRAM to QSPI accordind to new HW setup.

---
 .github/scripts/sketch_utils.sh | 2 +-
 tests/democfg/cfg.json          | 2 +-
 tests/nvs/cfg.json              | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)
 mode change 100644 => 100755 tests/democfg/cfg.json
 mode change 100644 => 100755 tests/nvs/cfg.json

diff --git a/.github/scripts/sketch_utils.sh b/.github/scripts/sketch_utils.sh
index 3a856202e51..9c3c1564eb2 100755
--- a/.github/scripts/sketch_utils.sh
+++ b/.github/scripts/sketch_utils.sh
@@ -72,7 +72,7 @@ function build_sketch(){ # build_sketch <ide_path> <user_path> <path-to-ino> [ex
 
             esp32_opts="PSRAM=enabled,PartitionScheme=huge_app"
             esp32s2_opts="PSRAM=enabled,PartitionScheme=huge_app"
-            esp32s3_opts="PSRAM=opi,USBMode=default,PartitionScheme=huge_app"
+            esp32s3_opts="PSRAM=enabled,USBMode=default,PartitionScheme=huge_app"
             esp32c3_opts="PartitionScheme=huge_app"
 
             # Select the common part of the FQBN based on the target.  The rest will be
diff --git a/tests/democfg/cfg.json b/tests/democfg/cfg.json
old mode 100644
new mode 100755
index 2b9f26bf1fe..a5c03aaa37f
--- a/tests/democfg/cfg.json
+++ b/tests/democfg/cfg.json
@@ -18,7 +18,7 @@
     },
     {
       "name": "esp32s3",
-      "fqbn": ["espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,PartitionScheme=huge_app"]
+      "fqbn": ["espressif:esp32:esp32s3:PSRAM=enabled,USBMode=default,PartitionScheme=huge_app"]
     }
   ]
 }
diff --git a/tests/nvs/cfg.json b/tests/nvs/cfg.json
old mode 100644
new mode 100755
index a7fe609d0a6..8000d9789a9
--- a/tests/nvs/cfg.json
+++ b/tests/nvs/cfg.json
@@ -30,10 +30,10 @@
     {
       "name": "esp32s3",
       "fqbn": [
-        "espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,PartitionScheme=huge_app,FlashMode=qio",
-        "espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,PartitionScheme=huge_app,FlashMode=qio120",
-        "espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,PartitionScheme=huge_app,FlashMode=dio",
-        "espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,PartitionScheme=huge_app,FlashMode=opi"
+        "espressif:esp32:esp32s3:PSRAM=enabled,USBMode=default,PartitionScheme=huge_app,FlashMode=qio",
+        "espressif:esp32:esp32s3:PSRAM=enabled,USBMode=default,PartitionScheme=huge_app,FlashMode=qio120",
+        "espressif:esp32:esp32s3:PSRAM=enabled,USBMode=default,PartitionScheme=huge_app,FlashMode=dio",
+        "espressif:esp32:esp32s3:PSRAM=enabled,USBMode=default,PartitionScheme=huge_app,FlashMode=opi"
       ]
     }
   ]

From f97106e89e78d9edcabcd13fa56680cd408bbbc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Procha=CC=81zka?=
 <90197375+P-R-O-C-H-Y@users.noreply.github.com>
Date: Thu, 11 Aug 2022 18:04:54 +0200
Subject: [PATCH 5/7] disabled PSRAM for ESP32S3

---
 tests/nvs/cfg.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/nvs/cfg.json b/tests/nvs/cfg.json
index 8000d9789a9..cf3fd14a128 100755
--- a/tests/nvs/cfg.json
+++ b/tests/nvs/cfg.json
@@ -30,10 +30,10 @@
     {
       "name": "esp32s3",
       "fqbn": [
-        "espressif:esp32:esp32s3:PSRAM=enabled,USBMode=default,PartitionScheme=huge_app,FlashMode=qio",
-        "espressif:esp32:esp32s3:PSRAM=enabled,USBMode=default,PartitionScheme=huge_app,FlashMode=qio120",
-        "espressif:esp32:esp32s3:PSRAM=enabled,USBMode=default,PartitionScheme=huge_app,FlashMode=dio",
-        "espressif:esp32:esp32s3:PSRAM=enabled,USBMode=default,PartitionScheme=huge_app,FlashMode=opi"
+        "espressif:esp32:esp32s3:PSRAM=disabled,USBMode=default,PartitionScheme=huge_app,FlashMode=qio",
+        "espressif:esp32:esp32s3:PSRAM=disabled,USBMode=default,PartitionScheme=huge_app,FlashMode=qio120",
+        "espressif:esp32:esp32s3:PSRAM=disabled,USBMode=default,PartitionScheme=huge_app,FlashMode=dio",
+        "espressif:esp32:esp32s3:PSRAM=disabled,USBMode=default,PartitionScheme=huge_app,FlashMode=opi"
       ]
     }
   ]

From b9612ceb044c7616f1acc8d7fa7e5511c2c1e727 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Procha=CC=81zka?=
 <90197375+P-R-O-C-H-Y@users.noreply.github.com>
Date: Mon, 15 Aug 2022 10:40:49 +0200
Subject: [PATCH 6/7] Reverting PSRAM changes

---
 .github/scripts/sketch_utils.sh | 2 +-
 tests/democfg/cfg.json          | 2 +-
 tests/nvs/cfg.json              | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)
 mode change 100755 => 100644 tests/democfg/cfg.json
 mode change 100755 => 100644 tests/nvs/cfg.json

diff --git a/.github/scripts/sketch_utils.sh b/.github/scripts/sketch_utils.sh
index 9c3c1564eb2..3a856202e51 100755
--- a/.github/scripts/sketch_utils.sh
+++ b/.github/scripts/sketch_utils.sh
@@ -72,7 +72,7 @@ function build_sketch(){ # build_sketch <ide_path> <user_path> <path-to-ino> [ex
 
             esp32_opts="PSRAM=enabled,PartitionScheme=huge_app"
             esp32s2_opts="PSRAM=enabled,PartitionScheme=huge_app"
-            esp32s3_opts="PSRAM=enabled,USBMode=default,PartitionScheme=huge_app"
+            esp32s3_opts="PSRAM=opi,USBMode=default,PartitionScheme=huge_app"
             esp32c3_opts="PartitionScheme=huge_app"
 
             # Select the common part of the FQBN based on the target.  The rest will be
diff --git a/tests/democfg/cfg.json b/tests/democfg/cfg.json
old mode 100755
new mode 100644
index a5c03aaa37f..2b9f26bf1fe
--- a/tests/democfg/cfg.json
+++ b/tests/democfg/cfg.json
@@ -18,7 +18,7 @@
     },
     {
       "name": "esp32s3",
-      "fqbn": ["espressif:esp32:esp32s3:PSRAM=enabled,USBMode=default,PartitionScheme=huge_app"]
+      "fqbn": ["espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,PartitionScheme=huge_app"]
     }
   ]
 }
diff --git a/tests/nvs/cfg.json b/tests/nvs/cfg.json
old mode 100755
new mode 100644
index cf3fd14a128..a7fe609d0a6
--- a/tests/nvs/cfg.json
+++ b/tests/nvs/cfg.json
@@ -30,10 +30,10 @@
     {
       "name": "esp32s3",
       "fqbn": [
-        "espressif:esp32:esp32s3:PSRAM=disabled,USBMode=default,PartitionScheme=huge_app,FlashMode=qio",
-        "espressif:esp32:esp32s3:PSRAM=disabled,USBMode=default,PartitionScheme=huge_app,FlashMode=qio120",
-        "espressif:esp32:esp32s3:PSRAM=disabled,USBMode=default,PartitionScheme=huge_app,FlashMode=dio",
-        "espressif:esp32:esp32s3:PSRAM=disabled,USBMode=default,PartitionScheme=huge_app,FlashMode=opi"
+        "espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,PartitionScheme=huge_app,FlashMode=qio",
+        "espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,PartitionScheme=huge_app,FlashMode=qio120",
+        "espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,PartitionScheme=huge_app,FlashMode=dio",
+        "espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,PartitionScheme=huge_app,FlashMode=opi"
       ]
     }
   ]

From df0fdd50fae2e5c78556818cc0f11013701f887c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Procha=CC=81zka?=
 <90197375+P-R-O-C-H-Y@users.noreply.github.com>
Date: Mon, 15 Aug 2022 10:41:54 +0200
Subject: [PATCH 7/7] Remove Octal flash test

Octal flash needs to be tested locally before each release.
---
 tests/nvs/cfg.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/nvs/cfg.json b/tests/nvs/cfg.json
index a7fe609d0a6..c1b23d46842 100644
--- a/tests/nvs/cfg.json
+++ b/tests/nvs/cfg.json
@@ -32,8 +32,7 @@
       "fqbn": [
         "espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,PartitionScheme=huge_app,FlashMode=qio",
         "espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,PartitionScheme=huge_app,FlashMode=qio120",
-        "espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,PartitionScheme=huge_app,FlashMode=dio",
-        "espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,PartitionScheme=huge_app,FlashMode=opi"
+        "espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,PartitionScheme=huge_app,FlashMode=dio"
       ]
     }
   ]