Skip to content

Commit

Permalink
Release/v1.0.1 (#348)
Browse files Browse the repository at this point in the history
* add changes 1.0.1

* add cmakelist editor fix
  • Loading branch information
brianignacio5 authored Mar 12, 2021
1 parent 6c6ab7d commit b5e9fcb
Show file tree
Hide file tree
Showing 8 changed files with 33 additions and 22 deletions.
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,21 @@

All notable changes to the "Espressif IDF" extension will be documented in this file.

## [1.0.1](https://github.com/espressif/vscode-esp-idf-extension/releases/tag/v1.0.1)

### Features and enhancements

- [Add remove CMakelists.txt elements](https://github.com/espressif/vscode-esp-idf-extension/pull/330)
- [Add ESP32-S3 and ESP32-C3 idf targets](https://github.com/espressif/vscode-esp-idf-extension/pull/338)
- [Add ESP-IDF validation for heap tracing and sdk configuration editor](https://github.com/espressif/vscode-esp-idf-extension/pull/347)
- [New Project Wizard](https://github.com/espressif/vscode-esp-idf-extension/pull/171)

### Bug Fixes

- [Fix WSL 1 Flashing](https://github.com/espressif/vscode-esp-idf-extension/pull/331)
- [Fix compiler in settings.json](https://github.com/espressif/vscode-esp-idf-extension/pull/334)
- [Fix relative links in tasks output](https://github.com/espressif/vscode-esp-idf-extension/pull/337)

## [1.0.0](https://github.com/espressif/vscode-esp-idf-extension/releases/tag/v1.0.0)

### Features and enhancements
Expand Down
4 changes: 2 additions & 2 deletions docs/COVERAGE.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Make sure you had properly configure xtensa toolchain in `idf.customExtraPaths`

## Editor Coverage

For the text editor highlighting, we use execute a child process with `gcovr -r . --gcov-executable xtensa-esp-elf-gcov --json`.
For the text editor highlighting, we use execute a child process with `gcovr -r . --gcov-executable {TOOLCHAIN_PREFIX}-gcov --json`.

> **NOTE:** This assumes you had configure your extension with Xtensa toolchain in `idf.customExtraPaths` and installed the `gcovr` from Debug adapter's python requirements.
Expand All @@ -25,7 +25,7 @@ You can customize highlight color using the extension settings. Visual Studio co

## HTML report

We execute a child process with command `gcovr -r . --gcov-executable xtensa-esp-elf-gcov --html` for the HTML report.
We execute a child process with command `gcovr -r . --gcov-executable {TOOLCHAIN_PREFIX}-gcov --html` for the HTML report.

> **NOTE:** This assumes you had configure your extension with Xtensa toolchain in `idf.customExtraPaths` and installed the `gcovr` from Debug adapter's python requirements.
Expand Down
2 changes: 1 addition & 1 deletion docs/FEATURES.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Click <kbd>F5</kbd> to start debugging. To configure the debug behaviour, please

On CMakeLists.txt file right click this extension provides a custom CMakeLists.txt Editor to fill an ESP-IDF Project and Component registration as specified in [ESP-IDF Project CMakeLists.txt](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-guides/build-system.html#project-cmakelists-file) and [ESP-IDF Component CMakeLists.txt files](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-guides/build-system.html#component-cmakelists-files). You need to choose which kind of CMakeLists.txt file (project or component) to edit. There is 2 types of input, one is a simple string and another is an array of strings, such as Component Sources (SRCS). All inputs are described in the CMakeLists.txt Schema (\${this_repository}/src/cmake/cmakeListsSchema.json).

> **NOTE** This editor doesn't support all CMake functions and syntaxes. This editor should only be used for simple CMakeLists.txt options such as component registration (using idf_component_register) and basic project elements. If you need more customization or advanced CMakeLists.txt, consider reviewing [ESP-IDF Build System]((https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-guides/build-system.html). Also review [CMakeLists.txt editor schema](../cmakeListsSchema.json) for a list of supported code.
> **NOTE** This editor doesn't support all CMake functions and syntaxes. This editor should only be used for simple CMakeLists.txt options such as component registration (using idf_component_register) and basic project elements. If you need more customization or advanced CMakeLists.txt, consider reviewing [ESP-IDF Build System](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-guides/build-system.html). Also review [CMakeLists.txt editor schema](../cmakeListsSchema.json) for a list of supported code.
## Flash

Expand Down
1 change: 1 addition & 0 deletions schema.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
"espIdf.configDevice.title",
"espIdf.menuconfig.start.title",
"espIdf.cmakeListsEditor.start.title",
"espIdf.disposeConfserverProcess.title",
"espIdf.newProject.start.title",
"espIdf.setDefaultConfig.title",
"espIdf.selectPort.title",
Expand Down
13 changes: 5 additions & 8 deletions src/cmake/cmakeListsBuilder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,13 @@ export function parseCmakeListsText(
if (resultStr && resultStr.length > 1 && resultStr[1].length > 1) {
let newElement: CmakeListsElement = JSON.parse(JSON.stringify(element));
newElement.value = [];
newElement.value =
element.type === "array"
? resultStr[1].trim().replace(/\"/g, "").split(" ")
: [resultStr[1].trim()];
switch (element.type) {
case "array":
newElement.value = resultStr[1]
.trim()
.replace(/\"/g, "")
.split(" ");
const listStr = resultStr[1].trim().replace(/\"/g, "");
if (listStr) {
newElement.value =
listStr && listStr === " " ? [listStr] : listStr.split(" ");
}
break;
case "binary_data":
if (resultStr[1]) {
Expand Down
2 changes: 1 addition & 1 deletion src/views/cmakelists-editor/CmakeListsEditor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
</div>
<div class="notification">
<CMakeElem
v-for="elem in elements"
v-for="(elem, i) in elements"
:key="elem.id"
:el="elem"
@delete="deleteElem(i)"
Expand Down
6 changes: 4 additions & 2 deletions src/views/cmakelists-editor/components/ArrayElement.vue
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,10 @@ export default class CMakeListsArrayElement extends Vue {
}
public addToArray() {
this.el.value.push(this.valueToPush);
this.valueToPush = "";
if (!!this.valueToPush) {
this.el.value.push(this.valueToPush);
this.valueToPush = "";
}
}
@Emit("delete")
Expand Down
12 changes: 4 additions & 8 deletions src/views/cmakelists-editor/components/CMakeListsElement.vue
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
<template>
<div>
<ArrayElement :el="el" v-if="el.type === 'array'" @delete="deleteElem(i)" />
<ArrayElement :el="el" v-if="el.type === 'array'" @delete="deleteElem" />
<BinaryDataElement
:el="el"
v-if="el.type === 'binary_data'"
@delete="deleteElem(i)"
/>
<SetElement :el="el" v-if="el.type === 'set'" @delete="deleteElem(i)" />
<StringElement
:el="el"
v-if="el.type === 'string'"
@delete="deleteElem(i)"
@delete="deleteElem"
/>
<SetElement :el="el" v-if="el.type === 'set'" @delete="deleteElem" />
<StringElement :el="el" v-if="el.type === 'string'" @delete="deleteElem" />
</div>
</template>

Expand Down

0 comments on commit b5e9fcb

Please sign in to comment.