Skip to content

Commit 11e75eb

Browse files
authored
Merge pull request #187 from github0null/dev
v3.10.3 update
2 parents 6839e07 + be6dff4 commit 11e75eb

44 files changed

Lines changed: 1429 additions & 429 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

CHANGELOG.md

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

77
***
88

9+
### [v3.10.3] revision
10+
11+
**New**:
12+
- `New task type: 'eide.msys'`: You can write user task in `tasks.json` file, and execute `unix shell` command in `windows` platform.
13+
- `Github Template`: Allow Create Project From Github Repository.
14+
15+
**Optimize**:
16+
- `High Cpu Load`: Don't check and search toolchain path when plug-in startup, cache search result.
17+
- `Riscv Builder Options UI`: Add auto-complete for `arch`, `abi`, `code-model` options.
18+
- `Cmsis Core Libraries`: Filter unused `*.lib` when unzip cmsis core libraries.
19+
- `Openocd v0.12.0-rc2`: Update Openocd to `v0.12.0-rc2`, repo: `https://github.com/github0null/eide_builtin_openocd`
20+
21+
***
22+
23+
### [v3.10.1] preview
24+
25+
**New**:
26+
- `Shell Flasher`: Allow install shell flasher scripts from remote repo.
27+
- `Configure Toolchain`: Add a button to setup tool prefix for gcc family compiler.
28+
29+
**Fix**:
30+
- `Eclipse Importer`: Can not parse 'link.location' in '.project' file.
31+
32+
**Optimize**:
33+
- `Configure Toolchain`: Don't check all toolchain status when plug-in launch.
34+
- `Resource Manager`: Don't remove non-existed source dirs in eide.json.
35+
36+
***
37+
938
### [v3.10.0]
1039

1140
**New**:

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ A mcu development environment for `8051/AVR/STM8/Cortex-M/RISC-V/Universal-Gcc`
1313
Provide `8051/AVR/STM8/Cortex-M/RISC-V` project development, compilation, program flash and other functions.
1414

1515
Supported Platforms:
16-
- **Windows X64 (>= Windows 10)**
16+
- **Windows x64 (>= Windows 10)**
1717
- **Linux x64**
1818
- **macOS**(Only tested in 'macOS 10.15 x64')
1919

@@ -34,6 +34,7 @@ Supported Platforms:
3434
* Automatically generates default debug configurations for debugger plug-in `cortex-debug, STM8-Debug`.
3535
* Built-in many utility tools, 'CMSIS Config Wizard UI', 'Disassembly view', 'Program resource view'...
3636
* Built-in implement `C/C++ IntelliSense Provider` for `ms-vscode.cpptools`, **Not Need to** configurate `c_cpp_properties.json` file.
37+
* Built-in Msys Unix Shell environment.
3738

3839
***
3940

README_ZH-CN.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
在 vscode 上提供 **8051**, **AVR**, **STM8**, **Cortex-M**, **RISC-V** ... 项目的 开发, 编译, 烧录 等功能。
1212

1313
支持的平台:
14-
- **Windows X64 (>= Windows 10)**
14+
- **Windows x64 (>= Windows 10)**
1515
- **Linux x64**
1616
- **macOS**(仅在 'macOS 10.15 x64' 中测试过)
1717

@@ -32,6 +32,7 @@
3232
* 自动生成默认调试配置,为调试器插件 Cortex-debug / STM8-debug 生成默认配置。
3333
* 内置多种实用工具,`CMSIS Config Wizard UI`, `反汇编查看``程序资源视图` ...
3434
* 内置 C/C++ 插件的 `C/C++ IntelliSense Provider`**无需配置** `c_cpp_properties.json` 即可获得源码跳转,补全提示功能。
35+
* 内置 Msys Unix Shell 环境,方便执行 shell 命令或脚本
3536

3637
***
3738

lang/riscv.gcc.verify.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,21 +144,23 @@
144144
"markdownDescription": "Arch",
145145
"description.zh-cn": "指令集(arch)",
146146
"size": "small",
147-
"type": "string"
147+
"type": "string",
148+
"auto_complete_ctx": "gcc.compiler.archs"
148149
},
149150
"abi": {
150151
"readable_name": "ABI",
151152
"readable_name.zh-cn": "调用约定(abi)",
152153
"markdownDescription": "Integer and floating-point calling convention",
153154
"description.zh-cn": "整数和浮点调用约定",
154155
"size": "small",
155-
"type": "string"
156+
"auto_complete_ctx": "gcc.compiler.abis"
156157
},
157158
"code-model": {
158159
"markdownDescription": "Code Model",
159160
"description.zh-cn": "代码模型(code-model)",
160161
"size": "small",
161-
"type": "string"
162+
"type": "string",
163+
"auto_complete_ctx": "gcc.compiler.riscv.code-models"
162164
},
163165
"misc-control": {
164166
"markdownDescription": "Other Global Options",

lib/node-utility

package.json

Lines changed: 64 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,13 @@
2929
"eide",
3030
"cmsis",
3131
"eclipse",
32-
"iar"
32+
"iar",
33+
"msys"
3334
],
3435
"homepage": "https://em-ide.com",
3536
"license": "MIT",
3637
"description": "A mcu development environment for 8051/AVR/STM8/Cortex-M/RISC-V",
37-
"version": "3.10.0",
38+
"version": "3.10.3",
3839
"preview": false,
3940
"engines": {
4041
"vscode": "^1.63.0"
@@ -143,7 +144,7 @@
143144
"altText": "setup toolchain"
144145
},
145146
"completionEvents": [
146-
"onContext:cl.eide.toolchain_ready"
147+
"onCommand:eide.operation.install_toolchain"
147148
]
148149
},
149150
{
@@ -530,7 +531,7 @@
530531
},
531532
{
532533
"command": "eide.project.genBuilderParams",
533-
"title": "Generate builder.params for project"
534+
"title": "%eide.project.generate_builder_params%"
534535
},
535536
{
536537
"command": "eide.operation.install_toolchain",
@@ -678,8 +679,8 @@
678679
"command": "_cl.eide.project.historyRecord",
679680
"title": "%eide.operation.open.history%",
680681
"icon": {
681-
"dark": "./res/icon/Note_16x.svg",
682-
"light": "./res/icon/Note_16x.svg"
682+
"dark": "./res/icon/History_16x.svg",
683+
"light": "./res/icon/History_16x.svg"
683684
}
684685
},
685686
{
@@ -754,11 +755,11 @@
754755
},
755756
{
756757
"command": "_cl.eide.project.installCMSISHeaders",
757-
"title": "%eide.package.install.cmsis%",
758-
"icon": {
759-
"dark": "./res/icon/AddBuildQueue_16x.svg",
760-
"light": "./res/icon/AddBuildQueue_16x.svg"
761-
}
758+
"title": "Install CMSIS Core Headers"
759+
},
760+
{
761+
"command": "_cl.eide.project.installCmsisLibs",
762+
"title": "Install CMSIS Core Libs"
762763
},
763764
{
764765
"command": "_cl.eide.project.addSrcDir",
@@ -848,6 +849,14 @@
848849
"light": "./res/icon/SwitchSourceOrTarget_16x.svg"
849850
}
850851
},
852+
{
853+
"command": "_cl.eide.project.fetchShellFlasher",
854+
"title": "%eide.flash.fetch-shell-flasher%",
855+
"icon": {
856+
"dark": "./res/icon/DownloadFile_16x.svg",
857+
"light": "./res/icon/DownloadFile_16x.svg"
858+
}
859+
},
851860
{
852861
"command": "_cl.eide.project.modifyUploadConfig",
853862
"title": "%eide.item.modify%",
@@ -1203,6 +1212,10 @@
12031212
"command": "_cl.eide.project.installCMSISHeaders",
12041213
"when": "viewItem == PACK && view == Project"
12051214
},
1215+
{
1216+
"command": "_cl.eide.project.installCmsisLibs",
1217+
"when": "viewItem == PACK && view == Project"
1218+
},
12061219
{
12071220
"command": "_cl.eide.project.setActive",
12081221
"when": "viewItem == SOLUTION && view == Project && cl.eide.enable.active"
@@ -1338,7 +1351,12 @@
13381351
{
13391352
"command": "_cl.eide.project.switchUploader",
13401353
"group": "inline",
1341-
"when": "view == Project && viewItem == UPLOAD_OPTION"
1354+
"when": "viewItem == UPLOAD_OPTION || viewItem == UPLOAD_OPTION_Shell && view == Project"
1355+
},
1356+
{
1357+
"command": "_cl.eide.project.fetchShellFlasher",
1358+
"group": "inline",
1359+
"when": "viewItem == UPLOAD_OPTION_Shell && view == Project"
13421360
},
13431361
{
13441362
"command": "_cl.eide.project.modifyCompileConfig",
@@ -1546,6 +1564,39 @@
15461564
"scopeName": "source.elf.info",
15471565
"path": "./lang/elf.info.tmLanguage.json"
15481566
}
1567+
],
1568+
"taskDefinitions": [
1569+
{
1570+
"type": "eide.msys",
1571+
"required": [
1572+
"name",
1573+
"command"
1574+
],
1575+
"properties": {
1576+
"name": {
1577+
"type": "string",
1578+
"description": "Task Name. A human-readable name for this task"
1579+
},
1580+
"command": {
1581+
"type": "string",
1582+
"description": "Command. A shell command will be executed."
1583+
},
1584+
"options": {
1585+
"type": "object",
1586+
"description": "Other options",
1587+
"properties": {
1588+
"cwd": {
1589+
"type": "string",
1590+
"description": "Work Directory"
1591+
}
1592+
}
1593+
},
1594+
"env": {
1595+
"type": "object",
1596+
"description": "Environment variables list. These variables will be exported to shell context."
1597+
}
1598+
}
1599+
}
15491600
]
15501601
}
1551-
}
1602+
}

package.nls.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
"eide.project.gen.makefile": "Generate Makefile Template",
3131
"eide.project.modify.files.options": "Append independent compiler args for sources",
3232
"eide.project.import.ext.project.src.struct": "Import source tree from other projects",
33+
"eide.project.generate_builder_params": "Generate builder.params",
3334

3435
"eide.prj.menus.main.cppcheck": "Static Check",
3536
"eide.prj.menus.sub.cppcheck.run": "Check Project by Cppcheck",
@@ -80,8 +81,11 @@
8081
"eide.package.comp.uninstall": "Uninstall Component",
8182

8283
"eide.builder.switch": "Choose Toolchain",
84+
"eide.builder.setup-toolchain-prefix": "Setup Compiler Prefix",
85+
8386
"eide.flash.switch": "Choose Flasher",
84-
87+
"eide.flash.fetch-shell-flasher": "Install Shell Flasher Script From Remote Repository",
88+
8589
"eide.deps.include.show": "Display All Include Paths",
8690
"eide.deps.include.add": "Add Include Path",
8791
"eide.deps.inclib.show": "Display All Library Folders",

package.nls.zh-CN.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030
"eide.project.gen.makefile": "生成 Makefile 模板",
3131
"eide.project.modify.files.options": "为源文件附加单独的编译参数",
3232
"eide.project.import.ext.project.src.struct": "从其他 IDE 的项目中导入源文件树",
33-
33+
"eide.project.generate_builder_params": "生成 builder.params",
34+
3435
"eide.workspace.build": "构建所有项目",
3536
"eide.workspace.rebuild": "重新构建所有项目",
3637
"eide.workspace.open.config": "打开工作区配置",
@@ -73,8 +74,11 @@
7374
"eide.package.comp.uninstall": "移除组件",
7475

7576
"eide.builder.switch": "切换编译工具",
77+
"eide.builder.setup-toolchain-prefix": "设置编译器前缀",
78+
7679
"eide.flash.switch": "切换烧录器",
77-
80+
"eide.flash.fetch-shell-flasher": "从云端安装 Shell 烧录脚本",
81+
7882
"eide.deps.include.show": "显示所有包含路径",
7983
"eide.deps.include.add": "添加包含路径",
8084
"eide.deps.inclib.show": "显示所有库目录",

0 commit comments

Comments
 (0)