添加PE2引脚配置，用作与genlock

2 years ago · aa56d241db
4 changed files with 118 additions and 1087 deletions
--- a/LWIP.ioc
+++ b/LWIP.ioc
@ -50,34 +50,35 @@ Mcu.IP9=USART1
 Mcu.IPNb=10
 Mcu.Name=STM32F407Z(E-G)Tx
 Mcu.Package=LQFP144
-Mcu.Pin0=PE3
-Mcu.Pin1=PE4
-Mcu.Pin10=PC5
-Mcu.Pin11=PD12
-Mcu.Pin12=PD13
-Mcu.Pin13=PC6
-Mcu.Pin14=PC7
-Mcu.Pin15=PA9
-Mcu.Pin16=PA10
-Mcu.Pin17=PA13
-Mcu.Pin18=PA14
-Mcu.Pin19=PD3
-Mcu.Pin2=PF10
-Mcu.Pin20=PG11
-Mcu.Pin21=PG13
-Mcu.Pin22=PG14
-Mcu.Pin23=VP_FREERTOS_VS_CMSIS_V1
-Mcu.Pin24=VP_LWIP_VS_Enabled
-Mcu.Pin25=VP_SYS_VS_tim1
-Mcu.Pin26=VP_TIM6_VS_ClockSourceINT
-Mcu.Pin3=PH0-OSC_IN
-Mcu.Pin4=PH1-OSC_OUT
-Mcu.Pin5=PC1
-Mcu.Pin6=PA1
-Mcu.Pin7=PA2
-Mcu.Pin8=PA7
-Mcu.Pin9=PC4
-Mcu.PinsNb=27
+Mcu.Pin0=PE2
+Mcu.Pin1=PE3
+Mcu.Pin10=PC4
+Mcu.Pin11=PC5
+Mcu.Pin12=PD12
+Mcu.Pin13=PD13
+Mcu.Pin14=PC6
+Mcu.Pin15=PC7
+Mcu.Pin16=PA9
+Mcu.Pin17=PA10
+Mcu.Pin18=PA13
+Mcu.Pin19=PA14
+Mcu.Pin2=PE4
+Mcu.Pin20=PD3
+Mcu.Pin21=PG11
+Mcu.Pin22=PG13
+Mcu.Pin23=PG14
+Mcu.Pin24=VP_FREERTOS_VS_CMSIS_V1
+Mcu.Pin25=VP_LWIP_VS_Enabled
+Mcu.Pin26=VP_SYS_VS_tim1
+Mcu.Pin27=VP_TIM6_VS_ClockSourceINT
+Mcu.Pin3=PF10
+Mcu.Pin4=PH0-OSC_IN
+Mcu.Pin5=PH1-OSC_OUT
+Mcu.Pin6=PC1
+Mcu.Pin7=PA1
+Mcu.Pin8=PA2
+Mcu.Pin9=PA7
+Mcu.PinsNb=28
 Mcu.ThirdPartyNb=0
 Mcu.UserConstants=
 Mcu.UserName=STM32F407ZETx
@ -139,6 +140,8 @@ PD3.GPIOParameters=GPIO_Label
 PD3.GPIO_Label=ETH_RST
 PD3.Locked=true
 PD3.Signal=GPIO_Output
+PE2.Locked=true
+PE2.Signal=GPIO_Input
 PE3.GPIOParameters=GPIO_PuPd
 PE3.GPIO_PuPd=GPIO_PULLUP
 PE3.Locked=true
--- a/MDK-ARM/LWIP.uvoptx
+++ b/MDK-ARM/LWIP.uvoptx
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="UTF-8"?>
 <ProjectOpt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_optx.xsd">

  <SchemaVersion>1.0</SchemaVersion>
@ -45,7 +45,7 @@
        <PageWidth>79</PageWidth>
        <PageLength>66</PageLength>
        <TabStop>8</TabStop>
-        <ListingPath></ListingPath>
+        <ListingPath />
      </OPTLEX>
      <ListingPage>
        <CreateCListing>1</CreateCListing>
@ -104,16 +104,16 @@
        <bSchkAxf>0</bSchkAxf>
        <bTchkAxf>0</bTchkAxf>
        <nTsel>3</nTsel>
-        <sDll></sDll>
-        <sDllPa></sDllPa>
-        <sDlgDll></sDlgDll>
-        <sDlgPa></sDlgPa>
-        <sIfile></sIfile>
-        <tDll></tDll>
-        <tDllPa></tDllPa>
-        <tDlgDll></tDlgDll>
-        <tDlgPa></tDlgPa>
-        <tIfile></tIfile>
+        <sDll />
+        <sDllPa />
+        <sDlgDll />
+        <sDlgPa />
+        <sIfile />
+        <tDll />
+        <tDllPa />
+        <tDlgDll />
+        <tDlgPa />
+        <tIfile />
        <pMon>BIN\CMSIS_AGDI.dll</pMon>
      </DebugOpt>
      <TargetDriverDllRegistry>
@ -130,12 +130,12 @@
        <SetRegEntry>
          <Number>0</Number>
          <Key>ARMDBGFLAGS</Key>
-          <Name></Name>
+          <Name />
        </SetRegEntry>
        <SetRegEntry>
          <Number>0</Number>
          <Key>DLGUARM</Key>
-          <Name></Name>
+          <Name />
        </SetRegEntry>
        <SetRegEntry>
          <Number>0</Number>
@ -167,7 +167,7 @@
          <BreakByAccess>0</BreakByAccess>
          <BreakIfRCount>1</BreakIfRCount>
          <Filename>..\usersrc\atcmd.c</Filename>
-          <ExecCommand></ExecCommand>
+          <ExecCommand />
          <Expression>\\LWIP\../usersrc/atcmd.c\132</Expression>
        </Bp>
        <Bp>
@ -183,7 +183,7 @@
          <BreakByAccess>0</BreakByAccess>
          <BreakIfRCount>1</BreakIfRCount>
          <Filename>../Src/ethernetif.c</Filename>
-          <ExecCommand></ExecCommand>
+          <ExecCommand />
          <Expression>\\LWIP\../Src/ethernetif.c\198</Expression>
        </Bp>
      </Breakpoint>
@ -228,19 +228,19 @@
        <newCpu>0</newCpu>
        <uProt>0</uProt>
      </DebugFlag>
-      <LintExecutable></LintExecutable>
-      <LintConfigFile></LintConfigFile>
+      <LintExecutable />
+      <LintConfigFile />
      <bLintAuto>0</bLintAuto>
      <bAutoGenD>0</bAutoGenD>
      <LntExFlags>0</LntExFlags>
-      <pMisraName></pMisraName>
-      <pszMrule></pszMrule>
-      <pSingCmds></pSingCmds>
-      <pMultCmds></pMultCmds>
-      <pMisraNamep></pMisraNamep>
-      <pszMrulep></pszMrulep>
-      <pSingCmdsp></pSingCmdsp>
-      <pMultCmdsp></pMultCmdsp>
+      <pMisraName />
+      <pszMrule />
+      <pSingCmds />
+      <pMultCmds />
+      <pMisraNamep />
+      <pszMrulep />
+      <pSingCmdsp />
+      <pMultCmdsp />
      <DebugDescription>
        <Enable>1</Enable>
        <EnableFlashSeq>0</EnableFlashSeq>
--- a/MDK-ARM/LWIP.uvprojx
+++ b/MDK-ARM/LWIP.uvprojx
--- a/Src/gpio.c
+++ b/Src/gpio.c
@ -59,6 +59,12 @@ void MX_GPIO_Init(void)
  /*Configure GPIO pin Output Level */
  HAL_GPIO_WritePin(ETH_RST_GPIO_Port, ETH_RST_Pin, GPIO_PIN_RESET);

+  /*Configure GPIO pin : PE2 */
+  GPIO_InitStruct.Pin = GPIO_PIN_2;
+  GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
+  GPIO_InitStruct.Pull = GPIO_NOPULL;
+  HAL_GPIO_Init(GPIOE, &GPIO_InitStruct);
+
  /*Configure GPIO pins : PE3 PE4 */
  GPIO_InitStruct.Pin = GPIO_PIN_3|GPIO_PIN_4;
  GPIO_InitStruct.Mode = GPIO_MODE_INPUT;