Skip to content

Commit 2601b56

Browse files
jreineckearmjreineckearm
authored
Merge branch 'main' into addNewTreeView
2 parents 3216d7d + 6db130b commit 2601b56

File tree

6 files changed

+34
-27
lines changed

6 files changed

+34
-27
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
node-version-file: package.json
6666
registry-url: https://npm.pkg.github.com
6767
always-auth: true
68-
cache: 'yarn'
68+
package-manager-cache: false
6969

7070
- name: Set version
7171
if: runner.os == 'Linux' && github.repository_owner == 'Open-CMSIS-Pack'
@@ -188,23 +188,14 @@ jobs:
188188
node-version-file: package.json
189189
registry-url: https://npm.pkg.github.com
190190
always-auth: true
191-
cache: 'yarn'
191+
package-manager-cache: false
192192

193193
- name: Download dist
194194
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
195195
with:
196196
name: dist
197197
path: .
198198

199-
- name: Cache tools
200-
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.6
201-
with:
202-
path: tools
203-
key: tools-${{ matrix.target }}-${{ github.head_ref || github.ref_name }}
204-
restore-keys: |
205-
tools-${{ matrix.target }}-${{ github.base_ref || 'main' }}
206-
tools-${{ matrix.target }}-
207-
208199
- name: Download tools
209200
run: |
210201
yarn --frozen-lockfile --ignore-scripts --prefer-offline

‎.github/workflows/tpip.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
node-version: '20'
4848
registry-url: https://npm.pkg.github.com
4949
always-auth: true
50-
cache: 'yarn'
50+
package-manager-cache: false
5151

5252
- name: Install dependencies
5353
run: yarn --frozen-lockfile --prefer-offline

‎CHANGELOG.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# Change Log
22

3+
## Unreleased
4+
5+
- Implements [#181](https://github.com/Open-CMSIS-Pack/vscode-cmsis-debugger/issues/181): RTOS Viewer
6+
- Includes mcu-debug [RTOS Views extension](https://marketplace.visualstudio.com/items?itemName=mcu-debug.rtos-views)
7+
in extension pack, which installs the mcu-debug [debug-tracker-vscode extension](https://marketplace.visualstudio.com/items?itemName=mcu-debug.debug-tracker-vscode)
8+
as a dependency.
9+
- Use with [CDT GDB Adapter extension](https://marketplace.visualstudio.com/items?itemName=eclipse-cdt.cdt-gdb-vscode)
10+
v2.4.1 or later to work best.
11+
312
## 1.1.0
413

514
- Implements [#443](https://github.com/Open-CMSIS-Pack/vscode-cmsis-debugger/issues/443): Show CPU execution time (from connection start and between breakpoints).

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ The Arm CMSIS Debugger includes [pyOCD](https://pyocd.io/) for target connection
1616
- [CDT™ GDB Debug Adapter Extension](https://marketplace.visualstudio.com/items?itemName=eclipse-cdt.cdt-gdb-vscode) for starting applications (_launch_) or connecting to running systems (_attach_).
1717
- [Memory Inspector](https://marketplace.visualstudio.com/items?itemName=eclipse-cdt.memory-inspector) provides a powerful and configurable memory viewer.
1818
- [Peripheral Inspector](https://marketplace.visualstudio.com/items?itemName=eclipse-cdt.peripheral-inspector) provides a structured view to device peripheral registers during debugging.
19+
- [RTOS Views](https://marketplace.visualstudio.com/items?itemName=mcu-debug.rtos-views) provides insights into resources of popular RTOS implementations at runtime.
1920
- [Serial Monitor](https://marketplace.visualstudio.com/items?itemName=ms-vscode.vscode-serial-monitor) to view output from and send messages to serial (UART) or TCP ports.
2021

2122
This extension is [free to use](https://marketplace.visualstudio.com/items/Arm.vscode-cmsis-debugger/license) and you can install it individually or as part of the [Arm Keil® Studio pack](https://marketplace.visualstudio.com/items?itemName=Arm.keil-studio-pack). For optimum debugger experience, use it with these extensions (included in the Arm Keil Studio pack):

‎package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
"eclipse-cdt.cdt-gdb-vscode",
3838
"eclipse-cdt.memory-inspector",
3939
"eclipse-cdt.peripheral-inspector",
40+
"mcu-debug.rtos-views",
4041
"ms-vscode.vscode-serial-monitor"
4142
],
4243
"extensionKind": [
@@ -233,7 +234,7 @@
233234
"jest": "^30.1.3",
234235
"jest-html-reporter": "^4.3.0",
235236
"lzma-native": "8.0.6",
236-
"markdown-link-check": "^3.13.7",
237+
"markdown-link-check": "^3.14.1",
237238
"markdownlint-cli": "^0.45.0",
238239
"minimist": "^1.2.8",
239240
"node-fetch": "^3.3.2",

‎yarn.lock‎

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2900,10 +2900,10 @@ commander@^12.1.0:
29002900
resolved "https://registry.yarnpkg.com/commander/-/commander-12.1.0.tgz"
29012901
integrity sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==
29022902

2903-
commander@^13.1.0, commander@~13.1.0:
2904-
version "13.1.0"
2905-
resolved "https://registry.yarnpkg.com/commander/-/commander-13.1.0.tgz#776167db68c78f38dcce1f9b8d7b8b9a488abf46"
2906-
integrity sha512-/rFeCpNJQbhSZjGVwO9RFV3xPqbnERS8MmIQzCtD/zl6gpJuV/bMLuN92oG3F7d8oDEHHRrujSXNUr8fpjntKw==
2903+
commander@^14.0.0:
2904+
version "14.0.1"
2905+
resolved "https://registry.yarnpkg.com/commander/-/commander-14.0.1.tgz#2f9225c19e6ebd0dc4404dd45821b2caa17ea09b"
2906+
integrity sha512-2JkV3gUZUVrbNA+1sjBOYLsMZ5cEEl8GTFP2a4AVz5hvasAMCQ1D2l2le/cX+pV4N6ZU17zjUahLpIXRrnWL8A==
29072907

29082908
commander@^2.20.0:
29092909
version "2.20.3"
@@ -2915,6 +2915,11 @@ commander@^8.3.0:
29152915
resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
29162916
integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
29172917

2918+
commander@~13.1.0:
2919+
version "13.1.0"
2920+
resolved "https://registry.yarnpkg.com/commander/-/commander-13.1.0.tgz#776167db68c78f38dcce1f9b8d7b8b9a488abf46"
2921+
integrity sha512-/rFeCpNJQbhSZjGVwO9RFV3xPqbnERS8MmIQzCtD/zl6gpJuV/bMLuN92oG3F7d8oDEHHRrujSXNUr8fpjntKw==
2922+
29182923
[email protected]:
29192924
version "0.0.1"
29202925
resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz"
@@ -4977,10 +4982,10 @@ lines-and-columns@^1.1.6:
49774982
resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz"
49784983
integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
49794984

4980-
link-check@^5.4.0:
4981-
version "5.4.0"
4982-
resolved "https://registry.yarnpkg.com/link-check/-/link-check-5.4.0.tgz#73be9b8c40a107da0dbb83a2d2c97657ae3c6672"
4983-
integrity sha512-0Pf4xBVUnwJdbDgpBlhHNmWDtbVjHTpIFs+JaBuIsC9PKRxjv4KMGCO2Gc8lkVnqMf9B/yaNY+9zmMlO5MyToQ==
4985+
link-check@^5.5.0:
4986+
version "5.5.0"
4987+
resolved "https://registry.yarnpkg.com/link-check/-/link-check-5.5.0.tgz#7c768c8b189934c0ee93684502331605a72866cb"
4988+
integrity sha512-CpMk2zMfyEMdDvFG92wO5pU/2I/wbw72/9pvUFhU9cDKkwhmVlPuvxQJzd/jXA2iVOgNgPLnS5zyOLW7OzNpdA==
49844989
dependencies:
49854990
is-relative-url "^4.0.0"
49864991
ms "^2.1.3"
@@ -5153,15 +5158,15 @@ markdown-it@^14.1.0, markdown-it@~14.1.0:
51535158
punycode.js "^2.3.1"
51545159
uc.micro "^2.1.0"
51555160

5156-
markdown-link-check@^3.13.7:
5157-
version "3.13.7"
5158-
resolved "https://registry.yarnpkg.com/markdown-link-check/-/markdown-link-check-3.13.7.tgz#789d7f2e6bf9a48df3d2a501735aa04b8acf1bd7"
5159-
integrity sha512-Btn3HU8s2Uyh1ZfzmyZEkp64zp2+RAjwfQt1u4swq2Xa6w37OW0T2inQZrkSNVxDSa2jSN2YYhw/JkAp5jF1PQ==
5161+
markdown-link-check@^3.14.1:
5162+
version "3.14.1"
5163+
resolved "https://registry.yarnpkg.com/markdown-link-check/-/markdown-link-check-3.14.1.tgz#bb45082ce32cffb7dfd69b1f89de8f18ffc79eb3"
5164+
integrity sha512-h1tihNL3kmOS3N7H4FyF4xKDxiHnNBNSgs/LWlDiRHlC8O0vfRX0LhDDvesRSs4HM7nS0F658glLxonaXBmuWw==
51605165
dependencies:
51615166
async "^3.2.6"
51625167
chalk "^5.3.0"
5163-
commander "^13.1.0"
5164-
link-check "^5.4.0"
5168+
commander "^14.0.0"
5169+
link-check "^5.5.0"
51655170
markdown-link-extractor "^4.0.2"
51665171
needle "^3.3.1"
51675172
progress "^2.0.3"

0 commit comments

Comments
 (0)