cleaned up merge conflicts

Author: aolgeirson

Core/Inc/main.h

@@ -65,37 +65,10 @@ void Error_Handler(void);
 #define TOF_RST_GPIO_Port GPIOE
 #define TOF_LPN_Pin GPIO_PIN_5
 #define TOF_LPN_GPIO_Port GPIOE
-#define MUX1_SEL1_Pin GPIO_PIN_6
-#define MUX1_SEL1_GPIO_Port GPIOF
-#define MUX1_SEL2_Pin GPIO_PIN_7
-#define MUX1_SEL2_GPIO_Port GPIOF
-#define MUX1_SEL3_Pin GPIO_PIN_8
-#define MUX1_SEL3_GPIO_Port GPIOF
-#define MUX1_SEL4_Pin GPIO_PIN_9
-#define MUX1_SEL4_GPIO_Port GPIOF
-#define PHY_IRQ_Pin GPIO_PIN_7
-#define PHY_IRQ_GPIO_Port GPIOE
-#define PHY_IRQ_EXTI_IRQn EXTI7_IRQn
-#define PHY_RX_ER_Pin GPIO_PIN_8
-#define PHY_RX_ER_GPIO_Port GPIOE
-#define PHY_RESET_Pin GPIO_PIN_10
-#define PHY_RESET_GPIO_Port GPIOE
-#define PHY_GPIO_Pin GPIO_PIN_11
-#define PHY_GPIO_GPIO_Port GPIOE
 #define DEBUG_LED1_Pin GPIO_PIN_3
 #define DEBUG_LED1_GPIO_Port GPIOG
 #define DEBUG_LED2_Pin GPIO_PIN_4
 #define DEBUG_LED2_GPIO_Port GPIOG
-#define MUX2_SEL1_Pin GPIO_PIN_6
-#define MUX2_SEL1_GPIO_Port GPIOC
-#define MUX2_SEL2_Pin GPIO_PIN_7
-#define MUX2_SEL2_GPIO_Port GPIOC
-#define MUX2_SEL3_Pin GPIO_PIN_8
-#define MUX2_SEL3_GPIO_Port GPIOC
-#define MUX2_SEL4_Pin GPIO_PIN_9
-#define MUX2_SEL4_GPIO_Port GPIOC
-#define MSB_ADDR_Pin GPIO_PIN_10
-#define MSB_ADDR_GPIO_Port GPIOC
 
 /* USER CODE BEGIN Private defines */
 

Core/Inc/stm32h5xx_it.h

@@ -52,10 +52,7 @@ void MemManage_Handler(void);
 void BusFault_Handler(void);
 void UsageFault_Handler(void);
 void DebugMon_Handler(void);
-void EXTI7_IRQHandler(void);
-void GPDMA1_Channel0_IRQHandler(void);
-void GPDMA1_Channel1_IRQHandler(void);
-void TIM2_IRQHandler(void);
+void TIM1_UP_IRQHandler(void);
 /* USER CODE BEGIN EFP */
 
 /* USER CODE END EFP */

Core/Src/app_threadx.c

@@ -56,11 +56,12 @@
 /* USER CODE END PFP */
 
 /**
- * @brief  Application ThreadX Initialization.
- * @param memory_ptr: memory pointer
- * @retval int
- */
-UINT App_ThreadX_Init(VOID *memory_ptr) {
+  * @brief  Application ThreadX Initialization.
+  * @param memory_ptr: memory pointer
+  * @retval int
+  */
+UINT App_ThreadX_Init(VOID *memory_ptr)
+{
   UINT ret = TX_SUCCESS;
   /* USER CODE BEGIN App_ThreadX_MEM_POOL */
   TX_BYTE_POOL *byte_pool = (TX_BYTE_POOL *)memory_ptr;
@@ -82,12 +83,13 @@ UINT App_ThreadX_Init(VOID *memory_ptr) {
   return ret;
 }
 
-/**
- * @brief  Function that implements the kernel's initialization.
- * @param  None
- * @retval None
- */
-void MX_ThreadX_Init(void) {
+  /**
+  * @brief  Function that implements the kernel's initialization.
+  * @param  None
+  * @retval None
+  */
+void MX_ThreadX_Init(void)
+{
   /* USER CODE BEGIN Before_Kernel_Start */
 
   /* USER CODE END Before_Kernel_Start */