Merge pull request #3 from ctjet/accelerometer

Accelerometer to master
calebmarting · Jan 16, 2021 · f334d48 · f334d48
2 parents c00ef12 + a71e8c5
commit f334d48
Show file tree

Hide file tree

Showing 102 changed files with 12,922 additions and 7,005 deletions.
diff --git a/.vscode/.cortex-debug.peripherals.state.json b/.vscode/.cortex-debug.peripherals.state.json
@@ -1 +1 @@
-[]
+[{"node":"ADC","expanded":true,"format":0},{"node":"BLUE_CTRL","expanded":true,"format":0}]
diff --git a/.vscode/.cortex-debug.registers.state.json b/.vscode/.cortex-debug.registers.state.json
@@ -1 +1 @@
-[]
+[{"node":"control","expanded":true}]
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
@@ -5,48 +5,43 @@
  "includePath": [
  "${workspaceRoot}",
  "${workspaceRoot}/inc",
- "C:/Users/cmart/ST/BlueNRG-1DKLib/Library/hal/inc",
- "C:/Users/cmart/ST/BlueNRG-1DKLib/Library/BlueNRG1_Periph_Driver/inc",
- "C:/Users/cmart/ST/BlueNRG-1DKLib/Library/Bluetooth_LE/inc",
- "C:/Users/cmart/ST/BlueNRG-1DKLib/Library/CMSIS/Include",
- "C:/Users/cmart/ST/BlueNRG-1DKLib/Library/CMSIS/Device/ST/BlueNRG1/Include",
- "C:/Users/cmart/ST/BlueNRG-1DKLib/Library/SDK_Eval_BlueNRG1/inc",
- "C:/Users/cmart/ST/BlueNRG-1DKLib/Library/BLE_Application/OTA/inc",
- "C:/Users/cmart/ST/BlueNRG-1DKLib/Library/BLE_Application/Utils/inc",
- "C:/Users/cmart/ST/BlueNRG-1DKLib/Library/BLE_Application/layers_inc",
- "C:/armtoolslib/lib/gcc/arm-none-eabi/8.2.1/include",
- "C:/armtoolslib/lib/gcc/arm-none-eabi/8.2.1/include-fixed",
- "C:/armtoolslib/arm-none-eabi/include",
- "C:/armtoolslib/arm-none-eabi/include/machine",
- "C:/armtoolslib/arm-none-eabi/include/newlib-nano",
- "C:/armtoolslib/arm-none-eabi/include/sys"
-
-
+ "${workspaceRoot}/libinc/Library/hal/inc",
+ "${workspaceRoot}/libinc/Library/BlueNRG1_Periph_Driver/inc",
+ "${workspaceRoot}/libinc/Library/Bluetooth_LE/inc",
+ "${workspaceRoot}/libinc/Library/CMSIS/Include",
+ "${workspaceRoot}/libinc/Library/CMSIS/Device/ST/BlueNRG1/Include",
+ "${workspaceRoot}/libinc/Library/SDK_Eval_BlueNRG1/inc",
+ "${workspaceRoot}/libinc/Library/BLE_Application/OTA/inc",
+ "${workspaceRoot}/libinc/Library/BLE_Application/Utils/inc",
+ "${workspaceRoot}/libinc/Library/BLE_Application/layers_inc",
+ "${config:cortex-debug.armToolchainPath}/../arm-none-eabi/include",
+ "${config:cortex-debug.armToolchainPath}/../lib/gcc/arm-none-eabi/${config:armToolchainVersion}/include",
+ "${config:cortex-debug.armToolchainPath}/../lib/gcc/arm-none-eabi/${config:armToolchainVersion}/include-fixed",
+ "${config:cortex-debug.armToolchainPath}/../arm-none-eabi/include/machine",
+ "${config:cortex-debug.armToolchainPath}/../arm-none-eabi/include/newlib-nano",
+ "${config:cortex-debug.armToolchainPath}/../arm-none-eabi/include/sys"
  ],
  "defines": [],
  "intelliSenseMode": "clang-x64",
  "browse": {
  "path": [
  "${workspaceRoot}",
- "C:/Users/cmart/ST/BlueNRG-1DKLib/Library/hal/inc",
- "C:/Users/cmart/ST/BlueNRG-1DKLib/Library/BlueNRG1_Periph_Driver/inc",
- "C:/Users/cmart/ST/BlueNRG-1DKLib/Library/Bluetooth_LE/inc",
- "C:/Users/cmart/ST/BlueNRG-1DKLib/Library/CMSIS/Include",
- "C:/Users/cmart/ST/BlueNRG-1DKLib/Library/CMSIS/Device/ST/BlueNRG1/Include",
- "C:/Users/cmart/ST/BlueNRG-1DKLib/Library/SDK_Eval_BlueNRG1/inc",
- "C:/Users/cmart/ST/BlueNRG-1DKLib/Library/BLE_Application/OTA/inc",
- "C:/Users/cmart/ST/BlueNRG-1DKLib/Library/BLE_Application/Utils/inc",
- "C:/Users/cmart/ST/BlueNRG-1DKLib/Library/BLE_Application/layers_inc",
- "C:/armtoolslib/lib/gcc/arm-none-eabi/8.2.1/include",
- "C:/armtoolslib/lib/gcc/arm-none-eabi/8.2.1/include-fixed",
- "C:/armtoolslib/arm-none-eabi/include"
+ "${workspaceRoot}/libinc//Library/hal/inc",
+ "${workspaceRoot}/libinc//Library/BlueNRG1_Periph_Driver/inc",
+ "${workspaceRoot}/libinc//Library/Bluetooth_LE/inc",
+ "${workspaceRoot}/libinc//Library/CMSIS/Include",
+ "${workspaceRoot}/libinc//Library/CMSIS/Device/ST/BlueNRG1/Include",
+ "${workspaceRoot}/libinc//Library/SDK_Eval_BlueNRG1/inc",
+ "${workspaceRoot}/libinc//Library/BLE_Application/OTA/inc",
+ "${workspaceRoot}/libinc//Library/BLE_Application/Utils/inc",
+ "${workspaceRoot}/libinc//Library/BLE_Application/layers_inc",
+ "${config:cortex-debug.armToolchainPath}/../lib/gcc/arm-none-eabi/${config:armToolchainVersion}/include",
+ "${config:cortex-debug.armToolchainPath}/../lib/gcc/arm-none-eabi/${config:armToolchainVersion}/include-fixed",
+ "${config:cortex-debug.armToolchainPath}/../arm-none-eabi/include"
  ],
  "limitSymbolsToIncludedHeaders": true,
  "databaseFilename": "${workspaceRoot}/.vscode/browse.vc.db"
- },
- // "compilerPath": "C:/MinGW/bin/gcc.exe",
- // "cppStandard": "c++17",
- // "cStandard": "c99"
+ }
  }
  ],
  "version": 4

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -5,8 +5,10 @@
  "version": "0.2.0",
  "configurations": [
  {
- "name": "Debug (OpenOCD)",
- "cwd": "${workspaceRoot}",
+ "name": "Debug (OpenOCD)",
+ //Comment prelaunch task to disable building before upload
+ "preLaunchTask": "Make",
+ "cwd": "${workspaceRoot}",
  "executable": "./bin/blink.elf",
  "request": "launch",
  "type": "cortex-debug",
@@ -18,6 +20,19 @@
  ],
  "runToMain": true,
  "svdFile": "${workspaceRoot}/pack/SVD/BlueNRG1.svd"
- }
+ },
+ {
+ "name": "Debug (JLink)",
+ //Comment prelaunch task to disable building before upload
+ "preLaunchTask": "Make",
+ "cwd": "${workspaceRoot}",
+ "executable": "./bin/blink.elf",
+ "request": "launch",
+ "type": "cortex-debug",
+ "servertype": "jlink",
+ "interface": "swd",
+ "runToMain": true,
+ "device": "BlueNRG1"
+ }
  ]
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -7,6 +7,10 @@
  "url": "schemaURL"
  }
  ],
+
+ "armToolchainVersion": "8.2.1",
  "cortex-debug.armToolchainPath": "C:/PROGRA~2/GNUTOO~1/82018-~1/bin", 
- "cortex-debug.openocdPath": "${workspaceRoot}/openocd-0.11.0-rc1/bin/openocd.exe"
+ "cortex-debug.openocdPath": "${workspaceRoot}/openocd-0.11.0-rc1/bin/openocd.exe",
+ //Please modify this to your server location if different
+ "cortex-debug.JLinkGDBServerPath": "C:/Program Files (x86)/SEGGER/JLink_V635c/JLinkGDBServerCL.exe"
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -1,5 +1,11 @@
 {
  "version": "2.0.0",
+ "options":{
+ "env":{
+ "ARM_TOOLCHAIN_PATH":"${config:cortex-debug.armToolchainPath}",
+ "ARM_TOOLCHAIN_VERSION":"${config:armToolchainVersion}"
+ },
+ },
  "tasks": [
  {
  "label": "Make",