cubemx更新time8配置，因为编码器板子还无法下程序，所以模拟小板子的输入捕获引脚状态

2 years ago · dfcc4236fa
5 changed files with 149 additions and 1088 deletions
--- a/LWIP.ioc
+++ b/LWIP.ioc
@ -55,32 +55,34 @@ 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=PB0
+Mcu.Pin14=PB1
+Mcu.Pin15=PD12
+Mcu.Pin16=PD13
+Mcu.Pin17=PC7
+Mcu.Pin18=PC8
+Mcu.Pin19=PA9
 Mcu.Pin2=PE4
-Mcu.Pin20=PA14
-Mcu.Pin21=PD3
-Mcu.Pin22=PG11
-Mcu.Pin23=PG13
-Mcu.Pin24=PG14
-Mcu.Pin25=VP_FREERTOS_VS_CMSIS_V1
-Mcu.Pin26=VP_LWIP_VS_Enabled
-Mcu.Pin27=VP_SYS_VS_tim1
-Mcu.Pin28=VP_TIM4_VS_ClockSourceINT
-Mcu.Pin29=VP_TIM6_VS_ClockSourceINT
+Mcu.Pin20=PA10
+Mcu.Pin21=PA13
+Mcu.Pin22=PA14
+Mcu.Pin23=PD3
+Mcu.Pin24=PG11
+Mcu.Pin25=PG13
+Mcu.Pin26=PG14
+Mcu.Pin27=VP_FREERTOS_VS_CMSIS_V1
+Mcu.Pin28=VP_LWIP_VS_Enabled
+Mcu.Pin29=VP_SYS_VS_tim1
 Mcu.Pin3=PF9
+Mcu.Pin30=VP_TIM4_VS_ClockSourceINT
+Mcu.Pin31=VP_TIM6_VS_ClockSourceINT
 Mcu.Pin4=PF10
 Mcu.Pin5=PH0-OSC_IN
 Mcu.Pin6=PH1-OSC_OUT
 Mcu.Pin7=PC1
 Mcu.Pin8=PA1
 Mcu.Pin9=PA2
-Mcu.PinsNb=30
+Mcu.PinsNb=32
 Mcu.ThirdPartyNb=0
 Mcu.UserConstants=
 Mcu.UserName=STM32F407ZETx
@ -123,14 +125,18 @@ PA7.Mode=RMII
 PA7.Signal=ETH_CRS_DV
 PA9.Mode=Asynchronous
 PA9.Signal=USART1_TX
+PB0.Locked=true
+PB0.Signal=TIM8_CH2N
+PB1.Locked=true
+PB1.Signal=TIM8_CH3N
 PC1.Mode=RMII
 PC1.Signal=ETH_MDC
 PC4.Mode=RMII
 PC4.Signal=ETH_RXD0
 PC5.Mode=RMII
 PC5.Signal=ETH_RXD1
-PC6.Signal=S_TIM8_CH1
 PC7.Signal=S_TIM8_CH2
+PC8.Signal=S_TIM8_CH3
 PD12.Signal=S_TIM4_CH1
 PD13.Signal=S_TIM4_CH2
 PD3.GPIOParameters=GPIO_Label
@ -243,10 +249,10 @@ SH.S_TIM4_CH1.0=TIM4_CH1,Input_Capture1_from_TI1
 SH.S_TIM4_CH1.ConfNb=1
 SH.S_TIM4_CH2.0=TIM4_CH2,Input_Capture2_from_TI2
 SH.S_TIM4_CH2.ConfNb=1
-SH.S_TIM8_CH1.0=TIM8_CH1,Input_Capture1_from_TI1
-SH.S_TIM8_CH1.ConfNb=1
 SH.S_TIM8_CH2.0=TIM8_CH2,Input_Capture2_from_TI2
 SH.S_TIM8_CH2.ConfNb=1
+SH.S_TIM8_CH3.0=TIM8_CH3,Input_Capture3_from_TI3
+SH.S_TIM8_CH3.ConfNb=1
 TIM4.AutoReloadPreload=TIM_AUTORELOAD_PRELOAD_ENABLE
 TIM4.Channel-Input_Capture1_from_TI1=TIM_CHANNEL_1
 TIM4.Channel-Input_Capture2_from_TI2=TIM_CHANNEL_2
@ -256,9 +262,9 @@ TIM6.IPParameters=Prescaler,Period,AutoReloadPreload
 TIM6.Period=1000-1
 TIM6.Prescaler=84-1
 TIM8.AutoReloadPreload=TIM_AUTORELOAD_PRELOAD_ENABLE
-TIM8.Channel-Input_Capture1_from_TI1=TIM_CHANNEL_1
 TIM8.Channel-Input_Capture2_from_TI2=TIM_CHANNEL_2
-TIM8.IPParameters=Channel-Input_Capture1_from_TI1,Channel-Input_Capture2_from_TI2,AutoReloadPreload
+TIM8.Channel-Input_Capture3_from_TI3=TIM_CHANNEL_3
+TIM8.IPParameters=Channel-Input_Capture2_from_TI2,Channel-Input_Capture3_from_TI3,AutoReloadPreload
 USART1.IPParameters=VirtualMode
 USART1.VirtualMode=VM_ASYNC
 VP_FREERTOS_VS_CMSIS_V1.Mode=CMSIS_V1
--- 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
@ -50,6 +50,7 @@ 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();

--- a/Src/tim.c
+++ b/Src/tim.c
@ -153,11 +153,11 @@ void MX_TIM8_Init(void)
  sConfigIC.ICSelection = TIM_ICSELECTION_DIRECTTI;
  sConfigIC.ICPrescaler = TIM_ICPSC_DIV1;
  sConfigIC.ICFilter = 0;
-  if (HAL_TIM_IC_ConfigChannel(&htim8, &sConfigIC, TIM_CHANNEL_1) != HAL_OK)
+  if (HAL_TIM_IC_ConfigChannel(&htim8, &sConfigIC, TIM_CHANNEL_2) != HAL_OK)
  {
    Error_Handler();
  }
-  if (HAL_TIM_IC_ConfigChannel(&htim8, &sConfigIC, TIM_CHANNEL_2) != HAL_OK)
+  if (HAL_TIM_IC_ConfigChannel(&htim8, &sConfigIC, TIM_CHANNEL_3) != HAL_OK)
  {
    Error_Handler();
  }
@ -229,10 +229,10 @@ void HAL_TIM_IC_MspInit(TIM_HandleTypeDef* tim_icHandle)

    __HAL_RCC_GPIOC_CLK_ENABLE();
    /**TIM8 GPIO Configuration
-    PC6     ------> TIM8_CH1
    PC7     ------> TIM8_CH2
+    PC8     ------> TIM8_CH3
    */
-    GPIO_InitStruct.Pin = GPIO_PIN_6|GPIO_PIN_7;
+    GPIO_InitStruct.Pin = GPIO_PIN_7|GPIO_PIN_8;
    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
    GPIO_InitStruct.Pull = GPIO_NOPULL;
    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
@ -247,6 +247,34 @@ void HAL_TIM_IC_MspInit(TIM_HandleTypeDef* tim_icHandle)
  /* USER CODE END TIM8_MspInit 1 */
  }
 }
+void HAL_TIM_MspPostInit(TIM_HandleTypeDef* timHandle)
+{
+
+  GPIO_InitTypeDef GPIO_InitStruct = {0};
+  if(timHandle->Instance==TIM8)
+  {
+  /* USER CODE BEGIN TIM8_MspPostInit 0 */
+
+  /* USER CODE END TIM8_MspPostInit 0 */
+
+    __HAL_RCC_GPIOB_CLK_ENABLE();
+    /**TIM8 GPIO Configuration
+    PB0     ------> TIM8_CH2N
+    PB1     ------> TIM8_CH3N
+    */
+    GPIO_InitStruct.Pin = GPIO_PIN_0|GPIO_PIN_1;
+    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
+    GPIO_InitStruct.Alternate = GPIO_AF3_TIM8;
+    HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
+
+  /* USER CODE BEGIN TIM8_MspPostInit 1 */
+
+  /* USER CODE END TIM8_MspPostInit 1 */
+  }
+
+}

 void HAL_TIM_Base_MspDeInit(TIM_HandleTypeDef* tim_baseHandle)
 {
@ -299,10 +327,14 @@ void HAL_TIM_IC_MspDeInit(TIM_HandleTypeDef* tim_icHandle)
    __HAL_RCC_TIM8_CLK_DISABLE();

    /**TIM8 GPIO Configuration
-    PC6     ------> TIM8_CH1
+    PB0     ------> TIM8_CH2N
+    PB1     ------> TIM8_CH3N
    PC7     ------> TIM8_CH2
+    PC8     ------> TIM8_CH3
    */
-    HAL_GPIO_DeInit(GPIOC, GPIO_PIN_6|GPIO_PIN_7);
+    HAL_GPIO_DeInit(GPIOB, GPIO_PIN_0|GPIO_PIN_1);
+
+    HAL_GPIO_DeInit(GPIOC, GPIO_PIN_7|GPIO_PIN_8);

    /* TIM8 interrupt Deinit */
    HAL_NVIC_DisableIRQ(TIM8_CC_IRQn);