Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
co2ampel
ampel-firmware
Commits
8c8966c0
Commit
8c8966c0
authored
Dec 18, 2020
by
Eric Duminil
Browse files
endif #ifdef -> #elif
parent
ab83b511
Changes
4
Hide whitespace changes
Inline
Side-by-side
csv_writer.cpp
View file @
8c8966c0
...
@@ -45,9 +45,7 @@ namespace csv_writer {
...
@@ -45,9 +45,7 @@ namespace csv_writer {
}
}
}
}
}
}
#endif
#elif defined(ESP32)
#if defined(ESP32)
/**
/**
* SPECIFIC FUNCTIONS FOR SPIFFS
* SPECIFIC FUNCTIONS FOR SPIFFS
*/
*/
...
...
web_server.cpp
View file @
8c8966c0
...
@@ -29,8 +29,7 @@ namespace web_server {
...
@@ -29,8 +29,7 @@ namespace web_server {
#if defined(ESP8266)
#if defined(ESP8266)
ESP8266WebServer
http
(
80
);
// Create a webserver object that listens for HTTP request on port 80
ESP8266WebServer
http
(
80
);
// Create a webserver object that listens for HTTP request on port 80
#endif
#elif defined(ESP32)
#if defined(ESP32)
WebServer
http
(
80
);
WebServer
http
(
80
);
#endif
#endif
...
...
web_server.h
View file @
8c8966c0
...
@@ -2,8 +2,7 @@
...
@@ -2,8 +2,7 @@
#define WEB_SERVER_H_
#define WEB_SERVER_H_
#if defined(ESP8266)
#if defined(ESP8266)
# include <ESP8266WebServer.h>
# include <ESP8266WebServer.h>
#endif
#elif defined(ESP32)
#if defined(ESP32)
# include <WebServer.h>
# include <WebServer.h>
#endif
#endif
...
...
wifi_util.cpp
View file @
8c8966c0
...
@@ -30,8 +30,7 @@ void WiFiConnect(const String &hostname) {
...
@@ -30,8 +30,7 @@ void WiFiConnect(const String &hostname) {
WiFi
.
mode
(
WIFI_STA
);
// Set ESP8266 to be a WiFi-client only
WiFi
.
mode
(
WIFI_STA
);
// Set ESP8266 to be a WiFi-client only
#if defined(ESP8266)
#if defined(ESP8266)
WiFi
.
hostname
(
hostname
);
WiFi
.
hostname
(
hostname
);
#endif
#elif defined(ESP32)
#if defined(ESP32)
WiFi
.
setHostname
(
hostname
.
c_str
());
WiFi
.
setHostname
(
hostname
.
c_str
());
#endif
#endif
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment