Skip to content

Commit

Permalink
add submodule
Browse files Browse the repository at this point in the history
  • Loading branch information
irvingywang committed Aug 22, 2024
1 parent daf7770 commit cfecd1c
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 11 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
.vscode/settings.json
/build
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "control-base"]
path = control-base
url = https://github.com/RoboMaster-Club/control-base.git
22 changes: 11 additions & 11 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ TARGET = swerve-standard

BOARD = typec

CONTROL_BASE = control-base/
BOARD_BASE = $(CONTROL_BASE)${BOARD}-board-base
CONTROL_BASE = control-base
BOARD_BASE = $(CONTROL_BASE)/${BOARD}-board-base

ifeq ($(BOARD), typec)
STARTUP_POSTFIX = stm32f407xx
Expand Down Expand Up @@ -82,11 +82,11 @@ $(BOARD_BASE)/Middlewares/Third_Party/FreeRTOS/Source/timers.c \
$(BOARD_BASE)/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS/cmsis_os.c \
$(BOARD_BASE)/Middlewares/Third_Party/FreeRTOS/Source/portable/MemMang/heap_4.c \
$(BOARD_BASE)/Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F/port.c \
$(wildcard $(BOARD_BASE)algo/src/*.c) \
$(wildcard $(BOARD_BASE)bsp/src/*.c) \
$(wildcard $(BOARD_BASE)devices/src/*.c) \
$(wildcard $(CONTROL_BASE)/algo/src/*.c) \
$(wildcard $(CONTROL_BASE)/bsp/src/*.c) \
$(wildcard $(CONTROL_BASE)/devices/src/*.c) \
$(wildcard /app/src/*.c) \
$(wildcard /ui/src/*.c) \
$(wildcard /ui/src/*.c)

# ASM sources
ASM_SOURCES = \
Expand Down Expand Up @@ -151,11 +151,11 @@ C_INCLUDES = \
-I$(BOARD_BASE)/Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F \
-I$(BOARD_BASE)/Drivers/CMSIS/Device/ST/STM32F4xx/Include \
-I$(BOARD_BASE)/Drivers/CMSIS/Include \
-I$(CONTROL_BASE)algo/inc \
-I$(CONTROL_BASE)devices/inc \
-I$(CONTROL_BASE)bsp/inc \
-I$(CONTROL_BASE)app/inc \
-I$(CONTROL_BASE)ui/inc
-I$(CONTROL_BASE)/algo/inc \
-I$(CONTROL_BASE)/devices/inc \
-I$(CONTROL_BASE)/bsp/inc \
-Iapp/inc \
-Iui/inc

# compile gcc flags
ASFLAGS = $(MCU) $(AS_DEFS) $(AS_INCLUDES) $(OPT) -fdata-sections -ffunction-sections
Expand Down
1 change: 1 addition & 0 deletions control-base
Submodule control-base added at 8a12e0

0 comments on commit cfecd1c

Please sign in to comment.