Skip to content

Fix NO_GLOBAL_INSTANCES #8184

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
Jul 17, 2021
Merged

Fix NO_GLOBAL_INSTANCES #8184

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
ccccd4e
Create devnull static if needed
paulocsanz Jun 27, 2021
9571f54
Move location of stack variable
paulocsanz Jun 27, 2021
7b594b0
Fix formatting
paulocsanz Jun 27, 2021
aa40a10
Make variable static
paulocsanz Jun 27, 2021
6efc0e9
Revert static addition, its optional and 1 byte
paulocsanz Jun 27, 2021
7328918
Merge branch 'master' into master
paulocsanz Jun 30, 2021
13b441c
Merge branch 'master' into master
paulocsanz Jul 4, 2021
faa662e
Remove Serial definition if not needed
paulocsanz Jul 4, 2021
5456e09
Undo serial changes
paulocsanz Jul 8, 2021
93754b0
Merge branch 'master' into master
paulocsanz Jul 8, 2021
34d4325
Create streamdev even if specifically unset
paulocsanz Jul 8, 2021
d07566b
Remove Serial declaration if not defined
paulocsanz Jul 9, 2021
31c935b
Merge branch 'master' into master
paulocsanz Jul 9, 2021
cb2fbde
Merge branch 'master' into master
paulocsanz Jul 15, 2021
66a0283
Merge branch 'master' into master
earlephilhower Jul 17, 2021
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
4 changes: 4 additions & 0 deletions cores/esp8266/HardwareSerial.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,8 +233,12 @@ class HardwareSerial: public Stream
size_t _rx_size;
};

#if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_SERIAL)
extern HardwareSerial Serial;
#endif
#if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_SERIAL1)
extern HardwareSerial Serial1;
#endif

extern void serialEventRun(void) __attribute__((weak));

Expand Down
4 changes: 4 additions & 0 deletions libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -849,6 +849,10 @@ bool HTTPClient::connect(void)
{
if(_reuse && _canReuse && connected()) {
DEBUG_HTTPCLIENT("[HTTP-Client] connect: already connected, reusing connection\n");

#if defined(NO_GLOBAL_INSTANCES)
StreamNull devnull;
#endif
_client->sendAvailable(devnull); // clear _client's output (all of it, no timeout)
return true;
}
Expand Down