new pcb cubemx config，update eth pin

2 years ago · 21c0cd1a76
7 changed files with 115 additions and 1099 deletions
--- a/LWIP.ioc
+++ b/LWIP.ioc
@ -55,19 +55,19 @@ Mcu.Pin1=PE3
 Mcu.Pin10=PA7
 Mcu.Pin11=PC4
 Mcu.Pin12=PC5
-Mcu.Pin13=PD12
-Mcu.Pin14=PD13
-Mcu.Pin15=PC6
-Mcu.Pin16=PC7
-Mcu.Pin17=PA9
-Mcu.Pin18=PA10
-Mcu.Pin19=PA13
+Mcu.Pin13=PB11
+Mcu.Pin14=PB12
+Mcu.Pin15=PB13
+Mcu.Pin16=PD12
+Mcu.Pin17=PD13
+Mcu.Pin18=PC6
+Mcu.Pin19=PC7
 Mcu.Pin2=PE4
-Mcu.Pin20=PA14
-Mcu.Pin21=PD3
-Mcu.Pin22=PG11
-Mcu.Pin23=PG13
-Mcu.Pin24=PG14
+Mcu.Pin20=PA9
+Mcu.Pin21=PA10
+Mcu.Pin22=PA13
+Mcu.Pin23=PA14
+Mcu.Pin24=PD3
 Mcu.Pin25=VP_FREERTOS_VS_CMSIS_V1
 Mcu.Pin26=VP_LWIP_VS_Enabled
 Mcu.Pin27=VP_SYS_VS_tim1
@ -120,6 +120,15 @@ PA7.Mode=RMII
 PA7.Signal=ETH_CRS_DV
 PA9.Mode=Asynchronous
 PA9.Signal=USART1_TX
+PB11.Locked=true
+PB11.Mode=RMII
+PB11.Signal=ETH_TX_EN
+PB12.Locked=true
+PB12.Mode=RMII
+PB12.Signal=ETH_TXD0
+PB13.Locked=true
+PB13.Mode=RMII
+PB13.Signal=ETH_TXD1
 PC1.Mode=RMII
 PC1.Signal=ETH_MDC
 PC4.Mode=RMII
@ -168,15 +177,6 @@ PF9.GPIO_Label=ENCODER_LIGHT
 PF9.GPIO_PuPd=GPIO_PULLUP
 PF9.Locked=true
 PF9.Signal=GPIO_Output
-PG11.Locked=true
-PG11.Mode=RMII
-PG11.Signal=ETH_TX_EN
-PG13.Locked=true
-PG13.Mode=RMII
-PG13.Signal=ETH_TXD0
-PG14.Locked=true
-PG14.Mode=RMII
-PG14.Signal=ETH_TXD1
 PH0-OSC_IN.Mode=HSE-External-Oscillator
 PH0-OSC_IN.Signal=RCC_OSC_IN
 PH1-OSC_OUT.Mode=HSE-External-Oscillator
--- 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/ethernetif.c
+++ b/Src/ethernetif.c
@ -585,7 +585,7 @@ void HAL_ETH_MspInit(ETH_HandleTypeDef* ethHandle)

    __HAL_RCC_GPIOC_CLK_ENABLE();
    __HAL_RCC_GPIOA_CLK_ENABLE();
-    __HAL_RCC_GPIOG_CLK_ENABLE();
+    __HAL_RCC_GPIOB_CLK_ENABLE();
    /**ETH GPIO Configuration
    PC1     ------> ETH_MDC
    PA1     ------> ETH_REF_CLK
@ -593,9 +593,9 @@ void HAL_ETH_MspInit(ETH_HandleTypeDef* ethHandle)
    PA7     ------> ETH_CRS_DV
    PC4     ------> ETH_RXD0
    PC5     ------> ETH_RXD1
-    PG11     ------> ETH_TX_EN
-    PG13     ------> ETH_TXD0
-    PG14     ------> ETH_TXD1
+    PB11     ------> ETH_TX_EN
+    PB12     ------> ETH_TXD0
+    PB13     ------> ETH_TXD1
    */
    GPIO_InitStruct.Pin = GPIO_PIN_1|GPIO_PIN_4|GPIO_PIN_5;
    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
@ -611,12 +611,12 @@ void HAL_ETH_MspInit(ETH_HandleTypeDef* ethHandle)
    GPIO_InitStruct.Alternate = GPIO_AF11_ETH;
    HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);

-    GPIO_InitStruct.Pin = GPIO_PIN_11|GPIO_PIN_13|GPIO_PIN_14;
+    GPIO_InitStruct.Pin = GPIO_PIN_11|GPIO_PIN_12|GPIO_PIN_13;
    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
    GPIO_InitStruct.Pull = GPIO_NOPULL;
    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
    GPIO_InitStruct.Alternate = GPIO_AF11_ETH;
-    HAL_GPIO_Init(GPIOG, &GPIO_InitStruct);
+    HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);

    /* Peripheral interrupt init */
    HAL_NVIC_SetPriority(ETH_IRQn, 5, 0);
@ -646,15 +646,15 @@ void HAL_ETH_MspDeInit(ETH_HandleTypeDef* ethHandle)
    PA7     ------> ETH_CRS_DV
    PC4     ------> ETH_RXD0
    PC5     ------> ETH_RXD1
-    PG11     ------> ETH_TX_EN
-    PG13     ------> ETH_TXD0
-    PG14     ------> ETH_TXD1
+    PB11     ------> ETH_TX_EN
+    PB12     ------> ETH_TXD0
+    PB13     ------> ETH_TXD1
    */
    HAL_GPIO_DeInit(GPIOC, GPIO_PIN_1|GPIO_PIN_4|GPIO_PIN_5);

    HAL_GPIO_DeInit(GPIOA, GPIO_PIN_1|GPIO_PIN_2|GPIO_PIN_7);

-    HAL_GPIO_DeInit(GPIOG, GPIO_PIN_11|GPIO_PIN_13|GPIO_PIN_14);
+    HAL_GPIO_DeInit(GPIOB, GPIO_PIN_11|GPIO_PIN_12|GPIO_PIN_13);

    /* Peripheral interrupt Deinit*/
    HAL_NVIC_DisableIRQ(ETH_IRQn);
--- a/Src/freertos.c
+++ b/Src/freertos.c
@ -157,13 +157,7 @@ void MX_FREERTOS_Init(void) {
 void StartDefaultTask(void const * argument)
 {
  /* init code for LWIP */
-  if (config_get()->obtaining_ip_mode == OBTAINING_IP_MODE_STATIC){
-    MX_LWIP_STATIC_Init();
-  }else if (config_get()->obtaining_ip_mode == OBTAINING_IP_MODE_DHCP){
-    MX_LWIP_Init();
-  }else{
-    printf("lwip error\r\n");
-  }
+  MX_LWIP_Init();
  /* USER CODE BEGIN StartDefaultTask */
  osThreadDef(mainTask, StartMainTask, osPriorityNormal, 0, 1024);
  mainTaskHandle = osThreadCreate(osThread(mainTask), NULL);
--- a/Src/gpio.c
+++ b/Src/gpio.c
@ -50,8 +50,8 @@ void MX_GPIO_Init(void)
  __HAL_RCC_GPIOH_CLK_ENABLE();
  __HAL_RCC_GPIOC_CLK_ENABLE();
  __HAL_RCC_GPIOA_CLK_ENABLE();
+  __HAL_RCC_GPIOB_CLK_ENABLE();
  __HAL_RCC_GPIOD_CLK_ENABLE();
-  __HAL_RCC_GPIOG_CLK_ENABLE();

  /*Configure GPIO pin Output Level */
  HAL_GPIO_WritePin(GPIOF, ENCODER_LIGHT_Pin|DEBUG_LIGHT_Pin, GPIO_PIN_RESET);
--- a/Src/lwip.c
+++ b/Src/lwip.c
@ -119,7 +119,7 @@ void MX_LWIP_Init(void)
  if (!netif_is_up(&gnetif)){
    netif_set_up(&gnetif);
    if (dhcp_start(&gnetif) == ERR_ARG){
-      NVIC_SystemReset(); /* è½¯å¤�ä½� */
+      NVIC_SystemReset(); /* è½¯å¤�ä½? */
    }
  }