continue with 1.4 bringup

rundb · Jun 16, 2024 · fe6f773 · fe6f773
1 parent 99c5f16
commit fe6f773
Show file tree

Hide file tree

Showing 9 changed files with 135 additions and 6,311 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -13,11 +13,11 @@
             "type": "cortex-debug",
             "servertype": "jlink",
             "serverpath": "/usr/bin/JLinkGDBServerCLExe",
-            "device": "nRF52832_xxAA",
+            "device": "nRF52840_xxAA",
             "interface": "swd",
             "serialNumber": "", // add J-Link serial number if having multiple attached the same time.
             "runToMain": false,
-            "svdFile": "${workspaceRoot}/firmware/sdk/nRF5_SDK_17.1.0_ddde560/modules/nrfx/mdk/nrf52.svd",
+            "svdFile": "${workspaceRoot}/firmware/sdk/nRF5_SDK_17.1.0_ddde560/modules/nrfx/mdk/nrf52840.svd",
             "showDevDebugOutput": "parsed",
         }
     ]

diff --git a/firmware/src/targets/bootloader/pca10040_s132_ble_debug/armgcc/Makefile b/firmware/src/targets/bootloader/pca10040_s132_ble_debug/armgcc/Makefile