Skip to content

minor: examples: reorder functions for declarations prior to call #6766

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 4 commits into from
Nov 14, 2019
Merged

minor: examples: reorder functions for declarations prior to call #6766

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5261178
minor: reorder functions for declaration prior to call
d-a-v Nov 13, 2019
ef83664
Merge branch 'master' into reorderc
d-a-v Nov 13, 2019
fae512b
fixes per review
d-a-v Nov 13, 2019
ac89ac0
Merge branch 'master' into reorderc
d-a-v Nov 13, 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
35 changes: 18 additions & 17 deletions libraries/ESP8266WebServer/examples/AdvancedWebServer/AdvancedWebServer.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,24 @@ void handleNotFound() {
digitalWrite(led, 0);
}

void drawGraph() {
String out = "";
char temp[100];
out += "<svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" width=\"400\" height=\"150\">\n";
out += "<rect width=\"400\" height=\"150\" fill=\"rgb(250, 230, 210)\" stroke-width=\"1\" stroke=\"rgb(0, 0, 0)\" />\n";
out += "<g stroke=\"black\">\n";
int y = rand() % 130;
for (int x = 10; x < 390; x += 10) {
int y2 = rand() % 130;
sprintf(temp, "<line x1=\"%d\" y1=\"%d\" x2=\"%d\" y2=\"%d\" stroke-width=\"1\" />\n", x, 140 - y, x + 10, 140 - y2);
out += temp;
y = y2;
}
out += "</g>\n</svg>\n";

server.send(200, "image/svg+xml", out);
}

void setup(void) {
pinMode(led, OUTPUT);
digitalWrite(led, 0);
Expand Down Expand Up @@ -133,20 +151,3 @@ void loop(void) {
MDNS.update();
}

void drawGraph() {
String out = "";
char temp[100];
out += "<svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" width=\"400\" height=\"150\">\n";
out += "<rect width=\"400\" height=\"150\" fill=\"rgb(250, 230, 210)\" stroke-width=\"1\" stroke=\"rgb(0, 0, 0)\" />\n";
out += "<g stroke=\"black\">\n";
int y = rand() % 130;
for (int x = 10; x < 390; x += 10) {
int y2 = rand() % 130;
sprintf(temp, "<line x1=\"%d\" y1=\"%d\" x2=\"%d\" y2=\"%d\" stroke-width=\"1\" />\n", x, 140 - y, x + 10, 140 - y2);
out += temp;
y = y2;
}
out += "</g>\n</svg>\n";

server.send(200, "image/svg+xml", out);
}
22 changes: 10 additions & 12 deletions libraries/esp8266/examples/NTP-TZ-DST/NTP-TZ-DST.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,16 @@ static bool time_machine_running = false;
// return 15000; // 15s
//}

#define PTM(w) \
Serial.print(" " #w "="); \
Serial.print(tm->tm_##w);

void printTm(const char* what, const tm* tm) {
Serial.print(what);
PTM(isdst); PTM(yday); PTM(wday);
PTM(year); PTM(mon); PTM(mday);
PTM(hour); PTM(min); PTM(sec);
}

void showTime() {
gettimeofday(&tv, nullptr);
Expand Down Expand Up @@ -152,18 +162,6 @@ void showTime() {
Serial.println();
}


#define PTM(w) \
Serial.print(" " #w "="); \
Serial.print(tm->tm_##w);

void printTm(const char* what, const tm* tm) {
Serial.print(what);
PTM(isdst); PTM(yday); PTM(wday);
PTM(year); PTM(mon); PTM(mday);
PTM(hour); PTM(min); PTM(sec);
}

void time_is_set_scheduled() {
// everything is allowed in this function

Expand Down