Skip to content

Commit 63cebe9

Browse files
authored
Merge pull request #464 from github0null/dev
v3.24.2 revision
2 parents 6966421 + e511ce3 commit 63cebe9

File tree

5 files changed

+3
-14
lines changed

5 files changed

+3
-14
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ All notable version changes will be recorded in this file.
66

77
***
88

9-
### [v3.24.1] update
9+
### [v3.24.2] update
1010

1111
**New**:
1212
- `8051 Toolchain`: Support new SDCC + Binutils Toolchain for mcs51 https://github.com/github0null/sdcc-binutils-mcs51/blob/master/README_zh.md

lang/sdcc.mcs51.verify.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -203,11 +203,6 @@
203203
true,
204204
false
205205
]
206-
},
207-
"misc-controls": {
208-
"markdownDescription": "Other Global Options",
209-
"description.zh-cn": "编译器附加选项(全局)",
210-
"$ref": "#/definitions/misc-controls"
211206
}
212207
}
213208
},

package.json

Lines changed: 1 addition & 1 deletion
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.24.1",
39+
"version": "3.24.2",
4040
"preview": false,
4141
"engines": {
4242
"vscode": "^1.67.0"

res/data/models/sdcc.mcs51.model.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -175,12 +175,6 @@
175175
"toolPath": "bin/i51-elf-objcopy",
176176
"outputSuffix": ".hex",
177177
"command": "-O ihex ${linkerOutput} ${output}"
178-
},
179-
{
180-
"name": "output bin file",
181-
"toolPath": "bin/i51-elf-objcopy",
182-
"outputSuffix": ".bin",
183-
"command": "-O binary ${linkerOutput} ${output}"
184178
}
185179
]
186180
},

src/EIDETypeDefine.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1565,7 +1565,7 @@ export class WorkspaceConfiguration extends Configuration<WorkspaceConfig> {
15651565
// workspace only can be force save, because user will modify this file,
15661566
// so we can not override it
15671567
Save(force?: boolean) {
1568-
if (force || !this.isLoadFailed)
1568+
if (force)
15691569
super.Save();
15701570
}
15711571

0 commit comments

Comments
 (0)