Nav Board Update

.cargo/config → .cargo/config.toml

@@ -1,14 +1,14 @@
-[target.'cfg(all(target_arch = "arm", target_os = "none"))']
-# This runner needs to be parametric so we can pass in the chip name
-runner = "probe-rs run --chip ATSAME51J20A --protocol swd"
-
-rustflags = [
-  "-C", "link-arg=-Tlink.x",
-  "-C", "link-arg=-Tdefmt.x",
-]
-
-[env]
-DEFMT_LOG="info"
-
-[build]
-target = "thumbv7em-none-eabihf"     # Cortex-M4F and Cortex-M7F (with FPU)
+[target.'cfg(all(target_arch = "arm", target_os = "none"))']
+# This runner needs to be parametric so we can pass in the chip name
+runner = "probe-rs run --chip STM32H733VGTx --protocol swd"
+#runner = "probe-rs run --chip ATSAME51J18A --protocol swd"
+rustflags = [
+  "-C", "link-arg=-Tlink.x",
+  "-C", "link-arg=-Tdefmt.x",
+]
+
+[env]
+DEFMT_LOG="info"
+
+[build]
+target = "thumbv7em-none-eabihf"     # Cortex-M4F and Cortex-M7F (with FPU)

.devcontainer/Dockerfile

@@ -13,12 +13,11 @@ COPY --from=toolchain /toolchain /toolchain
 
 ENV PATH="${PATH}:/toolchain/bin"
 ARG DEBIAN_FRONTEND=noninteractive
+RUN apt-get update && apt-get upgrade -y && apt-get install -y cmake pkg-config libusb-1.0-0-dev libftdi1-dev libudev-dev libssl-dev
 
-# Necessary system packages
-RUN apt-get update && apt-get install -y cmake pkg-config libusb-1.0-0-dev libftdi1-dev libudev-dev libssl-dev && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
-
-# Install Rust crates
-RUN cargo install probe-rs --features cli \
-    && cargo install cargo-make
+# Install ARM GCC deps
+RUN mkdir -p toolchain && \
+    curl -L "https://developer.arm.com/-/media/Files/downloads/gnu/13.2.rel1/binrel/arm-gnu-toolchain-13.2.rel1-x86_64-arm-none-eabi.tar.xz" \
+    | tar --strip-components=1 -xJ -C toolchain && \
+    cargo install --locked [email protected] --features cli
+ENV PATH="${PATH}:/toolchain/bin"

.devcontainer/devcontainer.json

@@ -6,5 +6,4 @@
 	},
 	"remoteUser": "root",
 	"runArgs": ["--privileged"] 
-
 }

.gitconfig

@@ -0,0 +1,2 @@
+[core]
+    autocrlf = true

.vscode/launch.json

@@ -4,6 +4,133 @@
     // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
+        {
+            "type": "probe-rs-debug",
+            "request": "launch",
+            "name": "Probe-rs Debug Recovery",
+            "chip": "ATSAME51J18A",
+            "coreConfigs": [
+                {
+                    "programBinary": "${workspaceFolder}/target/thumbv7em-none-eabihf/release/recovery",
+                }
+            ]
+        },
+        {
+            "type": "probe-rs-debug",
+            "request": "attach",
+            "name": "Probe-rs attach nav (Debug)",
+            "chip": "STM32H733VGTx",
+            "coreConfigs": [
+                {
+                    "programBinary": "${workspaceFolder}/target/thumbv7em-none-eabihf/debug/nav",
+                }
+            ]
+        },
+        {
+            "type": "probe-rs-debug",
+            "request": "attach",
+            "name": "Probe-rs attach recovery (Release)",
+            "chip": "ATSAME51J18A",
+            "coreConfigs": [
+                {
+                    "programBinary": "${workspaceFolder}/target/thumbv7em-none-eabihf/release/recovery",
+                }
+            ]
+        },
+        {
+            "type": "probe-rs-debug",
+            "request": "attach",
+            "name": "Probe-rs attach com (Release)",
+            "chip": "ATSAME51J18A",
+            "coreConfigs": [
+                {
+                    "programBinary": "${workspaceFolder}/target/thumbv7em-none-eabihf/release/communication",
+                }
+            ]
+        },
+        {
+            "type": "probe-rs-debug",
+            "request": "launch",
+            "name": "Probe-rs Debug Link (Release)",
+            "chip": "ATSAME51J18A",
+            "flashingConfig": {
+                "flashingEnabled": true,
+                "haltAfterReset": false,
+                "formatOptions": {
+                  //!MODIFY (or remove). Valid values are: 'bin', 'hex', 'elf'(default), 'idf'
+                  "binaryFormat": "elf"
+                }
+              },
+            "coreConfigs": [
+                {
+                    "programBinary": "${workspaceFolder}/target/thumbv7em-none-eabihf/release/communication",
+                }
+            ]
+        },
+        {
+            "type": "probe-rs-debug",
+            "request": "launch",
+            "name": "Probe-rs Debug nav (Debug)",
+            "chip": "STM32H733VGTx",
+            "wireProtocol": "Swd",
+            "flashingConfig": {
+
+                "haltAfterReset": true,
+                // "flashingEnabled": true,
+
+            },
+            "coreConfigs": [
+                {
+                    "programBinary": "${workspaceFolder}/target/thumbv7em-none-eabihf/debug/nav",
+                }
+            ]
+        },
+        {
+            "type": "probe-rs-debug",
+            "request": "attach",
+            "name": "Probe-rs attach Release nav",
+            "chip": "STM32H733VGTx",
+            "wireProtocol": "Swd",
+            "coreConfigs": [
+                {
+                    "programBinary": "${workspaceFolder}/target/thumbv7em-none-eabihf/release/nav",
+                    // "rttEnabled": true,
+                    // "coreIndex": 0,
+                }
+            ]
+        },
+        {
+            "type": "probe-rs-debug",
+            "request": "attach",
+            "name": "Probe-rs attach Release simple example",
+            "chip": "STM32H733VGTx",
+            "wireProtocol": "Swd",
+            "coreConfigs": [
+                {
+                    "programBinary": "${workspaceFolder}/target/thumbv7em-none-eabihf/release/simple_example",
+                    "rttEnabled": true,
+                    "coreIndex": 0,
+                }
+            ]
+        },
+        {
+            "type": "probe-rs-debug",
+            "request": "launch",
+            "name": "Probe-rs Release nav",
+            "chip": "STM32H733VGTx",
+            "wireProtocol": "Swd",
+            "flashingConfig": {
+                "haltAfterReset": true,
+                "flashingEnabled": true,
+            },
+            "coreConfigs": [
+                {
+                    "programBinary": "${workspaceFolder}/target/thumbv7em-none-eabihf/release/nav",
+                    "rttEnabled": true,
+                    "coreIndex": 0,
+                }
+            ]
+        },
         {
             "type": "cortex-debug",
             "request": "launch",