Skip to content

Commit a533efa

Browse files
authored
Merge pull request #307 from github0null/dev
v3.14.0 update
2 parents b8699d3 + 45765e4 commit a533efa

29 files changed

+366
-206
lines changed

CHANGELOG.md

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

77
***
88

9+
### [v3.14.0] update
10+
11+
**New**:
12+
- `Status Bar`: Add status bar 'Build' and 'Flash'
13+
14+
**Change**:
15+
- `Proxy Site`: Discard domain: github0null.io
16+
- `unify_builder`: Move obj files to '.obj' dir when build
17+
18+
**Optimize**:
19+
- `Model files`: Remove model file's UTF8-BOM header
20+
- `Project auto reload`: Optimize auto save/reload project when you modified 'eide.json'
21+
22+
***
23+
924
### [v3.13.2023060401] revision
1025

1126
**Fix**:

package.json

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
"publisher": "cl",
55
"author": {
66
"name": "cl",
7-
"url": "https://github0null.io",
8-
"email": "me@github0null.io"
7+
"url": "https://github.com/github0null",
8+
"email": "github0null@outlook.com"
99
},
1010
"keywords": [
1111
"mcu",
@@ -38,7 +38,7 @@
3838
"homepage": "https://em-ide.com",
3939
"license": "MIT",
4040
"description": "A mcu development environment for 8051/AVR/STM8/Cortex-M/MIPS/RISC-V",
41-
"version": "3.13.2023060401",
41+
"version": "3.14.0",
4242
"preview": false,
4343
"engines": {
4444
"vscode": "^1.67.0"
@@ -66,7 +66,7 @@
6666
"readme": "https://github.com/github0null/eide/blob/master/README.md",
6767
"bugs": {
6868
"url": "https://github.com/github0null/eide/issues",
69-
"email": "me@github0null.io"
69+
"email": "github0null@outlook.com"
7070
},
7171
"repository": {
7272
"url": "https://github.com/github0null/eide.git",
@@ -763,6 +763,11 @@
763763
"command": "_cl.eide.project.installCmsisLibs",
764764
"title": "Install CMSIS Core Libs"
765765
},
766+
{
767+
"command": "_cl.eide.project.installCmsisDriverInterface",
768+
"category": "eide",
769+
"title": "Install CMSIS Common Driver Interface"
770+
},
766771
{
767772
"command": "_cl.eide.project.addSrcDir",
768773
"title": "%eide.explorer.root.add.folder%",
@@ -1121,7 +1126,7 @@
11211126
{
11221127
"command": "_cl.eide.project.source.show_disassembly",
11231128
"group": "commands",
1124-
"when": "resourceExtname =~ /\\.c$|\\.cpp$|\\.c\\+\\+$|\\.cc$|\\.cxx$|\\.info$|\\.axf$|\\.elf$/ && cl.eide.projectActived && !config.EIDE.Option.DisableEditorContextMenu"
1129+
"when": "resourceExtname =~ /\\.c$|\\.cpp$|\\.c\\+\\+$|\\.cc$|\\.cxx$|\\.info$|\\.axf$|\\.elf$|\\.out$/ && cl.eide.projectActived && !config.EIDE.Option.DisableEditorContextMenu"
11251130
},
11261131
{
11271132
"command": "_cl.eide.project.source.show_cmsis_config_wizard",
@@ -1150,15 +1155,10 @@
11501155
}
11511156
],
11521157
"explorer/context": [
1153-
{
1154-
"command": "eide.c51ToSdcc",
1155-
"group": "commands",
1156-
"when": "resourceLangId =~ /^c$|^cpp$/ && cl.eide.projectActived && !config.EIDE.Option.DisableExplorerContextMenu"
1157-
},
11581158
{
11591159
"command": "_cl.eide.project.source.show_disassembly",
11601160
"group": "commands",
1161-
"when": "resourceExtname =~ /\\.c$|\\.cpp$|\\.c\\+\\+$|\\.cc$|\\.cxx$|\\.axf$|\\.elf$/ && cl.eide.projectActived && !config.EIDE.Option.DisableExplorerContextMenu"
1161+
"when": "resourceExtname =~ /\\.c$|\\.cpp$|\\.c\\+\\+$|\\.cc$|\\.cxx$|\\.axf$|\\.elf$|\\.out$/ && cl.eide.projectActived && !config.EIDE.Option.DisableExplorerContextMenu"
11621162
},
11631163
{
11641164
"command": "_cl.eide.project.source.show_cmsis_config_wizard",
@@ -1250,6 +1250,10 @@
12501250
"command": "_cl.eide.project.installCmsisLibs",
12511251
"when": "viewItem == PACK && view == cl.eide.view.projects"
12521252
},
1253+
{
1254+
"command": "_cl.eide.project.installCmsisDriverInterface",
1255+
"when": "viewItem == PACK && view == cl.eide.view.projects"
1256+
},
12531257
{
12541258
"command": "_cl.eide.project.setActive",
12551259
"when": "viewItem == SOLUTION && view == cl.eide.view.projects && cl.eide.enable.active"
@@ -1651,6 +1655,15 @@
16511655
}
16521656
}
16531657
}
1654-
]
1658+
],
1659+
"icons": {
1660+
"eide-hammer": {
1661+
"description": "fa-hammer",
1662+
"default": {
1663+
"fontPath": "./res/icon/fa-solid-900.woff",
1664+
"fontCharacter": "\\f6e3"
1665+
}
1666+
}
1667+
}
16551668
}
16561669
}

package.nls.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@
101101
"settings.builder.jobs": "The number of threads when build",
102102

103103
"settings.option.show.toolbar.in.editer.title": "Displays some toolbars in the editor title",
104+
"settings.option.show.statusbar": "Displays toolbar icons in the status bar",
104105
"settings.option.print.relative.path": "Print relative path when compile source file",
105106
"settings.option.create.batch.file": "Create batch file after build",
106107
"settings.option.use.task.to.build": "Use Task to build project instead of Terminal",

package.nls.zh-CN.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,8 @@
9393

9494
"settings.builder.jobs": "构建时使用的线程数",
9595

96-
"settings.option.show.toolbar.in.editer.title": "在编辑器的标题栏显示小工具",
96+
"settings.option.show.toolbar.in.editer.title": "在编辑器的标题栏显示工具栏图标",
97+
"settings.option.show.statusbar": "在状态栏显示工具栏图标",
9798
"settings.option.print.relative.path": "编译时打印源文件的相对路径",
9899
"settings.option.create.batch.file": "生成脚本",
99100
"settings.option.use.task.to.build": "使用 vscode 任务执行编译命令",
45.1 KB
Binary file not shown.

res/data/models/unix/any.gcc.model.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{
1+
{
22
"name": "GNU Toolchain",
33
"id": "GCC",
44
"toolPrefix": "",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{
1+
{
22
"name": "GNU Arm Embedded Toolchain",
33
"id": "GCC",
44
"toolPrefix": "arm-none-eabi-",

res/data/models/unix/stm8.cosmic.model.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{
1+
{
22
"name": "COSMIC C Compiler For STM8",
33
"id": "COSMIC_STM8",
44
"useUnixPath": true,

res/data/models/unix/stm8.iar.model.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{
1+
{
22
"name": "IAR C Compiler For STM8",
33
"id": "IAR_STM8",
44
"version": {

res/data/models/win32/any.gcc.model.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{
1+
{
22
"name": "GNU Toolchain",
33
"id": "GCC",
44
"toolPrefix": "",

0 commit comments

Comments
 (0)