diff --git a/.gitmodules b/.gitmodules index 2914532f..01f81804 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,4 @@ [submodule "Project/DAQ_System/Program/DFR_Libraries"] path = Project/DAQ_System/Program/DFR_Libraries - url = https://github.com/DallasFormulaRacing/DAQ-Firmware-Libraries.git + url = https://github.com/DallasFormulaRacing/DAQ-Firmware-Libraries.git + branch = "feature/CAN_Relay" diff --git a/Project/DAQ_System/.settings/language.settings.xml b/Project/DAQ_System/.settings/language.settings.xml index acd27d9a..6fe33405 100644 --- a/Project/DAQ_System/.settings/language.settings.xml +++ b/Project/DAQ_System/.settings/language.settings.xml @@ -5,7 +5,7 @@ - + @@ -16,7 +16,7 @@ - + diff --git a/Project/DAQ_System/.settings/stm32cubeide.project.prefs b/Project/DAQ_System/.settings/stm32cubeide.project.prefs index 0ec8a174..9ebb5b74 100644 --- a/Project/DAQ_System/.settings/stm32cubeide.project.prefs +++ b/Project/DAQ_System/.settings/stm32cubeide.project.prefs @@ -1,6 +1,6 @@ -2F62501ED4689FB349E356AB974DBE57=968A1448451C8881C960DFBA125F8504 +2F62501ED4689FB349E356AB974DBE57=9FB5EA8C4AF27A3412C513D3920059D1 635E684B79701B039C64EA45C3F84D30=D3B49A76E63B6893FDB440BD88066608 66BE74F758C12D739921AEA421D593D3=1 -8DF89ED150041C4CBC7CB9A9CAA90856=968A1448451C8881C960DFBA125F8504 +8DF89ED150041C4CBC7CB9A9CAA90856=9FB5EA8C4AF27A3412C513D3920059D1 DC22A860405A8BF2F2C095E5B6529F12=46760DAC9B1141B6DA2FBA74A4071CE5 eclipse.preferences.version=1