-
-
Notifications
You must be signed in to change notification settings - Fork 345
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
Fix system headers, review and simplify #2431
Merged
Merged
Conversation
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
e.g. `make lwip2-clean` will always fail because ENABLE_CUSTOM_LWIP option never gets set, so `lwip2-clean` target never gets created
Was removed from applications in SmingHub#1695. It's a hangover from C esp8266 SDK applications and makes maintenace difficult because it contains so much stuff.
Instead of working around them, we should have a consistent set. The SDK is no longer in development so these are very unlikely to change.
Tested with Basic_Blink sample and 256K, 512K flash size, no problem. Uses only libraries from SDK submodule.
Only used by startup code.
Consistent with esp8266
- Honour COMPONENT_SOC setting - `component-samples-clean` just plain broken - Simple library fixes
mikee47
force-pushed
the
fix/system-headers
branch
from
November 22, 2021 15:19
61d81ea
to
56aa88a
Compare
Note that not all samples are built for Windows - perhaps they should be? Add Basic_Templates anyway.
slaff
added
3.5 - Approved - Waiting for CI results
and removed
3 - Review
3.5 - Approved - Waiting for CI results
labels
Nov 23, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR removes some long-deprecated code and build logic from the framework,
and fixes some low-level (system) header file inconsistencies between architectures.
user_config.h
This header was removed from samples in #1695.
It's a hangover from the Espressif SDK applications and doesn't fit very well into the framework structure.
The file has been removed from all framework code but one copy left with a deprecation warning.
Note added to upgrade docs.
System header files
Each architecture has a set of system header files, located here:
In particular the ESP8266 SDK headers are problematic so have been moved into the
esp8266
Component:user_interface.h
intoesp_system.h
andesp_wifi.h
ip_addr.h
BIT
,TRUE
,FALSE
,LOCAL
macros intoc_types.h
For other architectures:
os_random
andos_get_random
intoesp_system
(get rid of esp_libc)system_set_os_print
andets_install_putc1
(not used)Remove pre-SDK 3 support
There was an issue with small flash sizes but this now seems to be resolved.
Tested with Basic_Blink sample and 256K, 512K flash size, no problem.
Now using only libraries from the SDK: all header/linker files are in framework.
Simplifies build system and code.
SDK_BASE
definition is no longer publicised.SDK submodule renamed from
ESP8266_NONOS_SDK
tosdk
.lwip
lwip_includes.h
file, relocated to Network Component, rather than one-per-archOther simplifications
esp_cplusplus.h
header not necessary, single function used only by startup codesystem_get_time
implementationBuild system
Fix issue with missing Component -clean targets.
e.g.
make lwip2-clean
will always fail because ENABLE_CUSTOM_LWIP option never gets set, solwip2-clean
target never gets createdFix
component-samples
build target, should honour COMPONENT_SOC settingFix
component-samples-clean
build target, brokenIntegration tests
Add
component-samples
to esp32 build, requires only a few simple library fixes to build all variants.