Skip to content

Commit 2f26d94

Browse files
d-a-vdevyte
authored andcommitted
minor: examples: reorder functions for declarations prior to call (#6766)
* minor: reorder functions for declaration prior to call harmless for arduino, helps with emulation on host or PIO * fixes per review
1 parent 09896d5 commit 2f26d94

File tree

2 files changed

+29
-29
lines changed

2 files changed

+29
-29
lines changed

libraries/ESP8266WebServer/examples/AdvancedWebServer/AdvancedWebServer.ino

+19-17
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,25 @@ void handleNotFound() {
9494
digitalWrite(led, 0);
9595
}
9696

97+
void drawGraph() {
98+
String out;
99+
out.reserve(2600);
100+
char temp[70];
101+
out += "<svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" width=\"400\" height=\"150\">\n";
102+
out += "<rect width=\"400\" height=\"150\" fill=\"rgb(250, 230, 210)\" stroke-width=\"1\" stroke=\"rgb(0, 0, 0)\" />\n";
103+
out += "<g stroke=\"black\">\n";
104+
int y = rand() % 130;
105+
for (int x = 10; x < 390; x += 10) {
106+
int y2 = rand() % 130;
107+
sprintf(temp, "<line x1=\"%d\" y1=\"%d\" x2=\"%d\" y2=\"%d\" stroke-width=\"1\" />\n", x, 140 - y, x + 10, 140 - y2);
108+
out += temp;
109+
y = y2;
110+
}
111+
out += "</g>\n</svg>\n";
112+
113+
server.send(200, "image/svg+xml", out);
114+
}
115+
97116
void setup(void) {
98117
pinMode(led, OUTPUT);
99118
digitalWrite(led, 0);
@@ -133,20 +152,3 @@ void loop(void) {
133152
MDNS.update();
134153
}
135154

136-
void drawGraph() {
137-
String out = "";
138-
char temp[100];
139-
out += "<svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" width=\"400\" height=\"150\">\n";
140-
out += "<rect width=\"400\" height=\"150\" fill=\"rgb(250, 230, 210)\" stroke-width=\"1\" stroke=\"rgb(0, 0, 0)\" />\n";
141-
out += "<g stroke=\"black\">\n";
142-
int y = rand() % 130;
143-
for (int x = 10; x < 390; x += 10) {
144-
int y2 = rand() % 130;
145-
sprintf(temp, "<line x1=\"%d\" y1=\"%d\" x2=\"%d\" y2=\"%d\" stroke-width=\"1\" />\n", x, 140 - y, x + 10, 140 - y2);
146-
out += temp;
147-
y = y2;
148-
}
149-
out += "</g>\n</svg>\n";
150-
151-
server.send(200, "image/svg+xml", out);
152-
}

libraries/esp8266/examples/NTP-TZ-DST/NTP-TZ-DST.ino

+10-12
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,16 @@ static bool time_machine_running = false;
8585
// return 15000; // 15s
8686
//}
8787

88+
#define PTM(w) \
89+
Serial.print(" " #w "="); \
90+
Serial.print(tm->tm_##w);
91+
92+
void printTm(const char* what, const tm* tm) {
93+
Serial.print(what);
94+
PTM(isdst); PTM(yday); PTM(wday);
95+
PTM(year); PTM(mon); PTM(mday);
96+
PTM(hour); PTM(min); PTM(sec);
97+
}
8898

8999
void showTime() {
90100
gettimeofday(&tv, nullptr);
@@ -152,18 +162,6 @@ void showTime() {
152162
Serial.println();
153163
}
154164

155-
156-
#define PTM(w) \
157-
Serial.print(" " #w "="); \
158-
Serial.print(tm->tm_##w);
159-
160-
void printTm(const char* what, const tm* tm) {
161-
Serial.print(what);
162-
PTM(isdst); PTM(yday); PTM(wday);
163-
PTM(year); PTM(mon); PTM(mday);
164-
PTM(hour); PTM(min); PTM(sec);
165-
}
166-
167165
void time_is_set_scheduled() {
168166
// everything is allowed in this function
169167

0 commit comments

Comments
 (0)