Merge pull request #100 from Neotron-Compute/vscode-config

Use probe-rs for debugging.

Author: thejpster

.vscode/launch.json

@@ -1,52 +1,23 @@
 {
-    /* 
-     * Requires the Rust Language Server (RLS) and Cortex-Debug extensions
-     * https://marketplace.visualstudio.com/items?itemName=rust-lang.rust
-     * https://marketplace.visualstudio.com/items?itemName=marus25.cortex-debug
-     */
     "version": "0.2.0",
     "configurations": [
         {
-            "type": "cortex-debug",
+            "type": "probe-rs-debug",
             "request": "launch",
-            "name": "Debug (QEMU)",
-            "servertype": "qemu",
-            "cwd": "${workspaceRoot}",
-            "preLaunchTask": "Cargo Build (debug)",
-            "runToMain": true,
-            "executable": "./target/thumbv7m-none-eabi/debug/neotron-pico-bios",
-            /* Run `cargo build --example hello` and uncomment this line to run semi-hosting example */
-            //"executable": "./target/thumbv7m-none-eabi/debug/examples/hello",
-            "cpu": "cortex-m3",
-            "machine": "lm3s6965evb",
-        },
-        {
-            /* Configuration for the STM32F303 Discovery board */
-            "type": "cortex-debug",
-            "request": "launch",
-            "name": "Debug (OpenOCD)",
-            "servertype": "openocd",
-            "cwd": "${workspaceRoot}",
-            "preLaunchTask": "Cargo Build (debug)",
-            "runToMain": true,
-            "executable": "./target/thumbv7em-none-eabihf/debug/neotron-pico-bios",
-            /* Run `cargo build --example itm` and uncomment this line to run itm example */
-            // "executable": "./target/thumbv7em-none-eabihf/debug/examples/itm",
-            "device": "STM32F303VCT6",
-            "configFiles": [
-                "interface/stlink-v2-1.cfg",
-                "target/stm32f3x.cfg"
+            "name": "Run with probe-rs",
+            "speed": 20000,
+            "preLaunchTask": "Cargo Build (release)",
+            "flashingConfig": {
+                "flashingEnabled": true,
+            },
+            "chip": "RP2040",
+            "coreConfigs": [
+                {
+                    // Change this to the binary you want to debug
+                    "programBinary": "${workspaceFolder}/target/thumbv6m-none-eabi/release/neotron-pico-bios",
+                    "rttEnabled": true
+                }
             ],
-            "svdFile": "${workspaceRoot}/.vscode/STM32F303.svd",
-            "swoConfig": {
-                "enabled": true,
-                "cpuFrequency": 8000000,
-                "swoFrequency": 2000000,
-                "source": "probe",
-                "decoders": [
-                    { "type": "console", "label": "ITM", "port": 0 }
-                ]
-            }
         }
     ]
 }

src/main.rs

@@ -1063,7 +1063,7 @@ impl Hardware {
 					resets,
 					clocks.peripheral_clock.freq(),
 					2_000_000.Hz(),
-					&embedded_hal::spi::MODE_0,
+					embedded_hal::spi::MODE_0,
 				),
 				delay,
 				led_state: 0,
@@ -2624,9 +2624,7 @@ extern "C" fn power_control(power_mode: common::PowerMode) -> ! {
 			// Reboot to USB bootloader with no GPIOs and both USB interfaces
 			// enabled.
 			hal::rom_data::reset_to_usb_boot(0, 0);
-			loop {
-				core::unreachable!()
-			}
+			core::unreachable!()
 		}
 		_ => {
 			// Anything else causes a reset