Skip to content

Commit 920239c

Browse files
github0nullgithub0null
authored
Merge pull request #72 from github0null/dev
v2.13.0 update
2 parents bd584b5 + 8159f1f commit 920239c

7 files changed

Lines changed: 257 additions & 24 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,14 @@
44

55
***
66

7+
### [v2.13.0]
8+
- 优化：切换不同的烧录器时，保留旧的烧录配置
9+
- 优化：为 STLink，JLink 烧录器增加**附加命令行**选项，用于为烧录程序附加额外的命令行
10+
- 修复：打开 RAM/ROM Layout 偶尔出现内容为空的问题，适应 vscode 主题色
11+
- 修复：同时打开多个 vscode 实例时，JLink Device List 读取冲突而导致 JLink Device List 为空
12+
- 修复：安装 Keil 包时，Components 为空导致包安装失败
13+
***
14+
715
### [v2.12.3]
816
- 新增：增加一条命令 `eide.reinstall.binaries`，允许重新安装 eide-binaries
917
- 优化：支持自动读取 JLink 内部 Device 列表，以及加载 JLink 安装目录下的 'JLinkDevices.xml'

‎lang/arm.v5.verify.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
"properties": {
116116
"use-microLIB": {
117117
"markdownDescription": "Use MicroLIB",
118-
"description.zh-cn": "是否使用微库",
118+
"description.zh-cn": "Use MicroLIB",
119119
"type": "boolean",
120120
"enum": [
121121
true,

‎lang/arm.v6.verify.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
"properties": {
116116
"use-microLIB": {
117117
"markdownDescription": "Use MicroLIB",
118-
"description.zh-cn": "是否使用微库",
118+
"description.zh-cn": "Use MicroLIB",
119119
"type": "boolean",
120120
"enum": [
121121
true,
@@ -237,13 +237,13 @@
237237
"type": "boolean"
238238
},
239239
"read-only-position-independent": {
240-
"markdownDescription": "read only position independent",
241-
"description.zh-cn": "为常量生成独立的代码空间",
240+
"markdownDescription": "Read-Only Position-Independent (ROPI)",
241+
"description.zh-cn": "Read-Only Position-Independent (ROPI)",
242242
"type": "boolean"
243243
},
244244
"read-write-position-independent": {
245-
"markdownDescription": "read write position independent",
246-
"description.zh-cn": "为可读写代码生成独立的代码空间",
245+
"markdownDescription": "Read-Write Position-Independent (RWPI)",
246+
"description.zh-cn": "Read-Write Position-Independent (RWPI)",
247247
"type": "boolean"
248248
},
249249
"misc-controls": {

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"homepage": "https://github.com/github0null/eide/blob/master/README.md",
2626
"license": "MIT",
2727
"description": "A singlechip development environment for 8051/STM8/Cortex-M/RISC-V",
28-
"version": "2.12.3",
28+
"version": "2.13.0",
2929
"engines": {
3030
"vscode": "^1.38.0"
3131
},

‎res/html/StorageLayoutView/fonts/consola.ttf‎

448 KB
Binary file not shown.

‎res/html/StorageLayoutView/index.html‎

Lines changed: 240 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<head>
55
<meta charset="utf-8">
6-
<title>RAM ROM Layout</title>
6+
<title>Memory Layout</title>
77

88
<link href="${bootstrap-css}" rel="stylesheet">
99
<link href="${checkbox-css}" rel="stylesheet">
@@ -17,6 +17,11 @@
1717
<script src="../bootstrap/js/bootstrap.min.js"></script>-->
1818

1919
<style>
20+
@font-face {
21+
font-family: Consolas;
22+
src: url("fonts/consola.ttf");
23+
}
24+
2025
body {
2126
margin: 12px;
2227
background-color: var(--vscode-editor-background) !important;
@@ -38,6 +43,224 @@
3843
.form-group {
3944
margin: 0;
4045
}
46+
47+
/* panel */
48+
49+
.panel-body {
50+
color: var(--vscode-editor-foreground) !important;
51+
background-color: var(--vscode-editor-background) !important;
52+
}
53+
54+
.panel-info,
55+
.panel-warning {
56+
color: var(--vscode-editor-foreground) !important;
57+
border-radius: .25rem !important;
58+
}
59+
60+
/* table */
61+
62+
table,
63+
tr,
64+
th,
65+
td,
66+
thead,
67+
.table,
68+
.table-bordered {
69+
color: var(--vscode-input-foreground) !important;
70+
background-color: var(--vscode-editor-background) !important;
71+
font-family: Consolas !important;
72+
border-color: var(--vscode-input-placeholderForeground) !important;
73+
}
74+
75+
.table:before {
76+
height: 0px;
77+
}
78+
79+
/* copy from eide builder options view */
80+
81+
legend {
82+
font-size: 1rem !important;
83+
}
84+
85+
section {
86+
color: var(--vscode-editor-foreground) !important;
87+
background-color: var(--vscode-editor-background) !important;
88+
}
89+
90+
.nav-link {
91+
color: var(--vscode-editor-foreground) !important;
92+
background-color: var(--vscode-editor-background) !important;
93+
border: 1px solid var(--vscode-button-background) !important;
94+
}
95+
96+
.nav-pills,
97+
.card,
98+
.card-body,
99+
.list-group-item,
100+
.custom-form {
101+
color: var(--vscode-editor-foreground) !important;
102+
background-color: var(--vscode-editor-background) !important;
103+
}
104+
105+
.custom-checkbox .custom-control-label:before {
106+
background-color: var(--vscode-editor-background);
107+
border-color: var(--vscode-input-placeholderForeground);
108+
}
109+
110+
.card-body {
111+
border-radius: 4px;
112+
box-shadow: 0 5px 15px var(--vscode-input-background);
113+
}
114+
115+
.nav-pills.show>.nav-link {
116+
color: var(--vscode-editor-foreground) !important;
117+
background-color: var(--vscode-button-background) !important;
118+
border: 1px solid var(--vscode-button-background) !important;
119+
}
120+
121+
/* set style for table */
122+
.el-popover {
123+
color: var(--vscode-input-foreground) !important;
124+
background-color: var(--vscode-editor-background) !important;
125+
font-family: Consolas !important;
126+
border: 1px solid var(--vscode-input-placeholderForeground) !important;
127+
border-radius: .25rem !important;
128+
box-shadow: 0 1px 3px var(--vscode-focusBorder) !important;
129+
}
130+
131+
/* set common style for input */
132+
input,
133+
textarea {
134+
color: var(--vscode-input-foreground) !important;
135+
background-color: var(--vscode-editor-background) !important;
136+
font-family: Consolas !important;
137+
border: 1px solid var(--vscode-input-placeholderForeground) !important;
138+
border-radius: .25rem !important;
139+
padding: .625rem .75rem !important;
140+
}
141+
142+
/* el select container style */
143+
144+
.el-select {
145+
padding: 0px !important;
146+
}
147+
148+
.el-select .el-input__inner {
149+
padding-left: 15px !important;
150+
padding-right: 32px !important;
151+
/* make arrow normal */
152+
}
153+
154+
.el-scrollbar,
155+
.el-select-dropdown,
156+
.el-select-dropdown__wrap,
157+
.el-scrollbar__wrap,
158+
.el-scrollbar__view,
159+
.el-select-dropdown__list,
160+
.el-select-dropdown__item {
161+
color: var(--vscode-input-foreground) !important;
162+
background-color: var(--vscode-editor-background) !important;
163+
}
164+
165+
.el-select-dropdown__item {
166+
height: 32px !important;
167+
}
168+
169+
.el-select-dropdown__item.selected {
170+
color: var(--vscode-editor-foreground) !important;
171+
}
172+
173+
.el-select-dropdown {
174+
padding: 2px 0px !important;
175+
border: 1px solid var(--vscode-input-placeholderForeground) !important;
176+
border-radius: .25rem !important;
177+
box-shadow: 0 1px 3px var(--vscode-focusBorder) !important;
178+
}
179+
180+
.el-select-dropdown__item:hover {
181+
background-color: var(--vscode-inputOption-activeBackground) !important;
182+
}
183+
184+
/* proper arrow */
185+
.el-popper[x-placement^=top] .popper__arrow:after {
186+
border-top-color: var(--vscode-input-placeholderForeground) !important;
187+
bottom: 0px !important;
188+
}
189+
190+
.el-popper[x-placement^=bottom] .popper__arrow:after {
191+
border-bottom-color: var(--vscode-input-placeholderForeground) !important;
192+
top: 0px !important;
193+
}
194+
195+
.el-popper[x-placement^=right] .popper__arrow:after {
196+
border-right-color: var(--vscode-input-placeholderForeground) !important;
197+
left: 0px !important;
198+
}
199+
200+
.el-popper[x-placement^=left] .popper__arrow:after {
201+
border-left-color: var(--vscode-input-placeholderForeground) !important;
202+
right: 0px !important;
203+
}
204+
205+
/* set foreground color for input placaholder */
206+
input::-webkit-input-placeholder,
207+
textarea::-webkit-input-placeholder,
208+
.form-control::-webkit-input-placeholder {
209+
color: var(--vscode-input-placeholderForeground) !important;
210+
}
211+
212+
.list-group-item {
213+
border: none !important;
214+
border-color: var(--vscode-input-placeholderForeground) !important;
215+
}
216+
217+
.form-control-alternative {
218+
color: var(--vscode-input-foreground) !important;
219+
/* set font color for input */
220+
background-color: var(--vscode-editor-background) !important;
221+
border: 1px solid var(--vscode-input-placeholderForeground) !important;
222+
border-radius: .25rem !important;
223+
}
224+
225+
.form-control {
226+
border: 1px solid var(--vscode-input-placeholderForeground) !important;
227+
border-radius: .25rem !important;
228+
}
229+
230+
select {
231+
border: 1px solid var(--vscode-input-placeholderForeground) !important;
232+
border-radius: .25rem !important;
233+
}
234+
235+
/* actions */
236+
237+
.nav-pills.active,
238+
.nav-link.active {
239+
color: var(--vscode-button-foreground) !important;
240+
background-color: var(--vscode-button-background) !important;
241+
border: 1px solid var(--vscode-button-background) !important;
242+
}
243+
244+
a:focus,
245+
input:focus,
246+
select:focus {
247+
outline: none !important;
248+
/* remove outline when get focus */
249+
}
250+
251+
select:focus {
252+
border: 1px solid var(--vscode-focusBorder) !important;
253+
border-radius: .25rem !important;
254+
}
255+
256+
input:focus,
257+
textarea:focus,
258+
.form-control:focus,
259+
.form-control-alternative:focus {
260+
border: 1px solid var(--vscode-focusBorder) !important;
261+
border-radius: .25rem !important;
262+
box-shadow: 0 1px 3px var(--vscode-focusBorder);
263+
}
41264
</style>
42265

43266
</head>
@@ -63,7 +286,7 @@ <h4 class="modal-title" id="dialog-label"></h4>
63286
<div class="panel-heading">
64287
<h4 class="panel-title">
65288
<li data-parent="#body">
66-
RAM Layout
289+
Ram Layout
67290
</li>
68291
</h4>
69292
</div>
@@ -73,9 +296,9 @@ <h4 class="panel-title">
73296
<caption>On-Chip</caption>
74297
<thead>
75298
<tr>
76-
<th>default</th>
77-
<th>start address</th>
78-
<th>size</th>
299+
<th>Default</th>
300+
<th>Start Address</th>
301+
<th>Size</th>
79302
<th>NoInit</th>
80303
</tr>
81304
</thead>
@@ -167,9 +390,9 @@ <h4 class="panel-title">
167390
<caption>Off-Chip</caption>
168391
<thead>
169392
<tr>
170-
<th>default</th>
171-
<th>start address</th>
172-
<th>size</th>
393+
<th>Default</th>
394+
<th>Start Address</th>
395+
<th>Size</th>
173396
<th>NoInit</th>
174397
</tr>
175398
</thead>
@@ -304,7 +527,7 @@ <h4 class="panel-title">
304527
<div class="panel-heading">
305528
<h4 class="panel-title">
306529
<li data-parent="#body">
307-
ROM Layout
530+
Rom Layout
308531
</li>
309532
</h4>
310533
</div>
@@ -314,10 +537,10 @@ <h4 class="panel-title">
314537
<caption>On-Chip</caption>
315538
<thead>
316539
<tr>
317-
<th>default</th>
318-
<th>start address</th>
319-
<th>size</th>
320-
<th>startup</th>
540+
<th>Default</th>
541+
<th>Start Address</th>
542+
<th>Size</th>
543+
<th>Startup</th>
321544
</tr>
322545
</thead>
323546
<tbody>
@@ -396,10 +619,10 @@ <h4 class="panel-title">
396619
<caption>Off-Chip</caption>
397620
<thead>
398621
<tr>
399-
<th>default</th>
400-
<th>start address</th>
401-
<th>size</th>
402-
<th>startup</th>
622+
<th>Default</th>
623+
<th>Start Address</th>
624+
<th>Size</th>
625+
<th>Startup</th>
403626
</tr>
404627
</thead>
405628
<tbody>

‎res/html/StorageLayoutView/index.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ InitEvent();
66

77
NotifySubmitStatus();
88

9+
vscode.postMessage('eide.ram_rom_layout.launched');
10+
911
//-----------------------------------------
1012

1113
function updateView(_data) {

0 commit comments

Comments
 (0)