Merge pull request #60 from 981182547/main

i3water · web-flow · commit 00a3a90f3511 · 2026-03-17T16:58:23.000+08:00
feat(oj_esp32s3basic): 修改digitalPins引脚配置
diff --git a/oj_esp32s3basic/board.json b/oj_esp32s3basic/board.json
@@ -75,71 +75,71 @@
             "1"
         ],
         [
-            "2",
+            "2/ES_LRCK",
             "2"
         ],
         [
-            "3",
+            "3/SD_CLK",
             "3"
         ],
         [
-            "4",
+            "4/CAM_SIOD",
             "4"
         ],
         [
-            "5",
+            "5/CAM_SIOC",
             "5"
         ],
         [
-            "6",
+            "6/CAM_VSYNC",
             "6"
         ],
         [
-            "7",
+            "7/CAM_HREF",
             "7"
         ],
         [
-            "8",
+            "8/CAM_Y4",
             "8"
         ],
         [
-            "9",
+            "9/CAM_Y3",
             "9"
         ],
         [
-            "10",
+            "10/CAM_Y5",
             "10"
         ],
         [
-            "11",
+            "11/CAM_Y2",
             "11"
         ],
         [
-            "12",
+            "12/CAM_Y6",
             "12"
         ],
         [
-            "13",
+            "13/CAM_PCLK",
             "13"
         ],
         [
-            "14",
+            "14/SD_MOSI",
             "14"
         ],
         [
-            "15",
+            "15/CAM_XCLK",
             "15"
         ],
         [
-            "16",
+            "16/CAM_Y9",
             "16"
         ],
         [
-            "17",
+            "17/CAM_Y8",
             "17"
         ],
         [
-            "18",
+            "18/CAM_Y7",
             "18"
         ],
         [
@@ -151,11 +151,11 @@
             "20"
         ],
         [
-            "21",
+            "21/LCD_SCLK",
             "21"
         ],
         [
-            "35",
+            "35/SD_MISO",
             "35"
         ],
         [
@@ -167,43 +167,43 @@
             "37"
         ],
         [
-            "38",
+            "38/ES_DIN",
             "38"
         ],
         [
-            "39",
+            "39/ES_SCLK",
             "39"
         ],
         [
-            "40",
+            "40/ES_DOUT",
             "40"
         ],
         [
-            "41",
+            "41/ES_SDA",
             "41"
         ],
         [
-            "42",
+            "42/ES_SCL",
             "42"
         ],
         [
-            "43",
+            "43/LCD_DC",
             "43"
         ],
         [
-            "44",
+            "44/LCD_CS",
             "44"
         ],
         [
             "45",
             "45"
         ],
         [
-            "46",
+            "46/ES_MCLK",
             "46"
         ],
         [
-            "47",
+            "47/LCD_MOSI",
             "47"
         ],
         [

Original file line number	Diff line number	Diff line change
`@@ -75,71 +75,71 @@`
`75`	`75`	`"1"`
`76`	`76`	`],`
`77`	`77`	`[`
`78`		`- "2",`
	`78`	`+ "2/ES_LRCK",`
`79`	`79`	`"2"`
`80`	`80`	`],`
`81`	`81`	`[`
`82`		`- "3",`
	`82`	`+ "3/SD_CLK",`
`83`	`83`	`"3"`
`84`	`84`	`],`
`85`	`85`	`[`
`86`		`- "4",`
	`86`	`+ "4/CAM_SIOD",`
`87`	`87`	`"4"`
`88`	`88`	`],`
`89`	`89`	`[`
`90`		`- "5",`
	`90`	`+ "5/CAM_SIOC",`
`91`	`91`	`"5"`
`92`	`92`	`],`
`93`	`93`	`[`
`94`		`- "6",`
	`94`	`+ "6/CAM_VSYNC",`
`95`	`95`	`"6"`
`96`	`96`	`],`
`97`	`97`	`[`
`98`		`- "7",`
	`98`	`+ "7/CAM_HREF",`
`99`	`99`	`"7"`
`100`	`100`	`],`
`101`	`101`	`[`
`102`		`- "8",`
	`102`	`+ "8/CAM_Y4",`
`103`	`103`	`"8"`
`104`	`104`	`],`
`105`	`105`	`[`
`106`		`- "9",`
	`106`	`+ "9/CAM_Y3",`
`107`	`107`	`"9"`
`108`	`108`	`],`
`109`	`109`	`[`
`110`		`- "10",`
	`110`	`+ "10/CAM_Y5",`
`111`	`111`	`"10"`
`112`	`112`	`],`
`113`	`113`	`[`
`114`		`- "11",`
	`114`	`+ "11/CAM_Y2",`
`115`	`115`	`"11"`
`116`	`116`	`],`
`117`	`117`	`[`
`118`		`- "12",`
	`118`	`+ "12/CAM_Y6",`
`119`	`119`	`"12"`
`120`	`120`	`],`
`121`	`121`	`[`
`122`		`- "13",`
	`122`	`+ "13/CAM_PCLK",`
`123`	`123`	`"13"`
`124`	`124`	`],`
`125`	`125`	`[`
`126`		`- "14",`
	`126`	`+ "14/SD_MOSI",`
`127`	`127`	`"14"`
`128`	`128`	`],`
`129`	`129`	`[`
`130`		`- "15",`
	`130`	`+ "15/CAM_XCLK",`
`131`	`131`	`"15"`
`132`	`132`	`],`
`133`	`133`	`[`
`134`		`- "16",`
	`134`	`+ "16/CAM_Y9",`
`135`	`135`	`"16"`
`136`	`136`	`],`
`137`	`137`	`[`
`138`		`- "17",`
	`138`	`+ "17/CAM_Y8",`
`139`	`139`	`"17"`
`140`	`140`	`],`
`141`	`141`	`[`
`142`		`- "18",`
	`142`	`+ "18/CAM_Y7",`
`143`	`143`	`"18"`
`144`	`144`	`],`
`145`	`145`	`[`
`@@ -151,11 +151,11 @@`
`151`	`151`	`"20"`
`152`	`152`	`],`
`153`	`153`	`[`
`154`		`- "21",`
	`154`	`+ "21/LCD_SCLK",`
`155`	`155`	`"21"`
`156`	`156`	`],`
`157`	`157`	`[`
`158`		`- "35",`
	`158`	`+ "35/SD_MISO",`
`159`	`159`	`"35"`
`160`	`160`	`],`
`161`	`161`	`[`
`@@ -167,43 +167,43 @@`
`167`	`167`	`"37"`
`168`	`168`	`],`
`169`	`169`	`[`
`170`		`- "38",`
	`170`	`+ "38/ES_DIN",`
`171`	`171`	`"38"`
`172`	`172`	`],`
`173`	`173`	`[`
`174`		`- "39",`
	`174`	`+ "39/ES_SCLK",`
`175`	`175`	`"39"`
`176`	`176`	`],`
`177`	`177`	`[`
`178`		`- "40",`
	`178`	`+ "40/ES_DOUT",`
`179`	`179`	`"40"`
`180`	`180`	`],`
`181`	`181`	`[`
`182`		`- "41",`
	`182`	`+ "41/ES_SDA",`
`183`	`183`	`"41"`
`184`	`184`	`],`
`185`	`185`	`[`
`186`		`- "42",`
	`186`	`+ "42/ES_SCL",`
`187`	`187`	`"42"`
`188`	`188`	`],`
`189`	`189`	`[`
`190`		`- "43",`
	`190`	`+ "43/LCD_DC",`
`191`	`191`	`"43"`
`192`	`192`	`],`
`193`	`193`	`[`
`194`		`- "44",`
	`194`	`+ "44/LCD_CS",`
`195`	`195`	`"44"`
`196`	`196`	`],`
`197`	`197`	`[`
`198`	`198`	`"45",`
`199`	`199`	`"45"`
`200`	`200`	`],`
`201`	`201`	`[`
`202`		`- "46",`
	`202`	`+ "46/ES_MCLK",`
`203`	`203`	`"46"`
`204`	`204`	`],`
`205`	`205`	`[`
`206`		`- "47",`
	`206`	`+ "47/LCD_MOSI",`
`207`	`207`	`"47"`
`208`	`208`	`],`
`209`	`209`	`[`