v3.26.0 update

.gitignore

@@ -8,6 +8,7 @@ vsc-extension-quickstart.md
 ./lib
 /dist
 /doc
+/note.md
 pack.js
 test.js
 *.js.map

CHANGELOG.md

@@ -6,6 +6,28 @@ All notable version changes will be recorded in this file.
 
 ***
 
+### [v3.26.0] update
+
+**Change**:
+  - `Project File`: Use yaml instead of json and update project data schema. Rename `eide.json` to `eide.yml`.
+
+**Fix**:
+  - `Target Switch`: Fix file's options was overrided when switch to other target.
+
+**Improve**:
+  - `Project Templates`: Add local cache for fetching remote templates repository.
+
+**Notice:** This version contains important changes. After the automatic migration is completed, you will no longer be able to open your project using the old version of the plugin.
+
+***
+
+### [v3.25.7] revision
+
+**Improve**:
+  - `Builder Options`: Support ARM/Thumb Mode select options. Fix [issues 475](https://github.com/github0null/eide/issues/475)
+
+***
+
 ### [v3.25.6] revision
 
 **Fix**:

lang/arm.gcc.verify.json

@@ -122,6 +122,27 @@
             "description.zh-cn": "全局选项",
             "type": "object",
             "properties": {
+                "arm-thumb-mode": {
+                    "readable_name": "ARM/Thumb Mode",
+                    "readable_name.zh-cn": "ARM/Thumb Mode",
+                    "markdownDescription": "Select between generating code that executes in ARM and Thumb states.",
+                    "type": "string",
+                    "default": "thumb",
+                    "enum": [
+                        "arm",
+                        "thumb"
+                    ],
+                    "enumDescriptions": [
+                        "ARM Mode",
+                        "Thumb Mode"
+                    ]
+                },
+                "arm-thumb-interwork": {
+                    "readable_name": "Thumb Interwork",
+                    "readable_name.zh-cn": "Thumb Interwork",
+                    "markdownDescription": "Generate code that supports calling between the ARM and Thumb instruction sets.",
+                    "type": "boolean"
+                },
                 "$float-abi-type": {
                     "markdownDescription": "Hardware floating-point ABI",
                     "description.zh-cn": "硬件浮点 ABI",

lang/arm.iar.verify.json

@@ -122,6 +122,21 @@
             "description.zh-cn": "全局选项",
             "type": "object",
             "properties": {
+                "arm-thumb-mode": {
+                    "readable_name": "ARM/Thumb Mode",
+                    "readable_name.zh-cn": "ARM/Thumb Mode",
+                    "markdownDescription": "Select between generating code that executes in ARM and Thumb states.",
+                    "type": "string",
+                    "default": "thumb",
+                    "enum": [
+                        "arm",
+                        "thumb"
+                    ],
+                    "enumDescriptions": [
+                        "ARM Mode",
+                        "Thumb Mode"
+                    ]
+                },
                 "endian-mode": {
                     "description": "Endian Mode",
                     "type": "string",

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.6",
+    "version": "3.26.0",
     "preview": false,
     "engines": {
         "vscode": "^1.67.0"
@@ -54,9 +54,6 @@
     },
     "qna": "https://discuss.em-ide.com/t/FAQ",
     "activationEvents": [
-        "workspaceContains:.eide/eide.json",
-        "workspaceContains:.eide/EIDE.json",
-        "workspaceContains:.EIDE/EIDE.json",
         "onStartupFinished"
     ],
     "icon": "res/icon/icon.png",
@@ -111,7 +108,7 @@
         "x2js": "^3.4.1",
         "xml-formatter": "^2.6.1",
         "xml2js": "^0.6.2",
-        "yaml": "^1.10.2"
+        "yaml": "2.8.1"
     },
     "contributes": {
         "terminal": {

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

@@ -32,6 +32,35 @@
                 "linker"
             ]
         },
+        "arm-thumb-interwork": {
+            "type": "selectable",
+            "command": {
+                "true": "-mthumb-interwork",
+                "false": ""
+            },
+            "group": [
+                "c",
+                "cpp",
+                "asm",
+                "linker"
+            ],
+            "location": "first"
+        },
+        "arm-thumb-mode": {
+            "type": "selectable",
+            "command": {
+                "arm"  : "-marm",
+                "thumb": "-mthumb",
+                "false": "-mthumb"
+            },
+            "group": [
+                "c",
+                "cpp",
+                "asm",
+                "linker"
+            ],
+            "location": "first"
+        },
         "microcontroller-float": {
             "type": "selectable",
             "command": {
@@ -381,8 +410,7 @@
             "$output": "-o ${out} -MMD ${in}",
             "$default": [
                 "-c",
-                "-xc",
-                "-mthumb"
+                "-xc"
             ],
             "$language-c": {
                 "type": "value",
@@ -433,8 +461,7 @@
             },
             "$output": "-o ${out} -MMD ${in}",
             "$default": [
-                "-c",
-                "-mthumb"
+                "-c"
             ],
             "$language-cpp": {
                 "type": "value",
@@ -482,8 +509,7 @@
             },
             "$default": [
                 "-c",
-                "-x assembler-with-cpp",
-                "-mthumb"
+                "-x assembler-with-cpp"
             ],
             "defines": {
                 "type": "list",
@@ -500,9 +526,7 @@
                 "useFile": true,
                 "body": "@${value}"
             },
-            "$default": [
-                "-mthumb"
-            ],
+            "$default": [],
             "$output": "-o ${out} ${in} ${lib_flags}",
             "$outputSuffix": ".elf",
             "$linkMap": {

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

@@ -33,6 +33,20 @@
             ],
             "location": "first"
         },
+        "arm-thumb-mode": {
+            "type": "selectable",
+            "command": {
+                "arm"  : "--arm",
+                "thumb": "--thumb",
+                "false": "--thumb"
+            },
+            "group": [
+                "c",
+                "cpp",
+                "asm"
+            ],
+            "location": "first"
+        },
         "microcontroller-cpu": {
             "type": "keyValue",
             "command": "",
@@ -169,7 +183,6 @@
             },
             "$output": "--dependencies=m + -o ${out} ${in}",
             "$default": [
-                "--thumb",
                 "--silent"
             ],
             "$listPath": {
@@ -271,7 +284,6 @@
             },
             "$output": "--dependencies=m + -o ${out} ${in}",
             "$default": [
-                "--thumb",
                 "--silent"
             ],
             "$listPath": {
@@ -365,7 +377,6 @@
             "$output": "-o ${out} ${in}",
             "$default": [
 				"-S",
-                "--thumb",
                 "-w+"
             ],
             "$listPath": {