Skip to content

Commit 3b7c616

Browse files
mathieucarboumathieucarbou
committed
Fix CI and examples
1 parent 4a54713 commit 3b7c616

File tree

7 files changed

+29
-41
lines changed

7 files changed

+29
-41
lines changed

‎.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
--recursive \
4040
--filter=-whitespace/line_length,-whitespace/braces,-whitespace/comments,-runtime/indentation_namespace,-whitespace/indent,-readability/braces,-whitespace/newline,-readability/todo,-build/c++11 \
4141
--exclude=src/espconnect_webpage.h \
42-
--exclude=src/esp8266/* \
42+
--exclude=src/backport/* \
4343
src
4444
4545
platformio-ci-esp32:

‎README.md

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -107,14 +107,10 @@ void loop() {
107107
### Set static IP
108108

109109
```cpp
110-
Mycila::ESPConnect::IPConfig ipConfig;
111-
112110
ipConfig.ip.fromString("192.168.125.99");
113-
ipConfig.gateway.fromString("192.168.125.1");
114-
ipConfig.subnet.fromString("255.255.255.0");
115-
ipConfig.dns.fromString("192.168.125.1");
116-
117-
espConnect.setIPConfig(ipConfig);
111+
espConnect.getConfig().ipConfig.gateway.fromString("192.168.125.1");
112+
espConnect.getConfig().ipConfig.subnet.fromString("255.255.255.0");
113+
espConnect.getConfig().ipConfig.dns.fromString("192.168.125.1");
118114
```
119115

120116
### Use an external configuration system
@@ -127,8 +123,8 @@ espConnect.setIPConfig(ipConfig);
127123
switch (state) {
128124
case Mycila::ESPConnect::State::PORTAL_COMPLETE:
129125
bool apMode = espConnect.hasConfiguredAPMode();
130-
std::string wifiSSID = espConnect.getConfiguredWiFiSSID();
131-
std::string wifiPassword = espConnect.getConfiguredWiFiPassword();
126+
std::string wifiSSID = espConnect.getConfig().wifiSSID;
127+
std::string wifiPassword = espConnect.getConfig().wifiPassword;
132128
if (apMode) {
133129
Serial.println("====> Captive Portal: Access Point configured");
134130
} else {

‎docs/index.md

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -107,14 +107,10 @@ void loop() {
107107
### Set static IP
108108

109109
```cpp
110-
Mycila::ESPConnect::IPConfig ipConfig;
111-
112-
ipConfig.ip.fromString("192.168.125.99");
113-
ipConfig.gateway.fromString("192.168.125.1");
114-
ipConfig.subnet.fromString("255.255.255.0");
115-
ipConfig.dns.fromString("192.168.125.1");
116-
117-
espConnect.setIPConfig(ipConfig);
110+
espConnect.getConfig().ipConfig.ip.fromString("192.168.125.99");
111+
espConnect.getConfig().ipConfig.gateway.fromString("192.168.125.1");
112+
espConnect.getConfig().ipConfig.subnet.fromString("255.255.255.0");
113+
espConnect.getConfig().ipConfig.dns.fromString("192.168.125.1");
118114
```
119115

120116
### Use an external configuration system
@@ -127,8 +123,8 @@ espConnect.setIPConfig(ipConfig);
127123
switch (state) {
128124
case Mycila::ESPConnect::State::PORTAL_COMPLETE:
129125
bool apMode = espConnect.hasConfiguredAPMode();
130-
std::string wifiSSID = espConnect.getConfiguredWiFiSSID();
131-
std::string wifiPassword = espConnect.getConfiguredWiFiPassword();
126+
std::string wifiSSID = espConnect.getConfig().wifiSSID;
127+
std::string wifiPassword = espConnect.getConfig().wifiPassword;
132128
if (apMode) {
133129
Serial.println("====> Captive Portal: Access Point configured");
134130
} else {

‎examples/AdvancedCaptivePortal/AdvancedCaptivePortal.ino

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,12 @@ void setup() {
5151

5252
case Mycila::ESPConnect::State::PORTAL_COMPLETE: {
5353
Serial.println("====> Captive Portal has ended, save the configuration...");
54-
bool apMode = espConnect.hasConfiguredAPMode();
5554
Preferences preferences;
5655
preferences.begin("app", false);
57-
preferences.putBool("ap", apMode);
58-
if (!apMode) {
59-
preferences.putString("ssid", espConnect.getConfiguredWiFiSSID().c_str());
60-
preferences.putString("password", espConnect.getConfiguredWiFiPassword().c_str());
56+
preferences.putBool("ap", espConnect.getConfig().apMode);
57+
if (!espConnect.getConfig().apMode) {
58+
preferences.putString("ssid", espConnect.getConfig().wifiSSID.c_str());
59+
preferences.putString("password", espConnect.getConfig().wifiPassword.c_str());
6160
}
6261
preferences.end();
6362
break;

‎examples/LoadSaveConfig/LoadSaveConfig.ino

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,16 +57,15 @@ void setup() {
5757
Mycila::ESPConnect::IPConfig ipConfig;
5858
switch (random(0, 3)) {
5959
case 0:
60-
ipConfig.ip.fromString("192.168.125.99");
61-
ipConfig.gateway.fromString("192.168.125.1");
62-
ipConfig.subnet.fromString("255.255.255.0");
63-
ipConfig.dns.fromString("192.168.125.1");
64-
espConnect.setIPConfig(ipConfig);
60+
espConnect.getConfig().ipConfig.ip.fromString("192.168.125.99");
61+
espConnect.getConfig().ipConfig.gateway.fromString("192.168.125.1");
62+
espConnect.getConfig().ipConfig.subnet.fromString("255.255.255.0");
63+
espConnect.getConfig().ipConfig.dns.fromString("192.168.125.1");
6564
espConnect.saveConfiguration();
6665
break;
6766

6867
case 1:
69-
espConnect.setIPConfig(Mycila::ESPConnect::IPConfig());
68+
espConnect.getConfig().ipConfig = {};
7069
espConnect.saveConfiguration();
7170
break;
7271

‎examples/WiFiStaticIP/WiFiStaticIP.ino

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,13 @@ void loop() {
6969
}
7070

7171
if (now - lastChange > 10000) {
72-
if (espConnect.getIPConfig().ip == INADDR_NONE) {
73-
Mycila::ESPConnect::IPConfig ipConfig;
74-
ipConfig.ip.fromString("192.168.125.99");
75-
ipConfig.gateway.fromString("192.168.125.1");
76-
ipConfig.subnet.fromString("255.255.255.0");
77-
ipConfig.dns.fromString("192.168.125.1");
78-
espConnect.setIPConfig(ipConfig);
72+
if (espConnect.getConfig().ipConfig.ip == INADDR_NONE) {
73+
espConnect.getConfig().ipConfig.ip.fromString("192.168.125.99");
74+
espConnect.getConfig().ipConfig.gateway.fromString("192.168.125.1");
75+
espConnect.getConfig().ipConfig.subnet.fromString("255.255.255.0");
76+
espConnect.getConfig().ipConfig.dns.fromString("192.168.125.1");
7977
} else {
80-
espConnect.setIPConfig(Mycila::ESPConnect::IPConfig());
78+
espConnect.getConfig().ipConfig = {};
8179
}
8280
lastChange = millis();
8381
}

‎platformio.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
default_envs = arduino-3, arduino-3-latest, esp8266, esp32-poe-arduino-3, esp32-poe-arduino-3-latest, wt32-eth01-arduino-3, wt32-eth01-arduino-3-latest, lilygo-eth-lite-s3-arduino-3, lilygo-eth-lite-s3-arduino-3-latest
44
lib_dir = .
55
; src_dir = examples/BlockingCaptivePortal
6-
src_dir = examples/NonBlockingCaptivePortal
6+
; src_dir = examples/NonBlockingCaptivePortal
77
; src_dir = examples/AdvancedCaptivePortal
88
; src_dir = examples/TestWiFi8266
99
; src_dir = examples/WiFiStaticIP
10-
; src_dir = examples/LoadSaveConfig
10+
src_dir = examples/LoadSaveConfig
1111
; src_dir = examples/NoCaptivePortal
1212

1313
[env]

0 commit comments

Comments
 (0)