Skip to content

Commit 3e1017a

Browse files
committed
Update network port/cert support for local testing
1 parent f51d4ac commit 3e1017a

File tree

3 files changed

+14
-9
lines changed

3 files changed

+14
-9
lines changed

src/network_interfaces/Wippersnapper_ESP32.h

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,14 +148,16 @@ class Wippersnapper_ESP32 : public Wippersnapper {
148148
void setupMQTTClient(const char *clientID) {
149149
if (strcmp(WS._config.aio_url, "io.adafruit.com") == 0) {
150150
_mqtt_client->setCACert(_aio_root_ca_prod);
151-
} else {
151+
} else if (strcmp(WS._config.aio_url, "io.adafruit.us") == 0) {
152152
_mqtt_client->setCACert(_aio_root_ca_staging);
153+
} else {
154+
_mqtt_client->setInsecure();
153155
}
154156

155157
// Construct MQTT client
156-
WS._mqtt = new Adafruit_MQTT_Client(_mqtt_client, WS._config.aio_url, 8883,
157-
clientID, WS._config.aio_user,
158-
WS._config.aio_key);
158+
WS._mqtt = new Adafruit_MQTT_Client(
159+
_mqtt_client, WS._config.aio_url, WS._config.io_port, clientID,
160+
WS._config.aio_user, WS._config.aio_key);
159161
}
160162

161163
/********************************************************/

src/network_interfaces/Wippersnapper_ESP8266.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,10 +173,11 @@ class Wippersnapper_ESP8266 : public Wippersnapper {
173173
// re-compile after. _wifi_client->setFingerprint(fingerprint); WS._mqtt =
174174
// new Adafruit_MQTT_Client(_wifi_client, WS._config.aio_url,
175175
// WS._config.io_port, clientID, WS._config.aio_user, WS._config.aio_key);
176-
177-
WS._mqtt = new Adafruit_MQTT_Client(_wifi_client, WS._config.aio_url, 1883,
178-
clientID, WS._config.aio_user,
179-
WS._config.aio_key);
176+
if (WS._config.io_port == 8883)
177+
WS._config.io_port = 1883;
178+
WS._mqtt = new Adafruit_MQTT_Client(
179+
_wifi_client, WS._config.aio_url, WS._config.io_port, clientID,
180+
WS._config.aio_user, WS._config.aio_key);
180181
}
181182

182183
/********************************************************/

src/network_interfaces/ws_networking_pico.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,10 @@ class ws_networking_pico : public Wippersnapper {
149149
// compare WS._config.aio_url to "io.adafruit.com"
150150
if (strcmp(WS._config.aio_url, "io.adafruit.com") == 0) {
151151
_mqtt_client->setCACert(_aio_root_ca_prod);
152-
} else {
152+
} else if (strcmp(WS._config.aio_url, "io.adafruit.us") == 0) {
153153
_mqtt_client->setCACert(_aio_root_ca_staging);
154+
} else {
155+
_mqtt_client->setInsecure();
154156
}
155157

156158
WS._mqtt = new Adafruit_MQTT_Client(

0 commit comments

Comments
 (0)