Merge pull request #81 from github0null/dev

v2.15.3 revision

Author: github0null

.gitignore

@@ -1,7 +1,7 @@
 /node_modules
 /out
 /out.min
-src/Telemetry/TelemetryTask.ts
+src/Telemetry/
 vsc-extension-quickstart.md
 *.vsix
 .EIDE

.vscodeignore

@@ -1,3 +1,4 @@
+.git
 .vscode
 .vscode-test
 out

CHANGELOG.md

@@ -4,6 +4,30 @@
 
 ***
 
+### [v2.15.3] (revision)
+
+**New Features**:
+  - Support `SC000`, `SC300` chips for armcc/armclang
+
+**Bug Fixes**:
+  - **Source files** under project resources **root** are ignored.
+  - A warning appears when creating a project using a workspace template.
+
+**Changes**:
+  - English README are preferred.
+  - Use CustomConfigurationProvider provide Intellisence information for `C/C++`, no longer use `c_cpp_properties. Json`.
+  - Use unify `env.ini` file for each target in a project. Instead of creating a separate '\<taregt\>.env.ini' file for each target. (**so the old env configuration will be invalid**)
+  - In the `env.ini` file, the `"workspace.order"` variable will be **invalid**, please use the `"EIDE_BUILD_ORDER"` variable instead. [docs](https://docs.em-ide.com/#/zh-cn/multi_prj_workspace?id=%e6%9e%84%e5%bb%ba%e4%bc%98%e5%85%88%e7%ba%a7)
+
+**Optimized**:
+  - Better build output rendering for `keil_c51, iar_stm8` toolchain
+  - Provide more complete brows Info to C/C++ plug-in.
+  - Output a more detailed log to "unify_builder.log".
+  - In dark theme, some 'file' icon has low contrast.
+  - When using the Exclude file function, use filters to ignore files with invalid file suffixes.
+
+***
+
 ### [v2.15.2] (revision)
 - **修复：v2.15.1 更新增加了源文件路径变量支持，导致打开项目时加载速度过慢的问题**
 - 优化：当开启 VT100 终端颜色失败时，自动禁用编译输出的关键字高亮（可通过向 Builder.AdditionalCommandLine 设置添加 `-force-color` 强制开启高亮）

README.md

@@ -4,38 +4,66 @@
 
 ***
 
-## [English](./README_EN.md)
+## [中文](./README_ZH-CN.md)
 
-## 简述 📑
+## Summary 📑
 
-一款适用于 8051/STM8/Cortex-M/RISC-V 的单片机开发环境。
+An embedded development environment for `8051/STM8/Cortex-M[0/0+/3/4/7]/RISC-V` on VsCode. 
 
-在 vscode 上提供 **8051**, **STM8**, **Cortex-M**, **RISC-V** ... 项目的 开发, 编译, 烧录 等功能。
+Provide `8051/STM8/Cortex-M/RISC-V` project development, compilation, burning and other functions.
 
-**注意：**
- - **仅支持 Windows 平台，Win7 及以上**
+**Note:**
+ - **Support only Windows platform, Windows 7 SP1 and later**
 
 ![preview](https://docs.em-ide.com/preview.png)
 
 ***
 
-## 功能特性 🎉
+## Features 🎉
 
-* 支持开发 8051，STM8，Cortex-M，RISC-V 项目
-* 支持导入 KEIL 项目 (仅支持 KEIL 5 及以上版本)
-* 支持安装标准的 KEIL 芯片支持包 (仅用于 Cortex-M 项目)
-* 提供丰富的项目模板方便快速开始项目
-* 一键编译、快速编译，支持多种主流的编译工具 (armcc, gcc-arm-none-eabi, keil_c51, sdcc ...)
-* 一键烧录到芯片，支持多种主流的烧录器 (jlink, stlink, openocd, pyocd ...)
-* 内置的串口监视器，一键打开串口
-* 支持使用 Cppcheck 对项目进行静态检查
-* 自动生成默认调试配置，为调试器插件 Cortex-debug / STM8-debug 生成默认配置
-* 支持编写 js 脚本来导入任意的 IDE 项目源文件资源
-* 内置多种实用工具，`CMSIS Config Wizard UI`, `反汇编查看`，`程序资源视图` ...
+* Support development of 8051, STM8, Cortex-M\[0/0+/3/4/7], RISC-V projects
+* Support to import KEIL projects (KEIL 5 and later only)
+* Support for installing standard KEIL chip support packs (only for Cortex-M projects)
+* Provides rich project templates for quick start projects
+* One-click compilation, fast compilation, support a variety of mainstream compilation tools (support: armcc, gcc-arm-none-eabi, keil_c51, sdcc ...)
+* One key to burn chip, support a variety of mainstream burn device (support: jlink, stlink, openocd, pyocd ...)
+* Built-in serial port monitor, one click to open the serial port
+* Supports static checking of projects using Cppcheck
+* Automatically generates default debug configurations for debugger plug-in `cortex-debug/STM8-Debug`
+* Support for writing JS scripts to import arbitrary IDE project source file resources
+* Built in a variety of utilities, 'CMSIS Config Wizard UI', 'disassembly view', 'program resource view'...
 
 ***
 
-## 支持的编译器 🔨
+## Example
+
+- Create An RISC-V Project By Internal Template
+
+![](https://docs.em-ide.com/img/show/new_prj.gif)
+
+- Build Project
+
+![](https://docs.em-ide.com/img/show/build_prj.gif)
+
+- Flash Project (It failed because there was no connection to the development board, for demonstration purposes only)
+
+![](https://docs.em-ide.com/img/show/flash_prj.gif)
+
+- Show Source File Disassembly Code
+
+![](https://docs.em-ide.com/img/show/show_disasm.gif)
+
+- Static Check Project By Cppcheck
+
+![](https://docs.em-ide.com/img/show/cppcheck_prj.gif)
+
+- Program Resource View
+
+![](https://docs.em-ide.com/img/show/show_prj_res.gif)
+
+***
+
+## Toolchain Support 🔨
 
  ![8051](https://img.shields.io/badge/-8051_:-grey.svg) ![status](https://img.shields.io/badge/Keil_C51-✔-brightgreen.svg) ![status](https://img.shields.io/badge/SDCC-✔-brightgreen.svg)
 
@@ -47,32 +75,32 @@
 
 ***
 
-## 快速开始 🏃‍♀️
+## Quick Start 🏃‍♀️
 
-1. 安装上述的任意一款编译器
+1. Install any of the above compilers
 
-2. 打开扩展的 Operations 栏，设置编译器的安装路径
+2. Open the **Operations** bar of the extension to set the compiler installation path
 
-3. 点击 Operations 栏的 `新建` 或 `导入` 功能，开始你的项目
+3. Click on the `New` or `Import` function in the Operations bar to start your project
 
 ***
 
-## 使用文档 📖
+## Document 📖
 
-[文档地址: https://docs.em-ide.com](https://docs.em-ide.com)
+[https://docs.em-ide.com](https://docs.em-ide.com)
+
+> The English document is being translated
 
 ***
 
-## 更新日志 📌
+## ChangeLog 📌
 
 [ChangeLog](https://marketplace.visualstudio.com/items/CL.eide/changelog)
 
 ***
 
-## 遇到了问题 ? 😥
-
-反馈途径: 
+## Community 🌈
 
-- [论坛: https://discuss.em-ide.com](https://discuss.em-ide.com/)
+- [Forum https://discuss.em-ide.com](https://discuss.em-ide.com/)
 
-- [Github Issue](https://github.com/github0null/eide/issues)
+- [Github](https://github.com/github0null/eide/issues)

README_EN.md

@@ -0,0 +1,76 @@
+# Embedded IDE
+
+[![](https://vsmarketplacebadge.apphb.com/version/cl.eide.svg)](https://marketplace.visualstudio.com/items?itemName=CL.eide) [![](https://vsmarketplacebadge.apphb.com/installs/cl.eide.svg)](https://marketplace.visualstudio.com/items?itemName=CL.eide) [![](https://vsmarketplacebadge.apphb.com/downloads/cl.eide.svg)](https://marketplace.visualstudio.com/items?itemName=CL.eide) [![](https://vsmarketplacebadge.apphb.com/rating/cl.eide.svg)](https://marketplace.visualstudio.com/items?itemName=CL.eide)
+
+***
+
+## 简述 📑
+
+一款适用于 8051/STM8/Cortex-M/RISC-V 的单片机开发环境。
+
+在 vscode 上提供 **8051**, **STM8**, **Cortex-M**, **RISC-V** ... 项目的 开发, 编译, 烧录 等功能。
+
+**注意：**
+ - **仅支持 Windows 平台，Win7 及以上**
+
+![preview](https://docs.em-ide.com/preview.png)
+
+***
+
+## 功能特性 🎉
+
+* 支持开发 8051，STM8，Cortex-M，RISC-V 项目
+* 支持导入 KEIL 项目 (仅支持 KEIL 5 及以上版本)
+* 支持安装标准的 KEIL 芯片支持包 (仅用于 Cortex-M 项目)
+* 提供丰富的项目模板方便快速开始项目
+* 一键编译、快速编译，支持多种主流的编译工具 (armcc, gcc-arm-none-eabi, keil_c51, sdcc ...)
+* 一键烧录到芯片，支持多种主流的烧录器 (jlink, stlink, openocd, pyocd ...)
+* 内置的串口监视器，一键打开串口
+* 支持使用 Cppcheck 对项目进行静态检查
+* 自动生成默认调试配置，为调试器插件 Cortex-debug / STM8-debug 生成默认配置
+* 支持编写 js 脚本来导入任意的 IDE 项目源文件资源
+* 内置多种实用工具，`CMSIS Config Wizard UI`, `反汇编查看`，`程序资源视图` ...
+
+***
+
+## 支持的编译器 🔨
+ 
+ ![8051](https://img.shields.io/badge/-8051_:-grey.svg) ![status](https://img.shields.io/badge/Keil_C51-✔-brightgreen.svg) ![status](https://img.shields.io/badge/SDCC-✔-brightgreen.svg)
+ 
+ ![STM8](https://img.shields.io/badge/-STM8_:-grey.svg) ![status](https://img.shields.io/badge/IAR_STM8-✔-brightgreen.svg) ![status](https://img.shields.io/badge/SDCC-✔-brightgreen.svg)
+ 
+ ![ARM](https://img.shields.io/badge/-ARM_:-grey.svg) ![status](https://img.shields.io/badge/ARMCC-✔-brightgreen.svg) ![status](https://img.shields.io/badge/ARMCLang-✔-brightgreen.svg) ![status](https://img.shields.io/badge/ARM_GCC-✔-brightgreen.svg)
+
+ ![RISC-V](https://img.shields.io/badge/-RISCV_:-grey.svg) ![status](https://img.shields.io/badge/RISCV_GCC-✔-brightgreen.svg)
+
+***
+
+## 快速开始 🏃‍♀️
+
+1. 安装上述的任意一款编译器
+
+2. 打开扩展的 Operations 栏，设置编译器的安装路径
+
+3. 点击 Operations 栏的 `新建` 或 `导入` 功能，开始你的项目
+
+***
+
+## 使用文档 📖
+
+[文档地址: https://docs.em-ide.com](https://docs.em-ide.com)
+
+***
+
+## 更新日志 📌
+
+[ChangeLog](https://marketplace.visualstudio.com/items/CL.eide/changelog)
+
+***
+
+## 遇到了问题 ? 😥
+
+反馈途径: 
+
+- [论坛: https://discuss.em-ide.com](https://discuss.em-ide.com/)
+
+- [Github Issue](https://github.com/github0null/eide/issues)

README_ZH-CN.md

@@ -27,7 +27,7 @@
     "homepage": "https://github.com/github0null/eide/blob/master/README.md",
     "license": "MIT",
     "description": "An embedded development environment for 8051/STM8/Cortex-M/RISC-V",
-    "version": "2.15.2",
+    "version": "2.15.3",
     "engines": {
         "vscode": "^1.60.0"
     },
@@ -144,6 +144,12 @@
             {
                 "title": "Embedded IDE",
                 "properties": {
+                    "EIDE.Option.EnableTelemetry": {
+                        "type": "boolean",
+                        "scope": "resource",
+                        "markdownDescription": "%settings.enable.telemetry%",
+                        "default": true
+                    },
                     "EIDE.Option.ShowOutputFilesInExplorer": {
                         "type": "boolean",
                         "scope": "resource",
@@ -1084,7 +1090,7 @@
                 },
                 {
                     "command": "_cl.eide.project.source.modify.path",
-                    "when": "viewItem == V_FOLDER || viewItem == V_FOLDER_ROOT || viewItem == V_FILE_ITEM || viewItem == V_EXCFILE_ITEM && view == Project"
+                    "when": "viewItem == PROJECT || viewItem == V_FOLDER || viewItem == V_FOLDER_ROOT || viewItem == V_FILE_ITEM || viewItem == V_EXCFILE_ITEM && view == Project"
                 },
                 {
                     "command": "_cl.eide.project.addPackage",

lib/node-utility

@@ -26,7 +26,7 @@
     "eide.project.upload": "Upload Program To Device",
     "eide.project.flash.erase.all": "Erase Chip",
     "eide.project.gen.makefile": "Generate Makefile Template",
-    "eide.project.modify.files.options": "Append separate compiler options to the file",
+    "eide.project.modify.files.options": "Append separate compiler params for source files",
     "eide.project.import.ext.project.src.struct": "Import source file resources from other IDE's project",
 
     "eide.prj.menus.main.cppcheck": "Static Check",
@@ -84,6 +84,8 @@
     "eide.deps.macro.show": "Display All Macros",
     "eide.deps.macro.add": "Add Macro",
 
+    "settings.enable.telemetry": "Enable telemetry for extension. We will collect information from the logs to help improve the functionality of this extension.",
+
     "settings.builder.jobs": "The number of threads when build",
     "settings.builder.gen.makefile.params": "Generate the Makefile parameters file",
 

package.json

@@ -26,7 +26,7 @@
     "eide.project.upload": "烧录",
     "eide.project.flash.erase.all": "擦除芯片",
     "eide.project.gen.makefile": "生成 Makefile 模板",
-    "eide.project.modify.files.options": "为文件附加单独的编译选项",
+    "eide.project.modify.files.options": "为源文件附加单独的编译参数",
     "eide.project.import.ext.project.src.struct": "从其他 IDE 的项目中导入源文件资源",
 
     "eide.workspace.build": "构建所有项目",
@@ -77,6 +77,8 @@
     "eide.deps.macro.show": "显示所有宏定义",
     "eide.deps.macro.add": "添加宏定义",
 
+    "settings.enable.telemetry": "启用遥测功能。我们将收集日志中的信息，帮助改进该扩展的功能",
+
     "settings.builder.jobs": "构建时使用的线程数",
     "settings.builder.gen.makefile.params": "生成 Makefile 参数文件",