Resolved merge conflicts and fixed makefile after cubeMX project update

Author: Maksymilian Wojczuk

Makefile

@@ -36,6 +36,11 @@ BUILD_DIR = build
 ######################################
 # C sources
 C_SOURCES =  \
+Src/usbh_diskio.c \
+Src/fatfs.c \
+Src/freertos.c \
+Src/usb_host.c \
+Src/usbh_conf.c \
 Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_eth.c \
 Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_hcd.c \
 Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_usb.c \
@@ -75,6 +80,7 @@ Middlewares/ST/STM32_USB_Host_Library/Core/Src/usbh_pipes.c \
 Middlewares/ST/STM32_USB_Host_Library/Class/MSC/Src/usbh_msc.c \
 Middlewares/ST/STM32_USB_Host_Library/Class/MSC/Src/usbh_msc_bot.c \
 Middlewares/ST/STM32_USB_Host_Library/Class/MSC/Src/usbh_msc_scsi.c \
+Src/syscalls.c \
 Middlewares/Third_Party/LwIP/src/netif/ppp/auth.c \
 Middlewares/Third_Party/LwIP/src/netif/ppp/ccp.c \
 Middlewares/Third_Party/LwIP/src/netif/ppp/chap_ms.c \
@@ -147,9 +153,15 @@ Middlewares/Third_Party/LwIP/src/core/ipv6/dhcp6.c \
 Middlewares/Third_Party/LwIP/src/core/ipv6/nd6.c \
 Middlewares/Third_Party/LwIP/system/OS/sys_arch.c \
 Middlewares/Third_Party/LwIP/src/apps/mqtt/mqtt.c \
+Src/stm32f4xx_hal_timebase_TIM.c \
+Src/main.c \
+Src/lwip.c \
+Src/ethernetif.c \
+Src/stm32f4xx_it.c \
+Src/stm32f4xx_hal_msp.c \
 Src/communication/dbgu.c \
 Src/communication/term_io.c \
-Src/communication/lwip_helpers.c
+Src/communication/lwip_helpers.c \
 
 # ASM sources
 ASM_SOURCES =  \
@@ -245,6 +257,27 @@ AS_INCLUDES =  \
 # C includes
 C_INCLUDES =  \
 -IInc \
+-IMiddlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F \
+-IMiddlewares/ST/STM32_USB_Host_Library/Core/Inc \
+-IMiddlewares/ST/STM32_USB_Host_Library/Class/MSC/Inc \
+-IMiddlewares/Third_Party/FatFs/src \
+-IMiddlewares/Third_Party/FreeRTOS/Source/include \
+-IMiddlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS \
+-IMiddlewares/Third_Party/LwIP/src/include \
+-IMiddlewares/Third_Party/LwIP/system \
+-IDrivers/STM32F4xx_HAL_Driver/Inc \
+-IDrivers/STM32F4xx_HAL_Driver/Inc/Legacy \
+-IMiddlewares/Third_Party/LwIP/src/include/netif/ppp \
+-IDrivers/CMSIS/Device/ST/STM32F4xx/Include \
+-IMiddlewares/Third_Party/LwIP/src/include/lwip \
+-IMiddlewares/Third_Party/LwIP/src/include/lwip/apps \
+-IMiddlewares/Third_Party/LwIP/src/include/lwip/priv \
+-IMiddlewares/Third_Party/LwIP/src/include/lwip/prot \
+-IMiddlewares/Third_Party/LwIP/src/include/netif \
+-IMiddlewares/Third_Party/LwIP/src/include/posix \
+-IMiddlewares/Third_Party/LwIP/src/include/posix/sys \
+-IMiddlewares/Third_Party/LwIP/system/arch \
+-IDrivers/CMSIS/Include \
 -IInc/communication
 
 C_INCLUDES += $(WAKAAMA_INC)