Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add DISABLE_NETWORK and SDK_CUSTOM_CONFIG settings #2362

Merged
merged 4 commits into from Sep 5, 2021

Conversation

mikee47
Copy link
Contributor

@mikee47 mikee47 commented Sep 3, 2021

This PR adds the DISABLE_NETWORK setting to explicitly remove network support. When enabled, if performs much like DISABLE_WIFI except it now works for ESP32 as well. The behaviour of DISABLE_WIFI is now more logical, and can be used with ethernet.

The ESP32 build process has been improved. PR #2358 added a separate project for each ESP_VARIANT. This is now created dynamically from a template along with the default configuration.

The SDK_CUSTOM_CONFIG build variable has been added so ESP32 SDK settings may be configured on a per-project basis, if necessary.

This allows DISABLE_WIFI to be used in conjunction with ethernet.
Project is created from a single default
Settings are assembled from multiple files
@mikee47 mikee47 changed the title Add DISABLE_NETWORK setting, revise ESP32 building Add DISABLE_NETWORK and SDK_CUSTOM_CONFIG settings Sep 3, 2021
@slaff slaff added this to the 4.4.0 milestone Sep 4, 2021
@mikee47
Copy link
Contributor Author

mikee47 commented Sep 4, 2021

Something else the esp32 builder doesn't do is rebuild the SDK components for debug/release automatically... That is, there needs to be a reconfigure step - though that would discard any customisations made via make sdk-menuconfig...

Can't see a simple way to get the IDF to use a different sdkconfig file so will try to find a workaround for this.

Comment on lines 385 to 386
.PHONY: sdk-defconfig
sdk-defconfig: $(SDKCONFIG_H) ##Create default SDK config files
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't think we need this, happens automatically.

##@SDK

SDK_PROJECT_PATH := $(COMPONENT_PATH)/project.$(ESP_VARIANT)
SDK_PROJECT_PATH := $(COMPONENT_PATH)/project/$(ESP_VARIANT)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Adding /$(BUILD_TYPE) to the end of this path fixes the issue switching between debug/release builds. We get a separate project instance for each.

@slaff slaff removed the 3 - Review label Sep 5, 2021
@slaff slaff merged commit 22dfd86 into SmingHub:develop Sep 5, 2021
@mikee47 mikee47 deleted the feature/disable-network branch September 5, 2021 07:05
@slaff slaff mentioned this pull request Sep 15, 2021
5 tasks
slaff pushed a commit that referenced this pull request Sep 27, 2021
This PR adds the `DISABLE_NETWORK` setting to explicitly remove network support. When enabled, if performs much like `DISABLE_WIFI` except it now works for ESP32 as well. The behaviour of `DISABLE_WIFI` is now more logical, and can be used with ethernet.

The ESP32 build process has been improved. PR #2358 added a separate project for each `ESP_VARIANT`. This is now created dynamically from a template along with the default configuration.

The `SDK_CUSTOM_CONFIG` build variable has been added so ESP32 SDK settings may be configured on a per-project basis, if necessary.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants