Skip to content

Refactored use of LOG_X(LOG_TAG, ...) to log_x(...) #2672

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.

Sign up for GitHub

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

Merged
merged 15 commits into from
Apr 15, 2019
Merged

Refactored use of LOG_X(LOG_TAG, ...) to log_x(...) #2672

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
601a094
Replaced ARDUINO_VARIANT with const char
Bascy Oct 11, 2018
7fb2f31
Fixed missing return value
Bascy Nov 10, 2018
686405a
Merge from upstream/master
Bascy Dec 2, 2018
d7eb665
Merge remote-tracking branch 'upstream/master'
Bascy Dec 5, 2018
49a360a
Merge remote-tracking branch 'upstream/master'
Bascy Dec 15, 2018
a29962e
Added quotes around defined value in macro (Issue #2193)
Bascy Dec 15, 2018
c9b646f
Merge remote-tracking branch 'upstream/master'
Bascy Dec 16, 2018
1cf1c5c
Merge remote-tracking branch 'upstream/master'
Bascy Feb 2, 2019
9323681
Change logging from Error to Verbose when not found and default avail…
Bascy Apr 13, 2019
18f1c49
Merge remote-tracking branch 'origin/master'
Bascy Apr 13, 2019
dcf312b
Merge remote-tracking branch 'upstream/master'
Bascy Apr 13, 2019
16fd65a
Move Enter and Exit logging to Verbose Level
Bascy Apr 13, 2019
100a884
Merge branch 'ReducedLogging'
Bascy Apr 13, 2019
2ea3509
Merge remote-tracking branch 'upstream/master'
Bascy Apr 13, 2019
8ce309f
Refactored LOG_X() into log_x()
Bascy Apr 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libraries/ESPmDNS/src/ESPmDNS.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ void MDNSResponder::setInstanceName(String name) {

void MDNSResponder::enableArduino(uint16_t port, bool auth){
mdns_txt_item_t arduTxtData[4] = {
{(char*)"board" ,(char*)ARDUINO_VARIANT},
{(char*)"board" ,(char*)"esp32"},
Copy link
Collaborator

Choose a reason for hiding this comment

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

This should be reverted, the ARDUINO_VARIANT variable is injected with the board name typically. The ESPmDNS library checks explicitly for this define and if missing defines it itself as you have done here: https://github.com/espressif/arduino-esp32/blob/master/libraries/ESPmDNS/src/ESPmDNS.h#L48-L51

Copy link
Member

Choose a reason for hiding this comment

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

yeah, why would you change that?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I don't know why all these commits are part of this pull request, these are from months ago, and already reverted locally.
It also looks like that code isn't there anymore

{(char*)"tcp_check" ,(char*)"no"},
{(char*)"ssh_upload" ,(char*)"no"},
{(char*)"auth_upload" ,(char*)"no"}
Expand Down