Merge pull request #468 from github0null/dev

v3.25.1 revision

Author: github0null

CHANGELOG.md

@@ -6,6 +6,15 @@ All notable version changes will be recorded in this file.
 
 ***
 
+### [v3.25.1] revision
+
+**Improve**:
+  - `Import Project`: Improve project parser when import an eclipse project.
+  - `Debug`: One-click to start debugging. NOT NEED ANY `launch.json`. [See Here](https://em-ide.com/docs/advance/debug_project)
+  - `Toolchain Options`: New option `use-newlib-nano`, `not-use-syscalls` for `arm-none-eabi-gcc` toolchain.
+
+***
+
 ### [v3.25.0] update
 
 **New**:

lang/arm.gcc.verify.json

@@ -144,6 +144,14 @@
                         "dwarf-3"
                     ]
                 },
+                "use-newlib-nano": {
+                    "markdownDescription": "Use newlib-nano (--specs=nano.specs)",
+                    "type": "boolean"
+                },
+                "not-use-syscalls": {
+                    "markdownDescription": "Do not use syscalls (--specs=nosys.specs)",
+                    "type": "boolean"
+                },
                 "misc-control": {
                     "markdownDescription": "Other Global Options",
                     "description.zh-cn": "编译器附加选项（全局）",

package.json

@@ -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.25.0",
+    "version": "3.25.1",
     "preview": false,
     "engines": {
         "vscode": "^1.67.0"
@@ -114,6 +114,12 @@
         "yaml": "^1.10.2"
     },
     "contributes": {
+        "debuggers": [
+            {
+                "type": "eide.cortex-debug",
+                "label": "EIDE (Cortex-Debug)"
+            }
+        ],
         "terminal": {
             "profiles": [
                 {
@@ -541,6 +547,20 @@
             }
         ],
         "commands": [
+            {
+                "command": "eide.debug.start",
+                "category": "eide",
+                "title": "%eide.project.debug.start%",
+                "icon": {
+                    "dark": "./res/icon/Run_16x.svg",
+                    "light": "./res/icon/Run_16x.svg"
+                }
+            },
+            {
+                "command": "eide.refresh.external_tools_index",
+                "category": "eide",
+                "title": "Refresh External Tools Index"
+            },
             {
                 "command": "eide.open.makelibs.cfg",
                 "category": "eide",
@@ -1217,17 +1237,22 @@
                 {
                     "when": "cl.eide.projectActived && config.EIDE.Option.ShowToolbarInEditerTitle",
                     "command": "eide.project.build",
-                    "group": "navigation"
+                    "group": "navigation@1"
                 },
                 {
                     "when": "cl.eide.projectActived && config.EIDE.Option.ShowToolbarInEditerTitle",
-                    "command": "eide.project.clean",
-                    "group": "navigation"
+                    "command": "eide.project.uploadToDevice",
+                    "group": "navigation@2"
                 },
                 {
                     "when": "cl.eide.projectActived && config.EIDE.Option.ShowToolbarInEditerTitle",
-                    "command": "eide.project.uploadToDevice",
-                    "group": "navigation"
+                    "command": "eide.debug.start",
+                    "group": "navigation@3"
+                },
+                {
+                    "when": "cl.eide.projectActived && config.EIDE.Option.ShowToolbarInEditerTitle",
+                    "command": "eide.project.clean",
+                    "group": "navigation@4"
                 }
             ],
             "editor/context": [
@@ -1291,10 +1316,15 @@
                     "when": "viewItem == SOLUTION && view == cl.eide.view.projects"
                 },
                 {
-                    "command": "eide.project.clean",
+                    "command": "eide.debug.start",
                     "group": "inline@4",
                     "when": "viewItem == SOLUTION && view == cl.eide.view.projects"
                 },
+                {
+                    "command": "eide.project.clean",
+                    "group": "inline@5",
+                    "when": "viewItem == SOLUTION && view == cl.eide.view.projects"
+                },
                 {
                     "command": "_cl.eide.project.setActive",
                     "when": "viewItem == SOLUTION && view == cl.eide.view.projects && cl.eide.enable.active",
@@ -1315,6 +1345,11 @@
                     "when": "viewItem == SOLUTION && view == cl.eide.view.projects",
                     "group": "2_build@2"
                 },
+                {
+                    "command": "eide.debug.start",
+                    "when": "viewItem == SOLUTION && view == cl.eide.view.projects",
+                    "group": "2_build@3"
+                },
                 {
                     "command": "eide.project.uploadToDevice",
                     "when": "viewItem == SOLUTION && view == cl.eide.view.projects",

package.nls.json

@@ -32,6 +32,7 @@
     "eide.project.modify.files.options": "Show Extra Options Of All Source Files",
     "eide.project.import.ext.project.src.struct": "Import SourceFile Tree From Other Project",
     "eide.project.generate_builder_params": "Generate builder.params",
+    "eide.project.debug.start": "Start Debugging (Cortex-Debug)",
 
     "eide.prj.menus.main.static-check": "Static Check",
     "eide.prj.menus.sub.static-check.cppcheck": "Run Cppcheck",

package.nls.zh-CN.json

@@ -32,6 +32,7 @@
     "eide.project.modify.files.options": "查看所有源文件的附加编译参数",
     "eide.project.import.ext.project.src.struct": "从其他 IDE 的项目中导入源文件树",
     "eide.project.generate_builder_params": "生成 builder.params",
+    "eide.project.debug.start": "启动调试(Cortex-Debug)",
 
     "eide.prj.menus.main.static-check": "静态检查",
     "eide.prj.menus.sub.static-check.cppcheck": "执行 Cppcheck",

res/data/builtin_headers/lint_sdcc.h

@@ -22,7 +22,6 @@
 #define __interrupt(x)
 #define __using(x)
 #define __at(x)
-#define __asm__(x)
 #define __naked
 
 // for pic

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

@@ -299,6 +299,32 @@
                 "cpp"
             ]
         },
+        "use-newlib-nano": {
+            "type": "selectable",
+            "command": {
+                "true": "--specs=nano.specs",
+                "false": ""
+            },
+            "group": [
+                "c",
+                "cpp",
+                "asm",
+                "linker"
+            ]
+        },
+        "not-use-syscalls": {
+            "type": "selectable",
+            "command": {
+                "true": "--specs=nosys.specs",
+                "false": ""
+            },
+            "group": [
+                "c",
+                "cpp",
+                "asm",
+                "linker"
+            ]
+        },
         "misc-control": {
             "type": "list",
             "command": "",