Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: espressif/vscode-esp-idf-extension
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5671403e0cea0545d33df1d65c41928e36c3f708
Choose a base ref
..
head repository: espressif/vscode-esp-idf-extension
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ad7a1077aeec238eefef852a52cf5118a8689a9f
Choose a head ref
Showing with 2,312 additions and 4,157 deletions.
  1. +0 −2 .gitignore
  2. +0 −1 .vscodeignore
  3. +2 −2 README.md
  4. +21 −0 clean.js
  5. +2 −2 docs/FEATURES.md
  6. +4 −15 docs/LANG_CONTRIBUTE.md
  7. +1 −1 docs/MANUAL_TESTING.md
  8. +1 −1 docs/POSTMORTEM.md
  9. +1 −1 docs/tutorial/basic_use.md
  10. +1 −1 docs/tutorial/code_coverage.md
  11. +0 −119 gulpfile.js
  12. +0 −3 i18n/en/out/build/buildCmd.i18n.json
  13. +0 −11 i18n/en/out/espIdf/menuconfig/MenuconfigPanel.i18n.json
  14. +0 −3 i18n/en/out/espIdf/monitor/command.i18n.json
  15. +0 −6 i18n/en/out/espIdf/serial/serialPort.i18n.json
  16. +0 −8 i18n/en/out/espIdf/size/idfSize.i18n.json
  17. +0 −23 i18n/en/out/extension.i18n.json
  18. +0 −3 i18n/en/out/flash/flashCmd.i18n.json
  19. +0 −3 i18n/en/out/idfComponentsDataProvider.i18n.json
  20. +0 −3 i18n/en/out/idfConfiguration.i18n.json
  21. +0 −4 i18n/en/out/utils.i18n.json
  22. +0 −165 i18n/en/package.i18n.json
  23. +0 −5 i18n/en/views/menuconfig.i18n.json
  24. +0 −3 i18n/es/out/build/buildCmd.i18n.json
  25. +0 −11 i18n/es/out/espIdf/menuconfig/MenuconfigPanel.i18n.json
  26. +0 −3 i18n/es/out/espIdf/monitor/command.i18n.json
  27. +0 −6 i18n/es/out/espIdf/serial/serialPort.i18n.json
  28. +0 −8 i18n/es/out/espIdf/size/idfSize.i18n.json
  29. +0 −23 i18n/es/out/extension.i18n.json
  30. +0 −3 i18n/es/out/flash/flashCmd.i18n.json
  31. +0 −3 i18n/es/out/idfComponentsDataProvider.i18n.json
  32. +0 −3 i18n/es/out/idfConfiguration.i18n.json
  33. +0 −4 i18n/es/out/utils.i18n.json
  34. +0 −165 i18n/es/package.i18n.json
  35. +0 −5 i18n/es/views/menuconfig.i18n.json
  36. +0 −3 i18n/ru/out/build/buildCmd.i18n.json
  37. +0 −11 i18n/ru/out/espIdf/menuconfig/MenuconfigPanel.i18n.json
  38. +0 −3 i18n/ru/out/espIdf/monitor/command.i18n.json
  39. +0 −6 i18n/ru/out/espIdf/serial/serialPort.i18n.json
  40. +0 −8 i18n/ru/out/espIdf/size/idfSize.i18n.json
  41. +0 −23 i18n/ru/out/extension.i18n.json
  42. +0 −3 i18n/ru/out/flash/flashCmd.i18n.json
  43. +0 −3 i18n/ru/out/idfComponentsDataProvider.i18n.json
  44. +0 −3 i18n/ru/out/idfConfiguration.i18n.json
  45. +0 −4 i18n/ru/out/utils.i18n.json
  46. +0 −165 i18n/ru/package.i18n.json
  47. +0 −5 i18n/ru/views/menuconfig.i18n.json
  48. +0 −3 i18n/zh-CN/out/build/buildCmd.i18n.json
  49. +0 −11 i18n/zh-CN/out/espIdf/menuconfig/MenuconfigPanel.i18n.json
  50. +0 −3 i18n/zh-CN/out/espIdf/monitor/command.i18n.json
  51. +0 −6 i18n/zh-CN/out/espIdf/serial/serialPort.i18n.json
  52. +0 −8 i18n/zh-CN/out/espIdf/size/idfSize.i18n.json
  53. +0 −23 i18n/zh-CN/out/extension.i18n.json
  54. +0 −3 i18n/zh-CN/out/flash/flashCmd.i18n.json
  55. +0 −3 i18n/zh-CN/out/idfComponentsDataProvider.i18n.json
  56. +0 −3 i18n/zh-CN/out/idfConfiguration.i18n.json
  57. +0 −4 i18n/zh-CN/out/utils.i18n.json
  58. +0 −165 i18n/zh-CN/package.i18n.json
  59. +0 −5 i18n/zh-CN/views/menuconfig.i18n.json
  60. +170 −0 l10n/bundle.l10n.es.json
  61. +170 −0 l10n/bundle.l10n.pt.json
  62. +170 −0 l10n/bundle.l10n.ru.json
  63. +170 −0 l10n/bundle.l10n.zh-CN.json
  64. +24 −26 package.json
  65. +182 −0 package.nls.es.json
  66. +144 −127 package.nls.json
  67. +182 −0 package.nls.pt.json
  68. +182 −0 package.nls.ru.json
  69. +182 −0 package.nls.zh-CN.json
  70. +0 −244 schema.i18n.json
  71. +1 −7 src/build/buildCmd.ts
  72. +39 −30 src/component-manager/utils.ts
  73. +16 −26 src/espIdf/menuconfig/MenuconfigPanel.ts
  74. +3 −6 src/espIdf/menuconfig/kconfigMenuLoader.ts
  75. +3 −9 src/espIdf/monitor/command.ts
  76. +3 −15 src/espIdf/serial/serialPort.ts
  77. +9 −28 src/espIdf/size/idfSize.ts
  78. +3 −9 src/examples/ExamplesPanel.ts
  79. +296 −207 src/extension.ts
  80. +15 −30 src/flash/flashCmd.ts
  81. +1 −6 src/idfComponentsDataProvider.ts
  82. +1 −7 src/idfConfiguration.ts
  83. +0 −112 src/localizationDictionary.ts
  84. +4 −8 src/newProject/newProjectPanel.ts
  85. +2 −5 src/project-conf/projectConfPanel.ts
  86. +2 −7 src/setup/SetupPanel.ts
  87. +2 −10 src/utils.ts
  88. +2 −7 src/welcome/panel.ts
  89. +0 −6 webpack.config.js
  90. +301 −2,132 yarn.lock
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -6,8 +6,6 @@ node_modules
.cache
.vscode-test/
*.vsix
!i18n/*/out
package.nls.*.json
testFiles/blink
!testFiles/dist
testFiles/tools
1 change: 0 additions & 1 deletion .vscodeignore
Original file line number Diff line number Diff line change
@@ -15,7 +15,6 @@ ci
esp/**
esp_idf_docs_index_lang_*.json
esp_idf_vsc_ext.log
gulpfile.js
media/screenshots
media/tutorials
node_modules
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -87,7 +87,7 @@ Install ESP-IDF and ESP-IDF Tools by following the [install tutorial](./docs/tut
- When you are ready, build your project by pressing <kbd>F1</kbd> and typing **ESP-IDF: Build your Project**.
- Flash to your device by pressing <kbd>F1</kbd> and typing **ESP-IDF: Select Flash Method and Flash** to select either UART or JTAG. You can also use the **ESP-IDF: Flash (UART) your Project** or **ESP-IDF: Flash (with JTag)** directly.
> **NOTE:** When using the **ESP-IDF: Select Flash Method and Flash** command, your choice will be saved in the `idf.flashType` configuration setting in the current workspace folder's settings.json.
- You can later start a monitor by pressing <kbd>F1</kbd> and typing **ESP-IDF: Monitor your Device** which will log the device activity in a Visual Studio Code terminal.
- You can later start a monitor by pressing <kbd>F1</kbd> and typing **ESP-IDF: Monitor Device** which will log the device activity in a Visual Studio Code terminal.
- To make sure you can debug your device, select the your board by pressing <kbd>F1</kbd> and typing **ESP-IDF: Select OpenOCD Board Configuration** or manually define the openOCD configuration files with `idf.openOcdConfigs` configuration in your settings.json.
- If you want to start a debug session, just press F5 (make sure you had at least build and flash once before so the debugger works correctly). Check the [Troubleshooting](./README.md#Troubleshooting) section if you have any issues.

@@ -135,7 +135,7 @@ Click <kbd>F1</kbd> to show Visual studio code actions, then type **ESP-IDF** to
| Launch IDF Monitor for CoreDump / GDB-Stub Mode | | |
| Launch QEMU Server | | |
| Launch QEMU Debug Session | | |
| Monitor your device | <kbd>⌘</kbd> <kbd>I</kbd> <kbd>M</kbd> | <kbd>Ctrl</kbd> <kbd>E</kbd> <kbd>M</kbd> |
| Monitor device | <kbd>⌘</kbd> <kbd>I</kbd> <kbd>M</kbd> | <kbd>Ctrl</kbd> <kbd>E</kbd> <kbd>M</kbd> |
| Monitor QEMU Device | | |
| New Project | <kbd>⌘</kbd> <kbd>I</kbd> <kbd>N</kbd> | <kbd>Ctrl</kbd> <kbd>E</kbd> <kbd>N</kbd> |
| Open ESP-IDF Terminal | <kbd>⌘</kbd> <kbd>I</kbd> <kbd>T</kbd> | <kbd>Ctrl</kbd> <kbd>E</kbd> <kbd>T</kbd> |
21 changes: 21 additions & 0 deletions clean.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
const del = require("del");

(async () => {
const pathsToDelete = [
"dist/**",
"out/**",
"*.vsix",
"report.json",
"report.txt",
"testing.results.log",
"esp_idf_vsc_ext.log",
"esp_idf_docs_*.json",
];

try {
await del(pathsToDelete);
console.log("Build files and directories cleaned successfully.");
} catch (error) {
console.error("Error while cleaning files:", error);
}
})();
4 changes: 2 additions & 2 deletions docs/FEATURES.md
Original file line number Diff line number Diff line change
@@ -73,9 +73,9 @@ You can follow [this](./HEAP_TRACING.md) quick step-by-step guide for Heap Traci

## Monitor

**ESP-IDF: Monitor your Device** is provided by this extension to start `idf.py monitor` terminal program in Visual Studio Code. Please take a look at the [IDF Monitor Documentation](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-guides/tools/idf-monitor.html?highlight=monitor).
**ESP-IDF: Monitor Device** is provided by this extension to start `idf.py monitor` terminal program in Visual Studio Code. Please take a look at the [IDF Monitor Documentation](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-guides/tools/idf-monitor.html?highlight=monitor).

In Visual Studio Code, for **ESP-IDF: Monitor your Device** we use the shell executable given in `vscode.env.shell` which is override by `terminal.integrated.shell.*` in your Visual Studio Code Settings when using the `Terminal: Select Default Shell` command to update the shell or updating `terminal.integrated.shell.windows` for Windows, `terminal.integrated.shell.osx` for MacOS and `terminal.integrated.shell.linux` for Linux in VSCode Settings Preference menu (F1 -> Preferences: Open Settings (JSON)).
In Visual Studio Code, for **ESP-IDF: Monitor Device** we use the shell executable given in `vscode.env.shell` which is override by `terminal.integrated.shell.*` in your Visual Studio Code Settings when using the `Terminal: Select Default Shell` command to update the shell or updating `terminal.integrated.shell.windows` for Windows, `terminal.integrated.shell.osx` for MacOS and `terminal.integrated.shell.linux` for Linux in VSCode Settings Preference menu (F1 -> Preferences: Open Settings (JSON)).

## OpenOCD Server

19 changes: 4 additions & 15 deletions docs/LANG_CONTRIBUTE.md
Original file line number Diff line number Diff line change
@@ -2,29 +2,18 @@

Make sure you install the source code version of this extension by following [Source Mode](./INSTALL.md#Build-from-Source-Code).

Inside i18n folder, create a sub-directory using the language code name as specified by [ISO 639-3](https://en.wikipedia.org/wiki/ISO_639-3) convention.
Inside `l10n` folder, create a `bundle.l10n.<lang>.json` file using the language code name as specified by [ISO 639-3](https://en.wikipedia.org/wiki/ISO_639-3) convention to replace `<lang>`.

For ease you could copy the `en` for English definitions. A language folder tree structure should look like:
In the root directory, also contribute a `package.nls.<lang>.json` for static language definitions such as command names and such.

```
<IS0 639-3 Language Code>/
+-- out/
+-- sub-directory/
+-- ...
+-- ...
+-- ...
+-- ...
+-- extension.i18n.json
+-- utils.i18n.json
+-- package.i18n.json
```
To generate the english definition, just run the `yarn genLocalizationBundle` command which will generate `l10n/bundle.l10n.json` english bundle file and copy the `package.nls.json`.

Each file has a key value structure such as:

```json
{
"espIdf.createFiles.title": "ESP-IDF: Create ESP-IDF Project from Extension Template",
"textID": "value"
"englishTextOrTextId": "translationInNewLanguage"
}
```

2 changes: 1 addition & 1 deletion docs/MANUAL_TESTING.md
Original file line number Diff line number Diff line change
@@ -108,7 +108,7 @@ _Steps:_

1. Press menu **View**, click on **Command Palette** and type **ESP-IDF: Select port to use** and select it.
2. Choose the serial port to connect and the workspace folder where to save the `idf.port` configuration setting.
3. Press menu **View**, click on **Command Palette** and type **ESP-IDF: Monitor your Device** and select it.
3. Press menu **View**, click on **Command Palette** and type **ESP-IDF: Monitor Device** and select it.
4. ESP-IDF Monitor should begin after.

_Expected Results:_
2 changes: 1 addition & 1 deletion docs/POSTMORTEM.md
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
The `ESP-IDF: Launch IDF Monitor for CoreDump / GDB-Stub Mode` command launches a ESP-IDF Monitor terminal listening for core-dump/gdbstub events on which will launch a debug session where you can send gdb commands to
the chip (without continue, pause or other debug steps).

> **NOTE:** The `ESP-IDF: Monitor your Device` command will not launch a debug session.
> **NOTE:** The `ESP-IDF: Monitor Device` command will not launch a debug session.
# Using Core Dump

2 changes: 1 addition & 1 deletion docs/tutorial/basic_use.md
Original file line number Diff line number Diff line change
@@ -59,7 +59,7 @@ The user will see a new terminal being launched with the flash output and a noti
<img src="../../media/tutorials/basic_use/flash.png" alt="Flashing" width="975">
</p>

10. Now to start monitoring your device, use the **ESP-IDF: Monitor your Device** command (<kbd>CTRL</kbd> <kbd>E</kbd> <kbd>M</kbd> keyboard shortcut). The user will see a new terminal being launched with the `idf.py monitor` output.
10. Now to start monitoring your device, use the **ESP-IDF: Monitor Device** command (<kbd>CTRL</kbd> <kbd>E</kbd> <kbd>M</kbd> keyboard shortcut). The user will see a new terminal being launched with the `idf.py monitor` output.

> **NOTE** The ESP-IDF Monitor baud rate value is taken from `idf.monitorBaudRate` with fallback on your project's SDKConfig `CONFIG_ESPTOOLPY_MONITOR_BAUD` (idf.py monitor' baud rate). This value can also be override by setting the environment variable `IDF_MONITOR_BAUD` or `MONITORBAUD` in your system environment variables or this extension's `idf.customExtraVars` configuration setting. Please review [ESP-IDF Settings](../SETTINGS.md)) to see how to modify `idf.customExtraVars`.
2 changes: 1 addition & 1 deletion docs/tutorial/code_coverage.md
Original file line number Diff line number Diff line change
@@ -36,7 +36,7 @@ The example will enable the following options by default:

> **NOTE:** For any project that you want to generate code coverage, you should enable these settings in your sdkconfig.
6. Now to build the project, flash your device and start the ESP-IDF Monitor you can use the **ESP-IDF: Build your Project**, **ESP-IDF: Flash your Project** and **ESP-IDF: Monitor your Device** commands as explained in the [Basic use tutorial](./basic_use.md). If everything is executed correctly, there will be a message in ESP-IDF Monitor saying `Ready to dump GCOV data...`
6. Now to build the project, flash your device and start the ESP-IDF Monitor you can use the **ESP-IDF: Build your Project**, **ESP-IDF: Flash your Project** and **ESP-IDF: Monitor Device** commands as explained in the [Basic use tutorial](./basic_use.md). If everything is executed correctly, there will be a message in ESP-IDF Monitor saying `Ready to dump GCOV data...`

> **NOTE:** There is also a **ESP-IDF: Build, Flash and Start a Monitor on your Device** command (<kbd>CTRL</kbd> <kbd>E</kbd> <kbd>D</kbd> keyboard shortcut).
119 changes: 0 additions & 119 deletions gulpfile.js

This file was deleted.

3 changes: 0 additions & 3 deletions i18n/en/out/build/buildCmd.i18n.json

This file was deleted.

11 changes: 0 additions & 11 deletions i18n/en/out/espIdf/menuconfig/MenuconfigPanel.i18n.json

This file was deleted.

3 changes: 0 additions & 3 deletions i18n/en/out/espIdf/monitor/command.i18n.json

This file was deleted.

6 changes: 0 additions & 6 deletions i18n/en/out/espIdf/serial/serialPort.i18n.json

This file was deleted.

8 changes: 0 additions & 8 deletions i18n/en/out/espIdf/size/idfSize.i18n.json

This file was deleted.

23 changes: 0 additions & 23 deletions i18n/en/out/extension.i18n.json

This file was deleted.

3 changes: 0 additions & 3 deletions i18n/en/out/flash/flashCmd.i18n.json

This file was deleted.

3 changes: 0 additions & 3 deletions i18n/en/out/idfComponentsDataProvider.i18n.json

This file was deleted.

3 changes: 0 additions & 3 deletions i18n/en/out/idfConfiguration.i18n.json

This file was deleted.

4 changes: 0 additions & 4 deletions i18n/en/out/utils.i18n.json

This file was deleted.

Loading