balbekova 7 роки тому
батько
коміт
571dca5717

+ 1 - 1
config/common_config.h

@@ -71,7 +71,7 @@
 /**
   * @brief  Отладочный порт USART и консоль
   */
-#define USART_DEBUG_ENABLE
+//#define USART_DEBUG_ENABLE
 
 #define SYSTEMTICK_PERIOD_MS  1
 

+ 2 - 1
modules/STM32F4x7_ETH_Driver/stm32f4x7_eth_bsp.c

@@ -70,11 +70,12 @@ void ETH_BSP_Config(void)
   /* Config NVIC for Ethernet */
   /* TODO remove if tested: ETH_NVIC_Config moved after ETH_MACDMA_Config *
    * to avoid ETH IRQ to stuck the system */
-  ETH_NVIC_Config();
+
 
   /* Configure the Ethernet MAC/DMA */
   ETH_MACDMA_Config();
 
+  ETH_NVIC_Config();
 
   if (EthInitStatus == 0) {
     // LCD_SetTextColor(LCD_COLOR_RED);

+ 2 - 2
user/init_task.c

@@ -75,8 +75,8 @@ void InitTask(void *params)
 // -----------------------------------------------------------------------------    
  // xTaskCreate(vTaskWdt, "WDT", configMINIMAL_STACK_SIZE, NULL, tskIDLE_PRIORITY, NULL);
 // -----------------------------------------------------------------------------    
-  //InitUSART();
- //ups_megatec_init();
+  InitUSART();
+  ups_megatec_init();
 // -----------------------------------------------------------------------------    
  // RCC_AHB1PeriphClockCmd(RCC_AHB1Periph_CRC, ENABLE);
   //SETTINGS_SetDefaultDebug();

+ 6 - 6
user/stm32f4xx_it.c

@@ -116,7 +116,7 @@ void HardFault_Output(uint32_t *sp)
   * @param  None
   * @retval None
   */
-/*__attribute__( (naked) )
+__attribute__( (naked) )
 void HardFault_Handler(void)
 {
 __asm volatile
@@ -129,7 +129,7 @@ __asm volatile
         "bx r1                                         \n"
         "debugHardfault_address: .word HardFault_Output  \n"
     );
-}*/
+}
 
 /**
   * @brief  This function handles Memory Manage exception.
@@ -144,10 +144,10 @@ void MemManage_Handler(void)
   }
 }
 
-void TIM8_UP_TIM13_IRQHandler(void)
+/*void TIM8_UP_TIM13_IRQHandler(void)
 {
 	TIM_ClearITPendingBit(TIM13, TIM_IT_Update);
-}
+}*/
 
 /**
   * @brief  This function handles Bus Fault exception.
@@ -249,7 +249,7 @@ void SD_SDIO_DMA_IRQHANDLER(void)
 //  SD_ProcessDMAIRQ();
 }
 
-#ifdef OS_FREERTOS
+//#ifdef OS_FREERTOS
 /**
   * @brief  This function handles ethernet DMA interrupt request.
   * @param  None
@@ -279,6 +279,6 @@ void ETH_IRQHandler(void)
 }
 
 //#endif
-#endif
+//#endif
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/