Merge pull request #126 from madcowswe/fw-v0.3.5-rc

Fw v0.3.5 rc
odriverobotics · Mar 6, 2018 · 92b1d34 · 92b1d34
2 parents 5985447 + f549fc1
commit 92b1d34
Show file tree

Hide file tree

Showing 170 changed files with 784 additions and 386 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,21 +8,21 @@ __pycache__/
 
 # Distribution / packaging
 .Python
-env/
-build/
-develop-eggs/
-dist/
-downloads/
-eggs/
-.eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-*.egg-info/
-.installed.cfg
-*.egg
+#env/
+#build/
+#develop-eggs/
+#dist/
+#downloads/
+#eggs/
+#.eggs/
+#lib/
+#lib64/
+#parts/
+#sdist/
+#var/
+#*.egg-info/
+#.installed.cfg
+#*.egg
 
 # PyInstaller
 #  Usually these files are written by a python script from a template
@@ -60,3 +60,6 @@ target/
 
 #Ipython Notebook
 .ipynb_checkpoints
+
+# Tup
+.tup
diff --git a/.travis.yml b/.travis.yml
@@ -18,6 +18,14 @@ install:
   - export GCC_URL=https://launchpad.net/gcc-arm-embedded/5.0/5-2015-q4-major/+download/gcc-arm-none-eabi-5_2-2015q4-20151219-linux.tar.bz2
   - if [ ! -e $GCC_DIR/bin/arm-none-eabi-gcc ]; then wget $GCC_URL -O $GCC_ARCHIVE; tar xfj $GCC_ARCHIVE -C $HOME/dl; fi
   - export PATH=$PATH:$GCC_DIR/bin
+  - export TUP_DIR=$HOME/dl/tup_0.7.2.12+ga582fee_amd64
+  - export TUP_ARCHIVE=$HOME/dl/tup_0.7.2.12+ga582fee_amd64.deb
+  - export TUP_URL=http://ppa.launchpad.net/anatol/tup/ubuntu/pool/main/t/tup/tup_0.7.2.12+ga582fee_amd64.deb
+  - if [ ! -e $TUP_DIR/bin/tup ]; then wget $TUP_URL -O $TUP_ARCHIVE; dpkg-deb -R $TUP_ARCHIVE $TUP_DIR; fi
+  - export PATH=$PATH:$TUP_DIR/usr/bin
 
 script:
-  - make clean && make
+  - cd Firmware
+  - mkdir -p build
+  - tup generate ./build.sh
+  - bash -xe ./build.sh
diff --git a/Firmware/.vscode/c_cpp_properties.json b/Firmware/.vscode/c_cpp_properties.json
@@ -4,136 +4,114 @@
             "name": "Win32",
             "includePath": [
                 "${workspaceRoot}",
-                "${workspaceRoot}/Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F",
-                "${workspaceRoot}/Middlewares/Third_Party/FreeRTOS/Source/include",
-                "${workspaceRoot}/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS",
-                "${workspaceRoot}/Drivers/DRV8301",
-                "${workspaceRoot}/Middlewares/ST/STM32_USB_Device_Library/Core/Inc",
-                "${workspaceRoot}/Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Inc",
-                "${workspaceRoot}/Drivers/STM32F4xx_HAL_Driver/Inc",
-                "${workspaceRoot}/Drivers/STM32F4xx_HAL_Driver/Inc/Legacy",
-                "${workspaceRoot}/Drivers/CMSIS/Device/ST/STM32F4xx/Include",
-                "${workspaceRoot}/Drivers/CMSIS/Include",
-                "${workspaceRoot}/Inc",
                 "${workspaceRoot}/MotorControl",
-                "C:/Program Files (x86)/GNU Tools ARM Embedded/6 2017-q1-update/arm-none-eabi/include/c++/6.3.1",
-                "C:/Program Files (x86)/GNU Tools ARM Embedded/6 2017-q1-update/arm-none-eabi/include/c++/6.3.1/arm-none-eabi",
-                "C:/Program Files (x86)/GNU Tools ARM Embedded/6 2017-q1-update/lib/gcc/arm-none-eabi/6.3.1/include",
-                "C:/Program Files (x86)/GNU Tools ARM Embedded/6 2017-q1-update/arm-none-eabi/include"
+                "${workspaceRoot}/Board/v3.3/Inc",
+                "${workspaceRoot}/Board/v3.3/Drivers/CMSIS/Include",
+                "${workspaceRoot}/Board/v3.3/Drivers/CMSIS/Device/ST/STM32F4xx/Include",
+                "${workspaceRoot}/Board/v3.3/Drivers/DRV8301",
+                "${workspaceRoot}/Board/v3.3/Drivers/STM32F4xx_HAL_Driver/Inc",
+                "${workspaceRoot}/Board/v3.3/Drivers/STM32F4xx_HAL_Driver/Inc/Legacy",
+                "${workspaceRoot}/Board/v3.3/Middlewares/ST/STM32_USB_Device_Library/Core/Inc",
+                "${workspaceRoot}/Board/v3.3/Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Inc",
+                "${workspaceRoot}/Board/v3.3/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS",
+                "${workspaceRoot}/Board/v3.3/Middlewares/Third_Party/FreeRTOS/Source/include",
+                "${workspaceRoot}/Board/v3.3/Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F",
+                "c:/program files (x86)/gnu tools arm embedded/6 2017-q1-update/arm-none-eabi/include/c++/6.3.1",
+                "c:/program files (x86)/gnu tools arm embedded/6 2017-q1-update/arm-none-eabi/include/c++/6.3.1/arm-none-eabi",
+                "c:/program files (x86)/gnu tools arm embedded/6 2017-q1-update/arm-none-eabi/include/c++/6.3.1/backward",
+                "c:/program files (x86)/gnu tools arm embedded/6 2017-q1-update/lib/gcc/arm-none-eabi/6.3.1/include",
+                "c:/program files (x86)/gnu tools arm embedded/6 2017-q1-update/lib/gcc/arm-none-eabi/6.3.1/include-fixed",
+                "c:/program files (x86)/gnu tools arm embedded/6 2017-q1-update/arm-none-eabi/include"
             ],
             "defines": [
-                "_DEBUG",
-                "UNICODE"
+                "STM32F405xx",
+                "USE_HAL_DRIVER",
+                "__weak=\"__attribute__((weak))\"",
+                "__packed=\"__attribute__((__packed__))\"",
+                "__GNUC__"
             ],
             "intelliSenseMode": "clang-x64",
             "browse": {
                 "path": [
                     "${workspaceRoot}",
-                    "${workspaceRoot}/Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F",
-                    "${workspaceRoot}/Middlewares/Third_Party/FreeRTOS/Source/include",
-                    "${workspaceRoot}/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS",
-                    "${workspaceRoot}/Drivers/DRV8301",
-                    "${workspaceRoot}/Middlewares/ST/STM32_USB_Device_Library/Core/Inc",
-                    "${workspaceRoot}/Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Inc",
-                    "${workspaceRoot}/Drivers/STM32F4xx_HAL_Driver/Inc",
-                    "${workspaceRoot}/Drivers/STM32F4xx_HAL_Driver/Inc/Legacy",
-                    "${workspaceRoot}/Drivers/CMSIS/Device/ST/STM32F4xx/Include",
-                    "${workspaceRoot}/Drivers/CMSIS/Include",
-                    "${workspaceRoot}/Inc",
-                    "${workspaceRoot}/MotorControl"
+                    "C:/Program Files (x86)/GNU Tools ARM Embedded"
                 ],
-                "limitSymbolsToIncludedHeaders": true,
-                "databaseFilename": ""
+                "limitSymbolsToIncludedHeaders": true
             }
         },
-        {
-            "name": "Linux",
-            "includePath": [
-                "${workspaceRoot}",
-                "${workspaceRoot}/Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F",
-                "${workspaceRoot}/Middlewares/Third_Party/FreeRTOS/Source/include",
-                "${workspaceRoot}/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS",
-                "${workspaceRoot}/Drivers/DRV8301",
-                "${workspaceRoot}/Middlewares/ST/STM32_USB_Device_Library/Core/Inc",
-                "${workspaceRoot}/Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Inc",
-                "${workspaceRoot}/Drivers/STM32F4xx_HAL_Driver/Inc",
-                "${workspaceRoot}/Drivers/STM32F4xx_HAL_Driver/Inc/Legacy",
-                "${workspaceRoot}/Drivers/CMSIS/Device/ST/STM32F4xx/Include",
-                "${workspaceRoot}/Drivers/CMSIS/Include",
-                "${workspaceRoot}/Inc",
-                "${workspaceRoot}/MotorControl",
-                "/usr/lib/gcc/arm-none-eabi/4.9.3/include",
-                "/usr/lib/arm-none-eabi/include"
-            ],
-            "defines": [
-                "_DEBUG",
-                "UNICODE"
-            ],
-            "intelliSenseMode": "clang-x64",
-            "browse": {
-                "path": [
+        { 
+            "name": "Linux", 
+            "includePath": [ 
+                "${workspaceRoot}", 
+                "${workspaceRoot}/Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F", 
+                "${workspaceRoot}/Middlewares/Third_Party/FreeRTOS/Source/include", 
+                "${workspaceRoot}/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS", 
+                "${workspaceRoot}/Drivers/DRV8301", 
+                "${workspaceRoot}/Middlewares/ST/STM32_USB_Device_Library/Core/Inc", 
+                "${workspaceRoot}/Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Inc", 
+                "${workspaceRoot}/Drivers/STM32F4xx_HAL_Driver/Inc", 
+                "${workspaceRoot}/Drivers/STM32F4xx_HAL_Driver/Inc/Legacy", 
+                "${workspaceRoot}/Drivers/CMSIS/Device/ST/STM32F4xx/Include", 
+                "${workspaceRoot}/Drivers/CMSIS/Include", 
+                "${workspaceRoot}/Inc", 
+                "${workspaceRoot}/MotorControl", 
+                "/usr/lib/gcc/arm-none-eabi/4.9.3/include", 
+                "/usr/lib/arm-none-eabi/include" 
+            ], 
+            "defines": [ 
+                "STM32F405xx",
+                "USE_HAL_DRIVER",
+                "__weak=\"__attribute__((weak))\"",
+                "__packed=\"__attribute__((__packed__))\"",
+                "__GNUC__"
+            ], 
+            "intelliSenseMode": "clang-x64", 
+            "browse": { 
+                "path": [ 
                     "${workspaceRoot}",
-                    "${workspaceRoot}/Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F",
-                    "${workspaceRoot}/Middlewares/Third_Party/FreeRTOS/Source/include",
-                    "${workspaceRoot}/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS",
-                    "${workspaceRoot}/Drivers/DRV8301",
-                    "${workspaceRoot}/Middlewares/ST/STM32_USB_Device_Library/Core/Inc",
-                    "${workspaceRoot}/Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Inc",
-                    "${workspaceRoot}/Drivers/STM32F4xx_HAL_Driver/Inc",
-                    "${workspaceRoot}/Drivers/STM32F4xx_HAL_Driver/Inc/Legacy",
-                    "${workspaceRoot}/Drivers/CMSIS/Device/ST/STM32F4xx/Include",
-                    "${workspaceRoot}/Drivers/CMSIS/Include",
-                    "${workspaceRoot}/Inc",
-                    "${workspaceRoot}/MotorControl"
-                ],
-                "limitSymbolsToIncludedHeaders": true,
-                "databaseFilename": ""
-            }
-        },
-        {
-            "name": "MacOS",
-            "includePath": [
-                "${workspaceRoot}",
-                "${workspaceRoot}/Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F",
-                "${workspaceRoot}/Middlewares/Third_Party/FreeRTOS/Source/include",
-                "${workspaceRoot}/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS",
-                "${workspaceRoot}/Drivers/DRV8301",
-                "${workspaceRoot}/Middlewares/ST/STM32_USB_Device_Library/Core/Inc",
-                "${workspaceRoot}/Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Inc",
-                "${workspaceRoot}/Drivers/STM32F4xx_HAL_Driver/Inc",
-                "${workspaceRoot}/Drivers/STM32F4xx_HAL_Driver/Inc/Legacy",
-                "${workspaceRoot}/Drivers/CMSIS/Device/ST/STM32F4xx/Include",
-                "${workspaceRoot}/Drivers/CMSIS/Include",
-                "${workspaceRoot}/Inc",
-                "${workspaceRoot}/MotorControl",
-                "/usr/local/Caskroom/gcc-arm-embedded/6-2017-q2-update/gcc-arm-none-eabi-6-2017-q2-update/arm-none-eabi/include",
-                "/usr/local/Caskroom/gcc-arm-embedded/6-2017-q2-update/gcc-arm-none-eabi-6-2017-q2-update/arm-none-eabi/include/c++/6.3.1",
-                "/usr/local/Caskroom/gcc-arm-embedded/6-2017-q2-update/gcc-arm-none-eabi-6-2017-q2-update/arm-none-eabi/include/c++/6.3.1/arm-none-eabi",
-                "/usr/local/Caskroom/gcc-arm-embedded/6-2017-q2-update/gcc-arm-none-eabi-6-2017-q2-update/lib/gcc/arm-none-eabi/6.3.1/include"
-            ],
-            "defines": [
-                "_DEBUG",
-                "UNICODE"
-            ],
-            "intelliSenseMode": "clang-x64",
-            "browse": {
-                "path": [
+                    "/usr/lib/gcc/arm-none-eabi/4.9.3/include", 
+                    "/usr/lib/arm-none-eabi/include" 
+                ], 
+                "limitSymbolsToIncludedHeaders": true, 
+                "databaseFilename": "" 
+            } 
+        }, 
+        { 
+            "name": "Mac", 
+            "includePath": [ 
+                "${workspaceRoot}", 
+                "${workspaceRoot}/Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F", 
+                "${workspaceRoot}/Middlewares/Third_Party/FreeRTOS/Source/include", 
+                "${workspaceRoot}/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS", 
+                "${workspaceRoot}/Drivers/DRV8301", 
+                "${workspaceRoot}/Middlewares/ST/STM32_USB_Device_Library/Core/Inc", 
+                "${workspaceRoot}/Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Inc", 
+                "${workspaceRoot}/Drivers/STM32F4xx_HAL_Driver/Inc", 
+                "${workspaceRoot}/Drivers/STM32F4xx_HAL_Driver/Inc/Legacy", 
+                "${workspaceRoot}/Drivers/CMSIS/Device/ST/STM32F4xx/Include", 
+                "${workspaceRoot}/Drivers/CMSIS/Include", 
+                "${workspaceRoot}/Inc", 
+                "${workspaceRoot}/MotorControl", 
+                "/usr/local/Caskroom/gcc-arm-embedded/6-2017-q2-update/gcc-arm-none-eabi-6-2017-q2-update/arm-none-eabi/include", 
+                "/usr/local/Caskroom/gcc-arm-embedded/6-2017-q2-update/gcc-arm-none-eabi-6-2017-q2-update/arm-none-eabi/include/c++/6.3.1", 
+                "/usr/local/Caskroom/gcc-arm-embedded/6-2017-q2-update/gcc-arm-none-eabi-6-2017-q2-update/arm-none-eabi/include/c++/6.3.1/arm-none-eabi", 
+                "/usr/local/Caskroom/gcc-arm-embedded/6-2017-q2-update/gcc-arm-none-eabi-6-2017-q2-update/lib/gcc/arm-none-eabi/6.3.1/include" 
+            ], 
+            "defines": [ 
+                "STM32F405xx",
+                "USE_HAL_DRIVER",
+                "__weak=\"__attribute__((weak))\"",
+                "__packed=\"__attribute__((__packed__))\"",
+                "__GNUC__"
+            ], 
+            "intelliSenseMode": "clang-x64", 
+            "browse": { 
+                "path": [ 
                     "${workspaceRoot}",
-                    "${workspaceRoot}/Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F",
-                    "${workspaceRoot}/Middlewares/Third_Party/FreeRTOS/Source/include",
-                    "${workspaceRoot}/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS",
-                    "${workspaceRoot}/Drivers/DRV8301",
-                    "${workspaceRoot}/Middlewares/ST/STM32_USB_Device_Library/Core/Inc",
-                    "${workspaceRoot}/Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Inc",
-                    "${workspaceRoot}/Drivers/STM32F4xx_HAL_Driver/Inc",
-                    "${workspaceRoot}/Drivers/STM32F4xx_HAL_Driver/Inc/Legacy",
-                    "${workspaceRoot}/Drivers/CMSIS/Device/ST/STM32F4xx/Include",
-                    "${workspaceRoot}/Drivers/CMSIS/Include",
-                    "${workspaceRoot}/Inc",
-                    "${workspaceRoot}/MotorControl"
-                ],
-                "limitSymbolsToIncludedHeaders": true,
-                "databaseFilename": ""
+                    "/usr/local/Caskroom/gcc-arm-embedded/"
+                ], 
+                "limitSymbolsToIncludedHeaders": true, 
+                "databaseFilename": "" 
             }
         }
     ],

diff --git a/Firmware/.vscode/launch.json b/Firmware/.vscode/launch.json
@@ -6,7 +6,8 @@
     "configurations": [
         {
             // For the Cortex-Debug extension
-            "type": "openocd-gdb",
+            "type": "cortex-debug",
+            "servertype": "openocd",
             "request": "launch",
             "name": "Debug ODrive",
             "executable": "${workspaceRoot}/build/ODriveFirmware.elf",

diff --git a/Firmware/.vscode/settings.json b/Firmware/.vscode/settings.json
@@ -1,5 +1,7 @@
 {
     "C_Cpp.clang_format_style": "{ BasedOnStyle: Google, IndentWidth: 4, ColumnLimit: 0 }",
+    "C_Cpp.intelliSenseEngine": "Default",
+    "C_Cpp.intelliSenseEngineFallback": "Disabled",
     "files.exclude": {
         "build": true
     },

diff --git a/Firmware/.vscode/tasks.json b/Firmware/.vscode/tasks.json
@@ -6,7 +6,7 @@
         {
             "taskName": "build",
             "type": "shell",
-            "command": "make -j4",
+            "command": "make",
             "group": {
                 "kind": "build",
                 "isDefault": true

diff --git a/...Device/ST/STM32F4xx/Include/stm32f405xx.h → ...Device/ST/STM32F4xx/Include/stm32f405xx.h b/...Device/ST/STM32F4xx/Include/stm32f405xx.h → ...Device/ST/STM32F4xx/Include/stm32f405xx.h
diff --git a/...S/Device/ST/STM32F4xx/Include/stm32f4xx.h → ...S/Device/ST/STM32F4xx/Include/stm32f4xx.h b/...S/Device/ST/STM32F4xx/Include/stm32f4xx.h → ...S/Device/ST/STM32F4xx/Include/stm32f4xx.h
diff --git a/...e/ST/STM32F4xx/Include/system_stm32f4xx.h → ...e/ST/STM32F4xx/Include/system_stm32f4xx.h b/...e/ST/STM32F4xx/Include/system_stm32f4xx.h → ...e/ST/STM32F4xx/Include/system_stm32f4xx.h
diff --git a/...Drivers/CMSIS/Include/arm_common_tables.h → ...Drivers/CMSIS/Include/arm_common_tables.h b/...Drivers/CMSIS/Include/arm_common_tables.h → ...Drivers/CMSIS/Include/arm_common_tables.h
diff --git a/...Drivers/CMSIS/Include/arm_const_structs.h → ...Drivers/CMSIS/Include/arm_const_structs.h b/...Drivers/CMSIS/Include/arm_const_structs.h → ...Drivers/CMSIS/Include/arm_const_structs.h
diff --git a/Firmware/Drivers/CMSIS/Include/arm_math.h → ...ard/v3.3/Drivers/CMSIS/Include/arm_math.h b/Firmware/Drivers/CMSIS/Include/arm_math.h → ...ard/v3.3/Drivers/CMSIS/Include/arm_math.h
diff --git a/Firmware/Drivers/CMSIS/Include/cmsis_armcc.h → .../v3.3/Drivers/CMSIS/Include/cmsis_armcc.h b/Firmware/Drivers/CMSIS/Include/cmsis_armcc.h → .../v3.3/Drivers/CMSIS/Include/cmsis_armcc.h
diff --git a/...re/Drivers/CMSIS/Include/cmsis_armcc_V6.h → ....3/Drivers/CMSIS/Include/cmsis_armcc_V6.h b/...re/Drivers/CMSIS/Include/cmsis_armcc_V6.h → ....3/Drivers/CMSIS/Include/cmsis_armcc_V6.h
diff --git a/Firmware/Drivers/CMSIS/Include/cmsis_gcc.h → ...rd/v3.3/Drivers/CMSIS/Include/cmsis_gcc.h b/Firmware/Drivers/CMSIS/Include/cmsis_gcc.h → ...rd/v3.3/Drivers/CMSIS/Include/cmsis_gcc.h
diff --git a/Firmware/Drivers/CMSIS/Include/core_cm0.h → ...ard/v3.3/Drivers/CMSIS/Include/core_cm0.h b/Firmware/Drivers/CMSIS/Include/core_cm0.h → ...ard/v3.3/Drivers/CMSIS/Include/core_cm0.h
diff --git a/...ware/Drivers/CMSIS/Include/core_cm0plus.h → ...v3.3/Drivers/CMSIS/Include/core_cm0plus.h b/...ware/Drivers/CMSIS/Include/core_cm0plus.h → ...v3.3/Drivers/CMSIS/Include/core_cm0plus.h
diff --git a/Firmware/Drivers/CMSIS/Include/core_cm3.h → ...ard/v3.3/Drivers/CMSIS/Include/core_cm3.h b/Firmware/Drivers/CMSIS/Include/core_cm3.h → ...ard/v3.3/Drivers/CMSIS/Include/core_cm3.h
diff --git a/Firmware/Drivers/CMSIS/Include/core_cm4.h → ...ard/v3.3/Drivers/CMSIS/Include/core_cm4.h b/Firmware/Drivers/CMSIS/Include/core_cm4.h → ...ard/v3.3/Drivers/CMSIS/Include/core_cm4.h
diff --git a/Firmware/Drivers/CMSIS/Include/core_cm7.h → ...ard/v3.3/Drivers/CMSIS/Include/core_cm7.h b/Firmware/Drivers/CMSIS/Include/core_cm7.h → ...ard/v3.3/Drivers/CMSIS/Include/core_cm7.h
diff --git a/Firmware/Drivers/CMSIS/Include/core_cmFunc.h → .../v3.3/Drivers/CMSIS/Include/core_cmFunc.h b/Firmware/Drivers/CMSIS/Include/core_cmFunc.h → .../v3.3/Drivers/CMSIS/Include/core_cmFunc.h
diff --git a/...ware/Drivers/CMSIS/Include/core_cmInstr.h → ...v3.3/Drivers/CMSIS/Include/core_cmInstr.h b/...ware/Drivers/CMSIS/Include/core_cmInstr.h → ...v3.3/Drivers/CMSIS/Include/core_cmInstr.h
diff --git a/Firmware/Drivers/CMSIS/Include/core_cmSimd.h → .../v3.3/Drivers/CMSIS/Include/core_cmSimd.h b/Firmware/Drivers/CMSIS/Include/core_cmSimd.h → .../v3.3/Drivers/CMSIS/Include/core_cmSimd.h
diff --git a/Firmware/Drivers/CMSIS/Include/core_sc000.h → ...d/v3.3/Drivers/CMSIS/Include/core_sc000.h b/Firmware/Drivers/CMSIS/Include/core_sc000.h → ...d/v3.3/Drivers/CMSIS/Include/core_sc000.h
diff --git a/Firmware/Drivers/CMSIS/Include/core_sc300.h → ...d/v3.3/Drivers/CMSIS/Include/core_sc300.h b/Firmware/Drivers/CMSIS/Include/core_sc300.h → ...d/v3.3/Drivers/CMSIS/Include/core_sc300.h
diff --git a/...rivers/CMSIS/Lib/libarm_cortexM4lf_math.a → ...rivers/CMSIS/Lib/libarm_cortexM4lf_math.a b/...rivers/CMSIS/Lib/libarm_cortexM4lf_math.a → ...rivers/CMSIS/Lib/libarm_cortexM4lf_math.a