Reverting PSRAM changes

P-R-O-C-H-Y · P-R-O-C-H-Y · commit b9612ceb044c · 2022-08-15T10:40:49.000+02:00
diff --git 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
@@ -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
@@ -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"
       ]
     }
   ]

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`},`
`19`	`19`	`{`
`20`	`20`	`"name": "esp32s3",`
`21`		`- "fqbn": ["espressif:esp32:esp32s3:PSRAM=enabled,USBMode=default,PartitionScheme=huge_app"]`
	`21`	`+ "fqbn": ["espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,PartitionScheme=huge_app"]`
`22`	`22`	`}`
`23`	`23`	`]`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,10 +30,10 @@`
`30`	`30`	`{`
`31`	`31`	`"name": "esp32s3",`
`32`	`32`	`"fqbn": [`
`33`		`- "espressif:esp32:esp32s3:PSRAM=disabled,USBMode=default,PartitionScheme=huge_app,FlashMode=qio",`
`34`		`- "espressif:esp32:esp32s3:PSRAM=disabled,USBMode=default,PartitionScheme=huge_app,FlashMode=qio120",`
`35`		`- "espressif:esp32:esp32s3:PSRAM=disabled,USBMode=default,PartitionScheme=huge_app,FlashMode=dio",`
`36`		`- "espressif:esp32:esp32s3:PSRAM=disabled,USBMode=default,PartitionScheme=huge_app,FlashMode=opi"`
	`33`	`+ "espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,PartitionScheme=huge_app,FlashMode=qio",`
	`34`	`+ "espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,PartitionScheme=huge_app,FlashMode=qio120",`
	`35`	`+ "espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,PartitionScheme=huge_app,FlashMode=dio",`
	`36`	`+ "espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,PartitionScheme=huge_app,FlashMode=opi"`
`37`	`37`	`]`
`38`	`38`	`}`
`39`	`39`	`]`