Moved PixRacer Pro GPS PPS pin from PG12 to PD12

avtoku · avtoku · commit 38990f9d156f · 2025-11-03T16:20:44.000-08:00
diff --git a/boards/varmint_h7/pixracer_pro/.cproject b/boards/varmint_h7/pixracer_pro/.cproject
@@ -108,14 +108,14 @@
 					</folderInfo>
 					<fileInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1837050439.24299683" name="Liv4f.h" rcbsApplicability="disable" resourcePath="common/drivers/Liv4f.h" toolsToInvoke=""/>
 					<sourceEntries>
-						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Core"/>
-						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Drivers"/>
-						<entry excluding="drivers/Liv4f.h|drivers/Liv4f.cpp" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="common"/>
-						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="comms"/>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="include"/>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
 						<entry excluding="eigen" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="lib"/>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="specific"/>
-						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Core"/>
+						<entry excluding="drivers/Liv4f.h|drivers/Liv4f.cpp" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="common"/>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="comms"/>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Drivers"/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>
diff --git a/boards/varmint_h7/pixracer_pro/Core/Inc/main.h b/boards/varmint_h7/pixracer_pro/Core/Inc/main.h
@@ -127,9 +127,6 @@ void MX_TIM3_Init(void);
 #define FMU_UART1_RX_GPIO_Port GPIOB
 #define FMU_UART1_TX_Pin GPIO_PIN_6
 #define FMU_UART1_TX_GPIO_Port GPIOB
-#define GPS_PPS_Pin GPIO_PIN_12
-#define GPS_PPS_GPIO_Port GPIOG
-#define GPS_PPS_EXTI_IRQn EXTI15_10_IRQn
 #define TELEM1_USART2_RX_Pin GPIO_PIN_6
 #define TELEM1_USART2_RX_GPIO_Port GPIOD
 #define CAN1_RX_Pin GPIO_PIN_0
@@ -217,10 +214,9 @@ void MX_TIM3_Init(void);
 #define ADC_5V_V_GPIO_Port GPIOA
 #define PWM_02_Pin GPIO_PIN_13
 #define PWM_02_GPIO_Port GPIOE
-#define TELEM2_USART3_RTS_Pin GPIO_PIN_12
-#define TELEM2_USART3_RTS_GPIO_Port GPIOD
-#define TELEM2_USART3_CTS_Pin GPIO_PIN_11
-#define TELEM2_USART3_CTS_GPIO_Port GPIOD
+#define GPS_PPS_Pin GPIO_PIN_12
+#define GPS_PPS_GPIO_Port GPIOD
+#define GPS_PPS_EXTI_IRQn EXTI15_10_IRQn
 #define FRAM_CS_Pin GPIO_PIN_10
 #define FRAM_CS_GPIO_Port GPIOD
 #define ADC_BATT_V_Pin GPIO_PIN_2
diff --git a/boards/varmint_h7/pixracer_pro/Core/Src/main.c b/boards/varmint_h7/pixracer_pro/Core/Src/main.c
@@ -1604,7 +1604,7 @@ void MX_USART3_UART_Init(void)
   huart3.Init.StopBits = UART_STOPBITS_1;
   huart3.Init.Parity = UART_PARITY_NONE;
   huart3.Init.Mode = UART_MODE_TX_RX;
-  huart3.Init.HwFlowCtl = UART_HWCONTROL_RTS_CTS;
+  huart3.Init.HwFlowCtl = UART_HWCONTROL_NONE;
   huart3.Init.OverSampling = UART_OVERSAMPLING_16;
   huart3.Init.OneBitSampling = UART_ONE_BIT_SAMPLE_DISABLE;
   huart3.Init.ClockPrescaler = UART_PRESCALER_DIV1;
@@ -1875,12 +1875,6 @@ void MX_GPIO_Init(void)
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
   HAL_GPIO_Init(GPIOD, &GPIO_InitStruct);
 
-  /*Configure GPIO pin : GPS_PPS_Pin */
-  GPIO_InitStruct.Pin = GPS_PPS_Pin;
-  GPIO_InitStruct.Mode = GPIO_MODE_IT_RISING;
-  GPIO_InitStruct.Pull = GPIO_PULLDOWN;
-  HAL_GPIO_Init(GPS_PPS_GPIO_Port, &GPIO_InitStruct);
-
   /*Configure GPIO pin : VDD_1V8_SENSORS_EN_Pin */
   GPIO_InitStruct.Pin = VDD_1V8_SENSORS_EN_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
@@ -1914,11 +1908,11 @@ void MX_GPIO_Init(void)
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
   HAL_GPIO_Init(GPIOF, &GPIO_InitStruct);
 
-  /*Configure GPIO pin : ICM_20602_DRDY_Pin */
-  GPIO_InitStruct.Pin = ICM_20602_DRDY_Pin;
+  /*Configure GPIO pins : ICM_20602_DRDY_Pin PD11 */
+  GPIO_InitStruct.Pin = ICM_20602_DRDY_Pin|GPIO_PIN_11;
   GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
   GPIO_InitStruct.Pull = GPIO_NOPULL;
-  HAL_GPIO_Init(ICM_20602_DRDY_GPIO_Port, &GPIO_InitStruct);
+  HAL_GPIO_Init(GPIOD, &GPIO_InitStruct);
 
   /*Configure GPIO pin : VBUS_VALID_Pin */
   GPIO_InitStruct.Pin = VBUS_VALID_Pin;
@@ -1933,6 +1927,12 @@ void MX_GPIO_Init(void)
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
   HAL_GPIO_Init(ICM_20602_CS_GPIO_Port, &GPIO_InitStruct);
 
+  /*Configure GPIO pin : GPS_PPS_Pin */
+  GPIO_InitStruct.Pin = GPS_PPS_Pin;
+  GPIO_InitStruct.Mode = GPIO_MODE_IT_RISING;
+  GPIO_InitStruct.Pull = GPIO_NOPULL;
+  HAL_GPIO_Init(GPS_PPS_GPIO_Port, &GPIO_InitStruct);
+
   /* EXTI interrupt init*/
   HAL_NVIC_SetPriority(EXTI1_IRQn, 5, 0);
   HAL_NVIC_EnableIRQ(EXTI1_IRQn);
diff --git a/boards/varmint_h7/pixracer_pro/Core/Src/stm32h7xx_hal_msp.c b/boards/varmint_h7/pixracer_pro/Core/Src/stm32h7xx_hal_msp.c
@@ -1798,24 +1798,22 @@ void HAL_UART_MspInit(UART_HandleTypeDef* huart)
 
     __HAL_RCC_GPIOD_CLK_ENABLE();
     /**USART3 GPIO Configuration
-    PD12     ------> USART3_RTS
-    PD11     ------> USART3_CTS
     PD9     ------> USART3_RX
     PD8     ------> USART3_TX
     */
-    GPIO_InitStruct.Pin = TELEM2_USART3_RTS_Pin|TELEM2_USART3_CTS_Pin|TELEM2_USART3_TX_Pin;
+    GPIO_InitStruct.Pin = TELEM2_USART3_RX_Pin;
     GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
-    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    GPIO_InitStruct.Pull = GPIO_PULLUP;
     GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
     GPIO_InitStruct.Alternate = GPIO_AF7_USART3;
-    HAL_GPIO_Init(GPIOD, &GPIO_InitStruct);
+    HAL_GPIO_Init(TELEM2_USART3_RX_GPIO_Port, &GPIO_InitStruct);
 
-    GPIO_InitStruct.Pin = TELEM2_USART3_RX_Pin;
+    GPIO_InitStruct.Pin = TELEM2_USART3_TX_Pin;
     GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
-    GPIO_InitStruct.Pull = GPIO_PULLUP;
+    GPIO_InitStruct.Pull = GPIO_NOPULL;
     GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
     GPIO_InitStruct.Alternate = GPIO_AF7_USART3;
-    HAL_GPIO_Init(TELEM2_USART3_RX_GPIO_Port, &GPIO_InitStruct);
+    HAL_GPIO_Init(TELEM2_USART3_TX_GPIO_Port, &GPIO_InitStruct);
 
     /* USART3 interrupt Init */
     HAL_NVIC_SetPriority(USART3_IRQn, 5, 0);
@@ -2018,12 +2016,10 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart)
     __HAL_RCC_USART3_CLK_DISABLE();
 
     /**USART3 GPIO Configuration
-    PD12     ------> USART3_RTS
-    PD11     ------> USART3_CTS
     PD9     ------> USART3_RX
     PD8     ------> USART3_TX
     */
-    HAL_GPIO_DeInit(GPIOD, TELEM2_USART3_RTS_Pin|TELEM2_USART3_CTS_Pin|TELEM2_USART3_RX_Pin|TELEM2_USART3_TX_Pin);
+    HAL_GPIO_DeInit(GPIOD, TELEM2_USART3_RX_Pin|TELEM2_USART3_TX_Pin);
 
     /* USART3 interrupt DeInit */
     HAL_NVIC_DisableIRQ(USART3_IRQn);
diff --git a/boards/varmint_h7/pixracer_pro/pixracer_pro.ioc b/boards/varmint_h7/pixracer_pro/pixracer_pro.ioc
@@ -477,95 +477,94 @@ Mcu.Pin13=PE4
 Mcu.Pin14=PB9
 Mcu.Pin15=PB7
 Mcu.Pin16=PB6
-Mcu.Pin17=PG12
-Mcu.Pin18=PD6
-Mcu.Pin19=PD0
+Mcu.Pin17=PD6
+Mcu.Pin18=PD0
+Mcu.Pin19=PC11
 Mcu.Pin2=PE0
-Mcu.Pin20=PC11
-Mcu.Pin21=PC10
-Mcu.Pin22=PA12
-Mcu.Pin23=PI6
-Mcu.Pin24=PI5
-Mcu.Pin25=PG9
-Mcu.Pin26=PD5
-Mcu.Pin27=PD1
-Mcu.Pin28=PI3
-Mcu.Pin29=PA11
+Mcu.Pin20=PC10
+Mcu.Pin21=PA12
+Mcu.Pin22=PI6
+Mcu.Pin23=PI5
+Mcu.Pin24=PG9
+Mcu.Pin25=PD5
+Mcu.Pin26=PD1
+Mcu.Pin27=PI3
+Mcu.Pin28=PA11
+Mcu.Pin29=PD4
 Mcu.Pin3=PB8
-Mcu.Pin30=PD4
-Mcu.Pin31=PD3
-Mcu.Pin32=PD2
-Mcu.Pin33=PA9
-Mcu.Pin34=PC9
-Mcu.Pin35=PH0-OSC_IN (PH0)
-Mcu.Pin36=PC8
-Mcu.Pin37=PC7
-Mcu.Pin38=PH1-OSC_OUT (PH1)
-Mcu.Pin39=PF2
+Mcu.Pin30=PD3
+Mcu.Pin31=PD2
+Mcu.Pin32=PA9
+Mcu.Pin33=PC9
+Mcu.Pin34=PH0-OSC_IN (PH0)
+Mcu.Pin35=PC8
+Mcu.Pin36=PC7
+Mcu.Pin37=PH1-OSC_OUT (PH1)
+Mcu.Pin38=PF2
+Mcu.Pin39=PF1
 Mcu.Pin4=PB5
-Mcu.Pin40=PF1
-Mcu.Pin41=PC6
-Mcu.Pin42=PF3
-Mcu.Pin43=PF4
-Mcu.Pin44=PG6
-Mcu.Pin45=PF7
-Mcu.Pin46=PF6
-Mcu.Pin47=PF10
-Mcu.Pin48=PF9
-Mcu.Pin49=PF8
+Mcu.Pin40=PC6
+Mcu.Pin41=PF3
+Mcu.Pin42=PF4
+Mcu.Pin43=PG6
+Mcu.Pin44=PF7
+Mcu.Pin45=PF6
+Mcu.Pin46=PF10
+Mcu.Pin47=PF9
+Mcu.Pin48=PF8
+Mcu.Pin49=PD15
 Mcu.Pin5=PG14
-Mcu.Pin50=PD15
-Mcu.Pin51=PC0
-Mcu.Pin52=PC1
-Mcu.Pin53=PC2_C
-Mcu.Pin54=PD14
-Mcu.Pin55=PD13
-Mcu.Pin56=PA1
-Mcu.Pin57=PA0
-Mcu.Pin58=PA4
-Mcu.Pin59=PE13
+Mcu.Pin50=PC0
+Mcu.Pin51=PC1
+Mcu.Pin52=PC2_C
+Mcu.Pin53=PD14
+Mcu.Pin54=PD13
+Mcu.Pin55=PA1
+Mcu.Pin56=PA0
+Mcu.Pin57=PA4
+Mcu.Pin58=PE13
+Mcu.Pin59=PD12
 Mcu.Pin6=PG13
-Mcu.Pin60=PD12
-Mcu.Pin61=PD11
-Mcu.Pin62=PD10
-Mcu.Pin63=PA2
-Mcu.Pin64=PA6
-Mcu.Pin65=PA5
-Mcu.Pin66=PE8
-Mcu.Pin67=PE9
-Mcu.Pin68=PE11
-Mcu.Pin69=PE14
+Mcu.Pin60=PD11
+Mcu.Pin61=PD10
+Mcu.Pin62=PA2
+Mcu.Pin63=PA6
+Mcu.Pin64=PA5
+Mcu.Pin65=PE8
+Mcu.Pin66=PE9
+Mcu.Pin67=PE11
+Mcu.Pin68=PE14
+Mcu.Pin69=PB12
 Mcu.Pin7=PB3 (JTDO/TRACESWO)
-Mcu.Pin70=PB12
-Mcu.Pin71=PB13
-Mcu.Pin72=PD9
-Mcu.Pin73=PD8
-Mcu.Pin74=PA3
-Mcu.Pin75=PA7
-Mcu.Pin76=PB1
-Mcu.Pin77=PB0
-Mcu.Pin78=PF11
-Mcu.Pin79=PF14
+Mcu.Pin70=PB13
+Mcu.Pin71=PD9
+Mcu.Pin72=PD8
+Mcu.Pin73=PA3
+Mcu.Pin74=PA7
+Mcu.Pin75=PB1
+Mcu.Pin76=PB0
+Mcu.Pin77=PF11
+Mcu.Pin78=PF14
+Mcu.Pin79=PE7
 Mcu.Pin8=PD7
-Mcu.Pin80=PE7
-Mcu.Pin81=PE15
-Mcu.Pin82=PB10
-Mcu.Pin83=PB11
-Mcu.Pin84=PB14
-Mcu.Pin85=PB15
-Mcu.Pin86=VP_ADC3_TempSens_Input
-Mcu.Pin87=VP_ADC3_Vref_Input
-Mcu.Pin88=VP_ADC3_Vbat_Input
-Mcu.Pin89=VP_CRC_VS_CRC
+Mcu.Pin80=PE15
+Mcu.Pin81=PB10
+Mcu.Pin82=PB11
+Mcu.Pin83=PB14
+Mcu.Pin84=PB15
+Mcu.Pin85=VP_ADC3_TempSens_Input
+Mcu.Pin86=VP_ADC3_Vref_Input
+Mcu.Pin87=VP_ADC3_Vbat_Input
+Mcu.Pin88=VP_CRC_VS_CRC
+Mcu.Pin89=VP_RNG_VS_RNG
 Mcu.Pin9=PC12
-Mcu.Pin90=VP_RNG_VS_RNG
-Mcu.Pin91=VP_RTC_VS_RTC_Activate
-Mcu.Pin92=VP_SYS_VS_Systick
-Mcu.Pin93=VP_TIM5_VS_ClockSourceINT
-Mcu.Pin94=VP_TIM7_VS_ClockSourceINT
-Mcu.Pin95=VP_TIM12_VS_ControllerModeClock
-Mcu.Pin96=VP_TIM12_VS_ClockSourceITR
-Mcu.PinsNb=97
+Mcu.Pin90=VP_RTC_VS_RTC_Activate
+Mcu.Pin91=VP_SYS_VS_Systick
+Mcu.Pin92=VP_TIM5_VS_ClockSourceINT
+Mcu.Pin93=VP_TIM7_VS_ClockSourceINT
+Mcu.Pin94=VP_TIM12_VS_ControllerModeClock
+Mcu.Pin95=VP_TIM12_VS_ClockSourceITR
+Mcu.PinsNb=96
 Mcu.ThirdPartyNb=0
 Mcu.UserConstants=
 Mcu.UserName=STM32H743IIKx
@@ -859,18 +858,12 @@ PD10.Locked=true
 PD10.PinAttribute=Free
 PD10.PinState=GPIO_PIN_SET
 PD10.Signal=GPIO_Output
-PD11.GPIOParameters=GPIO_Label,PinAttribute
-PD11.GPIO_Label=TELEM2_USART3_CTS
 PD11.Locked=true
-PD11.Mode=CTS_RTS
-PD11.PinAttribute=Free
-PD11.Signal=USART3_CTS
-PD12.GPIOParameters=GPIO_Label,PinAttribute
-PD12.GPIO_Label=TELEM2_USART3_RTS 
+PD11.Signal=GPIO_Input
+PD12.GPIOParameters=GPIO_Label
+PD12.GPIO_Label=GPS PPS
 PD12.Locked=true
-PD12.Mode=CTS_RTS
-PD12.PinAttribute=Free
-PD12.Signal=USART3_RTS
+PD12.Signal=GPXTI12
 PD13.GPIOParameters=GPIO_Label,PinAttribute
 PD13.GPIO_Label=PWM_05
 PD13.Locked=true
@@ -1059,11 +1052,6 @@ PF9.Locked=true
 PF9.Mode=Full_Duplex_Master
 PF9.PinAttribute=Free
 PF9.Signal=SPI5_MOSI
-PG12.GPIOParameters=GPIO_PuPd,GPIO_Label
-PG12.GPIO_Label=GPS_PPS
-PG12.GPIO_PuPd=GPIO_PULLDOWN
-PG12.Locked=true
-PG12.Signal=GPXTI12
 PG13.GPIOParameters=GPIO_Label
 PG13.GPIO_Label=PROBE1
 PG13.Locked=true
