From e85daefd7e9797c20c90dc648b9ebaea01b2cff7 Mon Sep 17 00:00:00 2001
From: Dmitry Maylarov <maylarov@yandex.ru>
Date: Wed, 11 Aug 2021 21:44:14 +0300
Subject: [PATCH] go to default freertos structure, remove duplicate
 definitions

---
 Core/Src/stm32f1xx_it.c | 39 ---------------------------------------
 Makefile                | 21 +++++++++++----------
 2 files changed, 11 insertions(+), 49 deletions(-)

diff --git a/Core/Src/stm32f1xx_it.c b/Core/Src/stm32f1xx_it.c
index d5c5d9a..e4ae182 100644
--- a/Core/Src/stm32f1xx_it.c
+++ b/Core/Src/stm32f1xx_it.c
@@ -138,19 +138,6 @@ void UsageFault_Handler(void)
   }
 }
 
-/**
-  * @brief This function handles System service call via SWI instruction.
-  */
-void SVC_Handler(void)
-{
-  /* USER CODE BEGIN SVCall_IRQn 0 */
-
-  /* USER CODE END SVCall_IRQn 0 */
-  /* USER CODE BEGIN SVCall_IRQn 1 */
-
-  /* USER CODE END SVCall_IRQn 1 */
-}
-
 /**
   * @brief This function handles Debug monitor.
   */
@@ -164,32 +151,6 @@ void DebugMon_Handler(void)
   /* USER CODE END DebugMonitor_IRQn 1 */
 }
 
-/**
-  * @brief This function handles Pendable request for system service.
-  */
-void PendSV_Handler(void)
-{
-  /* USER CODE BEGIN PendSV_IRQn 0 */
-
-  /* USER CODE END PendSV_IRQn 0 */
-  /* USER CODE BEGIN PendSV_IRQn 1 */
-
-  /* USER CODE END PendSV_IRQn 1 */
-}
-
-/**
-  * @brief This function handles System tick timer.
-  */
-void SysTick_Handler(void)
-{
-  /* USER CODE BEGIN SysTick_IRQn 0 */
-
-  /* USER CODE END SysTick_IRQn 0 */
-
-  /* USER CODE BEGIN SysTick_IRQn 1 */
-
-  /* USER CODE END SysTick_IRQn 1 */
-}
 
 /******************************************************************************/
 /* STM32F1xx Peripheral Interrupt Handlers                                    */
diff --git a/Makefile b/Makefile
index 1d072de..bc71d29 100644
--- a/Makefile
+++ b/Makefile
@@ -36,15 +36,15 @@ BUILD_DIR = build
 ######################################
 # C sources
 C_SOURCES =  \
-Middlewares/FreeRTOS/Src/tasks.c \
-Middlewares/FreeRTOS/Src/list.c \
-Middlewares/FreeRTOS/Src/port.c \
-Middlewares/FreeRTOS/Src/event_groups.c \
-Middlewares/FreeRTOS/Src/stream_buffer.c \
-Middlewares/FreeRTOS/Src/heap_4.c \
-Middlewares/FreeRTOS/Src/croutine.c \
-Middlewares/FreeRTOS/Src/queue.c \
-Middlewares/FreeRTOS/Src/timers.c \
+Middlewares/FreeRTOS/Source/tasks.c \
+Middlewares/FreeRTOS/Source/list.c \
+Middlewares/FreeRTOS/Source/event_groups.c \
+Middlewares/FreeRTOS/Source/stream_buffer.c \
+Middlewares/FreeRTOS/Source/croutine.c \
+Middlewares/FreeRTOS/Source/queue.c \
+Middlewares/FreeRTOS/Source/timers.c \
+Middlewares/FreeRTOS/Source/portable/GCC/ARM_CM3/port.c \
+Middlewares/FreeRTOS/Source/portable/MemMang/heap_4.c \
 Core/Src/main.c \
 Core/Src/music.c \
 Core/Src/lcd.c \
@@ -123,7 +123,8 @@ AS_INCLUDES =
 
 # C includes
 C_INCLUDES =  \
--IMiddlewares/FreeRTOS/Inc \
+-IMiddlewares/FreeRTOS/Source/include \
+-IMiddlewares/FreeRTOS/Source/portable/GCC/ARM_CM3 \
 -ICore/Inc \
 -IDrivers/STM32F1xx_HAL_Driver/Inc \
 -IDrivers/STM32F1xx_HAL_Driver/Inc/Legacy \