-
-
Notifications
You must be signed in to change notification settings - Fork 345
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixes to hardware config editing/display (#2765)
**If name not specified when loading config then 'save' raises exception** For example, `Basic_Ota` sample doesn't have its `name` field set in `ota.hw`: - Run `make hwconfig-edit` - Click 'save' So ensure we provide a default name based on filename. **Ensure all sample .hw files have names** For consistency. **Remove 'unused_before' and 'unused_after' fields from `make hwconfig` output** These are only used for map building so shouldn't be visible. Example: ``` "phy_init": { "device": "spiFlash", "address": "0x000fc000", "size": "4K", "type": "data", "subtype": "phy", "readonly": false, "encrypted": false, "filename": "$(FLASH_INIT_DATA)", "unused_before": 0, ///< "unused_after": 0 ///< Don't show }, ``` **Don't set name, comment fields from option data** For example, `Basic_Blink` sample uses default config. Running `make hwconfig` gives: ``` { "name": "Standard config with single ROM", "comment": "Should work with any Esp8266 variant", "arch": "Esp8266", "options": [], ``` If we run `make hwconfig HWCONFIG_OPTS=4m` we get this: ``` { "name": "", "comment": "", "arch": "Esp8266", "options": [ "4m" ], ``` The `name` and `comment` have been wiped out, should be as before. **Fix use of `not in` and `is not` operators** e.g. `x not in [...]` preferred to `not x in [...]`
- Loading branch information
Showing
11 changed files
with
34 additions
and
17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,5 @@ | ||
{ | ||
"name": "Basic IFS sample (ESP32)", | ||
"base_config": "basic_ifs", | ||
"arch": "Esp32", | ||
"partitions": { | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,5 @@ | ||
{ | ||
"name": "Basic IFS (ESP8266)", | ||
"base_config": "basic_ifs", | ||
"arch": "Esp8266", | ||
"partitions": { | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,5 @@ | ||
{ | ||
"name": "Basic IFS (HOST)", | ||
"base_config": "basic_ifs", | ||
"arch": "Host", | ||
"partitions": { | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,5 @@ | ||
{ | ||
"name": "Basic OTA sample", | ||
"base_config": "spiffs-two-roms", | ||
"partitions": { | ||
"rom0": { | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters