Merge branch 'master' of https://github.com/nodemcu/nodemcu-devkit

Conflicts: Documents/旧版本管脚对应关系.txt
2025-10-19 19:43:50 +08:00 · 2015-03-20 00:33:11 +08:00
parent 83e41256da 047248f6bb
commit 06fa2f4764
8 changed files with 4 additions and 4 deletions
--- a/Documents/CH340DS1.PDF
+++ b/Documents/CH340DS1.PDF
--- a/Documents/NODEMCU-DEVKIT-INSTRUCTION-EN.png
+++ b/Documents/NODEMCU-DEVKIT-INSTRUCTION-EN.png
--- a/Documents/NODEMCU-DEVKIT-INSTRUCTION-EN_BIG.png
+++ b/Documents/NODEMCU-DEVKIT-INSTRUCTION-EN_BIG.png
--- a/Documents/NODEMCU_DEVKIT_SCH.png
+++ b/Documents/NODEMCU_DEVKIT_SCH.png
--- a/Documents/NODEMCU_DEVKIT_SCH_BIG.png
+++ b/Documents/NODEMCU_DEVKIT_SCH_BIG.png
--- a/Documents/旧版本管脚对应关系.txt
+++ b/Documents/旧版本管脚对应关系.txt
@@ -4,8 +4,8 @@ D2 GPIO3 RXD0
 D3 GPIO12
 D4 GPIO14
 D5 GPIO0
-D6 GPIO5
+D6 GPIO4
-D7 GPIO4
+D7 GPIO5
 D8 GPIO2
 D9 GPIO13
 D10 GPIO15
--- a/NODEMCU_ESP12.PcbDoc
+++ b/NODEMCU_ESP12.PcbDoc
--- a/NODEMCU_ESP12.PrjPCB
+++ b/NODEMCU_ESP12.PrjPCB
@@ -28,7 +28,7 @@ PowerPortNamesTakePriority=0
 PushECOToAnnotationFile=1
 DItemRevisionGUID=
 ReportSuppressedErrorsInMessages=0
-OutputPath=Project Outputs for NODEMCU_ESP12
+OutputPath=
 LogFolderPath=
 [Preferences]
@@ -113,7 +113,7 @@ SCH_HasExpandLogicalToPhysicalSheets=-1
 SaveSettingsToOutJob=0
 [Generic_EDE]
-OutputDir=Project Outputs for NODEMCU_ESP12
+OutputDir=
 [OutputGroup1]
 Name=Netlist Outputs