Skip to content

Commit ecffba2

Browse files
committed
WiFi: Move locals
1 parent e4bec3e commit ecffba2

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

Firmware/RTK_Everywhere/RTK_Everywhere.ino

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -389,6 +389,9 @@ bool wifiSoftApRunning; // False: stopped, True: starting, running, stop
389389
bool wifiStationOnline; // WiFi station started successfully
390390
bool wifiStationRunning; // False: stopped, True: starting, running, stopping
391391

392+
const char * wifiSoftApSsid = "RTK Config";
393+
const char * wifiSoftApPassword = nullptr;
394+
392395
//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
393396

394397
// MQTT support

Firmware/RTK_Everywhere/WiFi.ino

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -347,30 +347,29 @@ const int wifiStartNamesEntries = sizeof(wifiStartNames) / sizeof(wifiStartNames
347347
#define WIFI_MAX_TIMEOUT (15 * 60 * 1000) // Timeout in milliseconds
348348
#define WIFI_MIN_TIMEOUT (15 * 1000) // Timeout in milliseconds
349349

350-
const char * wifiSoftApName = "Soft AP";
351-
352-
const char * wifiSoftApSsid = "RTK Config";
353-
const char * wifiSoftApPassword = nullptr;
354-
355350
//****************************************
356351
// Locals
357352
//****************************************
358353

359354
// DNS server for Captive Portal
360355
static DNSServer dnsServer;
361356

357+
static int wifiFailedConnectionAttempts = 0; // Count the number of connection attempts between restarts
358+
static bool wifiReconnectRequest; // Set true to request WiFi reconnection
359+
360+
const char * wifiSoftApName = "Soft AP";
361+
362362
// Start timeout
363363
static uint32_t wifiStartTimeout;
364364

365+
365366
// WiFi Timer usage:
366367
// * Measure interval to display IP address
367368
static unsigned long wifiDisplayTimer;
368-
static bool wifiReconnectRequest; // Set true to request WiFi reconnection
369369

370370
// WiFi interface status
371371
static bool wifiApRunning;
372372

373-
static int wifiFailedConnectionAttempts = 0; // Count the number of connection attempts between restarts
374373
static WiFiMulti *wifiMulti;
375374

376375
//*********************************************************************

0 commit comments

Comments
 (0)