format files

src/activities/network/AutoConnectingActivity.cpp

@@ -1,81 +1,75 @@
 #include "AutoConnectingActivity.h"
 
-#include <string>
-#include <WiFi.h>
 #include <GfxRenderer.h>
-#include "MappedInputManager.h"
-#include "fontIds.h"
-#include "CrossPointSettings.h"
-#include "WifiCredentialStore.h"
+#include <WiFi.h>
 
-AutoConnectingActivity::AutoConnectingActivity(
-    GfxRenderer& renderer,
-    MappedInputManager& mappedInput,
-    const std::function<void()>& on_success,
-    const std::function<void()>& on_failure
-) : Activity("AutoConnecting", renderer, mappedInput),
-    on_success(on_success),
-    on_failure(on_failure) {}
+#include <string>
+
+#include "CrossPointSettings.h"
+#include "MappedInputManager.h"
+#include "WifiCredentialStore.h"
+#include "fontIds.h"
+
+AutoConnectingActivity::AutoConnectingActivity(GfxRenderer& renderer, MappedInputManager& mappedInput,
+                                               const std::function<void()>& on_success,
+                                               const std::function<void()>& on_failure)
+    : Activity("AutoConnecting", renderer, mappedInput), on_success(on_success), on_failure(on_failure) {}
 
 void AutoConnectingActivity::onEnter() {
-    Activity::onEnter();
-    render();
-    attemptConnection();
+  Activity::onEnter();
+  render();
+  attemptConnection();
 }
 
-void AutoConnectingActivity::onExit() {
-    Activity::onExit();
-}
+void AutoConnectingActivity::onExit() { Activity::onExit(); }
 
-void AutoConnectingActivity::loop() {
-    checkConnectionStatus();
-}
+void AutoConnectingActivity::loop() { checkConnectionStatus(); }
 
 void AutoConnectingActivity::attemptConnection() {
-    connectionStartTime = millis();
-    std::string ssid = SETTINGS.lastConnectedSSID;
-    const auto* cred = WIFI_STORE.findCredential(ssid);
-    if (!cred) {
-        on_failure();
-        return;
-    }
-    
-    WiFi.mode(WIFI_STA);
-    WiFi.begin(ssid.c_str(), cred->password.c_str());
+  connectionStartTime = millis();
+  std::string ssid = SETTINGS.lastConnectedSSID;
+  const auto* cred = WIFI_STORE.findCredential(ssid);
+  if (!cred) {
+    on_failure();
+    return;
+  }
+
+  WiFi.mode(WIFI_STA);
+  WiFi.begin(ssid.c_str(), cred->password.c_str());
 }
 
 void AutoConnectingActivity::checkConnectionStatus() {
-    const wl_status_t status = WiFi.status();
+  const wl_status_t status = WiFi.status();
 
-    if (status == WL_CONNECTED) {
-        on_success();
-        return;
-    }
+  if (status == WL_CONNECTED) {
+    on_success();
+    return;
+  }
 
-    if (status == WL_CONNECT_FAILED || status == WL_NO_SSID_AVAIL) {
-        on_failure();
-        return;
-    }
+  if (status == WL_CONNECT_FAILED || status == WL_NO_SSID_AVAIL) {
+    on_failure();
+    return;
+  }
 
-    if (millis() - connectionStartTime > CONNECTION_TIMEOUT_MS) {
-        WiFi.disconnect();
-        on_failure();
-        return;
-    }
+  if (millis() - connectionStartTime > CONNECTION_TIMEOUT_MS) {
+    WiFi.disconnect();
+    on_failure();
+    return;
+  }
 }
 
 void AutoConnectingActivity::render() const {
-    renderer.clearScreen();
-    const auto pageHeight = renderer.getScreenHeight();
-    const auto height = renderer.getLineHeight(UI_10_FONT_ID);
-    const auto top = (pageHeight - height) / 2;
+  renderer.clearScreen();
+  const auto pageHeight = renderer.getScreenHeight();
+  const auto height = renderer.getLineHeight(UI_10_FONT_ID);
+  const auto top = (pageHeight - height) / 2;
 
-    renderer.drawCenteredText(UI_12_FONT_ID, top - 40, "Connecting...", true, EpdFontFamily::BOLD);
+  renderer.drawCenteredText(UI_12_FONT_ID, top - 40, "Connecting...", true, EpdFontFamily::BOLD);
 
-    std::string ssidInfo = "to " + std::string(SETTINGS.lastConnectedSSID);
-    if (ssidInfo.length() > 25) {
-      ssidInfo.replace(22, ssidInfo.length() - 22, "...");
-    }
-    renderer.drawCenteredText(UI_10_FONT_ID, top, ssidInfo.c_str());
-    renderer.displayBuffer();
+  std::string ssidInfo = "to " + std::string(SETTINGS.lastConnectedSSID);
+  if (ssidInfo.length() > 25) {
+    ssidInfo.replace(22, ssidInfo.length() - 22, "...");
+  }
+  renderer.drawCenteredText(UI_10_FONT_ID, top, ssidInfo.c_str());
+  renderer.displayBuffer();
 }

src/activities/network/AutoConnectingActivity.h

@@ -1,29 +1,26 @@
 #pragma once
 
-#include "activities/Activity.h"
 #include <functional>
 
+#include "activities/Activity.h"
+
 class AutoConnectingActivity final : public Activity {
-public:
-    AutoConnectingActivity(
-        GfxRenderer& renderer,
-        MappedInputManager& mappedInput,
-        const std::function<void()>& on_success,
-        const std::function<void()>& on_failure
-    );
+ public:
+  AutoConnectingActivity(GfxRenderer& renderer, MappedInputManager& mappedInput,
+                         const std::function<void()>& on_success, const std::function<void()>& on_failure);
 
-    void onEnter() override;
-    void onExit() override;
-    void loop() override;
+  void onEnter() override;
+  void onExit() override;
+  void loop() override;
 
-private:
-    void render() const;
-    void attemptConnection();
-    void checkConnectionStatus();
+ private:
+  void render() const;
+  void attemptConnection();
+  void checkConnectionStatus();
 
-    const std::function<void()> on_success;
-    const std::function<void()> on_failure;
+  const std::function<void()> on_success;
+  const std::function<void()> on_failure;
 
-    unsigned long connectionStartTime = 0;
-    static constexpr unsigned long CONNECTION_TIMEOUT_MS = 15000;
+  unsigned long connectionStartTime = 0;
+  static constexpr unsigned long CONNECTION_TIMEOUT_MS = 15000;
 };

src/activities/network/WifiSelectionActivity.cpp

@@ -6,11 +6,11 @@
 #include <algorithm>
 #include <map>
 
+#include "CrossPointSettings.h"
 #include "MappedInputManager.h"
 #include "WifiCredentialStore.h"
 #include "activities/util/KeyboardEntryActivity.h"
 #include "fontIds.h"
-#include "CrossPointSettings.h"
 
 void WifiSelectionActivity::taskTrampoline(void* param) {
   auto* self = static_cast<WifiSelectionActivity*>(param);
@@ -364,7 +364,7 @@ void WifiSelectionActivity::loop() {
         xSemaphoreGive(renderingMutex);
         // Update the network list to reflect the change
         const auto network = std::find_if(networks.begin(), networks.end(),
-                                     [this](const WifiNetworkInfo& net) { return net.ssid == selectedSSID; });
+                                          [this](const WifiNetworkInfo& net) { return net.ssid == selectedSSID; });
         if (network != networks.end()) {
           network->hasSavedPassword = false;
         }

src/activities/settings/SettingsActivity.cpp

@@ -53,7 +53,9 @@ const SettingInfo systemSettings[systemSettingsCount] = {
     SettingInfo::Enum("Time to Sleep", &CrossPointSettings::sleepTimeout,
                       {"1 min", "5 min", "10 min", "15 min", "30 min"}),
     SettingInfo::Action("Network"),
-    SettingInfo::Action("KOReader Sync"), SettingInfo::Action("OPDS Browser"), SettingInfo::Action("Clear Cache"),
+    SettingInfo::Action("KOReader Sync"),
+    SettingInfo::Action("OPDS Browser"),
+    SettingInfo::Action("Clear Cache"),
     SettingInfo::Action("Check for updates")};
 }  // namespace
 

src/main.cpp

@@ -5,6 +5,7 @@
 #include <HalGPIO.h>
 #include <SDCardManager.h>
 #include <SPI.h>
+#include <WiFi.h>
 #include <builtinFonts/all.h>
 
 #include <cstring>
@@ -20,14 +21,13 @@
 #include "activities/browser/OpdsBookBrowserActivity.h"
 #include "activities/home/HomeActivity.h"
 #include "activities/home/MyLibraryActivity.h"
+#include "activities/network/AutoConnectingActivity.h"
 #include "activities/network/CrossPointWebServerActivity.h"
+#include "activities/network/WifiSelectionActivity.h"
 #include "activities/reader/ReaderActivity.h"
 #include "activities/settings/SettingsActivity.h"
 #include "activities/util/FullScreenMessageActivity.h"
-#include "activities/network/AutoConnectingActivity.h"
-#include "activities/network/WifiSelectionActivity.h"
 #include "fontIds.h"
-#include <WiFi.h>
 
 HalDisplay display;
 HalGPIO gpio;
@@ -214,7 +214,7 @@ void onGoToReader(const std::string& initialEpubPath, MyLibraryActivity::Tab fro
 }
 void onContinueReading() { onGoToReader(APP_STATE.openEpubPath, MyLibraryActivity::Tab::Recent); }
 
-void onGoHome(); // forward declaration
+void onGoHome();  // forward declaration
 
 void withWifi(std::function<void()> on_success) {
   if (WiFi.isConnected()) {