Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ All notable version changes will be recorded in this file.

***

### [v3.24.0] update
### [v3.24.1] update

**New**:
- `8051 Toolchain`: Support new SDCC + Binutils Toolchain for mcs51 https://github.com/github0null/sdcc-binutils-mcs51/blob/master/README_zh.md
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"homepage": "https://em-ide.com",
"license": "MIT",
"description": "A mcu development environment for 8051/AVR/STM8/Cortex-M/MIPS/RISC-V",
"version": "3.24.0",
"version": "3.24.1",
"preview": false,
"engines": {
"vscode": "^1.67.0"
Expand Down
12 changes: 5 additions & 7 deletions src/EIDETypeDefine.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1538,7 +1538,7 @@ export interface WorkspaceConfig {
export class WorkspaceConfiguration extends Configuration<WorkspaceConfig> {

isDelUnknownKeysWhenLoad = false;
isLoaded = false;
isLoadFailed = false;

protected readTypeFromFile(configFile: File): ProjectType | undefined {
return undefined;
Expand All @@ -1547,13 +1547,13 @@ export class WorkspaceConfiguration extends Configuration<WorkspaceConfig> {
protected Parse(jsonStr: string): WorkspaceConfig {
try {
const obj = <any>jsonc.parse(jsonStr);
this.isLoaded = true;
this.isLoadFailed = false;
return obj;
} catch (error) {
GlobalEvent.log_error(error);
GlobalEvent.emit('msg', newMessage('Warning',
view_str$prompt$loadws_cfg_failed.replace('{}', this.FILE_NAME)));
this.isLoaded = false;
this.isLoadFailed = true;
return this.GetDefault();
}
}
Expand All @@ -1565,10 +1565,8 @@ export class WorkspaceConfiguration extends Configuration<WorkspaceConfig> {
// workspace only can be force save, because user will modify this file,
// so we can not override it
Save(force?: boolean) {
if (this.isLoaded) {
if (force)
super.Save();
}
if (force || !this.isLoadFailed)
super.Save();
}

GetDefault(): WorkspaceConfig {
Expand Down
4 changes: 2 additions & 2 deletions src/ResInstaller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -199,12 +199,12 @@ export class ResInstaller {

const r_sdcc_mcs51: ToolPlatformInfo = {
'win32': {
url: 'https://github.com/github0null/sdcc-binutils-mcs51/releases/latest/download/sdcc-4.5.0-with-binutils-win32.zip',
url: 'https://em-ide.com/resource/sdcc-4.5.0-with-binutils-win32.zip',
zip_type: 'zip',
bin_dir: 'sdcc-4.5.0-with-binutils/bin'
},
'linux': {
url: 'https://github.com/github0null/sdcc-binutils-mcs51/releases/latest/download/sdcc-4.5.0-with-binutils-linux.tar.gz',
url: 'https://em-ide.com/resource/sdcc-4.5.0-with-binutils-linux.tar.gz',
zip_type: 'tar.gz',
bin_dir: 'sdcc-4.5.0-with-binutils/bin'
}
Expand Down