diff --git a/.gitmodules b/.gitmodules index 8ec1ba3..7473532 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "Core/Lib/FT_CAN_AL"] - path = Core/Lib/FT_CAN_AL - url = ssh://git@git.fasttube.de:313/FaSTTUBe/FT_CAN_AL.git +[submodule "Core/Lib/can-halal"] + path = Core/Lib/can-halal + url = ssh://git@git.fasttube.de:313/FaSTTUBe/can-halal.git diff --git a/Core/Lib/FT_CAN_AL b/Core/Lib/FT_CAN_AL deleted file mode 160000 index 1589839..0000000 --- a/Core/Lib/FT_CAN_AL +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1589839b447df113d48c052897583de4ab3c8dfc diff --git a/Core/Lib/can-halal b/Core/Lib/can-halal new file mode 160000 index 0000000..eb74553 --- /dev/null +++ b/Core/Lib/can-halal @@ -0,0 +1 @@ +Subproject commit eb74553f896ed2739fc73cee13cbde9e19e1d66a diff --git a/Core/Src/can.c b/Core/Src/can.c index 2e95105..1888d60 100644 --- a/Core/Src/can.c +++ b/Core/Src/can.c @@ -6,7 +6,7 @@ #include "soc_estimation.h" #include "ts_state_machine.h" -#include "FT_CAN_AL.h" +#include "can-halal.h" #include diff --git a/Core/Src/shunt_monitoring.c b/Core/Src/shunt_monitoring.c index 4cd3e72..8ecf063 100644 --- a/Core/Src/shunt_monitoring.c +++ b/Core/Src/shunt_monitoring.c @@ -6,7 +6,7 @@ #include "ts_state_machine.h" #include "util.h" -#include "FT_CAN_AL.h" +#include "can-halal.h" ShuntData shunt_data; diff --git a/Core/Src/slave_monitoring.c b/Core/Src/slave_monitoring.c index d710ceb..2769144 100644 --- a/Core/Src/slave_monitoring.c +++ b/Core/Src/slave_monitoring.c @@ -3,7 +3,7 @@ #include "main.h" #include "ts_state_machine.h" -#include "FT_CAN_AL.h" +#include "can-halal.h" #include "stm32f3xx_hal.h" #include "stm32f3xx_hal_gpio.h" diff --git a/STM32Make.make b/STM32Make.make index 8b8fd01..b398e59 100644 --- a/STM32Make.make +++ b/STM32Make.make @@ -36,7 +36,7 @@ BUILD_DIR = build ###################################### # C sources C_SOURCES = \ -Core/Lib/FT_CAN_AL/FT_CAN_AL.c \ +Core/Lib/can-halal/can-halal.c \ Core/Src/can.c \ Core/Src/main.c \ Core/Src/shunt_monitoring.c \ @@ -140,7 +140,7 @@ AS_INCLUDES = \ # C includes C_INCLUDES = \ -ICore/Inc \ --ICore/Lib/FT_CAN_AL \ +-ICore/Lib/can-halal \ -IDrivers/CMSIS/Device/ST/STM32F3xx/Include \ -IDrivers/CMSIS/Include \ -IDrivers/STM32F3xx_HAL_Driver/Inc \