diff --git a/.vscode/launch.json b/.vscode/launch.json
index c32afb1..aa54d5c 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -1,4 +1,4 @@
-{
+  {
   // Use IntelliSense to learn about possible attributes.
   // Hover to view descriptions of existing attributes.
   // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
@@ -11,21 +11,19 @@
       "request": "launch",
       "type": "cortex-debug",
       "servertype": "openocd",
-      "gdbPath" : "arm-none-eabi-gdb",
+      "gdbPath": "gdb-multiarch",
       "device": "RP2040",
-      //"showDevDebugOutput": "parsed",
       "configFiles": [
-        "interface/picoprobe.cfg",
+        "interface/raspberrypi-swd.cfg",
         "target/rp2040.cfg"
         ],
       "svdFile": "${env:PICO_SDK_PATH}/src/rp2040/hardware_regs/rp2040.svd",
       "runToEntryPoint": "main",
-      // Give restart the same functionality as runToMain
-      //"postRestartCommands": [
-      //    "break main",
-      //    "continue"
-      //],
-      "searchDir": ["${env:HOME}/src/openocd/tcl"],
+      // Give restart the same functionality as runToEntryPoint - main
+      "postRestartCommands": [
+          "break main",
+          "continue"
+      ]
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 87853fc..960b66b 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -14,8 +14,6 @@
       "visibility": "hidden"
                },
      },
-    "cortex-debug.openocdPath": "${env:HOME}/src/openocd/src/openocd",
-    "cmake.generator": "Unix Makefiles",
     "C_Cpp.clang_format_fallbackStyle": "LLVM",
     "files.watcherExclude": {
       "**/.git/objects/**": true,
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 10d1e65..576033b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,11 +3,12 @@ cmake_minimum_required(VERSION 3.13)
 set(CMAKE_C_STANDARD 11)
 set(CMAKE_CXX_STANDARD 20)
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-volatile")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -fno-exceptions")
 
 # Initialise pico_sdk from installed location
 # (note this can come from environment, CMake cache etc)
-set(PICO_SDK_PATH "/usr/share/pico-sdk")
+#set(PICO_SDK_PATH "/usr/share/pico-sdk")
+set(PICO_SDK_PATH "/home/martin/pico/pico-sdk")
 
 # Pull in Raspberry Pi Pico SDK (must be before project)
 include("cmake/pico_sdk_import.cmake")
diff --git a/modules/pico-onewire b/modules/pico-onewire
index d5af2a1..6399467 160000
--- a/modules/pico-onewire
+++ b/modules/pico-onewire
@@ -1 +1 @@
-Subproject commit d5af2a1e1d81c3cb21805e332c8185607ee74b1d
+Subproject commit 6399467cf7687ecb7f8f4e4923303349e0ecf160
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a5256dc..b9408f4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -14,8 +14,8 @@ pico_set_program_name(${CMAKE_PROJECT_NAME} "gbmanager")
 pico_set_program_version(${CMAKE_PROJECT_NAME} ${PROJECT_VERSION})
 
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-    pico_enable_stdio_uart(${CMAKE_PROJECT_NAME} 1)
-    pico_enable_stdio_usb(${CMAKE_PROJECT_NAME} 0)
+    pico_enable_stdio_uart(${CMAKE_PROJECT_NAME} 0)
+    pico_enable_stdio_usb(${CMAKE_PROJECT_NAME} 1)
 else()
     pico_enable_stdio_uart(${CMAKE_PROJECT_NAME} 0)
     pico_enable_stdio_usb(${CMAKE_PROJECT_NAME} 0)