Skip to content

Commit

Permalink
Merge pull request #135 from github0null/dev
Browse files Browse the repository at this point in the history 
v3.7.1 update
  • Loading branch information
@github0null
github0null authored Jun 1, 2022
2 parents 6d74dd9 + ecc2c8f commit de61ecb
Show file tree
Hide file tree
Showing 16 changed files with 188 additions and 121 deletions.
13 changes: 13 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,19 @@

***

### [v3.7.1]

**Fixed**:
- Can not update source refs after build done.

**Optimized**:
- Add `Erase All` right-click menu in `Flasher Configurations` view.
- Auto add a default `.gitignore` file for new project.
- remove `runToMain: true` for cortex-debug debug config, use: `runToEntryPoint: "main"` now.
- Optimize drop-down field prompt for `Builder Options View`.

***

### [v3.7.0]

**Change**:
Expand Down
40 changes: 18 additions & 22 deletions lang/8051.keil.verify.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,9 @@
"LARGE"
],
"enumDescriptions": [
"vars in DATA",
"vars in PDATA",
"vars in XDATA"
"SMALL (vars in DATA)",
"COMPACT (vars in PDATA)",
"LARGE (vars in XDATA)"
]
},
"rom-mode": {
Expand All @@ -155,9 +155,9 @@
"LARGE"
],
"enumDescriptions": [
"program 2K or less",
"2K functions, 64K program",
"64K program"
"SMALL (program 2K or less)",
"COMPACT (2K functions, 64K program)",
"LARGE (64K program)"
]
}
}
Expand All @@ -177,10 +177,6 @@
"enum": [
"SPEED",
"SIZE"
],
"enumDescriptions": [
"Focus on code speed optimization",
"Focus on code size optimization"
]
},
"optimization-level": {
Expand All @@ -201,16 +197,16 @@
"level-9"
],
"enumDescriptions": [
"Constant folding",
"Dead code elimination",
"Data overlaying",
"Peephole optimization",
"Register variables",
"Common subexpression elimination",
"Loop rotation",
"Extended index access optimizing",
"Reuse common entry code",
"Common block subroutines"
"Lv0: Constant folding",
"Lv1: Dead code elimination",
"Lv2: Data overlaying",
"Lv3: Peephole optimization",
"Lv4: Register variables",
"Lv5: Common subexpression elimination",
"Lv6: Loop rotation",
"Lv7: Extended index access optimizing",
"Lv8: Reuse common entry code",
"Lv9: Common block subroutines"
]
},
"misc-controls": {
Expand Down Expand Up @@ -253,8 +249,8 @@
"lib"
],
"enumDescriptions": [
"Object File",
"Static Library"
"OBJ (Object File)",
"LIB (Static Library)"
]
},
"use-RTX": {
Expand Down
2 changes: 1 addition & 1 deletion lang/any.gcc.verify.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@
],
"enumDescriptions": [
"ELF (Executable Linkable Format)",
"Static Library"
"LIB (Static Library)"
]
},
"remove-unused-input-sections": {
Expand Down
2 changes: 1 addition & 1 deletion lang/arm.gcc.verify.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@
],
"enumDescriptions": [
"ELF (Executable Linkable Format)",
"Static Library"
"LIB (Static Library)"
]
},
"$disableOutputTask": {
Expand Down
2 changes: 1 addition & 1 deletion lang/arm.v5.verify.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@
],
"enumDescriptions": [
"AXF (Arm Executable File)",
"Static Library"
"LIB (Static Library)"
]
},
"$disableOutputTask": {
Expand Down
2 changes: 1 addition & 1 deletion lang/arm.v6.verify.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@
],
"enumDescriptions": [
"AXF (Arm Executable File)",
"Static Library"
"LIB (Static Library)"
]
},
"$disableOutputTask": {
Expand Down
2 changes: 1 addition & 1 deletion lang/riscv.gcc.verify.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@
],
"enumDescriptions": [
"ELF (Executable Linkable Format)",
"Static Library"
"LIB (Static Library)"
]
},
"$disableOutputTask": {
Expand Down
44 changes: 22 additions & 22 deletions lang/sdcc.verify.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,24 +154,24 @@
"pdk15"
],
"enumDescriptions": [
"Intel MCS51 family of processors. This is the default processor target. ",
"Dallas DS80C390 processor. ",
"Dallas DS80C400 processor. ",
"Freescale/Motorola HC08 (aka 68HC08) family of processors. ",
"Freescale/Motorola S08 (aka 68HCS08, HCS08, CS08) family of processors. ",
"Zilog Z80 family of processors. ",
"Zilog Z180 family of processors. ",
"Rabbit 2000 / Rabbit 3000 family of processors. ",
"Rabbit 3000A family of processors. ",
"LR35902 GameBoy Z80 processor. ",
"Toshiba TLCS-90 processor. ",
"Zilog eZ80 processor in Z80 mode. ",
"STMicroelectronics STM8 family of processors. ",
"Microchip PIC 14-bit processors (p16f84 and variants. In development, not complete).",
"Microchip PIC 16-bit processors (p18f452 and variants. In development, not complete).",
"Padauk processors with 13 bit wide program memory.",
"Padauk processors with 14 bit wide program memory.",
"Padauk processors with 15 bit wide program memory."
"MCS51",
"DS80C390",
"DS80C400",
"HC08 (aka 68HC08)",
"S08 (aka 68HCS08, HCS08, CS08)",
"Z80",
"Z180",
"Rabbit 2000/3000",
"Rabbit 3000A",
"GameBoy Z80",
"TLCS-90",
"eZ80_Z80",
"STM8",
"PIC 14",
"PIC 16",
"Padauk 13",
"Padauk 14",
"Padauk 15"
]
},
"optimize-type": {
Expand Down Expand Up @@ -365,10 +365,10 @@
"lib"
],
"enumDescriptions": [
"Intel HEX File",
"Motorola S19 File",
"ELF File (Only for STM8/HC08/S08)",
"Static Library"
"HEX",
"S19",
"ELF (Only for STM8/HC08/S08)",
"LIB (Static Library)"
]
},
"$disableOutputTask": {
Expand Down
2 changes: 1 addition & 1 deletion lang/stm8.gnu-sdcc.verify.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@
],
"enumDescriptions": [
"ELF (Executable Linkable Format)",
"Static Library"
"LIB (Static Library)"
]
},
"$disableOutputTask": {
Expand Down
14 changes: 7 additions & 7 deletions lang/stm8.iar.verify.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,20 +128,20 @@
"description.zh-cn": "全局选项",
"type": "object",
"properties": {
"data-mode": {
"description": "data mode",
"code-mode": {
"description": "code mode",
"type": "string",
"default": "medium",
"default": "small",
"enum": [
"small",
"medium",
"large"
]
},
"code-mode": {
"description": "code mode",
"data-mode": {
"description": "data mode",
"type": "string",
"default": "small",
"default": "medium",
"enum": [
"small",
"medium",
Expand Down Expand Up @@ -455,7 +455,7 @@
],
"enumDescriptions": [
"ELF (Executable Linkable Format)",
"Static Library"
"LIB (Static Library)"
]
},
"$disableOutputTask": {
Expand Down
8 changes: 6 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"homepage": "https://github.com/github0null/eide/blob/master/README.md",
"license": "MIT",
"description": "A mcu development environment for 8051/AVR/STM8/Cortex-M/RISC-V",
"version": "3.7.0",
"version": "3.7.1",
"preview": false,
"engines": {
"vscode": "^1.63.0"
Expand Down Expand Up @@ -1213,6 +1213,10 @@
"group": "inline",
"when": "viewItem == SOLUTION && view == Project"
},
{
"command": "eide.project.flash.erase.all",
"when": "view == Project && viewItem == UPLOAD_OPTION"
},
{
"command": "_cl.eide.project.close",
"when": "viewItem == SOLUTION && view == Project"
Expand Down Expand Up @@ -1277,7 +1281,7 @@
{
"command": "_cl.eide.project.switchUploader",
"group": "inline",
"when": "viewItem == UPLOAD_OPTION_C51 || viewItem == UPLOAD_OPTION"
"when": "view == Project && viewItem == UPLOAD_OPTION"
},
{
"command": "_cl.eide.project.modifyCompileConfig",
Expand Down
4 changes: 2 additions & 2 deletions src/CodeBuilder.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,8 @@ export abstract class CodeBuilder {
}
};

const builderLog = File.fromArray([this.project.getEideDir().path, 'log', 'unify_builder.log']);
const outDir = this.project.ToAbsolutePath(this.project.getOutputDir());
const builderLog = File.fromArray([outDir, 'unify_builder.log']);
if (!builderLog.IsFile()) builderLog.Write('');
if (this.logWatcher) { this.logWatcher.Close(); delete this.logWatcher; };

Expand Down Expand Up @@ -370,7 +371,6 @@ export abstract class CodeBuilder {
const settingManager = SettingManager.GetInstance();
const toolchain = this.project.getToolchain();

const dumpDir = this.project.getLogDir().path;
const outDir = File.ToUnixPath(this.project.getOutputDir());
const paramsPath = this.project.ToAbsolutePath(outDir + File.sep + this.paramsFileName);
const compileOptions: ICompileOptions = this.project.GetConfiguration()
Expand Down
8 changes: 4 additions & 4 deletions src/DebugConfigGenerator.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ class CortexDebugConfigProvider extends IDebugConfigProvider {
servertype: 'jlink',
interface: 'swd',
executable: 'undefined',
runToMain: true,
runToEntryPoint: "main",
device: '<MCU-NAME>'
},
{
Expand All @@ -229,7 +229,7 @@ class CortexDebugConfigProvider extends IDebugConfigProvider {
name: `stlink`,
servertype: 'openocd',
executable: 'undefined',
runToMain: true,
runToEntryPoint: "main",
configFiles: [
"interface/stlink.cfg",
"target/<target-name>.cfg"
Expand All @@ -242,7 +242,7 @@ class CortexDebugConfigProvider extends IDebugConfigProvider {
name: `openocd`,
servertype: 'openocd',
executable: 'undefined',
runToMain: true,
runToEntryPoint: "main",
configFiles: [
"interface/<debugger-type>.cfg",
"target/<target-name>.cfg"
Expand All @@ -255,7 +255,7 @@ class CortexDebugConfigProvider extends IDebugConfigProvider {
name: `pyocd`,
servertype: 'pyocd',
executable: 'undefined',
runToMain: true,
runToEntryPoint: "main",
targetId: '<MCU-NAME>',
cmsisPack: '<CMSIS-Pack-Path>'
}
Expand Down
26 changes: 24 additions & 2 deletions src/EIDEProject.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2384,7 +2384,7 @@ class EIDEProject extends AbstractProject {
const settings = workspaceConfig.config.settings;
const toolchain = this.getToolchain();

// --- settings field
// --- vscode settings

if (settings['files.autoGuessEncoding'] === undefined) {
settings['files.autoGuessEncoding'] = true;
Expand Down Expand Up @@ -2441,7 +2441,7 @@ class EIDEProject extends AbstractProject {
};
}

// --- tasks field
// --- vscode tasks

// append default task for new project
try {
Expand Down Expand Up @@ -2537,6 +2537,28 @@ class EIDEProject extends AbstractProject {
workspaceConfig.config.extensions.recommendations = recommendExt;
}

// default .gitignore
{
const ignCont = [
'# vscode files',
'.vscode/launch.json',
'.eide/log',
'',
'# project out',
`build`,
'',
'# eide template',
'*.ept',
'*.eide-template',
''
];

const ignFile = File.fromArray([this.GetRootDir().path, '.gitignore']);
if (!ignFile.IsFile()) {
ignFile.Write(ignCont.join(os.EOL));
}
}

workspaceConfig.forceSave();
}

Expand Down
10 changes: 10 additions & 0 deletions src/StringTable.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -603,6 +603,16 @@ export const txt_install_now = [
'Install Now'
][langIndex];

export const txt_yes = [
'是',
'Yes'
][langIndex];

export const txt_no = [
'否',
'No'
][langIndex];

//---------------Operation---------------

export const view_str$operation$done = [
Expand Down
Loading

0 comments on commit de61ecb

Please sign in to comment.