FaSTTUBe/ams-master-23
56
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FT_CAN_AL -> can-halal

Browse Source
This commit is contained in:
Jasper Blanckenburg 2023-03-18 20:24:07 +01:00
parent 5c5bc3678a
commit 3ac8e0e746
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitmodules vendored
View File

@ -1,3 +1,3 @@
[submodule "Core/Lib/FT_CAN_AL"] [submodule "Core/Lib/can-halal"]
path = Core/Lib/FT_CAN_AL path = Core/Lib/can-halal
url = ssh://git@git.fasttube.de:313/FaSTTUBe/FT_CAN_AL.git url = ssh://git@git.fasttube.de:313/FaSTTUBe/can-halal.git

1
Core/Lib/FT_CAN_AL

@ -1 +0,0 @@
Subproject commit 1589839b447df113d48c052897583de4ab3c8dfc

1
Core/Lib/can-halal Submodule

@ -0,0 +1 @@
Subproject commit eb74553f896ed2739fc73cee13cbde9e19e1d66a

2
Core/Src/can.c
View File

@ -6,7 +6,7 @@
#include "soc_estimation.h" #include "soc_estimation.h"
#include "ts_state_machine.h" #include "ts_state_machine.h"
#include "FT_CAN_AL.h" #include "can-halal.h"
#include <stdint.h> #include <stdint.h>

2
Core/Src/shunt_monitoring.c
View File

@ -6,7 +6,7 @@
#include "ts_state_machine.h" #include "ts_state_machine.h"
#include "util.h" #include "util.h"
#include "FT_CAN_AL.h" #include "can-halal.h"
ShuntData shunt_data; ShuntData shunt_data;

2
Core/Src/slave_monitoring.c
View File

@ -3,7 +3,7 @@
#include "main.h" #include "main.h"
#include "ts_state_machine.h" #include "ts_state_machine.h"
#include "FT_CAN_AL.h" #include "can-halal.h"
#include "stm32f3xx_hal.h" #include "stm32f3xx_hal.h"
#include "stm32f3xx_hal_gpio.h" #include "stm32f3xx_hal_gpio.h"

4
STM32Make.make
View File

@ -36,7 +36,7 @@ BUILD_DIR = build
###################################### ######################################
# C sources # C sources
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/can.c \
Core/Src/main.c \ Core/Src/main.c \
Core/Src/shunt_monitoring.c \ Core/Src/shunt_monitoring.c \
@ -140,7 +140,7 @@ AS_INCLUDES = \
# C includes # C includes
C_INCLUDES = \ C_INCLUDES = \
-ICore/Inc \ -ICore/Inc \
-ICore/Lib/FT_CAN_AL \ -ICore/Lib/can-halal \
-IDrivers/CMSIS/Device/ST/STM32F3xx/Include \ -IDrivers/CMSIS/Device/ST/STM32F3xx/Include \
-IDrivers/CMSIS/Include \ -IDrivers/CMSIS/Include \
-IDrivers/STM32F3xx_HAL_Driver/Inc \ -IDrivers/STM32F3xx_HAL_Driver/Inc \