Repository navigation
Conversation
ESP3DLib builds its web server only with WEBSUPPORT and its OTA only with OTASUPPORT, and uses WIFI_SSID / WIFI_PWD as its station-mode defaults. MarlinFirmware#28558 made these options WIFISUPPORT-only and warned that they do nothing with ESP3D_WIFISUPPORT, so ESP3D builds lost their web interface and OTA. Make WEBSUPPORT, OTASUPPORT and Configuration_Secure.h available with either WiFi option again, drop the ESP3D warnings, name both options in the sanity check errors, and build the TinyBee ESP3D test with WEBSUPPORT and OTASUPPORT.
This file contains hidden or 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
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.
Description
#28558 put
WEBSUPPORTandOTASUPPORTinside#if ENABLED(WIFISUPPORT)inConfiguration_adv.h, and added warnings thatWEBSUPPORT,OTASUPPORT,WIFI_SSIDandWIFI_PWDdo nothing withESP3D_WIFISUPPORT. That was wrong. ESP3DLib builds its web server only whenWEBSUPPORTis defined and its OTA only whenOTASUPPORTis defined, and it usesWIFI_SSID/WIFI_PWDas its station-mode defaults (src/esp3dlibconfig.hin the ESP3DLib version Marlin pins). So since #28558 anESP3D_WIFISUPPORTbuild can't enable the ESP3D web interface or OTA from the configuration, and the warnings tell users to remove the options that would.This PR:
WEBSUPPORT,OTASUPPORTandConfiguration_Secure.havailable with eitherWIFISUPPORTorESP3D_WIFISUPPORTagain, with comments saying what each does for ESP3D.WIFI_CUSTOM_COMMANDstays underESP3D_WIFISUPPORT.Warnings.cpp.SanityCheck.herrors for these options with no WiFi enabled.WEBSUPPORTandOTASUPPORTto themks_tinybeeconfig-01 ESP3D build test.Marlin's own webserver and OTA (
HAL/ESP32/wifi/) are unchanged: they still build only withWIFISUPPORT.Requirements
An ESP32 board with
ESP3D_WIFISUPPORT.Benefits
ESP3D builds have a web interface, OTA updates and compile-time WiFi credentials again.
Tested on an MKS TinyBee (
mks_tinybee, ESP3DLib 1.0), withESP3D_WIFISUPPORT,WEBSUPPORT,OTASUPPORTandWIFI_CUSTOM_COMMANDset in the configuration. Each firmware was built from an empty build directory and accessed from a PC over WiFi:Web_Server::/ArduinoOTAClass::symbols in the ELFGET /)espota.pyinstalls and bootsWIFI_SSID/WIFI_PWDfromConfiguration_Secure.hWEBSUPPORT,OTASUPPORT,WIFI_SSID/WIFI_PWDWith no WiFi enabled (
mega2560),WEBSUPPORT,OTASUPPORT,WIFI_SSIDandWIFI_CUSTOM_COMMANDeach still stop the build, with the updated messages.Builds:
mks_tinybeeconfig-01, andesp32config-01 (WIFISUPPORT+WEBSUPPORT+OTASUPPORT, Marlin's own webserver).PlatformIO doesn't rebuild ESP3DLib when only the Marlin configuration changes, because ESP3DLib includes
MarlinConfig.hthrough a macro. After togglingWEBSUPPORTorOTASUPPORT, do a clean build to see the change.Configurations
buildroot/tests/mks_tinybee/config-01.iniRelated Issues
Fixes a regression from #28558.