Rename

MagicCube · Feb 18, 2020 · 4d9c691 · 4d9c691
1 parent 31999f6
commit 4d9c691
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/src/espix-core/networking/WiFiNetwork.cpp b/src/espix-core/networking/WiFiNetwork.cpp
@@ -12,7 +12,7 @@ bool WiFiNetworkClass::isConnected() {
   return WiFi.status() == WL_CONNECTED;
 }
 
-WiFiConnectionState WiFiNetworkClass::getStatus() {
+WiFiConnectionState WiFiNetworkClass::getConnectionState() {
   return _connectionState;
 }
 

diff --git a/src/espix-core/networking/WiFiNetwork.h b/src/espix-core/networking/WiFiNetwork.h
@@ -17,7 +17,7 @@ class WiFiNetworkClass {
   WiFiNetworkClass();
 
   bool isConnected();
-  WiFiConnectionState getStatus();
+  WiFiConnectionState getConnectionState();
   String getLocalIP();
 
   void addToPreferredList(WiFiConnectionSetting setting);

diff --git a/src/main.cpp b/src/main.cpp
@@ -24,7 +24,7 @@ SH1106Wire display(0x3c, OLED_SDA_PIN, OLED_CLK_PIN);
 
 StatusBar statusBar;
 RootView rootView;
-ProgressView connectionView("Connecting to WiFi...", ProgressMode::INDETERMINATE);
+ProgressView connectionView("Setup WiFi connections...", ProgressMode::INDETERMINATE);
 
 void onConnected() {
   connecting = false;
@@ -164,6 +164,15 @@ void loop() {
   checkScreenBrightness();
 #endif
 
+  if (connecting) {
+    auto state = WiFiNetwork.getConnectionState();
+    if (state == WiFiConnectionState::SCANNING) {
+      connectionView.setText("Scanning WiFi...");
+    } else if (state == WiFiConnectionState::CONNECTING) {
+      connectionView.setText("Connecting to WiFi...");
+    }
+  }
+
   int timeBudget = Application.update();
   if (timeBudget > 0) {
     delay(timeBudget);