Skip to content

Commit b74bf67

Browse files
github0nullgithub0null
authored
Merge pull request #478 from github0null/dev
v3.26.0 update
2 parents e1b992f + 1c914ad commit b74bf67

25 files changed

+763
-497
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ vsc-extension-quickstart.md
88
./lib
99
/dist
1010
/doc
11+
/note.md
1112
pack.js
1213
test.js
1314
*.js.map

‎CHANGELOG.md‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,28 @@ All notable version changes will be recorded in this file.
66

77
***
88

9+
### [v3.26.0] update
10+
11+
**Change**:
12+
- `Project File`: Use yaml instead of json and update project data schema. Rename `eide.json` to `eide.yml`.
13+
14+
**Fix**:
15+
- `Target Switch`: Fix file's options was overrided when switch to other target.
16+
17+
**Improve**:
18+
- `Project Templates`: Add local cache for fetching remote templates repository.
19+
20+
**Notice:** This version contains important changes. After the automatic migration is completed, you will no longer be able to open your project using the old version of the plugin.
21+
22+
***
23+
24+
### [v3.25.7] revision
25+
26+
**Improve**:
27+
- `Builder Options`: Support ARM/Thumb Mode select options. Fix [issues 475](https://github.com/github0null/eide/issues/475)
28+
29+
***
30+
931
### [v3.25.6] revision
1032

1133
**Fix**:

‎lang/arm.gcc.verify.json‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,27 @@
122122
"description.zh-cn": "全局选项",
123123
"type": "object",
124124
"properties": {
125+
"arm-thumb-mode": {
126+
"readable_name": "ARM/Thumb Mode",
127+
"readable_name.zh-cn": "ARM/Thumb Mode",
128+
"markdownDescription": "Select between generating code that executes in ARM and Thumb states.",
129+
"type": "string",
130+
"default": "thumb",
131+
"enum": [
132+
"arm",
133+
"thumb"
134+
],
135+
"enumDescriptions": [
136+
"ARM Mode",
137+
"Thumb Mode"
138+
]
139+
},
140+
"arm-thumb-interwork": {
141+
"readable_name": "Thumb Interwork",
142+
"readable_name.zh-cn": "Thumb Interwork",
143+
"markdownDescription": "Generate code that supports calling between the ARM and Thumb instruction sets.",
144+
"type": "boolean"
145+
},
125146
"$float-abi-type": {
126147
"markdownDescription": "Hardware floating-point ABI",
127148
"description.zh-cn": "硬件浮点 ABI",

‎lang/arm.iar.verify.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,21 @@
122122
"description.zh-cn": "全局选项",
123123
"type": "object",
124124
"properties": {
125+
"arm-thumb-mode": {
126+
"readable_name": "ARM/Thumb Mode",
127+
"readable_name.zh-cn": "ARM/Thumb Mode",
128+
"markdownDescription": "Select between generating code that executes in ARM and Thumb states.",
129+
"type": "string",
130+
"default": "thumb",
131+
"enum": [
132+
"arm",
133+
"thumb"
134+
],
135+
"enumDescriptions": [
136+
"ARM Mode",
137+
"Thumb Mode"
138+
]
139+
},
125140
"endian-mode": {
126141
"description": "Endian Mode",
127142
"type": "string",

‎package-lock.json‎

Lines changed: 13 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"homepage": "https://em-ide.com",
3737
"license": "MIT",
3838
"description": "A mcu development environment for 8051/AVR/STM8/Cortex-M/MIPS/RISC-V",
39-
"version": "3.25.6",
39+
"version": "3.26.0",
4040
"preview": false,
4141
"engines": {
4242
"vscode": "^1.67.0"
@@ -54,9 +54,6 @@
5454
},
5555
"qna": "https://discuss.em-ide.com/t/FAQ",
5656
"activationEvents": [
57-
"workspaceContains:.eide/eide.json",
58-
"workspaceContains:.eide/EIDE.json",
59-
"workspaceContains:.EIDE/EIDE.json",
6057
"onStartupFinished"
6158
],
6259
"icon": "res/icon/icon.png",
@@ -111,7 +108,7 @@
111108
"x2js": "^3.4.1",
112109
"xml-formatter": "^2.6.1",
113110
"xml2js": "^0.6.2",
114-
"yaml": "^1.10.2"
111+
"yaml": "2.8.1"
115112
},
116113
"contributes": {
117114
"terminal": {

‎res/data/models/arm.gcc.model.json‎

Lines changed: 33 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,35 @@
3232
"linker"
3333
]
3434
},
35+
"arm-thumb-interwork": {
36+
"type": "selectable",
37+
"command": {
38+
"true": "-mthumb-interwork",
39+
"false": ""
40+
},
41+
"group": [
42+
"c",
43+
"cpp",
44+
"asm",
45+
"linker"
46+
],
47+
"location": "first"
48+
},
49+
"arm-thumb-mode": {
50+
"type": "selectable",
51+
"command": {
52+
"arm" : "-marm",
53+
"thumb": "-mthumb",
54+
"false": "-mthumb"
55+
},
56+
"group": [
57+
"c",
58+
"cpp",
59+
"asm",
60+
"linker"
61+
],
62+
"location": "first"
63+
},
3564
"microcontroller-float": {
3665
"type": "selectable",
3766
"command": {
@@ -381,8 +410,7 @@
381410
"$output": "-o ${out} -MMD ${in}",
382411
"$default": [
383412
"-c",
384-
"-xc",
385-
"-mthumb"
413+
"-xc"
386414
],
387415
"$language-c": {
388416
"type": "value",
@@ -433,8 +461,7 @@
433461
},
434462
"$output": "-o ${out} -MMD ${in}",
435463
"$default": [
436-
"-c",
437-
"-mthumb"
464+
"-c"
438465
],
439466
"$language-cpp": {
440467
"type": "value",
@@ -482,8 +509,7 @@
482509
},
483510
"$default": [
484511
"-c",
485-
"-x assembler-with-cpp",
486-
"-mthumb"
512+
"-x assembler-with-cpp"
487513
],
488514
"defines": {
489515
"type": "list",
@@ -500,9 +526,7 @@
500526
"useFile": true,
501527
"body": "@${value}"
502528
},
503-
"$default": [
504-
"-mthumb"
505-
],
529+
"$default": [],
506530
"$output": "-o ${out} ${in} ${lib_flags}",
507531
"$outputSuffix": ".elf",
508532
"$linkMap": {

‎res/data/models/arm.iar.model.json‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,20 @@
3333
],
3434
"location": "first"
3535
},
36+
"arm-thumb-mode": {
37+
"type": "selectable",
38+
"command": {
39+
"arm" : "--arm",
40+
"thumb": "--thumb",
41+
"false": "--thumb"
42+
},
43+
"group": [
44+
"c",
45+
"cpp",
46+
"asm"
47+
],
48+
"location": "first"
49+
},
3650
"microcontroller-cpu": {
3751
"type": "keyValue",
3852
"command": "",
@@ -169,7 +183,6 @@
169183
},
170184
"$output": "--dependencies=m + -o ${out} ${in}",
171185
"$default": [
172-
"--thumb",
173186
"--silent"
174187
],
175188
"$listPath": {
@@ -271,7 +284,6 @@
271284
},
272285
"$output": "--dependencies=m + -o ${out} ${in}",
273286
"$default": [
274-
"--thumb",
275287
"--silent"
276288
],
277289
"$listPath": {
@@ -365,7 +377,6 @@
365377
"$output": "-o ${out} ${in}",
366378
"$default": [
367379
"-S",
368-
"--thumb",
369380
"-w+"
370381
],
371382
"$listPath": {

0 commit comments

Comments
 (0)